Skip to content
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4d0c871
added libgig port to vcpkg
Rossmaxx Aug 18, 2023
e1088b0
attempted fix to patch fix
Rossmaxx Aug 18, 2023
b0a03c0
changed CRLF to LF
Rossmaxx Aug 18, 2023
77c11ec
added end of lines
Rossmaxx Aug 18, 2023
363c9fb
enabled libuuid for windows
Rossmaxx Aug 18, 2023
89d1b51
Revert "enabled libuuid for windows"
Rossmaxx Aug 18, 2023
2ff44b8
added blank spaces in other lines
Rossmaxx Aug 19, 2023
3be8b95
blacklisted uwp
Rossmaxx Aug 19, 2023
b946c4d
tweaked the patch to enable cmake cpp 11
Rossmaxx Aug 20, 2023
231c302
fix formatting
Rossmaxx Aug 20, 2023
27d2801
patched 32 bit builds
Rossmaxx Aug 21, 2023
1548bdf
does this fix versioning?
Rossmaxx Aug 21, 2023
170df35
another fix attempt at versioning
Rossmaxx Aug 21, 2023
caaf88f
added missing blank line
Rossmaxx Aug 21, 2023
3e9a826
added version
Rossmaxx Aug 22, 2023
1bca871
Removed unnecessary vcpkg_fixup_pkgconfig call
Rossmaxx Aug 24, 2023
c7ddcd3
added extra tools to portfile
Rossmaxx Aug 27, 2023
e392d11
fixed libakai using a patch
Rossmaxx Aug 27, 2023
c418eb7
versions
Rossmaxx Aug 27, 2023
9f47442
Revert "fixed libakai using a patch"
Rossmaxx Aug 27, 2023
35b646b
added versions
Rossmaxx Aug 27, 2023
381f682
revoked mac and linux support
Rossmaxx Sep 24, 2023
f579a95
removed linux build patch
Rossmaxx Sep 24, 2023
a127e28
versions
Rossmaxx Sep 24, 2023
70260c5
added usage patch
Rossmaxx Sep 28, 2023
ba34393
versions
Rossmaxx Sep 28, 2023
da5672b
removed auto clean
Rossmaxx Sep 30, 2023
a7c9be0
removed "extra" from extra-tools
Rossmaxx Oct 2, 2023
768a420
fixed formatting
Rossmaxx Oct 2, 2023
181d6b9
version
Rossmaxx Oct 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ports/libgig/0001-msvc-fix-ssize_t.patch
Original file line number Diff line number Diff line change
@@ -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 <assert.h>
#include <functional>

+#ifdef _MSC_VER
+#include <BaseTsd.h>
+using ssize_t = SSIZE_T;
+#endif
+
#ifndef __has_extension
# define __has_extension(x) 0
#endif
18 changes: 18 additions & 0 deletions ports/libgig/0002-cmake-fixes.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
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
19 changes: 19 additions & 0 deletions ports/libgig/0003-fix-usage.patch
Original file line number Diff line number Diff line change
@@ -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)

40 changes: 40 additions & 0 deletions ports/libgig/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
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-cmake-fixes.patch
0003-fix-usage.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()
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")
endif()
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")
31 changes: 31 additions & 0 deletions ports/libgig/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"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": "windows & !uwp",
"dependencies": [
{
"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"
]
}
}
}
4 changes: 4 additions & 0 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions versions/l-/libgig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "167b2aee97b24467c70b734089a093e86ac1d54e",
"version": "4.3.0",
"port-version": 0
}
]
}