Merge remote-tracking branch 'origin/master' into HEAD

fealebenpae · Mar 20, 2019 · b5a0378 · b5a0378
2 parents caa7981 + 64fc320
commit b5a0378
Show file tree

Hide file tree

Showing 48 changed files with 485 additions and 218 deletions.
diff --git a/ports/3fd/CONTROL b/ports/3fd/CONTROL
@@ -1,4 +1,4 @@
 Source: 3fd
-Version: 2.6.2-1
+Version: 2.6.2-2
 Description: C++ Framework For Fast Development
 Build-Depends: boost-lockfree (windows), boost-regex (windows), poco (windows), sqlite3, rapidxml
diff --git a/ports/3fd/RapidXML.patch b/ports/3fd/RapidXML.patch
@@ -0,0 +1,13 @@
+diff --git a/3FD/configuration.cpp b/3FD/configuration.cpp
+index b9ca804..207a397 100644
+--- a/3FD/configuration.cpp
++++ b/3FD/configuration.cpp
+@@ -2,7 +2,7 @@
+ #include "configuration.h"
+ #include "exceptions.h"
+ #include "utils_io.h"
+-#include <rapidxml.hpp>
++#include <rapidxml/rapidxml.hpp>
+
+ #ifdef _3FD_PLATFORM_WINRT
+ #    include "utils_winrt.h"
diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake
@@ -32,6 +32,7 @@ vcpkg_from_github(
     PATCHES
         "${CMAKE_CURRENT_LIST_DIR}/remove-seekpos.patch"
         "${CMAKE_CURRENT_LIST_DIR}/DataException.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/RapidXML.patch"
 )
 
 # Copy the sources to ensure a clean, out-of-source build

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
@@ -1,3 +1,3 @@
 Source: ace
-Version: 6.5.4-1
+Version: 6.5.4-2
 Description: The ADAPTIVE Communication Environment
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
@@ -89,16 +89,6 @@ function(install_ace_library SOURCE_PATH ACE_LIBRARY)
             ${LIB_PATH}/${ACE_LIBRARY}.dll
             DESTINATION ${CURRENT_PACKAGES_DIR}/bin
         )
-
-        # Install the pdb files
-        file(INSTALL
-            ${LIB_PATH}/${ACE_LIBRARY}${DLL_DECORATOR}d_dll.pdb
-            DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-        )
-        file(INSTALL
-            ${LIB_PATH}/${ACE_LIBRARY}${DLL_DECORATOR}.pdb
-            DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-        )
     endif()
 
     # Install the lib files
@@ -124,3 +114,5 @@ install_ace_library(${ACE_ROOT} "ACE_RLECompression")
 # Handle copyright
 file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL
@@ -1,4 +1,4 @@
 Source: clapack
-Version: 3.2.1-1
+Version: 3.2.1-2
 Description: CLAPACK (f2c'ed version of LAPACK)
 Build-Depends: openblas
diff --git a/ports/clapack/fix-lack-library.patch b/ports/clapack/fix-lack-library.patch
@@ -0,0 +1,19 @@
+diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt
+index 2bdbd05..e77b3a3 100644
+--- a/F2CLIBS/libf2c/CMakeLists.txt
++++ b/F2CLIBS/libf2c/CMakeLists.txt
+@@ -60,3 +60,13 @@ include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c)
+ include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c)
+ add_library(f2c STATIC ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
+ set_property(TARGET f2c PROPERTY PREFIX lib)
++
++install(TARGETS f2c 
++        RUNTIME DESTINATION bin
++        LIBRARY DESTINATION lib
++        ARCHIVE DESTINATION lib)
++        
++install(TARGETS arithchk 
++        RUNTIME DESTINATION tools
++        LIBRARY DESTINATION lib
++        ARCHIVE DESTINATION lib)
+\ No newline at end of file
diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake
@@ -29,7 +29,9 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/lapack.def DESTINATION ${SOURCE_PATH}/SRC)
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-other-blas-and-install-include.patch"
+    PATCHES
+        use-other-blas-and-install-include.patch
+        fix-lack-library.patch
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake
@@ -7,8 +7,9 @@ vcpkg_from_github(
     SHA512 cb923d296219765096f5246cc7a2b69712931f58171ae885dbdbd215fca86d911c34d12748d3304d6a5a350dc737ff0caead2495acac488af5431b437cbacc7d
     HEAD_REF v2.5.0
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/vs-version-detection.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/use-uriparser.patch"
+        vs-version-detection.patch
+        use-uriparser.patch
+		use-vcpkg-minizip.patch
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/collada-dom/use-vcpkg-minizip.patch b/ports/collada-dom/use-vcpkg-minizip.patch
@@ -0,0 +1,13 @@
+diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
+index 4536275..77651f9 100644
+--- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
++++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
+@@ -32,7 +32,7 @@
+ #include <iomanip>
+ using namespace std;
+
+-#include <zip.h> // for saving compressed files
++#include <minizip/zip.h> // for saving compressed files
+ #ifdef _WIN32
+ #include <iowin32.h>
+ #else
diff --git a/ports/cppfs/cmake-export-fix.patch b/ports/cppfs/cmake-export-fix.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea9fd15..c62c6fd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -124,7 +124,7 @@ endif()
+ if((UNIX AND SYSTEM_DIR_INSTALL) OR OPTION_FORCE_SYSTEM_DIR_INSTALL)
+     # Install into the system (/usr/bin or /usr/local/bin)
+     set(INSTALL_ROOT      "share/${project}")       # /usr/[local]/share/<project>
+-    set(INSTALL_CMAKE     "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
++    set(INSTALL_CMAKE     "share/${project}")       # /usr/[local]/share/<project>
+     set(INSTALL_EXAMPLES  "share/${project}")       # /usr/[local]/share/<project>
+     set(INSTALL_DATA      "share/${project}")       # /usr/[local]/share/<project>
+     set(INSTALL_BIN       "bin")                    # /usr/[local]/bin
+@@ -183,7 +183,7 @@ add_subdirectory(deploy)
+ install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
+
+ # Install cmake find script for the project
+-install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
++# install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
+
+ # Install the project meta files
+ install(FILES AUTHORS   DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
+diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt
+index aa37eda..e8a59e0 100644
+--- a/source/cppfs/CMakeLists.txt
++++ b/source/cppfs/CMakeLists.txt
+@@ -283,7 +283,7 @@ perform_health_checks(
+
+ # Library
+ install(TARGETS ${target}
+-    EXPORT  "${target}-export"            COMPONENT dev
++    EXPORT  "${target}-config"            COMPONENT dev
+     RUNTIME DESTINATION ${INSTALL_BIN}    COMPONENT runtime
+     LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime
+     ARCHIVE DESTINATION ${INSTALL_LIB}    COMPONENT dev
+@@ -302,8 +302,8 @@ install(DIRECTORY
+ )
+
+ # CMake config
+-install(EXPORT ${target}-export
++install(EXPORT ${target}-config
+     NAMESPACE   ${META_PROJECT_NAME}::
+-    DESTINATION ${INSTALL_CMAKE}/${target}
++    DESTINATION ${INSTALL_CMAKE}
+     COMPONENT   dev
+ )
diff --git a/ports/cppfs/portfile.cmake b/ports/cppfs/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         LibCrypto-fix.patch
+        cmake-export-fix.patch
 )
 
 if(${TARGET_TRIPLET} MATCHES "uwp")
@@ -40,6 +41,8 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
+vcpkg_fixup_cmake_targets()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppfs RENAME copyright)

diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.10.10
+Version: 2.10.11
 Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows)
 Description: C++11 JSON, REST, and OAuth library
   The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.

diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cpprestsdk
-    REF v2.10.10
-    SHA512 6169d0907aead80a4e0a3f6a25fb71ab13a46a10a9700974c629b91948a83ee3c841a4ac7dfac8155ea3731c0eedee594c07ec37050d57770faf4eee608660e5
+    REF v2.10.11
+    SHA512 ea2299e128f8a75e67bb29fb42ce249cf48166c60cc73ec40d3f6ec5ae7b283ac8a083d62a7221b35f1f7876d814263a96b2a376bb306b1b4605ef17de36a115
     HEAD_REF master
 )
 

diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL
@@ -1,3 +1,3 @@
 Source: fribidi
-Version: 1.0.5
+Version: 58c6cb3
 Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)
diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fribidi/fribidi
-    REF v1.0.5
-    SHA512 c51b67cc3e7610bef9a66f2456f7602fe010164c2c01e7d91026cefa4a08fdce5165b6eb3814e76cd89e766356fb71adc08bf75d9b2f5802f71c18b5d0476887
+    REF 58c6cb390a9a18c98b2cbaac555d8ea9352a9e4f
+    SHA512 1ec9c19faa87886786ce1589e2c66cab173b48e34d0e43487becc8606001f21f6ed17d0abd1c322fbbcaeb96a47ed882cad228be2e9beb019020ca2a475fc298
 HEAD_REF master)
 
 vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH}
@@ -23,5 +23,9 @@ if (EXE_FILES)
     file(REMOVE ${EXE_FILES})
 endif()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fribidi RENAME copyright)
diff --git a/ports/gli/CONTROL b/ports/gli/CONTROL
@@ -1,4 +1,4 @@
 Source: gli
-Version: 0.8.2-1
+Version: dd17acf
 Build-Depends: glm
 Description: OpenGL Image (GLI) https://gli.g-truc.net
diff --git a/ports/gli/portfile.cmake b/ports/gli/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO g-truc/gli
-    REF 0.8.2.0
-    SHA512 c254a4e1497d0add985e4a882c552db99c512cc0e9cc72145d51a6e7deada817d624d9818099a47136a8a3ef1223a26a34e355e3c713166f0bb062e506059834
+    REF dd17acf9cc7fc6e6abe9f9ec69949eeeee1ccd82
+    SHA512 9e3a4ab9ee73d5c271b8346cf81339cd3cd0c20d20991524b816313b6a99e8d3a01863316a38cf1a52ef9c5b31d689ecccf6248b12d1d270460c048bf904650b
     HEAD_REF master
 )
 

diff --git a/ports/glslang/CONTROL b/ports/glslang/CONTROL
@@ -1,3 +1,3 @@
 Source: glslang
-Version: 2018-03-02-1
+Version: 2018-03-02-2
 Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake
@@ -20,8 +20,10 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_fixup_cmake_targets()
+
 file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools")
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 

diff --git a/ports/gsoap/CONTROL b/ports/gsoap/CONTROL
@@ -1,4 +1,4 @@
 Source: gsoap
-Version: 2.8.82-1
+Version: 2.8.82-2
 Build-Depends: curl
 Description: The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings.
diff --git a/ports/gsoap/portfile.cmake b/ports/gsoap/portfile.cmake
@@ -50,11 +50,14 @@ endif()
 
 
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/gsoap/stdsoap2.h ${SOURCE_PATH}/gsoap/stdsoap2.c ${SOURCE_PATH}/gsoap/stdsoap2.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${SOURCE_PATH}/gsoap/stdsoap2.h ${SOURCE_PATH}/gsoap/stdsoap2.c ${SOURCE_PATH}/gsoap/stdsoap2.cpp ${SOURCE_PATH}/gsoap/dom.c ${SOURCE_PATH}/gsoap/dom.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
 # Handle import files
 file(COPY ${SOURCE_PATH}/gsoap/import DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap)
 
+# Handle plugin files
+file(COPY ${SOURCE_PATH}/gsoap/plugin DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap)
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE.txt ${SOURCE_PATH}/INSTALL.txt ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/copyright)

diff --git a/ports/magnum/001-sdl-includes.patch b/ports/magnum/001-sdl-includes.patch
@@ -1,14 +1,31 @@
+diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp
+index 46ade2d00..24d8eabe7 100644
+--- a/src/Magnum/Platform/Sdl2Application.cpp
++++ b/src/Magnum/Platform/Sdl2Application.cpp
+@@ -26,7 +26,7 @@
+ #include "Sdl2Application.h"
+
+ #include <cstring>
+-#include <SDL.h>
++#include <SDL2/SDL.h>
+ #ifndef CORRADE_TARGET_EMSCRIPTEN
+ #include <tuple>
+ #else
 diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h
-index 99c3174..311b2c1 100644
+index 1a50b1c72..45e88edf5 100644
 --- a/src/Magnum/Platform/Sdl2Application.h
 +++ b/src/Magnum/Platform/Sdl2Application.h
-@@ -42,11 +42,11 @@
- #ifdef CORRADE_TARGET_WINDOWS /* Windows version of SDL2 redefines main(), we don't want that */
+@@ -46,13 +46,13 @@
  #define SDL_MAIN_HANDLED
  #endif
--#include <SDL.h>
+ /* SDL.h includes the world, adding 50k LOC. We don't want that either. */
+-#include <SDL_keycode.h>
+-#include <SDL_mouse.h>
+-#include <SDL_video.h>
 -#include <SDL_scancode.h>
-+#include <SDL2/SDL.h>
++#include <SDL2/SDL_keycode.h>
++#include <SDL2/SDL_mouse.h>
++#include <SDL2/SDL_video.h>
 +#include <SDL2/SDL_scancode.h>
 
  #ifdef CORRADE_TARGET_WINDOWS_RT
@@ -17,4 +34,3 @@ index 99c3174..311b2c1 100644
  #include <wrl.h> /* For the WinMain entrypoint */
  #endif
 
-
diff --git a/ports/magnum/003-glfw-find-module.patch b/ports/magnum/003-glfw-find-module.patch
@@ -1,11 +1,11 @@
 diff --git a/modules/FindGLFW.cmake b/modules/FindGLFW.cmake
-index e831fdb2..b2dba97f 100644
+index 5e13798f7..d7cb12b03 100644
 --- a/modules/FindGLFW.cmake
 +++ b/modules/FindGLFW.cmake
-@@ -39,7 +39,7 @@
- #   DEALINGS IN THE SOFTWARE.
- #
+@@ -64,7 +64,7 @@ if(TARGET glfw)
+ endif()
 
+ # In case no config file was found, try manually finding the library.
 -find_library(GLFW_LIBRARY NAMES glfw glfw3)
 +find_library(GLFW_LIBRARY NAMES glfw glfw3 glfw3dll)
 

diff --git a/ports/mapbox-variant/CONTROL b/ports/mapbox-variant/CONTROL
@@ -1,3 +1,3 @@
 Source: mapbox-variant
-Version: 1.1.6-0f734f0
+Version: 1.1.6-0f734f0-1
 Description: C++11/C++14 Variant
diff --git a/ports/mapbox-variant/portfile.cmake b/ports/mapbox-variant/portfile.cmake
@@ -10,7 +10,7 @@ vcpkg_from_github(
 )
 
 # Copy header files
-file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox-variant FILES_MATCHING PATTERN "*.hpp")
+file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp")
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mapbox-variant)

diff --git a/ports/orc/0002-fix-executable-output-folder.patch b/ports/orc/0002-fix-executable-output-folder.patch