Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
changed CRLF to LF
  • Loading branch information
Rossmaxx committed Aug 18, 2023
commit b0a03c0846a5878fc14b81473055345603f0ead8
29 changes: 15 additions & 14 deletions ports/libgig/0001-msvc-fix-ssize_t.patch
Original file line number Diff line number Diff line change
@@ -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 <assert.h>
#include <functional>
+#ifdef _MSC_VER
+#include <type_traits>
+using ssize_t = std::make_signed<std::size_t>::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 <assert.h>
#include <functional>

+#ifdef _MSC_VER
+#include <type_traits>
+using ssize_t = std::make_signed<std::size_t>::type;
+#endif
+
#ifndef __has_extension
# define __has_extension(x) 0
#endif
28 changes: 14 additions & 14 deletions ports/libgig/0002-always-allow-cmake.patch
Original file line number Diff line number Diff line change
@@ -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")
50 changes: 25 additions & 25 deletions ports/libgig/0003-fix-linux-build.patch
Original file line number Diff line number Diff line change
@@ -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)