Spaces:
Sleeping
Sleeping
4594782f71b118d8833af74a602fde1b424e1ecd8d343fd0696bf3c8b6cc55cf
Browse files- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-external-png-zlib.patch +40 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-external-rawlib.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-external-webp.patch +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-freeimage-config-include.patch +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-functions-to-override-libtiff-warning-error-handlers.patch +31 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-typedef-as-already-declared.patch +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/vcpkg.json +21 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/boost-1.70.patch +29 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/cmakelists_fixes.patch +238 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/fix-std-headers.patch +24 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/improve_compatibility_with_recent_boost.patch +54 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/include_asio_first.patch +138 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/portfile.cmake +36 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/serverObj.patch +14 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/uri_facade_win.patch +28 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/use_another_implementation_of_has_begin_end.patch +39 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/DontInstallSystemRuntimeLibs.patch +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/fix-include-path.patch +52 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/fix-libusb.patch +45 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/fix-linux-build.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/install-dirs.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/openssl_threads.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/portfile.cmake +145 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/vcpkg.json +31 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetds/portfile.cmake +72 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetds/vcpkg.json +19 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype-gl/glew.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype-gl/portfile.cmake +57 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype-gl/vcpkg.json +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/0003-Fix-UWP.patch +65 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/brotli-static.patch +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/fix-bzip2-pc.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/fix-exports.patch +40 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/portfile.cmake +83 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake +64 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/vcpkg.json +49 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freexl/fix-makefiles.patch +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freexl/fix-pc-file.patch +26 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freexl/fix-sources.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freexl/portfile.cmake +86 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/freexl/vcpkg.json +9 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fribidi/meson-crosscompile.patch +36 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fribidi/portfile.cmake +56 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fribidi/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/frozen/portfile.cmake +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/frozen/vcpkg.json +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/frugally-deep/portfile.cmake +28 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/frugally-deep/vcpkg.json +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fruit/portfile.cmake +23 -0
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-external-png-zlib.patch
ADDED
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp
|
2 |
+
index ba2ef17..c3c5cd6 100644
|
3 |
+
--- a/Source/FreeImage/PluginPNG.cpp
|
4 |
+
+++ b/Source/FreeImage/PluginPNG.cpp
|
5 |
+
@@ -40,8 +40,8 @@
|
6 |
+
|
7 |
+
// ----------------------------------------------------------
|
8 |
+
|
9 |
+
-#include "../ZLib/zlib.h"
|
10 |
+
-#include "../LibPNG/png.h"
|
11 |
+
+#include <zlib.h>
|
12 |
+
+#include <libpng16/png.h>
|
13 |
+
|
14 |
+
// ----------------------------------------------------------
|
15 |
+
|
16 |
+
diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp
|
17 |
+
index 3ab6d32..725618b 100644
|
18 |
+
--- a/Source/FreeImage/ZLibInterface.cpp
|
19 |
+
+++ b/Source/FreeImage/ZLibInterface.cpp
|
20 |
+
@@ -19,10 +19,9 @@
|
21 |
+
// Use at your own risk!
|
22 |
+
// ==========================================================
|
23 |
+
|
24 |
+
-#include "../ZLib/zlib.h"
|
25 |
+
+#include <zlib.h>
|
26 |
+
#include "FreeImage.h"
|
27 |
+
#include "Utilities.h"
|
28 |
+
-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
|
29 |
+
|
30 |
+
/**
|
31 |
+
Compresses a source buffer into a target buffer, using the ZLib library.
|
32 |
+
@@ -115,7 +114,7 @@ FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_s
|
33 |
+
return 0;
|
34 |
+
case Z_OK: {
|
35 |
+
// patch header, setup crc and length (stolen from mod_trace_output)
|
36 |
+
- BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code
|
37 |
+
+ BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code
|
38 |
+
crc = crc32(crc, source, source_size);
|
39 |
+
memcpy(target + 4 + dest_len, &crc, 4);
|
40 |
+
memcpy(target + 8 + dest_len, &source_size, 4);
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-external-rawlib.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp
|
2 |
+
index e9bd5bf..c7f8758 100644
|
3 |
+
--- a/Source/FreeImage/PluginRAW.cpp
|
4 |
+
+++ b/Source/FreeImage/PluginRAW.cpp
|
5 |
+
@@ -19,7 +19,7 @@
|
6 |
+
// Use at your own risk!
|
7 |
+
// ==========================================================
|
8 |
+
|
9 |
+
-#include "../LibRawLite/libraw/libraw.h"
|
10 |
+
+#include <libraw/libraw.h>
|
11 |
+
|
12 |
+
#include "FreeImage.h"
|
13 |
+
#include "Utilities.h"
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-external-webp.patch
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp
|
2 |
+
index 7c9f62f..c401447 100644
|
3 |
+
--- a/Source/FreeImage/PluginWebP.cpp
|
4 |
+
+++ b/Source/FreeImage/PluginWebP.cpp
|
5 |
+
@@ -24,9 +24,9 @@
|
6 |
+
|
7 |
+
#include "../Metadata/FreeImageTag.h"
|
8 |
+
|
9 |
+
-#include "../LibWebP/src/webp/decode.h"
|
10 |
+
-#include "../LibWebP/src/webp/encode.h"
|
11 |
+
-#include "../LibWebP/src/webp/mux.h"
|
12 |
+
+#include <webp/decode.h>
|
13 |
+
+#include <webp/encode.h>
|
14 |
+
+#include <webp/mux.h>
|
15 |
+
|
16 |
+
// ==========================================================
|
17 |
+
// Plugin Interface
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-freeimage-config-include.patch
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Source/FreeImage.h b/Source/FreeImage.h
|
2 |
+
index 12182cd..86a1e68 100644
|
3 |
+
--- a/Source/FreeImage.h
|
4 |
+
+++ b/Source/FreeImage.h
|
5 |
+
@@ -32,6 +32,11 @@
|
6 |
+
#define FREEIMAGE_MINOR_VERSION 18
|
7 |
+
#define FREEIMAGE_RELEASE_SERIAL 0
|
8 |
+
|
9 |
+
+// vcpkg specific includes --------------------------------------------------
|
10 |
+
+// Include FreeImageConfig.h to define FREEIMAGE_LIB in static builds,
|
11 |
+
+// or do not define it in dynamic builds
|
12 |
+
+#include "FreeImageConfig.h"
|
13 |
+
+
|
14 |
+
// Compiler options ---------------------------------------------------------
|
15 |
+
|
16 |
+
#include <wchar.h> // needed for UNICODE functions
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-functions-to-override-libtiff-warning-error-handlers.patch
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
|
2 |
+
index a9fcf0e..b1f7b32 100644
|
3 |
+
--- a/Source/FreeImage/PluginTIFF.cpp
|
4 |
+
+++ b/Source/FreeImage/PluginTIFF.cpp
|
5 |
+
@@ -258,7 +258,7 @@ static void
|
6 |
+
msdosWarningHandler(const char* module, const char* fmt, va_list ap) {
|
7 |
+
}
|
8 |
+
|
9 |
+
-TIFFErrorHandler _TIFFwarningHandler = msdosWarningHandler;
|
10 |
+
+//TIFFErrorHandler _TIFFwarningHandler = msdosWarningHandler;
|
11 |
+
|
12 |
+
static void
|
13 |
+
msdosErrorHandler(const char* module, const char* fmt, va_list ap) {
|
14 |
+
@@ -273,7 +273,7 @@ msdosErrorHandler(const char* module, const char* fmt, va_list ap) {
|
15 |
+
*/
|
16 |
+
}
|
17 |
+
|
18 |
+
-TIFFErrorHandler _TIFFerrorHandler = msdosErrorHandler;
|
19 |
+
+//TIFFErrorHandler _TIFFerrorHandler = msdosErrorHandler;
|
20 |
+
|
21 |
+
// ----------------------------------------------------------
|
22 |
+
|
23 |
+
@@ -2659,6 +2659,8 @@ InitTIFF(Plugin *plugin, int format_id) {
|
24 |
+
// Set up the callback for extended TIFF directory tag support (see XTIFF.cpp)
|
25 |
+
// Must be called before using libtiff
|
26 |
+
XTIFFInitialize();
|
27 |
+
+ TIFFSetWarningHandler(msdosWarningHandler);
|
28 |
+
+ TIFFSetErrorHandler(msdosErrorHandler);
|
29 |
+
|
30 |
+
plugin->format_proc = Format;
|
31 |
+
plugin->description_proc = Description;
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/use-typedef-as-already-declared.patch
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Source/FreeImage.h b/Source/FreeImage.h
|
2 |
+
index 1fd9c2f..59de277 100644
|
3 |
+
--- a/Source/FreeImage.h
|
4 |
+
+++ b/Source/FreeImage.h
|
5 |
+
@@ -160,8 +160,8 @@ typedef uint8_t BYTE;
|
6 |
+
typedef uint16_t WORD;
|
7 |
+
typedef uint32_t DWORD;
|
8 |
+
typedef int32_t LONG;
|
9 |
+
-typedef int64_t INT64;
|
10 |
+
-typedef uint64_t UINT64;
|
11 |
+
+typedef long long int INT64;
|
12 |
+
+typedef long long unsigned int UINT64;
|
13 |
+
#else
|
14 |
+
// MS is not C99 ISO compliant
|
15 |
+
typedef long BOOL;
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeimage/vcpkg.json
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "freeimage",
|
3 |
+
"version": "3.18.0",
|
4 |
+
"port-version": 22,
|
5 |
+
"description": "Support library for graphics image formats",
|
6 |
+
"homepage": "https://sourceforge.net/projects/freeimage/",
|
7 |
+
"dependencies": [
|
8 |
+
"jxrlib",
|
9 |
+
"libjpeg-turbo",
|
10 |
+
"libpng",
|
11 |
+
"libraw",
|
12 |
+
{
|
13 |
+
"name": "libwebp",
|
14 |
+
"platform": "!uwp"
|
15 |
+
},
|
16 |
+
"openexr",
|
17 |
+
"openjpeg",
|
18 |
+
"tiff",
|
19 |
+
"zlib"
|
20 |
+
]
|
21 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/boost-1.70.patch
ADDED
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/server/opc_tcp_async.cpp b/src/server/opc_tcp_async.cpp
|
2 |
+
index 9c34d72..9e68d9b 100644
|
3 |
+
--- a/src/server/opc_tcp_async.cpp
|
4 |
+
+++ b/src/server/opc_tcp_async.cpp
|
5 |
+
@@ -106,7 +106,11 @@ public:
|
6 |
+
*/
|
7 |
+
typedef std::promise<void> Promise;
|
8 |
+
Promise promise;
|
9 |
+
+#if BOOST_VERSION >= 107000
|
10 |
+
+ boost::asio::post(Socket.get_executor(), bind(&Promise::set_value, &promise));
|
11 |
+
+#else
|
12 |
+
Socket.get_io_service().post(bind(&Promise::set_value, &promise));
|
13 |
+
+#endif
|
14 |
+
promise.get_future().wait();
|
15 |
+
}
|
16 |
+
|
17 |
+
@@ -372,7 +376,11 @@ void OpcTcpServer::Shutdown()
|
18 |
+
*/
|
19 |
+
typedef std::promise<void> Promise;
|
20 |
+
Promise promise;
|
21 |
+
- acceptor.get_io_service().post(bind(&Promise::set_value, &promise));
|
22 |
+
+#if BOOST_VERSION >= 107000
|
23 |
+
+ boost::asio::post(acceptor.get_executor(), bind(&Promise::set_value, &promise));
|
24 |
+
+#else
|
25 |
+
+ acceptor.get_io_service().post(bind(&Promise::set_value, &promise));
|
26 |
+
+#endif
|
27 |
+
promise.get_future().wait();
|
28 |
+
}
|
29 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/cmakelists_fixes.patch
ADDED
@@ -0,0 +1,238 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index de03564..df3fcf6 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -1,11 +1,8 @@
|
6 |
+
cmake_minimum_required(VERSION 2.8)
|
7 |
+
|
8 |
+
-#It seems Cmake does not set default bild type so we force it
|
9 |
+
-if( NOT CMAKE_BUILD_TYPE )
|
10 |
+
- set( CMAKE_BUILD_TYPE Debug CACHE STRING "Debug" FORCE )
|
11 |
+
-endif()
|
12 |
+
-
|
13 |
+
project(freeopcua)
|
14 |
+
+set(CMAKE_CXX_STANDARD 11)
|
15 |
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
16 |
+
|
17 |
+
option(BUILD_CLIENT "Build Client" ON)
|
18 |
+
option(BUILD_SERVER "Build Server" ON)
|
19 |
+
@@ -16,28 +13,6 @@ option(BUILD_PYTHON "Build Python bindings" ON)
|
20 |
+
option(BUILD_TESTING "Build and run tests" OFF)
|
21 |
+
OPTION(BUILD_SHARED_LIBS "Build shared libraries." ON)
|
22 |
+
|
23 |
+
-IF (NOT DEFINED CMAKE_INSTALL_LIBDIR)
|
24 |
+
- SET(CMAKE_INSTALL_LIBDIR lib)
|
25 |
+
-ENDIF ()
|
26 |
+
-
|
27 |
+
-SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY
|
28 |
+
- ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
|
29 |
+
- CACHE PATH
|
30 |
+
- ""
|
31 |
+
- )
|
32 |
+
-
|
33 |
+
-SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY
|
34 |
+
- ${PROJECT_BINARY_DIR}/bin
|
35 |
+
- CACHE PATH
|
36 |
+
- ""
|
37 |
+
- )
|
38 |
+
-
|
39 |
+
-SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
|
40 |
+
- ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
|
41 |
+
- CACHE PATH
|
42 |
+
- ""
|
43 |
+
- )
|
44 |
+
-
|
45 |
+
# Helper function to generate a pkg-config file for a single library
|
46 |
+
# Takes the filename of the .pc file as a parameter and replaces all
|
47 |
+
# placeholders in the .pc.in file with the actual values
|
48 |
+
@@ -60,23 +35,9 @@ function(generate_pkgconfig BASENAME)
|
49 |
+
endif()
|
50 |
+
endfunction(generate_pkgconfig)
|
51 |
+
if(MSVC)
|
52 |
+
- SET(STATIC_LIBRARY_CXX_FLAGS /MDd CACHE STRING "")
|
53 |
+
- SET(EXECUTABLE_CXX_FLAGS /MDd CACHE STRING "")
|
54 |
+
- SET(DYNAMIC_LIBRARY_CXX_FLAGS /MDd CACHE STRING "")
|
55 |
+
- SET(D /D)
|
56 |
+
-
|
57 |
+
- add_definitions(/D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32 /D_WINDOWS /FS /D_WIN32_WINNT=0x0600)
|
58 |
+
- add_compile_options(/Zi /Od /EHsc /W4)
|
59 |
+
-else(MSVC)
|
60 |
+
- set(CMAKE_CXX_FLAGS_DEBUG " -Wall -ggdb -o0 ${CMAKE_CXX_FLAGS_DEBUG}")
|
61 |
+
-
|
62 |
+
- SET(STATIC_LIBRARY_CXX_FLAGS)
|
63 |
+
- SET(EXECUTABLE_CXX_FLAGS)
|
64 |
+
- SET(DYNAMIC_LIBRARY_CXX_FLAGS)
|
65 |
+
- SET(D -D)
|
66 |
+
- set(CMAKE_CXX_FLAGS " -std=c++11 -Wall -fPIC ${CMAKE_CXX_FLAGS} ")
|
67 |
+
- SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_INIT} $ENV{LDFLAGS})
|
68 |
+
- #set(CMAKE_SHARED_LINKER_FLAGS "--no-undefined" )
|
69 |
+
+ add_definitions(-D_SCL_SECURE_NO_WARNINGS)
|
70 |
+
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
71 |
+
+ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
|
72 |
+
endif()
|
73 |
+
|
74 |
+
if(WIN32)
|
75 |
+
@@ -105,7 +66,7 @@ else(WIN32)
|
76 |
+
|
77 |
+
endif(WIN32)
|
78 |
+
|
79 |
+
-find_package( Boost COMPONENTS system program_options filesystem thread REQUIRED )
|
80 |
+
+find_package( Boost COMPONENTS system program_options filesystem thread date_time REQUIRED )
|
81 |
+
include_directories( ${Boost_INCLUDE_DIRS} )
|
82 |
+
link_directories( ${Boost_LIBRARY_DIRS} )
|
83 |
+
message(STATUS "Boost INCLUDE DIR IS: " ${Boost_INCLUDE_DIRS})
|
84 |
+
@@ -185,14 +146,12 @@ add_library(opcuaprotocol
|
85 |
+
src/protocol/subscriptions.cpp
|
86 |
+
)
|
87 |
+
|
88 |
+
-if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
89 |
+
- target_compile_options(opcuaprotocol PUBLIC ${STATIC_LIBRARY_CXX_FLAGS})
|
90 |
+
-endif ()
|
91 |
+
target_link_libraries(opcuaprotocol ${ADDITIONAL_LINK_LIBRARIES})
|
92 |
+
target_include_directories(opcuaprotocol PUBLIC $<INSTALL_INTERFACE:include>)
|
93 |
+
install(TARGETS opcuaprotocol EXPORT FreeOpcUa
|
94 |
+
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
95 |
+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
96 |
+
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static)
|
97 |
+
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
98 |
+
|
99 |
+
generate_pkgconfig("libopcuaprotocol.pc")
|
100 |
+
|
101 |
+
@@ -227,10 +186,6 @@ if (BUILD_TESTING)
|
102 |
+
gtest_main
|
103 |
+
)
|
104 |
+
|
105 |
+
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
106 |
+
- target_compile_options(test_opcuaprotocol PUBLIC ${EXECUTABLE_CXX_FLAGS})
|
107 |
+
- endif ()
|
108 |
+
-
|
109 |
+
add_test(NAME opcuaprotocol COMMAND test_opcuaprotocol)
|
110 |
+
endif()
|
111 |
+
|
112 |
+
@@ -266,15 +221,12 @@ SET(opcuacore_SOURCES
|
113 |
+
|
114 |
+
add_library(opcuacore ${opcuacore_SOURCES})
|
115 |
+
|
116 |
+
-if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
117 |
+
- target_compile_options(opcuacore PUBLIC ${STATIC_LIBRARY_CXX_FLAGS})
|
118 |
+
-endif ()
|
119 |
+
-
|
120 |
+
-target_link_libraries(opcuacore ${ADDITIONAL_LINK_LIBRARIES} opcuaprotocol ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
|
121 |
+
+target_link_libraries(opcuacore ${ADDITIONAL_LINK_LIBRARIES} opcuaprotocol ${Boost_LIBRARIES})
|
122 |
+
target_include_directories(opcuacore PUBLIC $<INSTALL_INTERFACE:include>)
|
123 |
+
install(TARGETS opcuacore EXPORT FreeOpcUa
|
124 |
+
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
125 |
+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
126 |
+
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static)
|
127 |
+
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
128 |
+
|
129 |
+
generate_pkgconfig("libopcuacore.pc")
|
130 |
+
|
131 |
+
@@ -306,7 +258,7 @@ if (BUILD_TESTING)
|
132 |
+
)
|
133 |
+
|
134 |
+
if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
135 |
+
- target_compile_options(test_opcuacore PUBLIC ${D}DYNAMIC_ADDON_PATH="${DYNAMIC_ADDON_PATH}" ${D}TEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}" ${EXECUTABLE_CXX_FLAGS})
|
136 |
+
+ target_compile_options(test_opcuacore PUBLIC -DDYNAMIC_ADDON_PATH="${DYNAMIC_ADDON_PATH}" -DTEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}" )
|
137 |
+
endif ()
|
138 |
+
|
139 |
+
add_test(NAME opcuacore COMMAND test_opcuacore)
|
140 |
+
@@ -327,9 +279,6 @@ if (BUILD_CLIENT)
|
141 |
+
src/client/client.cpp
|
142 |
+
)
|
143 |
+
|
144 |
+
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
145 |
+
- target_compile_options(opcuaclient PUBLIC ${STATIC_LIBRARY_CXX_FLAGS})
|
146 |
+
- endif ()
|
147 |
+
target_link_libraries(opcuaclient
|
148 |
+
opcuacore
|
149 |
+
${ADDITIONAL_LINK_LIBRARIES}
|
150 |
+
@@ -338,8 +287,9 @@ if (BUILD_CLIENT)
|
151 |
+
|
152 |
+
target_include_directories(opcuaclient PUBLIC $<INSTALL_INTERFACE:include>)
|
153 |
+
install(TARGETS opcuaclient EXPORT FreeOpcUa
|
154 |
+
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
155 |
+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
156 |
+
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static)
|
157 |
+
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
158 |
+
|
159 |
+
generate_pkgconfig("libopcuaclient.pc")
|
160 |
+
|
161 |
+
@@ -371,9 +321,6 @@ if (BUILD_CLIENT)
|
162 |
+
opcuacore
|
163 |
+
)
|
164 |
+
|
165 |
+
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
166 |
+
- target_compile_options(opcuaclient PUBLIC ${EXECUTABLE_CXX_FLAGS})
|
167 |
+
- endif ()
|
168 |
+
endif(BUILD_CLIENT)
|
169 |
+
|
170 |
+
|
171 |
+
@@ -423,14 +370,12 @@ if(BUILD_SERVER)
|
172 |
+
src/server/subscription_service_internal.cpp
|
173 |
+
)
|
174 |
+
|
175 |
+
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
176 |
+
- target_compile_options(opcuaserver PUBLIC ${STATIC_LIBRARY_CXX_FLAGS})
|
177 |
+
- endif ()
|
178 |
+
- target_link_libraries(opcuaserver ${ADDITIONAL_LINK_LIBRARIES} opcuacore opcuaprotocol ${Boost_SYSTEM_LIBRARY})
|
179 |
+
+ target_link_libraries(opcuaserver ${ADDITIONAL_LINK_LIBRARIES} opcuacore opcuaprotocol ${Boost_LIBRARIES})
|
180 |
+
target_include_directories(opcuaserver PUBLIC $<INSTALL_INTERFACE:include>)
|
181 |
+
install(TARGETS opcuaserver EXPORT FreeOpcUa
|
182 |
+
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
183 |
+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
184 |
+
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static)
|
185 |
+
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
186 |
+
|
187 |
+
generate_pkgconfig("libopcuaserver.pc")
|
188 |
+
|
189 |
+
@@ -481,7 +426,7 @@ if(BUILD_SERVER)
|
190 |
+
|
191 |
+
target_include_directories(test_opcuaserver PUBLIC .)
|
192 |
+
if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
193 |
+
- target_compile_options(test_opcuaserver PUBLIC ${D}TEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}" ${STATIC_LIBRARY_CXX_FLAGS})
|
194 |
+
+ target_compile_options(test_opcuaserver PUBLIC -DTEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}")
|
195 |
+
endif ()
|
196 |
+
|
197 |
+
add_test(NAME opcuaserverapp COMMAND test_opcuaserver)
|
198 |
+
@@ -510,9 +455,6 @@ if(BUILD_SERVER)
|
199 |
+
opcuaserver
|
200 |
+
${Boost_PROGRAM_OPTIONS_LIBRARY}
|
201 |
+
)
|
202 |
+
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
203 |
+
- target_compile_options(opcuaserverapp PUBLIC ${EXECUTABLE_CXX_FLAGS})
|
204 |
+
- endif ()
|
205 |
+
|
206 |
+
endif(BUILD_SERVER)
|
207 |
+
|
208 |
+
@@ -533,9 +475,6 @@ if (BUILD_CLIENT)
|
209 |
+
${SSL_SUPPORT_LINK_LIBRARIES}
|
210 |
+
)
|
211 |
+
|
212 |
+
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
213 |
+
- target_compile_options(example_client PUBLIC ${EXECUTABLE_CXX_FLAGS})
|
214 |
+
- endif ()
|
215 |
+
|
216 |
+
endif (BUILD_CLIENT)
|
217 |
+
|
218 |
+
@@ -555,9 +494,6 @@ if(BUILD_SERVER)
|
219 |
+
opcuaserver
|
220 |
+
)
|
221 |
+
|
222 |
+
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
223 |
+
- target_compile_options(example_server PUBLIC ${EXECUTABLE_CXX_FLAGS})
|
224 |
+
- endif ()
|
225 |
+
if(MSVC)
|
226 |
+
set_target_properties(example_server PROPERTIES LINK_FLAGS /STACK:3000000)
|
227 |
+
endif(MSVC)
|
228 |
+
@@ -572,8 +508,8 @@ if (BUILD_PYTHON)
|
229 |
+
add_subdirectory(python)
|
230 |
+
endif (BUILD_PYTHON)
|
231 |
+
|
232 |
+
-install(EXPORT FreeOpcUa DESTINATION lib/cmake/FreeOpcUa FILE FreeOpcUaConfig.cmake)
|
233 |
+
+install(EXPORT FreeOpcUa DESTINATION share/freeopcua FILE freeopcuaConfig.cmake)
|
234 |
+
|
235 |
+
SET(CPACK_GENERATOR "DEB")
|
236 |
+
-SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "FreeOpcUa")
|
237 |
+
+SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "freeopcua")
|
238 |
+
INCLUDE(CPack)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/fix-std-headers.patch
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/include/opc/ua/protocol/utils.h b/include/opc/ua/protocol/utils.h
|
2 |
+
index e23bffe..5c8c2ad 100644
|
3 |
+
--- a/include/opc/ua/protocol/utils.h
|
4 |
+
+++ b/include/opc/ua/protocol/utils.h
|
5 |
+
@@ -22,6 +22,7 @@
|
6 |
+
#include <iomanip>
|
7 |
+
#include <sstream>
|
8 |
+
#include <vector>
|
9 |
+
+#include <algorithm>
|
10 |
+
|
11 |
+
namespace OpcUa
|
12 |
+
{
|
13 |
+
diff --git a/src/core/model_impl.h b/src/core/model_impl.h
|
14 |
+
index 0f548c5..c29626b 100644
|
15 |
+
--- a/src/core/model_impl.h
|
16 |
+
+++ b/src/core/model_impl.h
|
17 |
+
@@ -20,6 +20,7 @@
|
18 |
+
#pragma once
|
19 |
+
|
20 |
+
#include <opc/ua/model.h>
|
21 |
+
+#include <algorithm>
|
22 |
+
|
23 |
+
namespace OpcUa
|
24 |
+
{
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/improve_compatibility_with_recent_boost.patch
ADDED
@@ -0,0 +1,54 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/include/opc/ua/services/services.h b/include/opc/ua/services/services.h
|
2 |
+
index f138831..4732a59 100644
|
3 |
+
--- a/include/opc/ua/services/services.h
|
4 |
+
+++ b/include/opc/ua/services/services.h
|
5 |
+
@@ -26,20 +26,7 @@
|
6 |
+
#include <vector>
|
7 |
+
|
8 |
+
#include <boost/version.hpp>
|
9 |
+
-
|
10 |
+
-
|
11 |
+
-namespace boost
|
12 |
+
-{
|
13 |
+
-namespace asio
|
14 |
+
-{
|
15 |
+
-#if BOOST_VERSION < 106600
|
16 |
+
- class io_service;
|
17 |
+
-#else
|
18 |
+
- class io_context;
|
19 |
+
- typedef io_context io_service;
|
20 |
+
-#endif
|
21 |
+
-}
|
22 |
+
-}
|
23 |
+
+#include <boost/asio/io_service.hpp>
|
24 |
+
|
25 |
+
namespace OpcUa
|
26 |
+
{
|
27 |
+
diff --git a/src/server/internal_subscription.cpp b/src/server/internal_subscription.cpp
|
28 |
+
index edf4715..69ef74a 100644
|
29 |
+
--- a/src/server/internal_subscription.cpp
|
30 |
+
+++ b/src/server/internal_subscription.cpp
|
31 |
+
@@ -14,7 +14,7 @@ InternalSubscription::InternalSubscription(SubscriptionServiceInternal & service
|
32 |
+
, CurrentSession(SessionAuthenticationToken)
|
33 |
+
, Callback(callback)
|
34 |
+
, io(service.GetIOService())
|
35 |
+
- , Timer(io, boost::posix_time::milliseconds(data.RevisedPublishingInterval))
|
36 |
+
+ , Timer(io, boost::posix_time::milliseconds((int)data.RevisedPublishingInterval))
|
37 |
+
, LifeTimeCount(data.RevisedLifetimeCount)
|
38 |
+
, Logger(logger)
|
39 |
+
{
|
40 |
+
@@ -105,7 +105,7 @@ void InternalSubscription::PublishResults(const boost::system::error_code & erro
|
41 |
+
}
|
42 |
+
|
43 |
+
TimerStopped = false;
|
44 |
+
- Timer.expires_at(Timer.expires_at() + boost::posix_time::milliseconds(Data.RevisedPublishingInterval));
|
45 |
+
+ Timer.expires_at(Timer.expires_at() + boost::posix_time::milliseconds((int)Data.RevisedPublishingInterval));
|
46 |
+
std::shared_ptr<InternalSubscription> self = shared_from_this();
|
47 |
+
Timer.async_wait([self](const boost::system::error_code & error) { self->PublishResults(error); });
|
48 |
+
}
|
49 |
+
@@ -615,5 +615,3 @@ std::vector<Variant> InternalSubscription::GetEventFields(const EventFilter & fi
|
50 |
+
|
51 |
+
}
|
52 |
+
}
|
53 |
+
-
|
54 |
+
-
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/include_asio_first.patch
ADDED
@@ -0,0 +1,138 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/core/subscription.cpp b/src/core/subscription.cpp
|
2 |
+
index b690d3a..fdac2f3 100644
|
3 |
+
--- a/src/core/subscription.cpp
|
4 |
+
+++ b/src/core/subscription.cpp
|
5 |
+
@@ -17,11 +17,10 @@
|
6 |
+
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
7 |
+
******************************************************************************/
|
8 |
+
|
9 |
+
-
|
10 |
+
-#include <opc/ua/subscription.h>
|
11 |
+
+#include <boost/asio.hpp>
|
12 |
+
#include <opc/ua/protocol/string_utils.h>
|
13 |
+
+#include <opc/ua/subscription.h>
|
14 |
+
|
15 |
+
-#include <boost/asio.hpp>
|
16 |
+
#include <iostream>
|
17 |
+
|
18 |
+
namespace OpcUa
|
19 |
+
diff --git a/src/server/asio_addon.cpp b/src/server/asio_addon.cpp
|
20 |
+
index 795a6b2..532ac3c 100644
|
21 |
+
--- a/src/server/asio_addon.cpp
|
22 |
+
+++ b/src/server/asio_addon.cpp
|
23 |
+
@@ -17,9 +17,9 @@
|
24 |
+
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
25 |
+
******************************************************************************/
|
26 |
+
|
27 |
+
+#include <boost/asio.hpp>
|
28 |
+
#include <opc/ua/server/addons/asio_addon.h>
|
29 |
+
|
30 |
+
-#include <boost/asio.hpp>
|
31 |
+
#include <iostream>
|
32 |
+
#include <thread>
|
33 |
+
|
34 |
+
diff --git a/src/server/internal_subscription.h b/src/server/internal_subscription.h
|
35 |
+
index d42aa65..dd193a9 100644
|
36 |
+
--- a/src/server/internal_subscription.h
|
37 |
+
+++ b/src/server/internal_subscription.h
|
38 |
+
@@ -1,6 +1,7 @@
|
39 |
+
|
40 |
+
#pragma once
|
41 |
+
|
42 |
+
+#include <boost/asio.hpp>
|
43 |
+
//#include "address_space_internal.h"
|
44 |
+
#include "subscription_service_internal.h"
|
45 |
+
|
46 |
+
@@ -11,7 +12,6 @@
|
47 |
+
#include <opc/ua/protocol/string_utils.h>
|
48 |
+
#include <opc/ua/services/attributes.h>
|
49 |
+
|
50 |
+
-#include <boost/asio.hpp>
|
51 |
+
#include <boost/thread/shared_mutex.hpp>
|
52 |
+
#include <chrono>
|
53 |
+
#include <iostream>
|
54 |
+
@@ -115,5 +115,3 @@ private:
|
55 |
+
|
56 |
+
}
|
57 |
+
}
|
58 |
+
-
|
59 |
+
-
|
60 |
+
diff --git a/src/server/opc_tcp_async.cpp b/src/server/opc_tcp_async.cpp
|
61 |
+
index dc700c2..f3a66b8 100644
|
62 |
+
--- a/src/server/opc_tcp_async.cpp
|
63 |
+
+++ b/src/server/opc_tcp_async.cpp
|
64 |
+
@@ -17,6 +17,7 @@
|
65 |
+
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
66 |
+
******************************************************************************/
|
67 |
+
|
68 |
+
+#include <boost/asio.hpp>
|
69 |
+
#include "opc_tcp_processor.h"
|
70 |
+
|
71 |
+
#include <opc/ua/server/opc_tcp_async.h>
|
72 |
+
@@ -29,7 +30,6 @@
|
73 |
+
#include <opc/ua/protocol/input_from_buffer.h>
|
74 |
+
|
75 |
+
#include <array>
|
76 |
+
-#include <boost/asio.hpp>
|
77 |
+
#include <future>
|
78 |
+
#include <iostream>
|
79 |
+
#include <set>
|
80 |
+
diff --git a/src/server/subscription_service_internal.h b/src/server/subscription_service_internal.h
|
81 |
+
index 6b16e1d..f7e5dfe 100644
|
82 |
+
--- a/src/server/subscription_service_internal.h
|
83 |
+
+++ b/src/server/subscription_service_internal.h
|
84 |
+
@@ -9,6 +9,7 @@
|
85 |
+
|
86 |
+
#pragma once
|
87 |
+
|
88 |
+
+#include <boost/asio.hpp>
|
89 |
+
#include "address_space_addon.h"
|
90 |
+
#include "internal_subscription.h"
|
91 |
+
|
92 |
+
@@ -20,7 +21,6 @@
|
93 |
+
#include <opc/ua/protocol/strings.h>
|
94 |
+
#include <opc/ua/protocol/string_utils.h>
|
95 |
+
|
96 |
+
-#include <boost/asio.hpp>
|
97 |
+
#include <boost/thread/shared_mutex.hpp>
|
98 |
+
#include <ctime>
|
99 |
+
#include <limits>
|
100 |
+
@@ -76,4 +76,3 @@ private:
|
101 |
+
}
|
102 |
+
|
103 |
+
}
|
104 |
+
-
|
105 |
+
diff --git a/src/server/tcp_server.cpp b/src/server/tcp_server.cpp
|
106 |
+
index b4f2000..2430820 100644
|
107 |
+
--- a/src/server/tcp_server.cpp
|
108 |
+
+++ b/src/server/tcp_server.cpp
|
109 |
+
@@ -8,9 +8,6 @@
|
110 |
+
/// http://www.gnu.org/licenses/lgpl.html)
|
111 |
+
///
|
112 |
+
|
113 |
+
-#ifdef _WIN32
|
114 |
+
-#include <windows.h>
|
115 |
+
-#endif
|
116 |
+
|
117 |
+
#include "tcp_server.h"
|
118 |
+
|
119 |
+
@@ -34,8 +31,18 @@
|
120 |
+
#include <string.h>
|
121 |
+
#include <sys/types.h>
|
122 |
+
|
123 |
+
-
|
124 |
+
#ifdef _WIN32
|
125 |
+
+#include <WinSock2.h>
|
126 |
+
+#include <windows.h>
|
127 |
+
+#if !defined SHUT_RD && defined SD_RECEIVE
|
128 |
+
+#define SHUT_RD SD_RECEIVE
|
129 |
+
+#endif
|
130 |
+
+#if !defined SHUT_WR && defined SD_SEND
|
131 |
+
+#define SHUT_WR SD_SEND
|
132 |
+
+#endif
|
133 |
+
+#if !defined SHUT_RDWR && defined SD_BOTH
|
134 |
+
+#define SHUT_RDWR SD_BOTH
|
135 |
+
+#endif
|
136 |
+
#else
|
137 |
+
#include <arpa/inet.h>
|
138 |
+
#include <netdb.h>
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/portfile.cmake
ADDED
@@ -0,0 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO FreeOpcUa/freeopcua
|
4 |
+
REF 2f2c886eb2da46b9dc8944c8f79ac31a9f116a81
|
5 |
+
SHA512 f19c1489eb116224ac3192e646c08cf3967c9a07064a09c4cbdef89d93e98c7541bb3edd030be22f6daf3f831ff92a324bc3734a8fe34cdd9d5a5ff7cb7f2f19
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
cmakelists_fixes.patch
|
9 |
+
improve_compatibility_with_recent_boost.patch
|
10 |
+
use_another_implementation_of_has_begin_end.patch
|
11 |
+
uri_facade_win.patch
|
12 |
+
serverObj.patch
|
13 |
+
include_asio_first.patch
|
14 |
+
boost-1.70.patch
|
15 |
+
fix-std-headers.patch
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_configure_cmake(
|
19 |
+
SOURCE_PATH ${SOURCE_PATH}
|
20 |
+
PREFER_NINJA
|
21 |
+
OPTIONS
|
22 |
+
-DBUILD_PYTHON=OFF
|
23 |
+
-DBUILD_TESTING=OFF
|
24 |
+
-DSSL_SUPPORT_MBEDTLS=OFF
|
25 |
+
-DCMAKE_DEBUG_POSTFIX=d
|
26 |
+
)
|
27 |
+
|
28 |
+
vcpkg_install_cmake()
|
29 |
+
vcpkg_fixup_cmake_targets()
|
30 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
31 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
32 |
+
|
33 |
+
#Handle copyright
|
34 |
+
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freeopcua RENAME copyright)
|
35 |
+
|
36 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/serverObj.patch
ADDED
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/server/server_object.cpp b/src/server/server_object.cpp
|
2 |
+
index f35b168..b6c816a 100644
|
3 |
+
--- a/src/server/server_object.cpp
|
4 |
+
+++ b/src/server/server_object.cpp
|
5 |
+
@@ -25,9 +25,6 @@
|
6 |
+
#include <functional>
|
7 |
+
#include <iostream>
|
8 |
+
|
9 |
+
-#ifdef WIN32
|
10 |
+
-#undef GetObject
|
11 |
+
-#endif
|
12 |
+
|
13 |
+
namespace
|
14 |
+
{
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/uri_facade_win.patch
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/core/common/uri_facade_win.cpp b/src/core/common/uri_facade_win.cpp
|
2 |
+
index 1a807fb..c579e2d 100644
|
3 |
+
--- a/src/core/common/uri_facade_win.cpp
|
4 |
+
+++ b/src/core/common/uri_facade_win.cpp
|
5 |
+
@@ -19,7 +19,7 @@
|
6 |
+
namespace Common
|
7 |
+
{
|
8 |
+
|
9 |
+
-void Uri::Initialize(const char * uriString, std::size_t size)
|
10 |
+
+void Uri::Initialize(const std::string& uriString)
|
11 |
+
{
|
12 |
+
URL_COMPONENTS url = {0};
|
13 |
+
url.dwStructSize = sizeof(url);
|
14 |
+
@@ -31,7 +31,7 @@ void Uri::Initialize(const char * uriString, std::size_t size)
|
15 |
+
|
16 |
+
// TODO msdn says do not use this function in services and in server patforms. :(
|
17 |
+
// TODO http://msdn.microsoft.com/en-us/library/windows/desktop/aa384376(v=vs.85).aspx
|
18 |
+
- if (!InternetCrackUrl(uriString, size, options, &url))
|
19 |
+
+ if (!InternetCrackUrl(uriString.c_str(), uriString.size(), options, &url))
|
20 |
+
{
|
21 |
+
THROW_ERROR1(CannotParseUri, uriString);
|
22 |
+
}
|
23 |
+
@@ -50,5 +50,3 @@ void Uri::Initialize(const char * uriString, std::size_t size)
|
24 |
+
}
|
25 |
+
|
26 |
+
} // namespace Common
|
27 |
+
-
|
28 |
+
-
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/use_another_implementation_of_has_begin_end.patch
ADDED
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/include/opc/ua/protocol/variant.h b/include/opc/ua/protocol/variant.h
|
2 |
+
index 9dc5b15..317cb17 100644
|
3 |
+
--- a/include/opc/ua/protocol/variant.h
|
4 |
+
+++ b/include/opc/ua/protocol/variant.h
|
5 |
+
@@ -76,22 +76,25 @@ public:
|
6 |
+
template <typename T>
|
7 |
+
struct has_begin_end
|
8 |
+
{
|
9 |
+
- template<typename C> static char (&f(typename std::enable_if <
|
10 |
+
- std::is_same<decltype(static_cast<typename C::const_iterator(C::*)() const>(&C::begin)),
|
11 |
+
- typename C::const_iterator(C::*)() const>::value, void >::type *))[1];
|
12 |
+
+ struct Dummy { typedef void const_iterator; };
|
13 |
+
+ typedef typename std::conditional<has_const_iterator<T>::value, T, Dummy>::type TType;
|
14 |
+
+ typedef typename TType::const_iterator iter;
|
15 |
+
|
16 |
+
- template<typename C> static char (&f(...))[2];
|
17 |
+
+ struct Fallback { iter begin() const; iter end() const; };
|
18 |
+
+ struct Derived : TType, Fallback { };
|
19 |
+
|
20 |
+
- template<typename C> static char (&g(typename std::enable_if <
|
21 |
+
- std::is_same<decltype(static_cast<typename C::const_iterator(C::*)() const>(&C::end)),
|
22 |
+
- typename C::const_iterator(C::*)() const>::value, void >::type *))[1];
|
23 |
+
+ template<typename C, C> struct ChT;
|
24 |
+
|
25 |
+
+ template<typename C> static char (&f(ChT<iter (Fallback::*)() const, &C::begin>*))[1];
|
26 |
+
+ template<typename C> static char (&f(...))[2];
|
27 |
+
+ template<typename C> static char (&g(ChT<iter (Fallback::*)() const, &C::end>*))[1];
|
28 |
+
template<typename C> static char (&g(...))[2];
|
29 |
+
|
30 |
+
- static bool const beg_value = sizeof(f<T>(0)) == 1;
|
31 |
+
- static bool const end_value = sizeof(g<T>(0)) == 1;
|
32 |
+
+ static bool const beg_value = sizeof(f<Derived>(0)) == 2;
|
33 |
+
+ static bool const end_value = sizeof(g<Derived>(0)) == 2;
|
34 |
+
};
|
35 |
+
|
36 |
+
+
|
37 |
+
template<typename T>
|
38 |
+
struct is_container_not_string : std::integral_constant < bool, has_const_iterator<T>::value && has_begin_end<T>::beg_value && has_begin_end<T>::end_value >
|
39 |
+
{ };
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freeopcua/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "freeopcua",
|
3 |
+
"version-string": "20190125",
|
4 |
+
"port-version": 5,
|
5 |
+
"description": "OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.",
|
6 |
+
"dependencies": [
|
7 |
+
"boost-asio",
|
8 |
+
"boost-date-time",
|
9 |
+
"boost-filesystem",
|
10 |
+
"boost-foreach",
|
11 |
+
"boost-format",
|
12 |
+
"boost-program-options",
|
13 |
+
"boost-property-tree",
|
14 |
+
"boost-system",
|
15 |
+
"boost-thread"
|
16 |
+
]
|
17 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/DontInstallSystemRuntimeLibs.patch
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
|
2 |
+
index 6ccfc7d..75479bf 100644
|
3 |
+
--- a/CMakeCPack.cmake
|
4 |
+
+++ b/CMakeCPack.cmake
|
5 |
+
@@ -67,9 +67,9 @@ if(MSVC)
|
6 |
+
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
|
7 |
+
include(InstallRequiredSystemLibraries)
|
8 |
+
|
9 |
+
- install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
|
10 |
+
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
11 |
+
- COMPONENT libraries)
|
12 |
+
+ # install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
|
13 |
+
+ # DESTINATION ${CMAKE_INSTALL_BINDIR}
|
14 |
+
+ # COMPONENT libraries)
|
15 |
+
endif()
|
16 |
+
endif()
|
17 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/fix-include-path.patch
ADDED
@@ -0,0 +1,52 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 97ba2f9..64a2f33 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -107,7 +107,7 @@ else()
|
6 |
+
endif()
|
7 |
+
message("FREERDP_VERSION=${FREERDP_VERSION_FULL}")
|
8 |
+
|
9 |
+
-set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/")
|
10 |
+
+set(FREERDP_INCLUDE_DIR "include/")
|
11 |
+
|
12 |
+
# Compatibility options
|
13 |
+
if(DEFINED STATIC_CHANNELS)
|
14 |
+
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
|
15 |
+
index a020dc5..0bc1157 100644
|
16 |
+
--- a/include/CMakeLists.txt
|
17 |
+
+++ b/include/CMakeLists.txt
|
18 |
+
@@ -19,7 +19,7 @@
|
19 |
+
|
20 |
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h)
|
21 |
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/build-config.h)
|
22 |
+
-set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp${FREERDP_VERSION_MAJOR}/freerdp)
|
23 |
+
+set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp)
|
24 |
+
|
25 |
+
file(GLOB FREERDP_HEADERS "freerdp/*.h")
|
26 |
+
install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers)
|
27 |
+
diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
|
28 |
+
index a94090a..08b6b88 100644
|
29 |
+
--- a/winpr/CMakeLists.txt
|
30 |
+
+++ b/winpr/CMakeLists.txt
|
31 |
+
@@ -215,7 +215,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
|
32 |
+
|
33 |
+
SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}")
|
34 |
+
|
35 |
+
- set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")
|
36 |
+
+ set(WINPR_INCLUDE_DIR "include")
|
37 |
+
|
38 |
+
configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake
|
39 |
+
INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR}
|
40 |
+
diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt
|
41 |
+
index 452383d..3faab0c 100644
|
42 |
+
--- a/winpr/include/CMakeLists.txt
|
43 |
+
+++ b/winpr/include/CMakeLists.txt
|
44 |
+
@@ -17,7 +17,7 @@
|
45 |
+
|
46 |
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h)
|
47 |
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h)
|
48 |
+
-set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr)
|
49 |
+
+set(WINPR_INSTALL_INCLUDE_DIR include/winpr)
|
50 |
+
|
51 |
+
file(GLOB WINPR_HEADERS "winpr/*.h")
|
52 |
+
install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/fix-libusb.patch
ADDED
@@ -0,0 +1,45 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c
|
2 |
+
index 814540756..56809fe45 100644
|
3 |
+
--- a/channels/urbdrc/client/libusb/libusb_udevice.c
|
4 |
+
+++ b/channels/urbdrc/client/libusb/libusb_udevice.c
|
5 |
+
@@ -232,7 +232,7 @@ static void async_transfer_user_data_free(ASYNC_TRANSFER_USER_DATA* user_data)
|
6 |
+
}
|
7 |
+
}
|
8 |
+
|
9 |
+
-static void func_iso_callback(struct libusb_transfer* transfer)
|
10 |
+
+static void LIBUSB_CALL func_iso_callback(struct libusb_transfer* transfer)
|
11 |
+
{
|
12 |
+
ASYNC_TRANSFER_USER_DATA* user_data = (ASYNC_TRANSFER_USER_DATA*)transfer->user_data;
|
13 |
+
const UINT32 streamID = stream_id_from_buffer(transfer);
|
14 |
+
@@ -331,7 +331,7 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT
|
15 |
+
return NULL;
|
16 |
+
}
|
17 |
+
|
18 |
+
-static void func_bulk_transfer_cb(struct libusb_transfer* transfer)
|
19 |
+
+static void LIBUSB_CALL func_bulk_transfer_cb(struct libusb_transfer* transfer)
|
20 |
+
{
|
21 |
+
ASYNC_TRANSFER_USER_DATA* user_data;
|
22 |
+
uint32_t streamID;
|
23 |
+
diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c
|
24 |
+
index 1638b8c13..b1440f300 100644
|
25 |
+
--- a/channels/urbdrc/client/libusb/libusb_udevman.c
|
26 |
+
+++ b/channels/urbdrc/client/libusb/libusb_udevman.c
|
27 |
+
@@ -580,7 +580,7 @@ static BOOL device_is_filtered(struct libusb_device* dev,
|
28 |
+
return filtered;
|
29 |
+
}
|
30 |
+
|
31 |
+
-static int hotplug_callback(struct libusb_context* ctx, struct libusb_device* dev,
|
32 |
+
+static int LIBUSB_CALL hotplug_callback(struct libusb_context* ctx, struct libusb_device* dev,
|
33 |
+
libusb_hotplug_event event, void* user_data)
|
34 |
+
{
|
35 |
+
VID_PID_PAIR pair;
|
36 |
+
@@ -859,7 +859,7 @@ static BOOL poll_libusb_events(UDEVMAN* udevman)
|
37 |
+
return rc > 0;
|
38 |
+
}
|
39 |
+
|
40 |
+
-static DWORD poll_thread(LPVOID lpThreadParameter)
|
41 |
+
+static DWORD __stdcall poll_thread(LPVOID lpThreadParameter)
|
42 |
+
{
|
43 |
+
libusb_hotplug_callback_handle handle;
|
44 |
+
UDEVMAN* udevman = (UDEVMAN*)lpThreadParameter;
|
45 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/fix-linux-build.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt
|
2 |
+
index 48fda5b..4e15a22 100644
|
3 |
+
--- a/winpr/tools/makecert-cli/CMakeLists.txt
|
4 |
+
+++ b/winpr/tools/makecert-cli/CMakeLists.txt
|
5 |
+
@@ -42,7 +42,7 @@ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
|
6 |
+
|
7 |
+
set(${MODULE_PREFIX}_LIBS winpr-tools)
|
8 |
+
|
9 |
+
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr)
|
10 |
+
+target_link_libraries(${MODULE_NAME} ${OPENSSL_LIBRARIES} ${${MODULE_PREFIX}_LIBS} winpr)
|
11 |
+
|
12 |
+
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
|
13 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/install-dirs.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 5e67ef9..4ef3e8e 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -18,7 +18,7 @@
|
6 |
+
# See the License for the specific language governing permissions and
|
7 |
+
# limitations under the License.
|
8 |
+
|
9 |
+
-cmake_minimum_required(VERSION 2.8)
|
10 |
+
+cmake_minimum_required(VERSION 3.11)
|
11 |
+
|
12 |
+
project(FreeRDP C CXX)
|
13 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/openssl_threads.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 97ba2f9..fc36185 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -907,6 +907,7 @@ if(OPENSSL_FOUND)
|
6 |
+
add_definitions("-DWITH_OPENSSL")
|
7 |
+
message(STATUS "Using OpenSSL Version: ${OPENSSL_VERSION}")
|
8 |
+
include_directories(${OPENSSL_INCLUDE_DIR})
|
9 |
+
+ list(APPEND OPENSSL_LIBRARIES Threads::Threads)
|
10 |
+
endif()
|
11 |
+
|
12 |
+
if(MBEDTLS_FOUND)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/portfile.cmake
ADDED
@@ -0,0 +1,145 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO FreeRDP/FreeRDP
|
4 |
+
REF 2.5.0
|
5 |
+
SHA512 7720306c8d0915578f6758f46ba0e0b8a81bbdcd1c80e08711576605142467f6735f644099e79a05113959fb30cd1070ca138a523537a41a7102880daf89c04c
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
DontInstallSystemRuntimeLibs.patch
|
9 |
+
fix-linux-build.patch
|
10 |
+
openssl_threads.patch
|
11 |
+
fix-include-path.patch
|
12 |
+
fix-libusb.patch
|
13 |
+
install-dirs.patch
|
14 |
+
)
|
15 |
+
|
16 |
+
if (NOT VCPKG_TARGET_IS_WINDOWS)
|
17 |
+
message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxfixes-dev\n")
|
18 |
+
endif()
|
19 |
+
set(FREERDP_WITH_CLIENT)
|
20 |
+
if (VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX)
|
21 |
+
set(FREERDP_WITH_CLIENT -DWITH_CLIENT=OFF)
|
22 |
+
endif()
|
23 |
+
|
24 |
+
set(FREERDP_CRT_LINKAGE)
|
25 |
+
if(VCPKG_CRT_LINKAGE STREQUAL "static")
|
26 |
+
set(FREERDP_CRT_LINKAGE -DMSVC_RUNTIME=static)
|
27 |
+
endif()
|
28 |
+
|
29 |
+
get_filename_component(SOURCE_VERSION "${SOURCE_PATH}" NAME)
|
30 |
+
file(WRITE "${SOURCE_PATH}/.source_version" "${SOURCE_VERSION}-vcpkg")
|
31 |
+
|
32 |
+
file(REMOVE "${SOURCE_PATH}/cmake/FindOpenSSL.cmake") # Remove outdated Module
|
33 |
+
|
34 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
35 |
+
FEATURES
|
36 |
+
urbdrc CHANNEL_URBDRC
|
37 |
+
)
|
38 |
+
|
39 |
+
vcpkg_cmake_configure(
|
40 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
41 |
+
OPTIONS
|
42 |
+
${FREERDP_CRT_LINKAGE}
|
43 |
+
${FREERDP_WITH_CLIENT}
|
44 |
+
${FEATURE_OPTIONS}
|
45 |
+
)
|
46 |
+
|
47 |
+
vcpkg_cmake_install()
|
48 |
+
vcpkg_copy_pdbs()
|
49 |
+
|
50 |
+
file(GLOB_RECURSE TOOLS_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*.exe")
|
51 |
+
|
52 |
+
if(TOOLS_RELEASE)
|
53 |
+
file(COPY ${TOOLS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
54 |
+
|
55 |
+
file(GLOB_RECURSE TOOLS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
|
56 |
+
file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG})
|
57 |
+
endif()
|
58 |
+
|
59 |
+
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
60 |
+
|
61 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
62 |
+
file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll")
|
63 |
+
foreach(FREERDP_DLL ${FREERDP_DLLS})
|
64 |
+
file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
|
65 |
+
file(REMOVE "${FREERDP_DLL}")
|
66 |
+
endforeach()
|
67 |
+
|
68 |
+
file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
|
69 |
+
foreach(FREERDP_DLL ${FREERDP_DLLS})
|
70 |
+
file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
|
71 |
+
file(REMOVE "${FREERDP_DLL}")
|
72 |
+
endforeach()
|
73 |
+
else()
|
74 |
+
file(GLOB_RECURSE FREERDP_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
|
75 |
+
foreach(FREERDP_TOOL ${FREERDP_TOOLS})
|
76 |
+
file(COPY "${FREERDP_TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
77 |
+
file(REMOVE "${FREERDP_TOOL}")
|
78 |
+
endforeach()
|
79 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
80 |
+
endif()
|
81 |
+
|
82 |
+
foreach(PACKAGE FreeRDP-Client2 FreeRDP2 WinPR2)
|
83 |
+
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp")
|
84 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp/${PACKAGE}")
|
85 |
+
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp")
|
86 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE}")
|
87 |
+
endforeach()
|
88 |
+
|
89 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Client2 PACKAGE_NAME FreeRDP-Client)
|
90 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP2_temp/FreeRDP2 PACKAGE_NAME FreeRDP)
|
91 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 PACKAGE_NAME WinPR)
|
92 |
+
|
93 |
+
vcpkg_fixup_pkgconfig(SKIP_CHECK)
|
94 |
+
|
95 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake"
|
96 |
+
"debug/lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
97 |
+
"debug/bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
98 |
+
)
|
99 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake"
|
100 |
+
"debug/lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
101 |
+
"debug/bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
102 |
+
)
|
103 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake"
|
104 |
+
"lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
105 |
+
"bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
106 |
+
)
|
107 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake"
|
108 |
+
"lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
109 |
+
"bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
110 |
+
)
|
111 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-debug.cmake"
|
112 |
+
"debug/lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
113 |
+
"debug/bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
114 |
+
)
|
115 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-release.cmake"
|
116 |
+
"lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
117 |
+
"bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
118 |
+
)
|
119 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-debug.cmake"
|
120 |
+
"debug/lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
121 |
+
"debug/bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
122 |
+
)
|
123 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-release.cmake"
|
124 |
+
"lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
125 |
+
"bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
|
126 |
+
)
|
127 |
+
|
128 |
+
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
129 |
+
file(GLOB OBJS "${CURRENT_PACKAGES_DIR}/debug/*.lib")
|
130 |
+
file(REMOVE ${OBJS})
|
131 |
+
file(GLOB OBJS "${CURRENT_PACKAGES_DIR}/*.lib")
|
132 |
+
file(REMOVE ${OBJS})
|
133 |
+
endif()
|
134 |
+
|
135 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
|
136 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
137 |
+
"${CURRENT_PACKAGES_DIR}/debug/lib/cmake"
|
138 |
+
"${CURRENT_PACKAGES_DIR}/lib/cmake")
|
139 |
+
|
140 |
+
|
141 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" ".")
|
142 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}/" "")
|
143 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}" "")
|
144 |
+
|
145 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freerdp/vcpkg.json
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "freerdp",
|
3 |
+
"version": "2.5.0",
|
4 |
+
"description": "A free implementation of the Remote Desktop Protocol (RDP)",
|
5 |
+
"homepage": "https://github.com/FreeRDP/FreeRDP",
|
6 |
+
"license": "Apache-2.0",
|
7 |
+
"supports": "!(arm | uwp)",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "glib",
|
11 |
+
"platform": "!windows"
|
12 |
+
},
|
13 |
+
"openssl",
|
14 |
+
{
|
15 |
+
"name": "vcpkg-cmake",
|
16 |
+
"host": true
|
17 |
+
},
|
18 |
+
{
|
19 |
+
"name": "vcpkg-cmake-config",
|
20 |
+
"host": true
|
21 |
+
}
|
22 |
+
],
|
23 |
+
"features": {
|
24 |
+
"urbdrc": {
|
25 |
+
"description": "USB redirection channel support",
|
26 |
+
"dependencies": [
|
27 |
+
"libusb"
|
28 |
+
]
|
29 |
+
}
|
30 |
+
}
|
31 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetds/portfile.cmake
ADDED
@@ -0,0 +1,72 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO freetds/freetds
|
4 |
+
REF 16f7a6280c7a19bfe5c60e5d61cc08e3f2dff991 # See https://github.com/microsoft/vcpkg/pull/14120#issuecomment-715896755
|
5 |
+
HEAD_REF master
|
6 |
+
SHA512 34ff10764156bac24444a74b636fafa56adc0097a62a3f3249d4bc09a0cdcaa88aa0c4f26761260c56dd47edf738ff68f647e045f32cac28e0be7f6760f7f90b
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
10 |
+
FEATURES
|
11 |
+
openssl WITH_OPENSSL
|
12 |
+
)
|
13 |
+
|
14 |
+
vcpkg_find_acquire_program(PERL)
|
15 |
+
get_filename_component(PERL_PATH ${PERL} DIRECTORY)
|
16 |
+
vcpkg_add_to_path(${PERL_PATH})
|
17 |
+
|
18 |
+
if (VCPKG_TARGET_IS_WINDOWS)
|
19 |
+
vcpkg_find_acquire_program(GPERF)
|
20 |
+
get_filename_component(GPERF_PATH ${GPERF} DIRECTORY)
|
21 |
+
vcpkg_add_to_path(${GPERF_PATH})
|
22 |
+
else()
|
23 |
+
if (NOT EXISTS /usr/bin/gperf)
|
24 |
+
message(FATAL_ERROR "freetds requires gperf, these can be installed on Ubuntu systems via apt-get install gperf.")
|
25 |
+
endif()
|
26 |
+
endif()
|
27 |
+
|
28 |
+
vcpkg_configure_cmake(
|
29 |
+
SOURCE_PATH ${SOURCE_PATH}
|
30 |
+
PREFER_NINJA
|
31 |
+
DISABLE_PARALLEL_CONFIGURE
|
32 |
+
OPTIONS ${FEATURE_OPTIONS}
|
33 |
+
)
|
34 |
+
|
35 |
+
vcpkg_install_cmake()
|
36 |
+
vcpkg_copy_pdbs()
|
37 |
+
|
38 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
39 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb.exe)
|
40 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc.exe)
|
41 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy.exe)
|
42 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy.exe)
|
43 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp.exe)
|
44 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool.exe)
|
45 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql.exe)
|
46 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb)
|
47 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc)
|
48 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy)
|
49 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy)
|
50 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp)
|
51 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool)
|
52 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql)
|
53 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb.exe)
|
54 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc.exe)
|
55 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy.exe)
|
56 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy.exe)
|
57 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp.exe)
|
58 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool.exe)
|
59 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql.exe)
|
60 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb)
|
61 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc)
|
62 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy)
|
63 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy)
|
64 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp)
|
65 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool)
|
66 |
+
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql)
|
67 |
+
|
68 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
69 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
70 |
+
endif()
|
71 |
+
|
72 |
+
file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetds/vcpkg.json
ADDED
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "freetds",
|
3 |
+
"version": "1.2.11",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "Implementation of the Tabular Data Stream protocol",
|
6 |
+
"homepage": "https://www.freetds.org",
|
7 |
+
"supports": "windows & !uwp",
|
8 |
+
"default-features": [
|
9 |
+
"openssl"
|
10 |
+
],
|
11 |
+
"features": {
|
12 |
+
"openssl": {
|
13 |
+
"description": "OpenSSL support",
|
14 |
+
"dependencies": [
|
15 |
+
"openssl"
|
16 |
+
]
|
17 |
+
}
|
18 |
+
}
|
19 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype-gl/glew.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 1c2e89fba..9e2d112c4 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -92,7 +92,7 @@ include_directories(
|
6 |
+
${OPENGL_INCLUDE_DIRS}
|
7 |
+
${FREETYPE_INCLUDE_DIRS}
|
8 |
+
${CMAKE_CURRENT_SOURCE_DIR}
|
9 |
+
- ${GLEW_INCLUDE_PATH}
|
10 |
+
+ ${GLEW_INCLUDE_DIRS}
|
11 |
+
)
|
12 |
+
|
13 |
+
if(MSVC)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype-gl/portfile.cmake
ADDED
@@ -0,0 +1,57 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO rougier/freetype-gl
|
6 |
+
REF 1a8c007f3fe7b1441f9e5616bc23d7455f4b07dd # accessed on 2020-09-14
|
7 |
+
SHA512 ce858b5d5e892162daf6f5bff3476938e15cb9f04adbf2dc2b4c538bfda56b023278b3acb62940a9388c46b89edfd22c9c1c99891f8fcf9d926ffedb8af2b38e
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES glew.patch
|
10 |
+
)
|
11 |
+
|
12 |
+
# make sure that no "internal" libraries are used by removing them
|
13 |
+
file(REMOVE_RECURSE ${SOURCE_PATH}/windows/freetype)
|
14 |
+
file(REMOVE_RECURSE ${SOURCE_PATH}/windows/AntTweakBar)
|
15 |
+
file(REMOVE_RECURSE ${SOURCE_PATH}/windows/glew)
|
16 |
+
file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindGLEW.cmake)
|
17 |
+
|
18 |
+
vcpkg_configure_cmake(
|
19 |
+
SOURCE_PATH ${SOURCE_PATH}
|
20 |
+
PREFER_NINJA
|
21 |
+
OPTIONS
|
22 |
+
-Dfreetype-gl_BUILD_APIDOC=OFF
|
23 |
+
-Dfreetype-gl_BUILD_DEMOS=OFF
|
24 |
+
-Dfreetype-gl_BUILD_TESTS=OFF
|
25 |
+
-Dfreetype-gl_BUILD_MAKEFONT=OFF
|
26 |
+
)
|
27 |
+
|
28 |
+
# We may soon install using a modified cmake process with install target
|
29 |
+
|
30 |
+
# Although FreeType-GL uses CMake as its build system, the implementation
|
31 |
+
# (*.cmake,CMakeLists.txt) doesn't provide for any type of installation.
|
32 |
+
# Presumably, it has been used as-is, in-tree, without ever needing to install
|
33 |
+
# itself within a larger system.
|
34 |
+
vcpkg_build_cmake(LOGFILE_ROOT install)
|
35 |
+
|
36 |
+
file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h")
|
37 |
+
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/freetype-gl)
|
38 |
+
|
39 |
+
# LIB
|
40 |
+
file(GLOB LIBS
|
41 |
+
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}"
|
42 |
+
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}"
|
43 |
+
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}"
|
44 |
+
)
|
45 |
+
file(GLOB DEBUG_LIBS
|
46 |
+
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}"
|
47 |
+
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}"
|
48 |
+
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}"
|
49 |
+
)
|
50 |
+
|
51 |
+
file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
52 |
+
file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
53 |
+
|
54 |
+
vcpkg_copy_pdbs()
|
55 |
+
|
56 |
+
# Handle copyright
|
57 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/freetype-gl RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype-gl/vcpkg.json
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "freetype-gl",
|
3 |
+
"version-string": "2020-09-14",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "OpenGL text using one vertex buffer, one texture and FreeType",
|
6 |
+
"homepage": "https://github.com/rougier/freetype-gl",
|
7 |
+
"dependencies": [
|
8 |
+
"freetype",
|
9 |
+
"glew"
|
10 |
+
]
|
11 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/0003-Fix-UWP.patch
ADDED
@@ -0,0 +1,65 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index db48e9f..5c35276 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -328,6 +328,10 @@ else ()
|
6 |
+
list(APPEND BASE_SRCS src/base/ftdebug.c)
|
7 |
+
endif ()
|
8 |
+
|
9 |
+
+if(MSVC)
|
10 |
+
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
|
11 |
+
+endif()
|
12 |
+
+
|
13 |
+
if (BUILD_FRAMEWORK)
|
14 |
+
list(APPEND BASE_SRCS builds/mac/freetype-Info.plist)
|
15 |
+
endif ()
|
16 |
+
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
|
17 |
+
index 4f2eaca..1e01fe4 100644
|
18 |
+
--- a/include/freetype/freetype.h
|
19 |
+
+++ b/include/freetype/freetype.h
|
20 |
+
@@ -1038,6 +1038,11 @@ FT_BEGIN_HEADER
|
21 |
+
* Especially for TrueType fonts see also the documentation for
|
22 |
+
* @FT_Size_Metrics.
|
23 |
+
*/
|
24 |
+
+
|
25 |
+
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
|
26 |
+
+#define generic GenericFromFreeTypeLibrary
|
27 |
+
+#endif
|
28 |
+
+
|
29 |
+
typedef struct FT_FaceRec_
|
30 |
+
{
|
31 |
+
FT_Long num_faces;
|
32 |
+
@@ -1910,6 +1915,9 @@ FT_BEGIN_HEADER
|
33 |
+
|
34 |
+
} FT_GlyphSlotRec;
|
35 |
+
|
36 |
+
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
|
37 |
+
+#undef generic
|
38 |
+
+#endif
|
39 |
+
|
40 |
+
/*************************************************************************/
|
41 |
+
/*************************************************************************/
|
42 |
+
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
|
43 |
+
index 3f8619d..edf03b6 100644
|
44 |
+
--- a/src/base/ftobjs.c
|
45 |
+
+++ b/src/base/ftobjs.c
|
46 |
+
@@ -528,6 +528,9 @@
|
47 |
+
return error;
|
48 |
+
}
|
49 |
+
|
50 |
+
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
|
51 |
+
+#define generic GenericFromFreeTypeLibrary
|
52 |
+
+#endif
|
53 |
+
|
54 |
+
static void
|
55 |
+
ft_glyphslot_clear( FT_GlyphSlot slot )
|
56 |
+
@@ -1195,6 +1198,9 @@
|
57 |
+
FT_FREE( face );
|
58 |
+
}
|
59 |
+
|
60 |
+
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
|
61 |
+
+#undef generic
|
62 |
+
+#endif
|
63 |
+
|
64 |
+
static void
|
65 |
+
Destroy_Driver( FT_Driver driver )
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/brotli-static.patch
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/builds/cmake/FindBrotliDec.cmake b/builds/cmake/FindBrotliDec.cmake
|
2 |
+
index 46356b1fd..ed4cc2409 100644
|
3 |
+
--- a/builds/cmake/FindBrotliDec.cmake
|
4 |
+
+++ b/builds/cmake/FindBrotliDec.cmake
|
5 |
+
@@ -35,10 +35,17 @@ find_path(BROTLIDEC_INCLUDE_DIRS
|
6 |
+
PATH_SUFFIXES brotli)
|
7 |
+
|
8 |
+
find_library(BROTLIDEC_LIBRARIES
|
9 |
+
- NAMES brotlidec
|
10 |
+
+ NAMES brotlidec brotlidec-static NAMES_PER_DIR
|
11 |
+
HINTS ${PC_BROTLIDEC_LIBDIR}
|
12 |
+
${PC_BROTLIDEC_LIBRARY_DIRS})
|
13 |
+
|
14 |
+
+if(BROTLIDEC_LIBRARIES MATCHES "-static")
|
15 |
+
+ find_library(BROTLICOMMON_LIBRARIES
|
16 |
+
+ NAMES brotlicommon-static
|
17 |
+
+ HINTS ${PC_BROTLIDEC_LIBDIR}
|
18 |
+
+ ${PC_BROTLIDEC_LIBRARY_DIRS})
|
19 |
+
+ set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES})
|
20 |
+
+endif()
|
21 |
+
|
22 |
+
include(FindPackageHandleStandardArgs)
|
23 |
+
find_package_handle_standard_args(
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/fix-bzip2-pc.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index cb1b9a0f2..53d0bfc68 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -503,7 +503,7 @@ endif ()
|
6 |
+
if (BZIP2_FOUND)
|
7 |
+
target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES})
|
8 |
+
target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS
|
9 |
+
- list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2")
|
10 |
+
+ list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "bzip2")
|
11 |
+
endif ()
|
12 |
+
if (PNG_FOUND)
|
13 |
+
target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES})
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/fix-exports.patch
ADDED
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index cb1b9a0f2..edca5d579 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -496,7 +496,7 @@ set(PKG_CONFIG_REQUIRED_PRIVATE "")
|
6 |
+
set(PKG_CONFIG_LIBS_PRIVATE "")
|
7 |
+
|
8 |
+
if (ZLIB_FOUND)
|
9 |
+
- target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES})
|
10 |
+
+ target_link_libraries(freetype PRIVATE ZLIB::ZLIB)
|
11 |
+
target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS})
|
12 |
+
list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "zlib")
|
13 |
+
endif ()
|
14 |
+
@@ -596,12 +596,25 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
|
15 |
+
install(
|
16 |
+
EXPORT freetype-targets
|
17 |
+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
|
18 |
+
- FILE freetype-config.cmake
|
19 |
+
COMPONENT headers)
|
20 |
+
install(
|
21 |
+
FILES ${PROJECT_BINARY_DIR}/freetype-config-version.cmake
|
22 |
+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
|
23 |
+
COMPONENT headers)
|
24 |
+
+
|
25 |
+
+ if(ZLIB_FOUND)
|
26 |
+
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake"
|
27 |
+
+[[include(CMakeFindDependencyMacro)
|
28 |
+
+find_dependency(ZLIB)
|
29 |
+
+include("${CMAKE_CURRENT_LIST_DIR}/freetype-targets.cmake")
|
30 |
+
+]])
|
31 |
+
+ else()
|
32 |
+
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake"
|
33 |
+
+[[include("${CMAKE_CURRENT_LIST_DIR}/freetype-targets.cmake")
|
34 |
+
+]])
|
35 |
+
+ endif()
|
36 |
+
+
|
37 |
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype)
|
38 |
+
endif ()
|
39 |
+
|
40 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/portfile.cmake
ADDED
@@ -0,0 +1,83 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(FT_VERSION 2.11.1)
|
2 |
+
|
3 |
+
vcpkg_from_sourceforge(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO freetype/freetype2
|
6 |
+
REF ${FT_VERSION}
|
7 |
+
FILENAME freetype-${FT_VERSION}.tar.xz
|
8 |
+
SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
|
9 |
+
PATCHES
|
10 |
+
0003-Fix-UWP.patch
|
11 |
+
fix-bzip2-pc.patch # we have a bzip2 file that we can use - https://gitlab.freedesktop.org/freetype/freetype/-/commit/b2aeca5fda870751f3c9d645e0dca4c80fa1ae5a
|
12 |
+
brotli-static.patch
|
13 |
+
fix-exports.patch
|
14 |
+
)
|
15 |
+
|
16 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
17 |
+
FEATURES
|
18 |
+
zlib FT_REQUIRE_ZLIB
|
19 |
+
bzip2 FT_REQUIRE_BZIP2
|
20 |
+
png FT_REQUIRE_PNG
|
21 |
+
brotli FT_REQUIRE_BROTLI
|
22 |
+
INVERTED_FEATURES
|
23 |
+
zlib FT_DISABLE_ZLIB
|
24 |
+
bzip2 FT_DISABLE_BZIP2
|
25 |
+
png FT_DISABLE_PNG
|
26 |
+
brotli FT_DISABLE_BROTLI
|
27 |
+
)
|
28 |
+
|
29 |
+
vcpkg_cmake_configure(
|
30 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
31 |
+
OPTIONS
|
32 |
+
-DFT_DISABLE_HARFBUZZ=ON
|
33 |
+
${FEATURE_OPTIONS}
|
34 |
+
)
|
35 |
+
|
36 |
+
vcpkg_cmake_install()
|
37 |
+
vcpkg_copy_pdbs()
|
38 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/freetype)
|
39 |
+
|
40 |
+
# Rename for easy usage (VS integration; CMake and autotools will not care)
|
41 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/include/freetype2/freetype" "${CURRENT_PACKAGES_DIR}/include/freetype")
|
42 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/include/freetype2/ft2build.h" "${CURRENT_PACKAGES_DIR}/include/ft2build.h")
|
43 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/freetype2")
|
44 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
45 |
+
|
46 |
+
# Fix the include dir [freetype2 -> freetype]
|
47 |
+
file(READ "${CURRENT_PACKAGES_DIR}/share/freetype/freetype-targets.cmake" CONFIG_MODULE)
|
48 |
+
string(REPLACE "\${_IMPORT_PREFIX}/include/freetype2" "\${_IMPORT_PREFIX}/include" CONFIG_MODULE "${CONFIG_MODULE}")
|
49 |
+
string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlicommon-static.lib" [[\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/brotlicommon-static.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/brotlicommon-static.lib>]] CONFIG_MODULE "${CONFIG_MODULE}")
|
50 |
+
string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlidec-static.lib" [[\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/brotlidec-static.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/brotlidec-static.lib>]] CONFIG_MODULE "${CONFIG_MODULE}")
|
51 |
+
string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlidec.lib" [[\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/brotlidec.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/brotlidec.lib>]] CONFIG_MODULE "${CONFIG_MODULE}")
|
52 |
+
string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlidec.lib" [[\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/brotlidec.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/brotlidec.lib>]] CONFIG_MODULE "${CONFIG_MODULE}")
|
53 |
+
file(WRITE ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-targets.cmake "${CONFIG_MODULE}")
|
54 |
+
|
55 |
+
find_library(FREETYPE_DEBUG NAMES freetyped PATHS "${CURRENT_PACKAGES_DIR}/debug/lib/" NO_DEFAULT_PATH)
|
56 |
+
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freetype2.pc")
|
57 |
+
file(READ "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freetype2.pc" _contents)
|
58 |
+
if(FREETYPE_DEBUG)
|
59 |
+
string(REPLACE "-lfreetype" "-lfreetyped" _contents "${_contents}")
|
60 |
+
endif()
|
61 |
+
string(REPLACE "-I\${includedir}/freetype2" "-I\${includedir}" _contents "${_contents}")
|
62 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freetype2.pc" "${_contents}")
|
63 |
+
endif()
|
64 |
+
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freetype2.pc")
|
65 |
+
file(READ "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freetype2.pc" _contents)
|
66 |
+
string(REPLACE "-I\${includedir}/freetype2" "-I\${includedir}" _contents "${_contents}")
|
67 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freetype2.pc" "${_contents}")
|
68 |
+
endif()
|
69 |
+
|
70 |
+
vcpkg_fixup_pkgconfig()
|
71 |
+
|
72 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
73 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
74 |
+
|
75 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
|
76 |
+
"${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
|
77 |
+
|
78 |
+
file(COPY
|
79 |
+
"${SOURCE_PATH}/docs/FTL.TXT"
|
80 |
+
"${SOURCE_PATH}/docs/GPLv2.TXT"
|
81 |
+
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
|
82 |
+
)
|
83 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake
ADDED
@@ -0,0 +1,64 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
cmake_policy(PUSH)
|
2 |
+
cmake_policy(SET CMP0012 NEW)
|
3 |
+
cmake_policy(SET CMP0054 NEW)
|
4 |
+
|
5 |
+
_find_package(${ARGS})
|
6 |
+
|
7 |
+
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
|
8 |
+
if("@FT_REQUIRE_ZLIB@")
|
9 |
+
find_package(ZLIB)
|
10 |
+
endif()
|
11 |
+
if("@FT_REQUIRE_BZIP2@")
|
12 |
+
find_package(BZip2)
|
13 |
+
endif()
|
14 |
+
if("@FT_REQUIRE_PNG@")
|
15 |
+
find_package(PNG)
|
16 |
+
endif()
|
17 |
+
if("@FT_REQUIRE_BROTLI@")
|
18 |
+
find_library(BROTLIDEC_LIBRARY_RELEASE NAMES brotlidec brotlidec-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH)
|
19 |
+
find_library(BROTLIDEC_LIBRARY_DEBUG NAMES brotlidec brotlidec-static brotlidecd brotlidec-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH)
|
20 |
+
find_library(BROTLICOMMON_LIBRARY_RELEASE NAMES brotlicommon brotlicommon-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH)
|
21 |
+
find_library(BROTLICOMMON_LIBRARY_DEBUG NAMES brotlicommon brotlicommon-static brotlicommond brotlicommon-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH)
|
22 |
+
include(SelectLibraryConfigurations)
|
23 |
+
select_library_configurations(BROTLIDEC)
|
24 |
+
select_library_configurations(BROTLICOMMON)
|
25 |
+
endif("@FT_REQUIRE_BROTLI@")
|
26 |
+
|
27 |
+
if(TARGET Freetype::Freetype)
|
28 |
+
if("@FT_REQUIRE_ZLIB@")
|
29 |
+
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
|
30 |
+
endif()
|
31 |
+
if("@FT_REQUIRE_BZIP2@")
|
32 |
+
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2)
|
33 |
+
endif()
|
34 |
+
if("@FT_REQUIRE_PNG@")
|
35 |
+
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES PNG::PNG)
|
36 |
+
endif()
|
37 |
+
if("@FT_REQUIRE_BROTLI@")
|
38 |
+
if(BROTLIDEC_LIBRARY_DEBUG)
|
39 |
+
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$<CONFIG:DEBUG>:${BROTLIDEC_LIBRARY_DEBUG}>")
|
40 |
+
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$<CONFIG:DEBUG>:${BROTLICOMMON_LIBRARY_DEBUG}>")
|
41 |
+
endif()
|
42 |
+
if(BROTLIDEC_LIBRARY_RELEASE)
|
43 |
+
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$<NOT:$<CONFIG:DEBUG>>:${BROTLIDEC_LIBRARY_RELEASE}>")
|
44 |
+
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$<NOT:$<CONFIG:DEBUG>>:${BROTLICOMMON_LIBRARY_RELEASE}>")
|
45 |
+
endif()
|
46 |
+
endif()
|
47 |
+
endif()
|
48 |
+
|
49 |
+
if(FREETYPE_LIBRARIES)
|
50 |
+
if("@FT_REQUIRE_ZLIB@")
|
51 |
+
list(APPEND FREETYPE_LIBRARIES ${ZLIB_LIBRARIES})
|
52 |
+
endif()
|
53 |
+
if("@FT_REQUIRE_BZIP2@")
|
54 |
+
list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES})
|
55 |
+
endif()
|
56 |
+
if("@FT_REQUIRE_PNG@")
|
57 |
+
list(APPEND FREETYPE_LIBRARIES ${PNG_LIBRARIES})
|
58 |
+
endif()
|
59 |
+
if("@FT_REQUIRE_BROTLI@")
|
60 |
+
list(APPEND FREETYPE_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES})
|
61 |
+
endif()
|
62 |
+
endif()
|
63 |
+
endif()
|
64 |
+
cmake_policy(POP)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freetype/vcpkg.json
ADDED
@@ -0,0 +1,49 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "freetype",
|
3 |
+
"version-semver": "2.11.1",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "A library to render fonts.",
|
6 |
+
"homepage": "https://www.freetype.org/",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake-config",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
],
|
17 |
+
"default-features": [
|
18 |
+
"brotli",
|
19 |
+
"bzip2",
|
20 |
+
"png",
|
21 |
+
"zlib"
|
22 |
+
],
|
23 |
+
"features": {
|
24 |
+
"brotli": {
|
25 |
+
"description": "Support decompression of WOFF2 streams",
|
26 |
+
"dependencies": [
|
27 |
+
"brotli"
|
28 |
+
]
|
29 |
+
},
|
30 |
+
"bzip2": {
|
31 |
+
"description": "Support bzip2 compressed fonts.",
|
32 |
+
"dependencies": [
|
33 |
+
"bzip2"
|
34 |
+
]
|
35 |
+
},
|
36 |
+
"png": {
|
37 |
+
"description": "Support PNG compressed OpenType embedded bitmaps.",
|
38 |
+
"dependencies": [
|
39 |
+
"libpng"
|
40 |
+
]
|
41 |
+
},
|
42 |
+
"zlib": {
|
43 |
+
"description": "Use zlib instead of internal library for DEFLATE",
|
44 |
+
"dependencies": [
|
45 |
+
"zlib"
|
46 |
+
]
|
47 |
+
}
|
48 |
+
}
|
49 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freexl/fix-makefiles.patch
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/makefile.vc b/makefile.vc
|
2 |
+
index cb8bd36..85c0352 100644
|
3 |
+
--- a/makefile.vc
|
4 |
+
+++ b/makefile.vc
|
5 |
+
@@ -23,9 +23,9 @@ freexl.lib: $(LIBOBJ)
|
6 |
+
$(FREEXL_DLL): freexl_i.lib
|
7 |
+
|
8 |
+
freexl_i.lib: $(LIBOBJ)
|
9 |
+
- link /debug /dll /out:$(FREEXL_DLL) \
|
10 |
+
+ link $(LINK_FLAGS) /dll /out:$(FREEXL_DLL) \
|
11 |
+
/implib:freexl_i.lib $(LIBOBJ) \
|
12 |
+
- C:\OSGeo4w\lib\iconv.lib
|
13 |
+
+ $(LIBS_ALL)
|
14 |
+
if exist $(FREEXL_DLL).manifest mt -manifest \
|
15 |
+
$(FREEXL_DLL).manifest -outputresource:$(FREEXL_DLL);2
|
16 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freexl/fix-pc-file.patch
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/configure.ac b/configure.ac
|
2 |
+
index a44dbf4..55bd768 100644
|
3 |
+
--- a/configure.ac
|
4 |
+
+++ b/configure.ac
|
5 |
+
@@ -64,9 +64,11 @@ AC_CONFIG_FILES([Makefile \
|
6 |
+
AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
|
7 |
+
# on some systems "iconv()" lives in libc. On others it lives in libiconv
|
8 |
+
# on older systems "libiconv()" lives in libiconv
|
9 |
+
+SAVED_LIBS="${LIBS}"
|
10 |
+
AC_SEARCH_LIBS(iconv,iconv,,
|
11 |
+
AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),))
|
12 |
+
AC_SEARCH_LIBS(locale_charset,charset,,
|
13 |
+
AC_SEARCH_LIBS(nl_langinfo,c,,AC_MSG_ERROR(['libcharset' is required but it doesn't seem to be installed on this system.]),))
|
14 |
+
+AC_SUBST(ICONV_LIBS, "${LIBS%${SAVED_LIBS}}")
|
15 |
+
|
16 |
+
AC_OUTPUT
|
17 |
+
|
18 |
+
diff --git a/freexl.pc.in b/freexl.pc.in
|
19 |
+
index 5813e68..8fc671d 100644
|
20 |
+
--- a/freexl.pc.in
|
21 |
+
+++ b/freexl.pc.in
|
22 |
+
@@ -10,3 +10,4 @@ Description: a simple library extracting data from .xls (Excel BIFF) files
|
23 |
+
Version: @VERSION@
|
24 |
+
Libs: -L${libdir} -lfreexl -lm
|
25 |
+
Cflags: -I${includedir}
|
26 |
+
+Libs.private: @ICONV_LIBS@
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freexl/fix-sources.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/config-msvc.h b/config-msvc.h
|
2 |
+
index a39d4e7..37f1c0b 100644
|
3 |
+
--- a/config-msvc.h
|
4 |
+
+++ b/config-msvc.h
|
5 |
+
@@ -66,7 +66,7 @@
|
6 |
+
#define HAVE_SYS_TYPES_H 1
|
7 |
+
|
8 |
+
/* Define to 1 if you have the <unistd.h> header file. */
|
9 |
+
-#define HAVE_UNISTD_H 1
|
10 |
+
+#undef HAVE_UNISTD_H
|
11 |
+
|
12 |
+
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
|
13 |
+
slash. */
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freexl/portfile.cmake
ADDED
@@ -0,0 +1,86 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(FREEXL_VERSION_STR "1.0.6")
|
2 |
+
|
3 |
+
vcpkg_download_distfile(ARCHIVE
|
4 |
+
URLS "https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-${FREEXL_VERSION_STR}.tar.gz"
|
5 |
+
FILENAME "freexl-${FREEXL_VERSION_STR}.tar.gz"
|
6 |
+
SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_extract_source_archive_ex(
|
10 |
+
ARCHIVE "${ARCHIVE}"
|
11 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
12 |
+
PATCHES
|
13 |
+
fix-makefiles.patch
|
14 |
+
fix-sources.patch
|
15 |
+
fix-pc-file.patch
|
16 |
+
)
|
17 |
+
|
18 |
+
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
19 |
+
set(OPTFLAGS "/nologo /fp:precise /W3 /D_CRT_SECURE_NO_WARNINGS /DDLL_EXPORT")
|
20 |
+
set(LIBS_ALL "iconv.lib charset.lib")
|
21 |
+
if(VCPKG_TARGET_IS_UWP)
|
22 |
+
string(APPEND OPTFLAGS " /DWINAPI_FAMILY=WINAPI_FAMILY_APP")
|
23 |
+
string(APPEND LIBS_ALL " WindowsApp.lib /APPCONTAINER")
|
24 |
+
endif()
|
25 |
+
cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR INSTDIR)
|
26 |
+
vcpkg_install_nmake(
|
27 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
28 |
+
OPTIONS
|
29 |
+
"OPTFLAGS=${OPTFLAGS}"
|
30 |
+
"CFLAGS=-I. -Iheaders ${OPTFLAGS}"
|
31 |
+
"LIBS_ALL=${LIBS_ALL}"
|
32 |
+
OPTIONS_DEBUG
|
33 |
+
"INSTDIR=${INSTDIR}\\debug"
|
34 |
+
"LINK_FLAGS=/debug /LIBPATH:\"${CURRENT_INSTALLED_DIR}/debug/lib\""
|
35 |
+
OPTIONS_RELEASE
|
36 |
+
"INSTDIR=${INSTDIR}"
|
37 |
+
"LINK_FLAGS=/LIBPATH:\"${CURRENT_INSTALLED_DIR}/lib\""
|
38 |
+
)
|
39 |
+
|
40 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
41 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
|
42 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
|
43 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib")
|
44 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib")
|
45 |
+
else()
|
46 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl.lib")
|
47 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib")
|
48 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
49 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/lib/freexl.lib")
|
50 |
+
endif()
|
51 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
52 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib")
|
53 |
+
endif()
|
54 |
+
endif()
|
55 |
+
|
56 |
+
set(VERSION "${FREEXL_VERSION_STR}")
|
57 |
+
set(libdir [[${prefix}/lib]])
|
58 |
+
set(exec_prefix [[${prefix}]])
|
59 |
+
set(ICONV_LIBS "-liconv -lcharset")
|
60 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
61 |
+
set(includedir [[${prefix}/include]])
|
62 |
+
set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freexl.pc")
|
63 |
+
configure_file("${SOURCE_PATH}/freexl.pc.in" "${outfile}" @ONLY)
|
64 |
+
vcpkg_replace_string("${outfile}" " -lm" "")
|
65 |
+
endif()
|
66 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
67 |
+
set(includedir [[${prefix}/../include]])
|
68 |
+
set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freexl.pc")
|
69 |
+
configure_file("${SOURCE_PATH}/freexl.pc.in" "${outfile}" @ONLY)
|
70 |
+
vcpkg_replace_string("${outfile}" " -lm" "")
|
71 |
+
endif()
|
72 |
+
|
73 |
+
else()
|
74 |
+
|
75 |
+
vcpkg_configure_make(
|
76 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
77 |
+
AUTOCONFIG
|
78 |
+
)
|
79 |
+
vcpkg_install_make()
|
80 |
+
|
81 |
+
endif()
|
82 |
+
|
83 |
+
vcpkg_fixup_pkgconfig()
|
84 |
+
|
85 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
86 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/freexl/vcpkg.json
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "freexl",
|
3 |
+
"version-string": "1.0.6",
|
4 |
+
"description": "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet",
|
5 |
+
"homepage": "https://www.gaia-gis.it/gaia-sins/freexl-sources",
|
6 |
+
"dependencies": [
|
7 |
+
"libiconv"
|
8 |
+
]
|
9 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fribidi/meson-crosscompile.patch
ADDED
@@ -0,0 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/gen.tab/meson.build b/gen.tab/meson.build
|
2 |
+
index 8c21e98..1cd9960 100644
|
3 |
+
--- a/gen.tab/meson.build
|
4 |
+
+++ b/gen.tab/meson.build
|
5 |
+
@@ -1,5 +1,10 @@
|
6 |
+
# gen.tab
|
7 |
+
|
8 |
+
+if get_option('pregenerated_tab') != ''
|
9 |
+
+ generated_tab_include_files = []
|
10 |
+
+ fribidi_unicode_version_h = files()
|
11 |
+
+ add_project_arguments('-I' + get_option('pregenerated_tab'), language: 'c')
|
12 |
+
+else
|
13 |
+
native_cc = meson.get_compiler('c')
|
14 |
+
|
15 |
+
# Don't pick up top-level config.h, as that has defines for the cross-compiler
|
16 |
+
@@ -75,7 +80,10 @@ foreach tab : tabs
|
17 |
+
input: gen_prog_inputs,
|
18 |
+
output: gen_prog_out,
|
19 |
+
command: [gen_exe, COMPRESSION, '@INPUT@', gen_prog_name],
|
20 |
+
+ install: true,
|
21 |
+
+ install_dir: 'share/fribidi/gen.tab',
|
22 |
+
capture: true)
|
23 |
+
|
24 |
+
generated_tab_include_files += [tab_inc_file]
|
25 |
+
endforeach
|
26 |
+
+endif
|
27 |
+
diff --git a/meson_options.txt b/meson_options.txt
|
28 |
+
index f54a639..8f60205 100644
|
29 |
+
--- a/meson_options.txt
|
30 |
+
+++ b/meson_options.txt
|
31 |
+
@@ -8,3 +8,5 @@ option('tests', type : 'boolean', value : true,
|
32 |
+
description: 'Build tests')
|
33 |
+
option('fuzzer_ldflags', type : 'string',
|
34 |
+
description: 'Extra LDFLAGS used during linking of fuzzing binaries')
|
35 |
+
+option('pregenerated_tab', type: 'string',
|
36 |
+
+ description: 'Path to pregenerated table sources')
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fribidi/portfile.cmake
ADDED
@@ -0,0 +1,56 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO fribidi/fribidi
|
4 |
+
REF v1.0.11
|
5 |
+
SHA512 9ddb0dbfb28ee4f1d9dd5d46fe1fff75c5446bfdacaabf8647847c36ef72eec823f6e6d6d1369d67c292d680004f7113c9e69114a8fae1d73ab11a58c66a8b8a
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES meson-crosscompile.patch
|
8 |
+
)
|
9 |
+
|
10 |
+
set(gen_tab_subdir "share/${PORT}/gen.tab")
|
11 |
+
|
12 |
+
set(options "")
|
13 |
+
if(VCPKG_CROSSCOMPILING)
|
14 |
+
set(gen_tab "${CURRENT_HOST_INSTALLED_DIR}/${gen_tab_subdir}")
|
15 |
+
cmake_path(NATIVE_PATH gen_tab gen_tab)
|
16 |
+
set(options "-Dpregenerated_tab=${gen_tab}")
|
17 |
+
endif()
|
18 |
+
|
19 |
+
vcpkg_configure_meson(
|
20 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
21 |
+
OPTIONS
|
22 |
+
${options}
|
23 |
+
-Ddocs=false
|
24 |
+
-Dbin=false
|
25 |
+
-Dtests=false
|
26 |
+
)
|
27 |
+
|
28 |
+
vcpkg_install_meson()
|
29 |
+
vcpkg_fixup_pkgconfig()
|
30 |
+
vcpkg_copy_pdbs()
|
31 |
+
|
32 |
+
# Define static macro
|
33 |
+
file(READ "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" FRIBIDI_COMMON_H)
|
34 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
35 |
+
string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 0" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}")
|
36 |
+
else()
|
37 |
+
string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 1" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}")
|
38 |
+
endif()
|
39 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "${FRIBIDI_COMMON_H}")
|
40 |
+
|
41 |
+
if(VCPKG_CROSSCOMPILING)
|
42 |
+
file(
|
43 |
+
COPY "${gen_tab}/fribidi-unicode-version.h"
|
44 |
+
DESTINATION "${CURRENT_PACKAGES_DIR}/include/fribidi"
|
45 |
+
)
|
46 |
+
else()
|
47 |
+
file(
|
48 |
+
COPY "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-unicode-version.h"
|
49 |
+
DESTINATION "${CURRENT_PACKAGES_DIR}/${gen_tab_subdir}"
|
50 |
+
)
|
51 |
+
endif()
|
52 |
+
|
53 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
54 |
+
|
55 |
+
# Handle copyright
|
56 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fribidi/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "fribidi",
|
3 |
+
"version": "1.0.11",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)",
|
6 |
+
"supports": "!uwp",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "fribidi",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-tool-meson",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
]
|
17 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/frozen/portfile.cmake
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO serge-sans-paille/frozen
|
4 |
+
REF 867b33916044ced463ed42874b2aa1514ef66bec
|
5 |
+
SHA512 0cace261bf6068a382dc7c2d2b1c7d50de882e966adcdaaee7c358cc2e55b736d41c6ce2cefb30c231f550e4576cfdc5b2a10379a8affa084f1eb9202db7200e
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_cmake_configure(
|
10 |
+
SOURCE_PATH ${SOURCE_PATH}
|
11 |
+
OPTIONS
|
12 |
+
-Dfrozen.benchmark=OFF
|
13 |
+
-Dfrozen.coverage=OFF
|
14 |
+
-Dfrozen.installation=ON
|
15 |
+
-Dfrozen.tests=OFF
|
16 |
+
)
|
17 |
+
vcpkg_cmake_install()
|
18 |
+
|
19 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/frozen)
|
20 |
+
|
21 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
|
22 |
+
|
23 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/frozen/vcpkg.json
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "frozen",
|
3 |
+
"version-date": "2021-04-22",
|
4 |
+
"description": "Header-only library that provides 0 cost initialization for immutable containers and various algorithms. Frozen provides:immutable (a.k.a. frozen), constexpr-compatible versions of std::set, std::unordered_set, std::map and std::unordered_map and 0-cost initialization version of std::search for frozen needles using Boyer-Moore or Knuth-Morris-Pratt algorithms.",
|
5 |
+
"homepage": "https://github.com/serge-sans-paille/frozen",
|
6 |
+
"dependencies": [
|
7 |
+
{
|
8 |
+
"name": "vcpkg-cmake",
|
9 |
+
"host": true
|
10 |
+
},
|
11 |
+
{
|
12 |
+
"name": "vcpkg-cmake-config",
|
13 |
+
"host": true
|
14 |
+
}
|
15 |
+
]
|
16 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/frugally-deep/portfile.cmake
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO Dobiasd/frugally-deep
|
4 |
+
REF v0.15.10-p0
|
5 |
+
SHA512 e665df59c83fea5fc0a89158639c83f9c72cba1fc8c61086032db60c395606dab4e9085f1380714e4f8a82c1f2b143aa22ff6212d9180c368283e1965e6dea87
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
10 |
+
FEATURES
|
11 |
+
double FDEEP_USE_DOUBLE
|
12 |
+
)
|
13 |
+
|
14 |
+
vcpkg_configure_cmake(
|
15 |
+
SOURCE_PATH ${SOURCE_PATH}
|
16 |
+
PREFER_NINJA
|
17 |
+
OPTIONS
|
18 |
+
-DFDEEP_BUILD_UNITTEST=OFF
|
19 |
+
-DFDEEP_USE_TOOLCHAIN=ON
|
20 |
+
${FEATURE_OPTIONS}
|
21 |
+
)
|
22 |
+
|
23 |
+
vcpkg_install_cmake()
|
24 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/frugally-deep TARGET_PATH share/${PORT})
|
25 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
26 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
|
27 |
+
|
28 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/frugally-deep/vcpkg.json
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "frugally-deep",
|
3 |
+
"version-semver": "0.15.10-p0",
|
4 |
+
"description": "Header-only library for using Keras models in C++.",
|
5 |
+
"homepage": "https://github.com/Dobiasd/frugally-deep",
|
6 |
+
"dependencies": [
|
7 |
+
"eigen3",
|
8 |
+
"fplus",
|
9 |
+
"nlohmann-json"
|
10 |
+
],
|
11 |
+
"features": {
|
12 |
+
"double": {
|
13 |
+
"description": "Use double precision"
|
14 |
+
}
|
15 |
+
}
|
16 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fruit/portfile.cmake
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
|
2 |
+
vcpkg_from_github(
|
3 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
4 |
+
REPO google/fruit
|
5 |
+
REF 29c9fd265cfa72ee72fb64257fe4b72198d87264 # v3.6.0
|
6 |
+
SHA512 1a8f5b126492dd81fe40bbedd0ead839fd25dac6ea569dd51879e288a4c5850c6618754547ac201d82875781ee0490261372df7a0d1cf50e90c3a9b9da9aaed4
|
7 |
+
HEAD_REF master
|
8 |
+
)
|
9 |
+
|
10 |
+
# TODO: Make boost an optional dependency?
|
11 |
+
vcpkg_configure_cmake(
|
12 |
+
SOURCE_PATH ${SOURCE_PATH}
|
13 |
+
PREFER_NINJA
|
14 |
+
OPTIONS
|
15 |
+
-DFRUIT_USES_BOOST=False
|
16 |
+
-DFRUIT_TESTS_USE_PRECOMPILED_HEADERS=OFF
|
17 |
+
)
|
18 |
+
|
19 |
+
vcpkg_install_cmake()
|
20 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
21 |
+
|
22 |
+
# Handle copyright
|
23 |
+
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|