From 4d0c8713e5726a0aa451168ac19ccce28714d97a Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 18 Aug 2023 15:14:39 +0530 Subject: [PATCH 01/30] added libgig port to vcpkg --- ports/libgig/0001-msvc-fix-ssize_t.patch | 16 ++++++++++ ports/libgig/0002-always-allow-cmake.patch | 15 +++++++++ ports/libgig/0003-fix-linux-build.patch | 26 +++++++++++++++ ports/libgig/portfile.cmake | 37 ++++++++++++++++++++++ ports/libgig/vcpkg.json | 34 ++++++++++++++++++++ versions/1-/libgig.json | 9 ++++++ versions/baseline.json | 4 +++ 7 files changed, 141 insertions(+) create mode 100644 ports/libgig/0001-msvc-fix-ssize_t.patch create mode 100644 ports/libgig/0002-always-allow-cmake.patch create mode 100644 ports/libgig/0003-fix-linux-build.patch create mode 100644 ports/libgig/portfile.cmake create mode 100644 ports/libgig/vcpkg.json create mode 100644 versions/1-/libgig.json diff --git a/ports/libgig/0001-msvc-fix-ssize_t.patch b/ports/libgig/0001-msvc-fix-ssize_t.patch new file mode 100644 index 00000000000000..03270c57d34772 --- /dev/null +++ b/ports/libgig/0001-msvc-fix-ssize_t.patch @@ -0,0 +1,16 @@ +diff --git a/src/Serialization.h b/src/Serialization.h +index cccfc54..91a8fa4 100644 +--- a/src/Serialization.h ++++ b/src/Serialization.h +@@ -40,6 +40,11 @@ + #include + #include + ++#ifdef _MSC_VER ++#include ++using ssize_t = std::make_signed::type; ++#endif ++ + #ifndef __has_extension + # define __has_extension(x) 0 + #endif \ No newline at end of file diff --git a/ports/libgig/0002-always-allow-cmake.patch b/ports/libgig/0002-always-allow-cmake.patch new file mode 100644 index 00000000000000..707c31a1447ba4 --- /dev/null +++ b/ports/libgig/0002-always-allow-cmake.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ae66913..9bff4b1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,10 +1,6 @@ + cmake_minimum_required(VERSION 3.0) + project(libgig) + +-if(NOT MSVC) +- message(FATAL_ERROR "Please use configure and make, this cmake file is currently only to generate msvc solution files") +-endif() +- + + #configuration options + set(LIBGIG_BUILD_TOOLS ON CACHE BOOL "Build the extra tools") \ No newline at end of file diff --git a/ports/libgig/0003-fix-linux-build.patch b/ports/libgig/0003-fix-linux-build.patch new file mode 100644 index 00000000000000..62b076b76e1ed1 --- /dev/null +++ b/ports/libgig/0003-fix-linux-build.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bff4b1..ef3a9db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,6 +17,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + ++if(NOT WIN32 AND NOT APPLE) ++ find_package(unofficial-libuuid CONFIG REQUIRED) ++ add_definitions(-DHAVE_UUID_UUID_H -DHAVE_UUID_GENERATE) ++endif() ++ + #TODO: this is written for vcpkg cppunit install + #if you're adding other platform and package managers it's probably better to put everything in FindCppUnit.cmake + #and replace everything here with a simple find_package(CppUnit) +@@ -89,6 +94,9 @@ endif() + if(BUILD_SHARED_LIBS AND MSVC) + set_target_properties(libgig PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + endif() ++if(NOT WIN32 AND NOT APPLE) ++ target_link_libraries(libgig PRIVATE unofficial::UUID::uuid) ++endif() + + #libakai library + add_library(libakai src/Akai.cpp) \ No newline at end of file diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake new file mode 100644 index 00000000000000..5030754e5015d7 --- /dev/null +++ b/ports/libgig/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://download.linuxsampler.org/packages/libgig-4.3.0.tar.bz2" + FILENAME "libgig-4.3.0.tar.bz2" + SHA512 683c09b1d17acf69020c631452b7dfb25ac54c3701db5e97471d4e7973e9a06267667bf19bfe4eb00d2964223e8446f248d93b4cf29c062dec2588758b4dfba2 +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + 0001-msvc-fix-ssize_t.patch + 0002-always-allow-cmake.patch + 0003-fix-linux-build.patch +) + +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic LIBGIG_BUILD_SHARED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + extra-tools LIBGIG_BUILD_TOOLS + tests LIBGIG_ENABLE_TESTING +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBGIG_BUILD_SHARED=${LIBGIG_BUILD_SHARED} +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json new file mode 100644 index 00000000000000..70b02af2605ecd --- /dev/null +++ b/ports/libgig/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "libgig", + "version": "4.3.0", + "description": "C++ library for loading Gigasampler files and DLS Level 1/2 files", + "homepage": "https://www.linuxsampler.org/libgig/", + "dependencies": [ + { + "name": "libuuid", + "platform": "!osx & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "extra-tools": { + "description": "Build extra tools", + "dependencies": [ + "libsndfile" + ] + }, + "tests": { + "description": "Build test cases", + "dependencies": [ + "cppunit" + ] + } + } + } \ No newline at end of file diff --git a/versions/1-/libgig.json b/versions/1-/libgig.json new file mode 100644 index 00000000000000..be460bfbced0fe --- /dev/null +++ b/versions/1-/libgig.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2fa5ea53c13d57f430f7b38a8c09596ade36969c", + "version": "4.3.0", + "port-version": 0 + } + ] + } \ No newline at end of file diff --git a/versions/baseline.json b/versions/baseline.json index 2b1c2caf20e628..674ca10d5dd195 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4136,6 +4136,10 @@ "baseline": "1.7.1", "port-version": 3 }, + "libgig": { + "baseline": "4.3.0", + "port-version": 0 + }, "libgit2": { "baseline": "1.6.4", "port-version": 1 From e1088b08415110dfde4760c9e3acc44be81e1d4e Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 18 Aug 2023 15:37:23 +0530 Subject: [PATCH 02/30] attempted fix to patch fix --- ports/libgig/0001-msvc-fix-ssize_t.patch | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/libgig/0001-msvc-fix-ssize_t.patch b/ports/libgig/0001-msvc-fix-ssize_t.patch index 03270c57d34772..baa16e96cd6ef3 100644 --- a/ports/libgig/0001-msvc-fix-ssize_t.patch +++ b/ports/libgig/0001-msvc-fix-ssize_t.patch @@ -5,7 +5,6 @@ index cccfc54..91a8fa4 100644 @@ -40,6 +40,11 @@ #include #include - +#ifdef _MSC_VER +#include +using ssize_t = std::make_signed::type; From b0a03c0846a5878fc14b81473055345603f0ead8 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 18 Aug 2023 15:54:25 +0530 Subject: [PATCH 03/30] changed CRLF to LF --- ports/libgig/0001-msvc-fix-ssize_t.patch | 29 +++++++------ ports/libgig/0002-always-allow-cmake.patch | 28 ++++++------ ports/libgig/0003-fix-linux-build.patch | 50 +++++++++++----------- 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/ports/libgig/0001-msvc-fix-ssize_t.patch b/ports/libgig/0001-msvc-fix-ssize_t.patch index baa16e96cd6ef3..e0d804caae04e4 100644 --- a/ports/libgig/0001-msvc-fix-ssize_t.patch +++ b/ports/libgig/0001-msvc-fix-ssize_t.patch @@ -1,15 +1,16 @@ -diff --git a/src/Serialization.h b/src/Serialization.h -index cccfc54..91a8fa4 100644 ---- a/src/Serialization.h -+++ b/src/Serialization.h -@@ -40,6 +40,11 @@ - #include - #include -+#ifdef _MSC_VER -+#include -+using ssize_t = std::make_signed::type; -+#endif -+ - #ifndef __has_extension - # define __has_extension(x) 0 +diff --git a/src/Serialization.h b/src/Serialization.h +index cccfc54..91a8fa4 100644 +--- a/src/Serialization.h ++++ b/src/Serialization.h +@@ -40,6 +40,11 @@ + #include + #include + ++#ifdef _MSC_VER ++#include ++using ssize_t = std::make_signed::type; ++#endif ++ + #ifndef __has_extension + # define __has_extension(x) 0 #endif \ No newline at end of file diff --git a/ports/libgig/0002-always-allow-cmake.patch b/ports/libgig/0002-always-allow-cmake.patch index 707c31a1447ba4..4737819c5ab961 100644 --- a/ports/libgig/0002-always-allow-cmake.patch +++ b/ports/libgig/0002-always-allow-cmake.patch @@ -1,15 +1,15 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae66913..9bff4b1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,10 +1,6 @@ - cmake_minimum_required(VERSION 3.0) - project(libgig) - --if(NOT MSVC) -- message(FATAL_ERROR "Please use configure and make, this cmake file is currently only to generate msvc solution files") --endif() -- - - #configuration options +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ae66913..9bff4b1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,10 +1,6 @@ + cmake_minimum_required(VERSION 3.0) + project(libgig) + +-if(NOT MSVC) +- message(FATAL_ERROR "Please use configure and make, this cmake file is currently only to generate msvc solution files") +-endif() +- + + #configuration options set(LIBGIG_BUILD_TOOLS ON CACHE BOOL "Build the extra tools") \ No newline at end of file diff --git a/ports/libgig/0003-fix-linux-build.patch b/ports/libgig/0003-fix-linux-build.patch index 62b076b76e1ed1..1a8bc7fbbef61f 100644 --- a/ports/libgig/0003-fix-linux-build.patch +++ b/ports/libgig/0003-fix-linux-build.patch @@ -1,26 +1,26 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9bff4b1..ef3a9db 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - -+if(NOT WIN32 AND NOT APPLE) -+ find_package(unofficial-libuuid CONFIG REQUIRED) -+ add_definitions(-DHAVE_UUID_UUID_H -DHAVE_UUID_GENERATE) -+endif() -+ - #TODO: this is written for vcpkg cppunit install - #if you're adding other platform and package managers it's probably better to put everything in FindCppUnit.cmake - #and replace everything here with a simple find_package(CppUnit) -@@ -89,6 +94,9 @@ endif() - if(BUILD_SHARED_LIBS AND MSVC) - set_target_properties(libgig PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) - endif() -+if(NOT WIN32 AND NOT APPLE) -+ target_link_libraries(libgig PRIVATE unofficial::UUID::uuid) -+endif() - - #libakai library +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bff4b1..ef3a9db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,6 +17,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + ++if(NOT WIN32 AND NOT APPLE) ++ find_package(unofficial-libuuid CONFIG REQUIRED) ++ add_definitions(-DHAVE_UUID_UUID_H -DHAVE_UUID_GENERATE) ++endif() ++ + #TODO: this is written for vcpkg cppunit install + #if you're adding other platform and package managers it's probably better to put everything in FindCppUnit.cmake + #and replace everything here with a simple find_package(CppUnit) +@@ -89,6 +94,9 @@ endif() + if(BUILD_SHARED_LIBS AND MSVC) + set_target_properties(libgig PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + endif() ++if(NOT WIN32 AND NOT APPLE) ++ target_link_libraries(libgig PRIVATE unofficial::UUID::uuid) ++endif() + + #libakai library add_library(libakai src/Akai.cpp) \ No newline at end of file From 77c11ec1cc25f04191b207c9359623815072e676 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 18 Aug 2023 16:24:54 +0530 Subject: [PATCH 04/30] added end of lines --- ports/libgig/0001-msvc-fix-ssize_t.patch | 2 +- ports/libgig/0002-always-allow-cmake.patch | 2 +- ports/libgig/0003-fix-linux-build.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/libgig/0001-msvc-fix-ssize_t.patch b/ports/libgig/0001-msvc-fix-ssize_t.patch index e0d804caae04e4..e0e7280758e41f 100644 --- a/ports/libgig/0001-msvc-fix-ssize_t.patch +++ b/ports/libgig/0001-msvc-fix-ssize_t.patch @@ -13,4 +13,4 @@ index cccfc54..91a8fa4 100644 + #ifndef __has_extension # define __has_extension(x) 0 - #endif \ No newline at end of file + #endif diff --git a/ports/libgig/0002-always-allow-cmake.patch b/ports/libgig/0002-always-allow-cmake.patch index 4737819c5ab961..c95848a3740f48 100644 --- a/ports/libgig/0002-always-allow-cmake.patch +++ b/ports/libgig/0002-always-allow-cmake.patch @@ -12,4 +12,4 @@ index ae66913..9bff4b1 100644 - #configuration options - set(LIBGIG_BUILD_TOOLS ON CACHE BOOL "Build the extra tools") \ No newline at end of file + set(LIBGIG_BUILD_TOOLS ON CACHE BOOL "Build the extra tools") diff --git a/ports/libgig/0003-fix-linux-build.patch b/ports/libgig/0003-fix-linux-build.patch index 1a8bc7fbbef61f..d2c2e0fe41bbaa 100644 --- a/ports/libgig/0003-fix-linux-build.patch +++ b/ports/libgig/0003-fix-linux-build.patch @@ -23,4 +23,4 @@ index 9bff4b1..ef3a9db 100644 +endif() #libakai library - add_library(libakai src/Akai.cpp) \ No newline at end of file + add_library(libakai src/Akai.cpp) From 363c9fb129311c8c61f72291d8c919af42bb1a24 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 18 Aug 2023 17:17:30 +0530 Subject: [PATCH 05/30] enabled libuuid for windows --- ports/libgig/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json index 70b02af2605ecd..d9a844dae9bcfe 100644 --- a/ports/libgig/vcpkg.json +++ b/ports/libgig/vcpkg.json @@ -6,7 +6,7 @@ "dependencies": [ { "name": "libuuid", - "platform": "!osx & !windows" + "platform": "!osx" }, { "name": "vcpkg-cmake", From 89d1b51e91de2edfceba5e31b45502dc5481abe5 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Fri, 18 Aug 2023 17:21:57 +0530 Subject: [PATCH 06/30] Revert "enabled libuuid for windows" This reverts commit 363c9fb129311c8c61f72291d8c919af42bb1a24. --- ports/libgig/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json index d9a844dae9bcfe..70b02af2605ecd 100644 --- a/ports/libgig/vcpkg.json +++ b/ports/libgig/vcpkg.json @@ -6,7 +6,7 @@ "dependencies": [ { "name": "libuuid", - "platform": "!osx" + "platform": "!osx & !windows" }, { "name": "vcpkg-cmake", From 2ff44b8ecfc7fc61789200d02ba8bf5640e0360d Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 19 Aug 2023 09:22:22 +0530 Subject: [PATCH 07/30] added blank spaces in other lines --- ports/libgig/portfile.cmake | 2 +- ports/libgig/vcpkg.json | 2 +- versions/1-/libgig.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake index 5030754e5015d7..49c766f212f0b3 100644 --- a/ports/libgig/portfile.cmake +++ b/ports/libgig/portfile.cmake @@ -34,4 +34,4 @@ vcpkg_cmake_config_fixup() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json index 70b02af2605ecd..33af9bed01222d 100644 --- a/ports/libgig/vcpkg.json +++ b/ports/libgig/vcpkg.json @@ -31,4 +31,4 @@ ] } } - } \ No newline at end of file + } diff --git a/versions/1-/libgig.json b/versions/1-/libgig.json index be460bfbced0fe..38411899987df7 100644 --- a/versions/1-/libgig.json +++ b/versions/1-/libgig.json @@ -6,4 +6,4 @@ "port-version": 0 } ] - } \ No newline at end of file + } From 3be8b958181e34a61d7221a68b5fea7407964086 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 19 Aug 2023 15:32:57 +0530 Subject: [PATCH 08/30] blacklisted uwp --- ports/libgig/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json index 33af9bed01222d..861e177c256abe 100644 --- a/ports/libgig/vcpkg.json +++ b/ports/libgig/vcpkg.json @@ -3,6 +3,7 @@ "version": "4.3.0", "description": "C++ library for loading Gigasampler files and DLS Level 1/2 files", "homepage": "https://www.linuxsampler.org/libgig/", + "supports": "!uwp", "dependencies": [ { "name": "libuuid", From b946c4d598ef40842fff589b48bcd0254be6c148 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 20 Aug 2023 14:44:47 +0530 Subject: [PATCH 09/30] tweaked the patch to enable cmake cpp 11 --- ...low-cmake.patch => 0002-cmake-fixes.patch} | 33 ++++++++++--------- ports/libgig/portfile.cmake | 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) rename ports/libgig/{0002-always-allow-cmake.patch => 0002-cmake-fixes.patch} (52%) diff --git a/ports/libgig/0002-always-allow-cmake.patch b/ports/libgig/0002-cmake-fixes.patch similarity index 52% rename from ports/libgig/0002-always-allow-cmake.patch rename to ports/libgig/0002-cmake-fixes.patch index c95848a3740f48..19982f251c6e80 100644 --- a/ports/libgig/0002-always-allow-cmake.patch +++ b/ports/libgig/0002-cmake-fixes.patch @@ -1,15 +1,18 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae66913..9bff4b1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,10 +1,6 @@ - cmake_minimum_required(VERSION 3.0) - project(libgig) - --if(NOT MSVC) -- message(FATAL_ERROR "Please use configure and make, this cmake file is currently only to generate msvc solution files") --endif() -- - - #configuration options - set(LIBGIG_BUILD_TOOLS ON CACHE BOOL "Build the extra tools") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ae66913..893e3ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,9 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.1) + project(libgig) + +-if(NOT MSVC) +- message(FATAL_ERROR "Please use configure and make, this cmake file is currently only to generate msvc solution files") +-endif() ++#To force the compiler to use C++ 11 ++set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD_REQUIRED TRUE) + + + #configuration options diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake index 49c766f212f0b3..867fb4d8f4840d 100644 --- a/ports/libgig/portfile.cmake +++ b/ports/libgig/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" PATCHES 0001-msvc-fix-ssize_t.patch - 0002-always-allow-cmake.patch + 0002-cmake-fixes.patch 0003-fix-linux-build.patch ) From 231c302cadc8679503258b054c745300f0bf13c8 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 20 Aug 2023 14:47:54 +0530 Subject: [PATCH 10/30] fix formatting --- ports/libgig/vcpkg.json | 70 ++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json index 861e177c256abe..a3f0c8c6ef66f5 100644 --- a/ports/libgig/vcpkg.json +++ b/ports/libgig/vcpkg.json @@ -1,35 +1,35 @@ -{ - "name": "libgig", - "version": "4.3.0", - "description": "C++ library for loading Gigasampler files and DLS Level 1/2 files", - "homepage": "https://www.linuxsampler.org/libgig/", - "supports": "!uwp", - "dependencies": [ - { - "name": "libuuid", - "platform": "!osx & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "extra-tools": { - "description": "Build extra tools", - "dependencies": [ - "libsndfile" - ] - }, - "tests": { - "description": "Build test cases", - "dependencies": [ - "cppunit" - ] - } - } - } +{ + "name": "libgig", + "version": "4.3.0", + "description": "C++ library for loading Gigasampler files and DLS Level 1/2 files", + "homepage": "https://www.linuxsampler.org/libgig/", + "supports": "!uwp", + "dependencies": [ + { + "name": "libuuid", + "platform": "!osx & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "extra-tools": { + "description": "Build extra tools", + "dependencies": [ + "libsndfile" + ] + }, + "tests": { + "description": "Build test cases", + "dependencies": [ + "cppunit" + ] + } + } +} From 27d28013e1ebdff62a06e6bb4b9fd1d22d56b234 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 21 Aug 2023 16:44:59 +0530 Subject: [PATCH 11/30] patched 32 bit builds --- ports/libgig/0001-msvc-fix-ssize_t.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libgig/0001-msvc-fix-ssize_t.patch b/ports/libgig/0001-msvc-fix-ssize_t.patch index e0e7280758e41f..d2edce0e7be6be 100644 --- a/ports/libgig/0001-msvc-fix-ssize_t.patch +++ b/ports/libgig/0001-msvc-fix-ssize_t.patch @@ -7,8 +7,8 @@ index cccfc54..91a8fa4 100644 #include +#ifdef _MSC_VER -+#include -+using ssize_t = std::make_signed::type; ++#include ++using ssize_t = SSIZE_T; +#endif + #ifndef __has_extension From 1548bdfeb224a04424f376ab41048a2cb66e152a Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 21 Aug 2023 17:03:58 +0530 Subject: [PATCH 12/30] does this fix versioning? --- versions/1-/libgig.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/versions/1-/libgig.json b/versions/1-/libgig.json index 38411899987df7..115d6616811c6f 100644 --- a/versions/1-/libgig.json +++ b/versions/1-/libgig.json @@ -1,9 +1,9 @@ { - "versions": [ - { - "git-tree": "2fa5ea53c13d57f430f7b38a8c09596ade36969c", - "version": "4.3.0", - "port-version": 0 - } - ] - } + "versions": [ + { + "git-tree": "2fa5ea53c13d57f430f7b38a8c09596ade36969c", + "version": "4.3.0", + "port-version": 0 + } + ] +} From 170df35f0a7da96e578413cf1362a1639fe89362 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 21 Aug 2023 17:13:27 +0530 Subject: [PATCH 13/30] another fix attempt at versioning --- versions/1-/libgig.json | 9 --------- versions/l-/libgig.json | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 versions/1-/libgig.json create mode 100644 versions/l-/libgig.json diff --git a/versions/1-/libgig.json b/versions/1-/libgig.json deleted file mode 100644 index 115d6616811c6f..00000000000000 --- a/versions/1-/libgig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "2fa5ea53c13d57f430f7b38a8c09596ade36969c", - "version": "4.3.0", - "port-version": 0 - } - ] -} diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json new file mode 100644 index 00000000000000..39f96caf13ce2e --- /dev/null +++ b/versions/l-/libgig.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2fa5ea53c13d57f430f7b38a8c09596ade36969c", + "version": "4.3.0", + "port-version": 0 + } + ] +} \ No newline at end of file From caaf88f5cb4fec4788500d99d0354b21d462b389 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 21 Aug 2023 17:20:46 +0530 Subject: [PATCH 14/30] added missing blank line --- versions/l-/libgig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json index 39f96caf13ce2e..cd033d9799a031 100644 --- a/versions/l-/libgig.json +++ b/versions/l-/libgig.json @@ -6,4 +6,4 @@ "port-version": 0 } ] -} \ No newline at end of file +} From 3e9a82623b856357eea06b4ea817e990f4d9038b Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Tue, 22 Aug 2023 09:01:39 +0530 Subject: [PATCH 15/30] added version --- versions/l-/libgig.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json index cd033d9799a031..06b47b9b7c8a41 100644 --- a/versions/l-/libgig.json +++ b/versions/l-/libgig.json @@ -1,9 +1,9 @@ -{ - "versions": [ - { - "git-tree": "2fa5ea53c13d57f430f7b38a8c09596ade36969c", - "version": "4.3.0", - "port-version": 0 - } - ] -} +{ + "versions": [ + { + "git-tree": "8d48e224bf4c871734671e2808c0a3a9f054310a", + "version": "4.3.0", + "port-version": 0 + } + ] +} From 1bca8718b80b0ea75ee852629e8b55cfe800ece5 Mon Sep 17 00:00:00 2001 From: Rossmaxx <74815851+Rossmaxx@users.noreply.github.com> Date: Thu, 24 Aug 2023 11:27:45 +0530 Subject: [PATCH 16/30] Removed unnecessary vcpkg_fixup_pkgconfig call Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/libgig/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake index 867fb4d8f4840d..a9bcd3d81517e7 100644 --- a/ports/libgig/portfile.cmake +++ b/ports/libgig/portfile.cmake @@ -29,7 +29,6 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") From c7ddcd361b4a2102c19af6fe3306d9493ce8f2e5 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 27 Aug 2023 08:35:19 +0530 Subject: [PATCH 17/30] added extra tools to portfile --- ports/libgig/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake index a9bcd3d81517e7..953fbd2c1e38ee 100644 --- a/ports/libgig/portfile.cmake +++ b/ports/libgig/portfile.cmake @@ -29,6 +29,11 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +if("extra-tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES dlsdump gigdump gigmerge korg2gig korgdump rifftree sf2dump + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin" + AUTO_CLEAN) +endif() vcpkg_cmake_config_fixup() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") From e392d1197a8acfad9dfdd5324f312048351c2d17 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 27 Aug 2023 08:41:31 +0530 Subject: [PATCH 18/30] fixed libakai using a patch --- ports/libgig/0004-fix-libakai-cmake.patch | 13 +++++++++++++ ports/libgig/portfile.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 ports/libgig/0004-fix-libakai-cmake.patch diff --git a/ports/libgig/0004-fix-libakai-cmake.patch b/ports/libgig/0004-fix-libakai-cmake.patch new file mode 100644 index 00000000000000..c751d6403e6fad --- /dev/null +++ b/ports/libgig/0004-fix-libakai-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ae66913..79a1c7d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -130,7 +130,7 @@ install(TARGETS libgig EXPORT libgig-config + PUBLIC_HEADER DESTINATION include/libgig) + install(EXPORT libgig-config NAMESPACE libgig:: DESTINATION share/libgig) + +-install(TARGETS libakai EXPORT libakai-config ++install(TARGETS libakai EXPORT libgig-config + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake index 953fbd2c1e38ee..44e5841a0b5c2b 100644 --- a/ports/libgig/portfile.cmake +++ b/ports/libgig/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_extract_source_archive( 0001-msvc-fix-ssize_t.patch 0002-cmake-fixes.patch 0003-fix-linux-build.patch + 0004-fix-libakai-cmake.patch ) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic LIBGIG_BUILD_SHARED) From c418eb734703b621fa642dd80bfa4ecdd4a27eb4 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 27 Aug 2023 08:42:44 +0530 Subject: [PATCH 19/30] versions --- versions/l-/libgig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json index 06b47b9b7c8a41..49959484ee7498 100644 --- a/versions/l-/libgig.json +++ b/versions/l-/libgig.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8d48e224bf4c871734671e2808c0a3a9f054310a", + "git-tree": "824e38bf39798d335b687cccde7f1e1dd1e307a2", "version": "4.3.0", "port-version": 0 } From 9f4744248c1cf7ce603238b26ea091b1657ba68d Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 27 Aug 2023 08:49:35 +0530 Subject: [PATCH 20/30] Revert "fixed libakai using a patch" This reverts commit e392d1197a8acfad9dfdd5324f312048351c2d17. --- ports/libgig/0004-fix-libakai-cmake.patch | 13 ------------- ports/libgig/portfile.cmake | 1 - 2 files changed, 14 deletions(-) delete mode 100644 ports/libgig/0004-fix-libakai-cmake.patch diff --git a/ports/libgig/0004-fix-libakai-cmake.patch b/ports/libgig/0004-fix-libakai-cmake.patch deleted file mode 100644 index c751d6403e6fad..00000000000000 --- a/ports/libgig/0004-fix-libakai-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae66913..79a1c7d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -130,7 +130,7 @@ install(TARGETS libgig EXPORT libgig-config - PUBLIC_HEADER DESTINATION include/libgig) - install(EXPORT libgig-config NAMESPACE libgig:: DESTINATION share/libgig) - --install(TARGETS libakai EXPORT libakai-config -+install(TARGETS libakai EXPORT libgig-config - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake index 44e5841a0b5c2b..953fbd2c1e38ee 100644 --- a/ports/libgig/portfile.cmake +++ b/ports/libgig/portfile.cmake @@ -11,7 +11,6 @@ vcpkg_extract_source_archive( 0001-msvc-fix-ssize_t.patch 0002-cmake-fixes.patch 0003-fix-linux-build.patch - 0004-fix-libakai-cmake.patch ) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic LIBGIG_BUILD_SHARED) From 35b646be14c508b847a9085d32a87664af873904 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 27 Aug 2023 09:02:32 +0530 Subject: [PATCH 21/30] added versions --- versions/l-/libgig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json index 49959484ee7498..20870b0a0041eb 100644 --- a/versions/l-/libgig.json +++ b/versions/l-/libgig.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "824e38bf39798d335b687cccde7f1e1dd1e307a2", + "git-tree": "36cf3b459b5dd9c98a24580d7074972a6cb1248b", "version": "4.3.0", "port-version": 0 } From 381f682bec0ec285adc86c4593a06a94a9f8e2ae Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 24 Sep 2023 23:31:52 +0530 Subject: [PATCH 22/30] revoked mac and linux support --- ports/libgig/vcpkg.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json index a3f0c8c6ef66f5..370dcb35ec2d93 100644 --- a/ports/libgig/vcpkg.json +++ b/ports/libgig/vcpkg.json @@ -3,12 +3,8 @@ "version": "4.3.0", "description": "C++ library for loading Gigasampler files and DLS Level 1/2 files", "homepage": "https://www.linuxsampler.org/libgig/", - "supports": "!uwp", + "supports": "windows & !uwp", "dependencies": [ - { - "name": "libuuid", - "platform": "!osx & !windows" - }, { "name": "vcpkg-cmake", "host": true From f579a95a24d2ad499a9609bae3910b72de6565ff Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 24 Sep 2023 23:33:29 +0530 Subject: [PATCH 23/30] removed linux build patch --- ports/libgig/0003-fix-linux-build.patch | 26 ------------------------- ports/libgig/portfile.cmake | 1 - 2 files changed, 27 deletions(-) delete mode 100644 ports/libgig/0003-fix-linux-build.patch diff --git a/ports/libgig/0003-fix-linux-build.patch b/ports/libgig/0003-fix-linux-build.patch deleted file mode 100644 index d2c2e0fe41bbaa..00000000000000 --- a/ports/libgig/0003-fix-linux-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9bff4b1..ef3a9db 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - -+if(NOT WIN32 AND NOT APPLE) -+ find_package(unofficial-libuuid CONFIG REQUIRED) -+ add_definitions(-DHAVE_UUID_UUID_H -DHAVE_UUID_GENERATE) -+endif() -+ - #TODO: this is written for vcpkg cppunit install - #if you're adding other platform and package managers it's probably better to put everything in FindCppUnit.cmake - #and replace everything here with a simple find_package(CppUnit) -@@ -89,6 +94,9 @@ endif() - if(BUILD_SHARED_LIBS AND MSVC) - set_target_properties(libgig PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) - endif() -+if(NOT WIN32 AND NOT APPLE) -+ target_link_libraries(libgig PRIVATE unofficial::UUID::uuid) -+endif() - - #libakai library - add_library(libakai src/Akai.cpp) diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake index 953fbd2c1e38ee..ef4b5de46d385a 100644 --- a/ports/libgig/portfile.cmake +++ b/ports/libgig/portfile.cmake @@ -10,7 +10,6 @@ vcpkg_extract_source_archive( PATCHES 0001-msvc-fix-ssize_t.patch 0002-cmake-fixes.patch - 0003-fix-linux-build.patch ) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic LIBGIG_BUILD_SHARED) From a127e286f24d569f3eaeae1866300abbac90e805 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sun, 24 Sep 2023 23:41:29 +0530 Subject: [PATCH 24/30] versions --- versions/l-/libgig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json index 20870b0a0041eb..ab52cab93263e4 100644 --- a/versions/l-/libgig.json +++ b/versions/l-/libgig.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "36cf3b459b5dd9c98a24580d7074972a6cb1248b", + "git-tree": "94d4b61c502b15ae4e5b39861c1a51a9879ccda4", "version": "4.3.0", "port-version": 0 } From 70260c5378ce4a78fa1a1ccf24eb0ef20b2f1427 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 13:01:58 +0530 Subject: [PATCH 25/30] added usage patch --- ports/libgig/0003-fix-usage.patch | 19 +++++++++++++++++++ ports/libgig/portfile.cmake | 1 + 2 files changed, 20 insertions(+) create mode 100644 ports/libgig/0003-fix-usage.patch diff --git a/ports/libgig/0003-fix-usage.patch b/ports/libgig/0003-fix-usage.patch new file mode 100644 index 00000000000000..0b2c040bced3de --- /dev/null +++ b/ports/libgig/0003-fix-usage.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 893e3ea..2eef641 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,12 +128,11 @@ install(TARGETS libgig EXPORT libgig-config + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + PUBLIC_HEADER DESTINATION include/libgig) +-install(EXPORT libgig-config NAMESPACE libgig:: DESTINATION share/libgig) + +-install(TARGETS libakai EXPORT libakai-config ++install(TARGETS libakai EXPORT libgig-config + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + PUBLIC_HEADER DESTINATION include/libgig) +-install(EXPORT libakai-config NAMESPACE libgig:: DESTINATION share/libgig) ++install(EXPORT libgig-config NAMESPACE libgig:: DESTINATION share/libgig) + diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake index ef4b5de46d385a..02be55dcbaea6e 100644 --- a/ports/libgig/portfile.cmake +++ b/ports/libgig/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_extract_source_archive( PATCHES 0001-msvc-fix-ssize_t.patch 0002-cmake-fixes.patch + 0003-fix-usage.patch ) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic LIBGIG_BUILD_SHARED) From ba343931dc7d59e328b1e3d2640fd6c64f833224 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 28 Sep 2023 13:02:46 +0530 Subject: [PATCH 26/30] versions --- versions/l-/libgig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json index ab52cab93263e4..630dedccef73f6 100644 --- a/versions/l-/libgig.json +++ b/versions/l-/libgig.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "94d4b61c502b15ae4e5b39861c1a51a9879ccda4", + "git-tree": "167b2aee97b24467c70b734089a093e86ac1d54e", "version": "4.3.0", "port-version": 0 } From da5672b48d94f78cc8ad0452e48f64a54a65204a Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 30 Sep 2023 10:36:32 +0530 Subject: [PATCH 27/30] removed auto clean --- ports/libgig/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake index 02be55dcbaea6e..75a96447f88d78 100644 --- a/ports/libgig/portfile.cmake +++ b/ports/libgig/portfile.cmake @@ -31,8 +31,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() if("extra-tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES dlsdump gigdump gigmerge korg2gig korgdump rifftree sf2dump - SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin" - AUTO_CLEAN) + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin") endif() vcpkg_cmake_config_fixup() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") From a7c9be08ea3060e09091fedb38bfb7ca4700421b Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 2 Oct 2023 17:29:56 +0530 Subject: [PATCH 28/30] removed "extra" from extra-tools --- ports/libgig/portfile.cmake | 2 +- ports/libgig/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake index 75a96447f88d78..57f2748f878009 100644 --- a/ports/libgig/portfile.cmake +++ b/ports/libgig/portfile.cmake @@ -29,7 +29,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -if("extra-tools" IN_LIST FEATURES) +if("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES dlsdump gigdump gigmerge korg2gig korgdump rifftree sf2dump SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin") endif() diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json index 370dcb35ec2d93..e70218d818c7e6 100644 --- a/ports/libgig/vcpkg.json +++ b/ports/libgig/vcpkg.json @@ -15,7 +15,7 @@ } ], "features": { - "extra-tools": { + "tools": { "description": "Build extra tools", "dependencies": [ "libsndfile" From 768a420dd7692f882825663696ab79273530322e Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 2 Oct 2023 17:31:40 +0530 Subject: [PATCH 29/30] fixed formatting --- ports/libgig/vcpkg.json | 12 ++++++------ versions/l-/libgig.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json index e70218d818c7e6..917fb405e9817f 100644 --- a/ports/libgig/vcpkg.json +++ b/ports/libgig/vcpkg.json @@ -15,17 +15,17 @@ } ], "features": { - "tools": { - "description": "Build extra tools", - "dependencies": [ - "libsndfile" - ] - }, "tests": { "description": "Build test cases", "dependencies": [ "cppunit" ] + }, + "tools": { + "description": "Build extra tools", + "dependencies": [ + "libsndfile" + ] } } } diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json index 630dedccef73f6..88c76cf4d42f8b 100644 --- a/versions/l-/libgig.json +++ b/versions/l-/libgig.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "167b2aee97b24467c70b734089a093e86ac1d54e", + "git-tree": "c5ba1356e56635a18cbb6e396fd2d9f82dc5af02", "version": "4.3.0", "port-version": 0 } From 181d6b98127962dd2252b09bd3f7f493a4ca0c99 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Mon, 2 Oct 2023 17:31:56 +0530 Subject: [PATCH 30/30] version --- versions/l-/libgig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json index 88c76cf4d42f8b..b68106b2e4f233 100644 --- a/versions/l-/libgig.json +++ b/versions/l-/libgig.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c5ba1356e56635a18cbb6e396fd2d9f82dc5af02", + "git-tree": "328bc5b2b64bc33badee7d282589b14d49aadb55", "version": "4.3.0", "port-version": 0 }