diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL index 26122342a0b335..4631958804e102 100644 --- a/ports/angle/CONTROL +++ b/ports/angle/CONTROL @@ -1,5 +1,5 @@ Source: angle -Version: 2019-12-31 +Version: 2019-12-31-1 Homepage: https://github.com/google/angle Description: A conformant OpenGL ES implementation for Windows, Mac and Linux. The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support. diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index cd5f46115f41a3..dfdd6374e6e2ed 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -36,10 +36,18 @@ endif() if(APPLE) list(APPEND B2_OPTIONS target-os=darwin toolset=clang) +elseif(WIN32) + list(APPEND B2_OPTIONS target-os=windows toolset=gcc) else() list(APPEND B2_OPTIONS target-os=linux toolset=gcc) endif() +if(WIN32) + list(APPEND B2_OPTIONS threadapi=win32) +else() + list(APPEND B2_OPTIONS threadapi=pthread) +endif() + # Properly handle compiler and linker flags passed by VCPKG if(CMAKE_BUILD_TYPE STREQUAL "Release") set(CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") @@ -156,7 +164,6 @@ add_custom_target(boost ALL architecture=x86 threading=multi - threadapi=pthread debug-symbols=on stage diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 823e81e7f62604..94ce34b891ce7b 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,2 +1,2 @@ Source: boost-modular-build-helper -Version: 1.72.0 +Version: 1.72.0-1 diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL index 5f52faad484320..695925c073b7c5 100644 --- a/ports/bzip2/CONTROL +++ b/ports/bzip2/CONTROL @@ -1,4 +1,4 @@ Source: bzip2 -Version: 1.0.6-4 +Version: 1.0.6-5 Homepage: http://www.bzip.org/ Description: High-quality data compressor. diff --git a/ports/bzip2/fix-windows-include.patch b/ports/bzip2/fix-windows-include.patch new file mode 100644 index 00000000000000..11797ad2f8eed5 --- /dev/null +++ b/ports/bzip2/fix-windows-include.patch @@ -0,0 +1,12 @@ +diff -urN bzip2-1.0.6-orig/bzip2.c bzip2-1.0.6/bzip2.c +--- bzip2-1.0.6-orig/bzip2.c 2010-09-11 02:04:53.000000000 +0300 ++++ bzip2-1.0.6/bzip2.c 2019-11-04 11:40:52.230652175 +0200 +@@ -128,7 +128,7 @@ + #if BZ_LCCWIN32 + # include + # include +-# include ++# include + + # define NORETURN /**/ + # define PATH_SEP '\\' diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index 25e3df10f11ecb..0462d53eb6f809 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_extract_source_archive_ex( REF ${BZIP2_VERSION} PATCHES fix-import-export-macros.patch + fix-windows-include.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index fee79a66a5d823..7699954975f5cf 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.2-4 +Version: 4.2-5 Build-Depends: zlib Homepage: https://ffmpeg.org Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in index 1562fff05470ea..bb47069857eba4 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -51,7 +51,7 @@ endif() # Platform dependent libraries required by FFMPEG if(WIN32) if(NOT CYGWIN) - list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS wsock32 ws2_32 Secur32 bcrypt) + list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS wsock32 ws2_32 secur32 bcrypt) endif() else() list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS m) diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL index 011b631b4a9a61..9a7fd7e9c2324e 100644 --- a/ports/glew/CONTROL +++ b/ports/glew/CONTROL @@ -1,4 +1,4 @@ Source: glew -Version: 2.1.0-6 +Version: 2.1.0-7 Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. Homepage: https://github.com/nigels-com/glew diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 796574df1fd06a..504a91dcf4a976 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glew) +if(VCPKG_TARGET_IS_WINDOWS) set(_targets_cmake_files) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") list(APPEND _targets_cmake_files "${CURRENT_PACKAGES_DIR}/share/glew/glew-targets-debug.cmake") @@ -46,6 +47,7 @@ endif() if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib) endif() +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/ports/kd-soap/CONTROL b/ports/kd-soap/CONTROL index b399126c1a311a..2bc553cf5e0200 100644 --- a/ports/kd-soap/CONTROL +++ b/ports/kd-soap/CONTROL @@ -1,5 +1,5 @@ Source: kd-soap -Version: 1.8.0 +Version: 1.8.0-1 Description: A Qt-based client-side and server-side SOAP component Homepage: https://www.kdab.com/products/kd-soap Build-Depends: qt5-base diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake index 61102836cc7f72..d924d1c652f3f5 100644 --- a/ports/kd-soap/portfile.cmake +++ b/ports/kd-soap/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDAB/KDSoap @@ -19,8 +17,11 @@ vcpkg_install_cmake() # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/kd-soap RENAME copyright) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp.exe ${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) diff --git a/ports/libraqm/CMakeLists.txt b/ports/libraqm/CMakeLists.txt index b1a88b2684dc21..22f4e59d9d98d0 100644 --- a/ports/libraqm/CMakeLists.txt +++ b/ports/libraqm/CMakeLists.txt @@ -13,10 +13,11 @@ find_path(HARFBUZZ_INCLUDE_DIRS PATH_SUFFIXES harfbuzz) find_path(FREETYPE_ADDITIONAL_INCLUDE_DIRS NAMES ft2build.h) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h) +configure_file(src/raqm-version.h.in src/raqm-version.h) -add_library(raqm ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.c ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h) +add_library(raqm src/raqm.c src/raqm.h src/raqm-version.h) +target_include_directories(raqm PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/src) target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_ADDITIONAL_INCLUDE_DIRS}) target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_INCLUDE_DIRS}) target_include_directories(raqm SYSTEM PUBLIC ${HARFBUZZ_INCLUDE_DIRS}) @@ -34,4 +35,4 @@ install(TARGETS raqm set(RAQM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src") set(RAQM_LIBRARY raqm) set(RAQM_LIBRARIES ${HARFBUZZ_LIBRARY} ${FRIBIDI_LIBRARY} ${RAQM_LIBRARY}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_BINARY_DIR}/src/raqm-version.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/libraqm/CONTROL b/ports/libraqm/CONTROL index f637fac3ae76de..d768af76f72dda 100644 --- a/ports/libraqm/CONTROL +++ b/ports/libraqm/CONTROL @@ -1,4 +1,4 @@ Source: libraqm -Version: 0.7.0 +Version: 0.7.0-1 Description: A library for complex text layout Build-Depends: freetype, harfbuzz, fribidi \ No newline at end of file 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/tmxparser/CONTROL b/ports/tmxparser/CONTROL index 44954e36e4a3cb..52288b2db0dc70 100644 --- a/ports/tmxparser/CONTROL +++ b/ports/tmxparser/CONTROL @@ -1,4 +1,4 @@ Source: tmxparser -Version: 2.1.0-3 +Version: 2.1.0-4 Description: C++11 library for parsing the maps generated by the Map Editor called Tiled. Build-Depends: zlib, tinyxml2 diff --git a/ports/tmxparser/fix_include_paths.patch b/ports/tmxparser/fix_include_paths.patch new file mode 100644 index 00000000000000..fedcb43bc55b25 --- /dev/null +++ b/ports/tmxparser/fix_include_paths.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d06cb4..593bbfd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,8 @@ endif (NOT USE_MINIZ) + + set(EXAMPLE_CFLAGS "-std=c++11 -pedantic -Werror -Wall -g") + #include_directories("${PROJECT_SOURCE_DIR}/include") ++include_directories("${PROJECT_BINARY_DIR}") ++include_directories("${PROJECT_SOURCE_DIR}/src") + + add_library(tmxparser_static STATIC ${SOURCES} ${HEADERS}) + set_target_properties(tmxparser_static PROPERTIES +@@ -67,8 +69,6 @@ add_executable(run_tests test/test.cpp) + set_target_properties(run_tests PROPERTIES + COMPILE_FLAGS ${EXAMPLE_CFLAGS}) + target_link_libraries(run_tests tmxparser ${TINYXML2_LIBRARIES}) +-include_directories("${PROJECT_BINARY_DIR}") +-include_directories("${PROJECT_SOURCE_DIR}/src") + + install(FILES ${HEADERS} DESTINATION include/tmxparser) + install(TARGETS tmxparser tmxparser_static DESTINATION lib) diff --git a/ports/tmxparser/portfile.cmake b/ports/tmxparser/portfile.cmake index 024d14d09cd9cb..1f1b9e28616144 100644 --- a/ports/tmxparser/portfile.cmake +++ b/ports/tmxparser/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v2.1.0 HEAD_REF master SHA512 011cce3bb98057f8e2a0a82863fedb7c4b9e41324d5cfa6daade4d000c3f6c8c157da7b153f7f2564ecdefe8019fc8446c9b1b8a675be04329b04a0891ee1c27 + PATCHES + fix_include_paths.patch ) vcpkg_configure_cmake( diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL index aa7c7b6e92b665..601fb1bc0eda06 100644 --- a/ports/zlib/CONTROL +++ b/ports/zlib/CONTROL @@ -1,4 +1,4 @@ Source: zlib -Version: 1.2.11-5 +Version: 1.2.11-6 Homepage: https://www.zlib.net/ Description: A compression library diff --git a/ports/zlib/cmake_dont_build_more_than_needed.patch b/ports/zlib/cmake_dont_build_more_than_needed.patch index 229a2d055be52f..a374f76d628096 100644 --- a/ports/zlib/cmake_dont_build_more_than_needed.patch +++ b/ports/zlib/cmake_dont_build_more_than_needed.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0fe939d..8d2f5f1 100644 +index 0fe939d..a1291d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ set(VERSION "1.2.11") @@ -10,24 +10,56 @@ index 0fe939d..8d2f5f1 100644 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") -@@ -211,7 +212,15 @@ elseif(BUILD_SHARED_LIBS AND WIN32) +@@ -124,9 +125,11 @@ set(ZLIB_SRCS + ) + + if(NOT MINGW) +- set(ZLIB_DLL_SRCS +- win32/zlib1.rc # If present will override custom build rule below. +- ) ++ if(BUILD_SHARED_LIBS) ++ set(ZLIB_DLL_SRCS ++ win32/zlib1.rc # If present will override custom build rule below. ++ ) ++ endif() + endif() + + if(CMAKE_COMPILER_IS_GNUCC) +@@ -180,11 +183,12 @@ if(MINGW) + -I ${CMAKE_CURRENT_BINARY_DIR} + -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj + -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) +- set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) ++ if(BUILD_SHARED_LIBS) ++ set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) ++ endif() + endif(MINGW) + +-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) ++add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) + set_target_properties(zlib PROPERTIES SOVERSION 1) + +@@ -201,7 +205,7 @@ endif() + + if(UNIX) + # On unix-like platforms the library is almost always called libz +- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) ++ set_target_properties(zlib PROPERTIES OUTPUT_NAME z) + if(NOT APPLE) + set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif() +@@ -211,7 +215,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32) endif() if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) - install(TARGETS zlib zlibstatic -+ if (BUILD_SHARED_LIBS) -+ set(ZLIB_TARGETS zlib) -+ set_target_properties(zlibstatic PROPERTIES EXCLUDE_FROM_ALL ON) -+ else() -+ set(ZLIB_TARGETS zlibstatic) -+ set_target_properties(zlib PROPERTIES EXCLUDE_FROM_ALL ON) -+ endif() -+ -+ install(TARGETS ${ZLIB_TARGETS} ++ install(TARGETS zlib RUNTIME DESTINATION "${INSTALL_BIN_DIR}" ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) -@@ -230,6 +239,7 @@ endif() +@@ -230,6 +234,7 @@ endif() # Example binaries #============================================================================ @@ -35,7 +67,7 @@ index 0fe939d..8d2f5f1 100644 add_executable(example test/example.c) target_link_libraries(example zlib) add_test(example example) -@@ -247,3 +257,4 @@ if(HAVE_OFF64_T) +@@ -247,3 +252,4 @@ if(HAVE_OFF64_T) target_link_libraries(minigzip64 zlib) set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") endif() diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 78030309b1b2a3..01c331b119e34f 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -31,16 +31,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -# Both dynamic and static are built, so keep only the one needed -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib ${CURRENT_PACKAGES_DIR}/lib/zlib.lib) - endif() - if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zlibd.lib) - endif() -endif() - file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zlib RENAME copyright) vcpkg_copy_pdbs() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 640808d709fef6..51d916b3eabb5c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -660,9 +660,7 @@ jemalloc:x64-uwp=fail jemalloc:x64-windows-static=fail jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail -kd-soap:x64-linux=fail kd-soap:x64-osx=fail -kd-soap:x64-windows-static=fail keystone:arm64-windows=fail keystone:arm-uwp=fail keystone:x64-uwp=fail @@ -1550,8 +1548,8 @@ sdl2-mixer:arm-uwp=fail sdl2-mixer:x64-uwp=fail sdl2-net:arm-uwp=fail sdl2-net:x64-uwp=fail -seal:arm-uwp=fail -seal:x64-uwp=fail +seal:arm-uwp=fail +seal:x64-uwp=fail secp256k1:x64-linux=fail secp256k1:x64-osx=fail selene:x64-linux=ignore