diff --git a/ports/akali/CONTROL b/ports/akali/CONTROL index 2aa6b0d6c817c5..a7acd59194766c 100644 --- a/ports/akali/CONTROL +++ b/ports/akali/CONTROL @@ -1,4 +1,4 @@ Source: akali -Version: 1.39 +Version: 1.41 Description: C++ Common Library. Homepage: https://github.com/winsoft666/akali \ No newline at end of file diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index 1c87179f88c5af..e1be350182db68 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -1,20 +1,23 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali - REF 07d855dd2da7cddb374646465799734e48e0adb2 - SHA512 4298bc97c5b99494f517e46a86a30dcd61e9d4cfdfa5dbb4c17957c8e866de8ed5b41b2f9a17261f96fc3c7b25fbac2003af4ad8ca675d3f59ce6176e1112220 + REF aa0ee3b82cef325ca582fce30bf3bf177ed81e9b + SHA512 0d523191219b19bcf2becb2c9e78b32b50fbbd5a052dd5330e315a6310c0d5c322639434f710a37c6d98e23510506d294b52978f8487227d4461d29d4a6bb502 HEAD_REF master ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DAKALI_STATIC:BOOL=${AKALI_STATIC} -DBUILD_TESTS:BOOL=OFF ) -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_install_cmake() if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/akali) @@ -23,6 +26,14 @@ elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/akali) vcpkg_fixup_cmake_targets(CONFIG_PATH share/akali) endif() +file(READ ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h AKALI_EXPORT_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "#ifdef AKALI_STATIC" "#if 1" AKALI_EXPORT_H "${AKALI_EXPORT_H}") +else() + string(REPLACE "#ifdef AKALI_STATIC" "#if 0" AKALI_EXPORT_H "${AKALI_EXPORT_H}") +endif() +file(WRITE ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h "${AKALI_EXPORT_H}") + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/cpr/CONTROL b/ports/cpr/CONTROL index de5c3478f552f1..6912c8be6d7908 100644 --- a/ports/cpr/CONTROL +++ b/ports/cpr/CONTROL @@ -1,5 +1,5 @@ Source: cpr -Version: 1.3.0-7 +Version: 1.3.0-8 Homepage: https://github.com/whoshuu/cpr Description: C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project. Build-Depends: curl[core] diff --git a/ports/cpr/cprConfig.cmake b/ports/cpr/cprConfig.cmake index 501fcd96a82b1d..85e433c4b94700 100644 --- a/ports/cpr/cprConfig.cmake +++ b/ports/cpr/cprConfig.cmake @@ -25,3 +25,7 @@ endmacro() include("${CMAKE_CURRENT_LIST_DIR}/cprTargets.cmake") check_required_components("cpr") + +include(CMakeFindDependencyMacro) +find_dependency(ZLIB REQUIRED) +find_dependency(CURL REQUIRED) diff --git a/ports/gettext/CMakeLists.txt b/ports/gettext/CMakeLists.txt index 1ec9aa285ee5d8..67e1d05f7e82b2 100644 --- a/ports/gettext/CMakeLists.txt +++ b/ports/gettext/CMakeLists.txt @@ -102,7 +102,7 @@ if(BUILD_SHARED_LIBS) endif() add_definitions("-DBUILDING_LIBINTL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY") -add_definitions("-DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -D_CRT_SECURE_NO_WARNINGS") +add_definitions("-DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -DHAVE_ICONV -DHAVE_ICONV_H -DICONV_CONST=const -D_CRT_SECURE_NO_WARNINGS") add_library(libintl ${SOURCES}) target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv) @@ -147,4 +147,4 @@ include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-gettext-targets.cmake) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-gettext-config.cmake DESTINATION share/unofficial-gettext -) \ No newline at end of file +) diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL index 1816f8b76504da..a2876ee995ade6 100644 --- a/ports/gettext/CONTROL +++ b/ports/gettext/CONTROL @@ -1,5 +1,5 @@ Source: gettext -Version: 0.19-11 +Version: 0.19-12 Homepage: https://www.gnu.org/software/gettext/ Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl. Build-Depends: libiconv diff --git a/ports/glad/CONTROL b/ports/glad/CONTROL index f5ac7ac028e123..dc556e13d55255 100644 --- a/ports/glad/CONTROL +++ b/ports/glad/CONTROL @@ -1,4 +1,5 @@ Source: glad -Version: 0.1.31 +Version: 0.1.33 Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs. Build-Depends: egl-registry, opengl-registry +Homepage: https://github.com/Dav1dde/glad diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake index 2be191fc16ad76..9f08fe660043e8 100644 --- a/ports/glad/portfile.cmake +++ b/ports/glad/portfile.cmake @@ -1,12 +1,10 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Dav1dde/glad - REF 1a42f8a6099c60f6a4522731fadad4191d64e6ff - SHA512 02870cf43b5ee33a733122885f748a1368e4487fc08f32ba376d6d53c0efd9ed6e9aea350b723d955869ed47b4d9d69235a52f01723215cf4393d6ca99e2ac00 + REF de6c39e3040c987323b8ed078c36442f4fb681b3 + SHA512 a24523186d59de5c0895791c639c62573eaacf1d3843d3bf81eba848b4a33a9a8d17f9b6f791202dac77692bf147e25b3650989731d5ddb7a22e7d023b66885e HEAD_REF master ) @@ -42,4 +40,4 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glad) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/KHR) -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/glad/copyright COPYONLY) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/glfw3/CONTROL b/ports/glfw3/CONTROL index 6c99ef4a746644..e51362d2a43f17 100644 --- a/ports/glfw3/CONTROL +++ b/ports/glfw3/CONTROL @@ -1,4 +1,4 @@ Source: glfw3 -Version: 3.3-3 +Version: 3.3.1 Homepage: https://github.com/glfw/glfw Description: GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc. diff --git a/ports/glfw3/fix-config.patch b/ports/glfw3/fix-config.patch deleted file mode 100644 index 181d7d91bf4911..00000000000000 --- a/ports/glfw3/fix-config.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3c0f625..0c985cf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -319,7 +319,8 @@ set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/glfw3") - configure_package_config_file(src/glfw3Config.cmake.in - src/glfw3Config.cmake - INSTALL_DESTINATION "${GLFW_CONFIG_PATH}" -- NO_CHECK_REQUIRED_COMPONENTS_MACRO) -+ NO_CHECK_REQUIRED_COMPONENTS_MACRO -+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR) - - write_basic_package_version_file(src/glfw3ConfigVersion.cmake - VERSION ${GLFW_VERSION_FULL} -diff --git a/src/glfw3Config.cmake.in b/src/glfw3Config.cmake.in -index 1fa200e..861df93 100644 ---- a/src/glfw3Config.cmake.in -+++ b/src/glfw3Config.cmake.in -@@ -1 +1,5 @@ -+@PACKAGE_INIT@ -+ -+set_and_check(glfw_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") -+ - include("${CMAKE_CURRENT_LIST_DIR}/glfw3Targets.cmake") diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index 5b399134b112dd..fef1bdf2eeafd9 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -1,16 +1,12 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glfw/glfw - REF 3.3 - SHA512 e74bb7ba0c1c3a524a193c4fb5a2d13ba0e75f8e309612ea19cdcc944859d6e2fe29d8b2e3db76236e1011b637564ddd5f4a176dcccfeb84d09bda060f08f774 + REF 3.3.1 + SHA512 f9376002314eae5518ca63738cf1558433007dbf628fb6093a6f54c330f72d85e0ac30049877c50bc99f029e3eb6f69e69508f412d1ec9bdde0ac721dbbeba1e HEAD_REF master - PATCHES - fix-config.patch ) -if(NOT VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_LINUX) message( "GLFW3 currently requires the following libraries from the system package manager: xinerama @@ -36,19 +32,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glfw3) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/glfw3.dll OR EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/bin/glfw3.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/debug/bin/glfw3.dll) - foreach(_conf release debug) - file(READ ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets-${_conf}.cmake _contents) - string(REPLACE "lib/glfw3.dll" "bin/glfw3.dll" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets-${_conf}.cmake "${_contents}") - endforeach() - endif() -endif() - file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/gperf/CMakeLists.txt b/ports/gperf/CMakeLists.txt new file mode 100644 index 00000000000000..d9cad0d8955a1c --- /dev/null +++ b/ports/gperf/CMakeLists.txt @@ -0,0 +1,53 @@ +cmake_minimum_required(VERSION 3.0) +project(gperf LANGUAGES C CXX) + +include(CheckCXXSourceCompiles) +include(GNUInstallDirs) + +CHECK_CXX_SOURCE_COMPILES("int main(int n) { int dynamic_array[n]; }" HAVE_DYNAMIC_ARRAY) + +set(LIBGP_SOURCES + lib/getline.cc + lib/getline.h + lib/getopt.c + lib/getopt.h + lib/getopt1.c + lib/hash.cc + lib/hash.h) +add_library(gp STATIC ${LIBGP_SOURCES}) +target_include_directories(gp PUBLIC "${CMAKE_SOURCE_DIR}/lib") + +set(GPERF_SOURCES + src/bool-array.cc + src/bool-array.h + src/bool-array.icc + src/hash-table.cc + src/hash-table.h + src/input.cc + src/input.h + src/keyword-list.cc + src/keyword-list.h + src/keyword-list.icc + src/keyword.cc + src/keyword.h + src/keyword.icc + src/main.cc + src/options.cc + src/options.h + src/options.icc + src/output.cc + src/output.h + src/positions.cc + src/positions.h + src/positions.icc + src/search.cc + src/search.h + src/version.cc + src/version.h) +add_executable(gperf ${GPERF_SOURCES}) +target_link_libraries(gperf gp) +target_include_directories(gperf PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") + +configure_file(config.h.in config.h @ONLY) + +install(TARGETS gperf RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/ports/gperf/CONTROL b/ports/gperf/CONTROL new file mode 100644 index 00000000000000..34d19df809617c --- /dev/null +++ b/ports/gperf/CONTROL @@ -0,0 +1,4 @@ +Source: gperf +Version: 3.1-1 +Description: GNU perfect hash function generator +Homepage: https://www.gnu.org/software/gperf/ diff --git a/ports/gperf/config.h.in b/ports/gperf/config.h.in new file mode 100644 index 00000000000000..f1f643d7bdf539 --- /dev/null +++ b/ports/gperf/config.h.in @@ -0,0 +1 @@ +#cmakedefine HAVE_DYNAMIC_ARRAY @HAVE_DYNAMIC_ARRAY@ diff --git a/ports/gperf/portfile.cmake b/ports/gperf/portfile.cmake new file mode 100644 index 00000000000000..8531426fca02a2 --- /dev/null +++ b/ports/gperf/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_download_distfile(ARCHIVE + URLS http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz + FILENAME gperf-3.1.tar.gz + SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_RELEASE -DCMAKE_INSTALL_BINDIR=tools +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() diff --git a/ports/libxml2/CONTROL b/ports/libxml2/CONTROL index 7a4b02ceaf3887..ccf2a9c60feae2 100644 --- a/ports/libxml2/CONTROL +++ b/ports/libxml2/CONTROL @@ -1,5 +1,5 @@ Source: libxml2 -Version: 2.9.9-4 +Version: 2.9.9-5 Homepage: https://xmlsoft.org/ Description: Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform) Build-Depends: zlib, libiconv, liblzma diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index b6ec9571a34c61..50eca4d6163f44 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -12,6 +12,13 @@ if(LibXml2_FOUND) debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libcharset.lib optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libcharset.lib ws2_32) + if(TARGET LibXml2::LibXml2) + target_link_libraries(LibXml2::LibXml2 INTERFACE + debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libiconv.lib + optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libiconv.lib + debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libcharset.lib + optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libcharset.lib) + endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBXML2_LIBRARIES m) endif() diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index ac926522b578fb..c6512c1b23e57b 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,5 @@ Source: qt5-base -Version: 5.12.5-8 +Version: 5.12.5-9 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 443d462e11d01c..49cf24d450d0f6 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -197,14 +197,14 @@ elseif(VCPKG_TARGET_IS_LINUX) "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE}" "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE}" + "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -liconv" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG}" "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG}" + "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -liconv" ) elseif(VCPKG_TARGET_IS_OSX) list(APPEND CORE_OPTIONS -fontconfig) @@ -235,14 +235,14 @@ elseif(VCPKG_TARGET_IS_OSX) "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE} -framework ApplicationServices" "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE}" + "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -liconv" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG} -framework ApplicationServices" "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG}" + "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -liconv" ) endif() diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index 24108f974215b8..20ee53538f67e6 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,4 +1,4 @@ Source: qt5-imageformats -Version: 5.12.5-2 +Version: 5.12.5-3 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP Build-Depends: qt5-base, tiff, libwebp, jasper diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index f7ce7466e4c4a9..dbea7fd9e45c1e 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -14,8 +14,10 @@ find_library(TIFF_DEBUG NAMES tiffd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" N find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(JASPER_DEBUG NAMES jasperd jasper libjasperd libjasper PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +if(NOT VCPKG_TARGET_IS_OSX) + find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +endif() find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(WEBP_DEBUG NAMES webpd webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL index ab574561c9e90d..9f59426392aed2 100644 --- a/ports/sfml/CONTROL +++ b/ports/sfml/CONTROL @@ -1,5 +1,5 @@ Source: sfml -Version: 2.5.1-4 +Version: 2.5.1-5 Homepage: https://github.com/sfml/sfml Description: Simple and fast multimedia library Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb diff --git a/ports/sfml/export-win-libs.patch b/ports/sfml/export-win-libs.patch new file mode 100644 index 00000000000000..210b6e52eaf699 --- /dev/null +++ b/ports/sfml/export-win-libs.patch @@ -0,0 +1,26 @@ +diff --git a/src/SFML/System/CMakeLists.txt b/src/SFML/System/CMakeLists.txt +index d1b712d..5c12801 100644 +--- a/src/SFML/System/CMakeLists.txt ++++ b/src/SFML/System/CMakeLists.txt +@@ -96,7 +96,7 @@ endif() + if(SFML_OS_LINUX) + target_link_libraries(sfml-system PRIVATE rt) + elseif(SFML_OS_WINDOWS) +- target_link_libraries(sfml-system PRIVATE winmm) ++ target_link_libraries(sfml-system PUBLIC winmm) + elseif(SFML_OS_ANDROID) + target_link_libraries(sfml-system PRIVATE android log) + endif() +diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt +index 98ea439..53c1ac7 100644 +--- a/src/SFML/Window/CMakeLists.txt ++++ b/src/SFML/Window/CMakeLists.txt +@@ -276,7 +276,7 @@ if(SFML_OS_LINUX) + sfml_find_package(UDev INCLUDE "UDEV_INCLUDE_DIR" LINK "UDEV_LIBRARIES") + target_link_libraries(sfml-window PRIVATE UDev) + elseif(SFML_OS_WINDOWS) +- target_link_libraries(sfml-window PRIVATE winmm gdi32) ++ target_link_libraries(sfml-window PUBLIC winmm gdi32) + elseif(SFML_OS_FREEBSD) + target_link_libraries(sfml-window PRIVATE usbhid) + elseif(SFML_OS_MACOSX) diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index 793489b9720464..ce2fc41fde8804 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -1,11 +1,11 @@ - -include(vcpkg_common_functions) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO SFML/SFML REF 2.5.1 HEAD_REF master SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 - PATCHES use-system-freetype.patch + PATCHES + use-system-freetype.patch + export-win-libs.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/extlibs) @@ -54,4 +54,4 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfml RENAME copyright) +file(INSTALL ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/soem/CONTROL b/ports/soem/CONTROL new file mode 100644 index 00000000000000..f3194a53bc28fc --- /dev/null +++ b/ports/soem/CONTROL @@ -0,0 +1,5 @@ +Source: soem +Version: 1.4.0 +Homepage: https://github.com/OpenEtherCATsociety/SOEM +Description: Simple Open Source EtherCAT Master +Build-Depends: winpcap (windows) diff --git a/ports/soem/portfile.cmake b/ports/soem/portfile.cmake new file mode 100644 index 00000000000000..3eccfeb3a192ec --- /dev/null +++ b/ports/soem/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenEtherCATsociety/SOEM + REF abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd #v1.4.0 + SHA512 2967775c6746bb63becea5eb12f136c184bbf874e1e5e8753374bfc212ec9cefbf1159350e79627b978af3562d261b61c50f38936a425c4d9c70598a1d136817 + HEAD_REF master + PATCHES + winpcap.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/soem/winpcap.patch b/ports/soem/winpcap.patch new file mode 100644 index 00000000000000..215226e6f56fc1 --- /dev/null +++ b/ports/soem/winpcap.patch @@ -0,0 +1,23 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -13,15 +13,13 @@ + + if(WIN32) + set(OS "win32") +- include_directories(oshw/win32/wpcap/Include) +- if(CMAKE_SIZEOF_VOID_P EQUAL 8) +- link_directories(${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib/x64) +- elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) +- link_directories(${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib) +- endif() ++ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) ++ find_library(winpcap_LIBRARY NAMES wpcap) ++ find_library(packet_LIBRARY NAMES packet) ++ include_directories(${winpcap_INCLUDE_DIRS}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") +- set(OS_LIBS wpcap.lib Packet.lib Ws2_32.lib Winmm.lib) ++ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) + elseif(UNIX AND NOT APPLE) + set(OS "linux") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL index b3fbc8422526bc..3e2cc3d517172a 100644 --- a/ports/xlnt/CONTROL +++ b/ports/xlnt/CONTROL @@ -1,4 +1,4 @@ Source: xlnt -Version: 1.3.0-2 +Version: 1.4.0 Homepage: https://github.com/tfussell/xlnt Description: Cross-platform user-friendly xlsx library for C++14 diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake index 1e1a9cb435a5a5..42e1883350bf33 100644 --- a/ports/xlnt/portfile.cmake +++ b/ports/xlnt/portfile.cmake @@ -1,30 +1,38 @@ -include(vcpkg_common_functions) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO tfussell/xlnt - REF v1.3.0 - SHA512 716b93a6138daf1e293980a3c26801bfd00aa713afdd9cbe9be672ccff8c86b69b26eb0f3e8259bd0844e04d0e6148b64467d7db6815c76ecf412715d506786f - HEAD_REF master -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(STATIC OFF) -else() - set(STATIC ON) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DTESTS=OFF -DSAMPLES=OFF -DBENCHMARKS=OFF -DSTATIC=${STATIC} -) - -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/xlnt RENAME copyright) - -vcpkg_copy_pdbs() +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(win_patch "static-linking-for-windows.patch") + endif() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tfussell/xlnt + REF v1.4.0 + SHA512 74abbee97994098fb7d8fd0839929db74fe01b8428f8bdb8edd28340d3b3ed04d4c7d6dd5d886ae766054ff1b0fe9a8275098a1462e7a5146ff09f1cdb063360 + HEAD_REF master + PATCHES + ${win_patch} +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(STATIC OFF) +else() + set(STATIC ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DTESTS=OFF -DSAMPLES=OFF -DBENCHMARKS=OFF -DSTATIC=${STATIC} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/xlnt) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/ports/xlnt/static-linking-for-windows.patch b/ports/xlnt/static-linking-for-windows.patch new file mode 100644 index 00000000000000..9f27197242d95f --- /dev/null +++ b/ports/xlnt/static-linking-for-windows.patch @@ -0,0 +1,13 @@ +diff --git a/include/xlnt/xlnt.hpp b/include/xlnt/xlnt.hpp +index 01fe4981..9cefa6e0 100644 +--- a/include/xlnt/xlnt.hpp ++++ b/include/xlnt/xlnt.hpp +@@ -22,7 +22,7 @@ + // @author: see AUTHORS file + + #pragma once +- ++#define XLNT_STATIC + #include + + // cell diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 64969ecb59f393..2067b29838f355 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -54,7 +54,6 @@ activemq-cpp:x64-windows-static=fail akali:x64-uwp=fail akali:arm-uwp=fail akali:arm64-windows=fail -akali:x64-osx=fail alac:arm-uwp=fail alac:x64-uwp=fail alembic:x64-linux=fail @@ -555,6 +554,8 @@ googleapis:x64-uwp=fail google-cloud-cpp:x64-linux=ignore google-cloud-cpp-spanner:x86-windows=fail gppanel:x64-osx=fail +gperf:x64-uwp=fail +gperf:arm-uwp=fail graphicsmagick:arm64-windows=fail graphicsmagick:arm-uwp=fail graphicsmagick:x64-uwp=fail @@ -1563,6 +1564,8 @@ smpeg2:x64-linux=fail smpeg2:x64-uwp=fail soci:arm-uwp=fail soci:x64-uwp=fail +soem:x64-uwp=fail +soem:arm-uwp=fail soil:arm-uwp=fail soil:x64-uwp=fail soil2:arm-uwp=fail