diff --git a/ports/clockutils/add-missing-thread-header.patch b/ports/clockutils/add-missing-thread-header.patch new file mode 100644 index 0000000000..995a097ea8 --- /dev/null +++ b/ports/clockutils/add-missing-thread-header.patch @@ -0,0 +1,24 @@ +diff --git a/include/clockUtils/sockets/TcpSocket.h b/include/clockUtils/sockets/TcpSocket.h +index 3bb97a9..cdd7810 100644 +--- a/include/clockUtils/sockets/TcpSocket.h ++++ b/include/clockUtils/sockets/TcpSocket.h +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include "clockUtils/errors.h" + +diff --git a/include/clockUtils/sockets/UdpSocket.h b/include/clockUtils/sockets/UdpSocket.h +index c5da451..ea0a518 100644 +--- a/include/clockUtils/sockets/UdpSocket.h ++++ b/include/clockUtils/sockets/UdpSocket.h +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include "clockUtils/errors.h" + diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake index d3c42fef1c..5ca33127f5 100644 --- a/ports/clockutils/portfile.cmake +++ b/ports/clockutils/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF dev-1.2 PATCHES fix-warningC4643.patch + add-missing-thread-header.patch ) set(SHARED_FLAG OFF) diff --git a/ports/clockutils/vcpkg.json b/ports/clockutils/vcpkg.json index 1939b6aa89..d40cc4f116 100644 --- a/ports/clockutils/vcpkg.json +++ b/ports/clockutils/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clockutils", "version": "1.1.1", - "port-version": 1, + "port-version": 2, "description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.", "homepage": "https://github.com/ClockworkOrigins/clockUtils", "license": "MIT", diff --git a/ports/ffmpeg/0041-add-const-for-opengl-definition.patch b/ports/ffmpeg/0041-add-const-for-opengl-definition.patch new file mode 100644 index 0000000000..b22b40d1f3 --- /dev/null +++ b/ports/ffmpeg/0041-add-const-for-opengl-definition.patch @@ -0,0 +1,13 @@ +diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c +index b2ac6eb..6351614 100644 +--- a/libavdevice/opengl_enc.c ++++ b/libavdevice/opengl_enc.c +@@ -116,7 +116,7 @@ typedef void (APIENTRY *FF_PFNGLATTACHSHADERPROC) (GLuint program, GLuint shad + typedef GLuint (APIENTRY *FF_PFNGLCREATESHADERPROC) (GLenum type); + typedef void (APIENTRY *FF_PFNGLDELETESHADERPROC) (GLuint shader); + typedef void (APIENTRY *FF_PFNGLCOMPILESHADERPROC) (GLuint shader); +-typedef void (APIENTRY *FF_PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const char* *string, const GLint *length); ++typedef void (APIENTRY *FF_PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const char* const *string, const GLint *length); + typedef void (APIENTRY *FF_PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); + typedef void (APIENTRY *FF_PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, char *infoLog); + diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 77ec35eb37..62de617433 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_from_github( 0020-fix-aarch64-libswscale.patch 0022-fix-iconv.patch 0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch # Do not remove this patch. It is required by chromium + 0041-add-const-for-opengl-definition.patch ) if(SOURCE_PATH MATCHES " ") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index c6cba4ab0a..0901cd5717 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "6.1.1", - "port-version": 5, + "port-version": 6, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index eb16d4e8ce..bc22c6a64b 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -1,3 +1,9 @@ +vcpkg_download_distfile(FIX_IMPLICIT_INT_PATCH + URLS https://github.com/BrunoLevy/geogram/commit/382da2d2f0d39bf8df2f65051c338e7e827e31db.patch?full_index=1 + FILENAME geogram-implicit-ini-382da2d2f0d39bf8df2f65051c338e7e827e31db.patch + SHA512 1a85195b76cd7140fe890893bf1f57a1f9c30dbc2865bab28b7eda9d97b9bab5be7cbc638b24d8da489aee1e25e0e7289655ade13893bdc225d1b332f1d845a0 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BrunoLevy/geogram @@ -5,6 +11,7 @@ vcpkg_from_github( SHA512 ae3d95be1c5061ace92921b3fcfb0027d23c595b131b0d31f1788adbe0d8f92367bef71736d6c936504bd37eba5fcdae658369f03734e233bf3eab14bca6f9e5 PATCHES fix-vcpkg-install.patch + "${FIX_IMPLICIT_INT_PATCH}" ) #third_party: amgcl diff --git a/ports/geogram/vcpkg.json b/ports/geogram/vcpkg.json index 51233ba898..11afd5f6af 100644 --- a/ports/geogram/vcpkg.json +++ b/ports/geogram/vcpkg.json @@ -1,7 +1,7 @@ { "name": "geogram", "version": "1.8.3", - "port-version": 1, + "port-version": 2, "description": "Geogram is a programming library of geometric algorithms.", "homepage": "https://github.com/BrunoLevy/geogram", "license": "BSD-3-Clause", diff --git a/ports/qt5-location/disable-enum-warning.patch b/ports/qt5-location/disable-enum-warning.patch new file mode 100644 index 0000000000..198e084a04 --- /dev/null +++ b/ports/qt5-location/disable-enum-warning.patch @@ -0,0 +1,14 @@ +diff --git a/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro b/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro +index ed974db..f17d45a 100644 +--- a/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro ++++ b/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro +@@ -34,6 +34,9 @@ android|gcc { + } + + darwin { ++ QMAKE_CXXFLAGS += \ ++ -Wno-enum-constexpr-conversion ++ + LIBS += \ + -framework Foundation + } diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake index 7c964477e2..5b446c6b50 100644 --- a/ports/qt5-location/portfile.cmake +++ b/ports/qt5-location/portfile.cmake @@ -1,3 +1,3 @@ message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.") include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES missing-include.patch) +qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch) diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index 6089af0253..ef7c66ced1 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-location", "version": "5.15.14", + "port-version": 1, "description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.", "license": null, "dependencies": [ diff --git a/ports/qtinterfaceframework/requirements_minimal.txt b/ports/qtinterfaceframework/requirements_minimal.txt index 4e4ae361f6..f74cd50130 100644 --- a/ports/qtinterfaceframework/requirements_minimal.txt +++ b/ports/qtinterfaceframework/requirements_minimal.txt @@ -3,10 +3,9 @@ argh==0.26.2 click==6.7 coloredlogs==10.0 humanfriendly==4.15.1 -Jinja2==2.11.3 -MarkupSafe==1.1 +Jinja2==3.1.4 +MarkupSafe==2.1.5 path.py==11.0.1 -pathtools==0.1.2 PyYAML==6.0.1 six==1.11.0 watchdog==2.1.7 diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index ddad1bf8ab..9bef2b0e32 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtinterfaceframework", "version": "6.7.0", + "port-version": 1, "description": "The Qt Interface Framework module provides both the tools and the core APIs, for you to implement Middleware APIs, Middleware Back ends, and Middleware Services.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/stormlib/CMakeLists.txt b/ports/stormlib/CMakeLists.txt deleted file mode 100644 index e8bf793abf..0000000000 --- a/ports/stormlib/CMakeLists.txt +++ /dev/null @@ -1,286 +0,0 @@ -cmake_minimum_required(VERSION 3.9) -project(stormlib) - -set(SRC_FILES - stormlib_dll/StormLib.def - src/adpcm/adpcm.cpp - src/huffman/huff.cpp - src/jenkins/lookup3.c - src/lzma/C/LzFind.c - src/lzma/C/LzmaDec.c - src/lzma/C/LzmaEnc.c - src/pklib/explode.c - src/pklib/implode.c - src/sparse/sparse.cpp - src/FileStream.cpp - src/SBaseCommon.cpp - src/SBaseDumpData.cpp - src/SBaseFileTable.cpp - src/SBaseSubTypes.cpp - src/SCompression.cpp - src/SFileAddFile.cpp - src/SFileAttributes.cpp - src/SFileCompactArchive.cpp - src/SFileCreateArchive.cpp - src/SFileExtractFile.cpp - src/SFileFindFile.cpp - src/SFileGetFileInfo.cpp - src/SFileListFile.cpp - src/SFileOpenArchive.cpp - src/SFileOpenFileEx.cpp - src/SFilePatchArchives.cpp - src/SFileReadFile.cpp - src/SFileVerify.cpp - src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c - src/libtomcrypt/src/misc/crypt_libc.c -) - -if(MSVC) - # This file is used to create a DLL on windows - # Use BUILD_SHARED_LIBS to create StormLib.dll - set(STORM_DEF_FILES - stormlib_dll/StormLib.def - ) -endif() - -set(TOMCRYPT_FILES - src/libtomcrypt/src/hashes/hash_memory.c - src/libtomcrypt/src/hashes/md5.c - src/libtomcrypt/src/hashes/sha1.c - src/libtomcrypt/src/math/ltm_desc.c - src/libtomcrypt/src/math/multi.c - src/libtomcrypt/src/math/rand_prime.c - src/libtomcrypt/src/misc/base64_decode.c - src/libtomcrypt/src/misc/crypt_argchk.c - src/libtomcrypt/src/misc/crypt_find_hash.c - src/libtomcrypt/src/misc/crypt_find_prng.c - src/libtomcrypt/src/misc/crypt_hash_descriptor.c - src/libtomcrypt/src/misc/crypt_hash_is_valid.c - src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c - src/libtomcrypt/src/misc/crypt_prng_descriptor.c - src/libtomcrypt/src/misc/crypt_prng_is_valid.c - src/libtomcrypt/src/misc/crypt_register_hash.c - src/libtomcrypt/src/misc/crypt_register_prng.c - src/libtomcrypt/src/misc/zeromem.c - src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c - src/libtomcrypt/src/pk/asn1/der_decode_boolean.c - src/libtomcrypt/src/pk/asn1/der_decode_choice.c - src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c - src/libtomcrypt/src/pk/asn1/der_decode_integer.c - src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c - src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c - src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c - src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c - src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c - src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c - src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c - src/libtomcrypt/src/pk/asn1/der_decode_utctime.c - src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c - src/libtomcrypt/src/pk/asn1/der_encode_bit_string.c - src/libtomcrypt/src/pk/asn1/der_encode_boolean.c - src/libtomcrypt/src/pk/asn1/der_encode_ia5_string.c - src/libtomcrypt/src/pk/asn1/der_encode_integer.c - src/libtomcrypt/src/pk/asn1/der_encode_object_identifier.c - src/libtomcrypt/src/pk/asn1/der_encode_octet_string.c - src/libtomcrypt/src/pk/asn1/der_encode_printable_string.c - src/libtomcrypt/src/pk/asn1/der_encode_sequence_ex.c - src/libtomcrypt/src/pk/asn1/der_encode_sequence_multi.c - src/libtomcrypt/src/pk/asn1/der_encode_set.c - src/libtomcrypt/src/pk/asn1/der_encode_setof.c - src/libtomcrypt/src/pk/asn1/der_encode_short_integer.c - src/libtomcrypt/src/pk/asn1/der_encode_utctime.c - src/libtomcrypt/src/pk/asn1/der_encode_utf8_string.c - src/libtomcrypt/src/pk/asn1/der_length_bit_string.c - src/libtomcrypt/src/pk/asn1/der_length_boolean.c - src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c - src/libtomcrypt/src/pk/asn1/der_length_integer.c - src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c - src/libtomcrypt/src/pk/asn1/der_length_octet_string.c - src/libtomcrypt/src/pk/asn1/der_length_printable_string.c - src/libtomcrypt/src/pk/asn1/der_length_sequence.c - src/libtomcrypt/src/pk/asn1/der_length_utctime.c - src/libtomcrypt/src/pk/asn1/der_sequence_free.c - src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c - src/libtomcrypt/src/pk/asn1/der_length_short_integer.c - src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c - src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c - src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c - src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c - src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c - src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c - src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c - src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c - src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c - src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_encode.c - src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c - src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_encode.c - src/libtomcrypt/src/pk/rsa/rsa_exptmod.c - src/libtomcrypt/src/pk/rsa/rsa_free.c - src/libtomcrypt/src/pk/rsa/rsa_import.c - src/libtomcrypt/src/pk/rsa/rsa_make_key.c - src/libtomcrypt/src/pk/rsa/rsa_sign_hash.c - src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c -) - -set(TOMMATH_FILES - src/libtommath/bncore.c - src/libtommath/bn_fast_mp_invmod.c - src/libtommath/bn_fast_mp_montgomery_reduce.c - src/libtommath/bn_fast_s_mp_mul_digs.c - src/libtommath/bn_fast_s_mp_mul_high_digs.c - src/libtommath/bn_fast_s_mp_sqr.c - src/libtommath/bn_mp_2expt.c - src/libtommath/bn_mp_abs.c - src/libtommath/bn_mp_add.c - src/libtommath/bn_mp_addmod.c - src/libtommath/bn_mp_add_d.c - src/libtommath/bn_mp_and.c - src/libtommath/bn_mp_clamp.c - src/libtommath/bn_mp_clear.c - src/libtommath/bn_mp_clear_multi.c - src/libtommath/bn_mp_cmp.c - src/libtommath/bn_mp_cmp_d.c - src/libtommath/bn_mp_cmp_mag.c - src/libtommath/bn_mp_cnt_lsb.c - src/libtommath/bn_mp_copy.c - src/libtommath/bn_mp_count_bits.c - src/libtommath/bn_mp_div.c - src/libtommath/bn_mp_div_2.c - src/libtommath/bn_mp_div_2d.c - src/libtommath/bn_mp_div_3.c - src/libtommath/bn_mp_div_d.c - src/libtommath/bn_mp_dr_is_modulus.c - src/libtommath/bn_mp_dr_reduce.c - src/libtommath/bn_mp_dr_setup.c - src/libtommath/bn_mp_exch.c - src/libtommath/bn_mp_exptmod.c - src/libtommath/bn_mp_exptmod_fast.c - src/libtommath/bn_mp_expt_d.c - src/libtommath/bn_mp_exteuclid.c - src/libtommath/bn_mp_fread.c - src/libtommath/bn_mp_fwrite.c - src/libtommath/bn_mp_gcd.c - src/libtommath/bn_mp_get_int.c - src/libtommath/bn_mp_grow.c - src/libtommath/bn_mp_init.c - src/libtommath/bn_mp_init_copy.c - src/libtommath/bn_mp_init_multi.c - src/libtommath/bn_mp_init_set.c - src/libtommath/bn_mp_init_set_int.c - src/libtommath/bn_mp_init_size.c - src/libtommath/bn_mp_invmod.c - src/libtommath/bn_mp_invmod_slow.c - src/libtommath/bn_mp_is_square.c - src/libtommath/bn_mp_jacobi.c - src/libtommath/bn_mp_karatsuba_mul.c - src/libtommath/bn_mp_karatsuba_sqr.c - src/libtommath/bn_mp_lcm.c - src/libtommath/bn_mp_lshd.c - src/libtommath/bn_mp_mod.c - src/libtommath/bn_mp_mod_2d.c - src/libtommath/bn_mp_mod_d.c - src/libtommath/bn_mp_montgomery_calc_normalization.c - src/libtommath/bn_mp_montgomery_reduce.c - src/libtommath/bn_mp_montgomery_setup.c - src/libtommath/bn_mp_mul.c - src/libtommath/bn_mp_mulmod.c - src/libtommath/bn_mp_mul_2.c - src/libtommath/bn_mp_mul_2d.c - src/libtommath/bn_mp_mul_d.c - src/libtommath/bn_mp_neg.c - src/libtommath/bn_mp_n_root.c - src/libtommath/bn_mp_or.c - src/libtommath/bn_mp_prime_fermat.c - src/libtommath/bn_mp_prime_is_divisible.c - src/libtommath/bn_mp_prime_is_prime.c - src/libtommath/bn_mp_prime_miller_rabin.c - src/libtommath/bn_mp_prime_next_prime.c - src/libtommath/bn_mp_prime_rabin_miller_trials.c - src/libtommath/bn_mp_prime_random_ex.c - src/libtommath/bn_mp_radix_size.c - src/libtommath/bn_mp_radix_smap.c - src/libtommath/bn_mp_rand.c - src/libtommath/bn_mp_read_radix.c - src/libtommath/bn_mp_read_signed_bin.c - src/libtommath/bn_mp_read_unsigned_bin.c - src/libtommath/bn_mp_reduce.c - src/libtommath/bn_mp_reduce_2k.c - src/libtommath/bn_mp_reduce_2k_l.c - src/libtommath/bn_mp_reduce_2k_setup.c - src/libtommath/bn_mp_reduce_2k_setup_l.c - src/libtommath/bn_mp_reduce_is_2k.c - src/libtommath/bn_mp_reduce_is_2k_l.c - src/libtommath/bn_mp_reduce_setup.c - src/libtommath/bn_mp_rshd.c - src/libtommath/bn_mp_set.c - src/libtommath/bn_mp_set_int.c - src/libtommath/bn_mp_shrink.c - src/libtommath/bn_mp_signed_bin_size.c - src/libtommath/bn_mp_sqr.c - src/libtommath/bn_mp_sqrmod.c - src/libtommath/bn_mp_sqrt.c - src/libtommath/bn_mp_sub.c - src/libtommath/bn_mp_submod.c - src/libtommath/bn_mp_sub_d.c - src/libtommath/bn_mp_toom_mul.c - src/libtommath/bn_mp_toom_sqr.c - src/libtommath/bn_mp_toradix.c - src/libtommath/bn_mp_toradix_n.c - src/libtommath/bn_mp_to_signed_bin.c - src/libtommath/bn_mp_to_signed_bin_n.c - src/libtommath/bn_mp_to_unsigned_bin.c - src/libtommath/bn_mp_to_unsigned_bin_n.c - src/libtommath/bn_mp_unsigned_bin_size.c - src/libtommath/bn_mp_xor.c - src/libtommath/bn_mp_zero.c - src/libtommath/bn_prime_tab.c - src/libtommath/bn_reverse.c - src/libtommath/bn_s_mp_add.c - src/libtommath/bn_s_mp_exptmod.c - src/libtommath/bn_s_mp_mul_digs.c - src/libtommath/bn_s_mp_mul_high_digs.c - src/libtommath/bn_s_mp_sqr.c - src/libtommath/bn_s_mp_sub.c -) - -find_package(ZLIB REQUIRED) -find_package(BZip2 REQUIRED) - -if(WIN32) - set(LINK_LIBS wininet) -endif() - -list(APPEND LINK_LIBS ZLIB::ZLIB BZip2::BZip2) - -if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - message(STATUS "Using FreeBSD port") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate") -endif() - -add_library(stormlib ${LIB_TYPE} ${SRC_FILES} ${TOMCRYPT_FILES} ${TOMMATH_FILES} ${STORM_DEF_FILES}) -add_definitions(-D__SYS_ZLIB -D__SYS_BZLIB) - -target_link_libraries(stormlib PRIVATE ${LINK_LIBS}) - -target_compile_definitions(stormlib PRIVATE _7ZIP_ST BZ_STRICT_ANSI) - -if(WIN32) - target_compile_definitions(stormlib PRIVATE UNICODE _UNICODE) -endif() - -if(NOT MSVC) - # don't error on implicit declarations, which are invalid in C99 but commonly used - target_compile_options(stormlib PRIVATE -Wno-error=implicit-function-declaration) -endif() - - -set_target_properties(stormlib PROPERTIES PUBLIC_HEADER "src/StormLib.h;src/StormPort.h") - -install(TARGETS stormlib EXPORT stormlibConfig - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - PUBLIC_HEADER DESTINATION include -) - -install(EXPORT stormlibConfig NAMESPACE stormlib:: DESTINATION share/stormlib) diff --git a/ports/stormlib/portfile.cmake b/ports/stormlib/portfile.cmake index d0b0c32ea4..1d6c4097f2 100644 --- a/ports/stormlib/portfile.cmake +++ b/ports/stormlib/portfile.cmake @@ -1,16 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ladislav-zezula/StormLib - REF 2f0e0e69e6b3739d7c450ac3d38816aee45ac3c2 - SHA512 54cbe4270963944edf3d75b845047add2b004e0d95b20b75a4c4790c2a12a41bf19cc4f55aaeaec697a0a913827e11cfabde2123b2b13730556310dd89eef1e9 + REF "v${VERSION}" + SHA512 0da78bda4bb89637da892fc73a0673b8a5f852ede4fdceba1029431d24dd1e59db9bfceafab1c5fb642e4b5d0d15d9865f7a138bfb190ce0c2d3601b22dd3023 HEAD_REF master ) -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" - DESTINATION "${SOURCE_PATH}" -) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) @@ -19,4 +14,3 @@ vcpkg_cmake_install() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup() \ No newline at end of file diff --git a/ports/stormlib/vcpkg.json b/ports/stormlib/vcpkg.json index 2727c3b6cd..360866732b 100644 --- a/ports/stormlib/vcpkg.json +++ b/ports/stormlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "stormlib", - "version-date": "2019-05-10", - "port-version": 5, + "version": "9.25", "description": "StormLib is a library for opening and manipulating Blizzard MPQ files", "dependencies": [ "bzip2", @@ -9,10 +8,6 @@ "name": "vcpkg-cmake", "host": true }, - { - "name": "vcpkg-cmake-config", - "host": true - }, "zlib" ] } diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 0499445c79..1313d94497 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -75,14 +75,14 @@ jobs: - template: osx/azure-pipelines.yml parameters: jobName: x64_osx - poolName: 'PrOsx-2024-01-18' + poolName: 'PrOsx-2024-05-20' vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} - template: osx/azure-pipelines.yml parameters: jobName: arm64_osx - poolName: 'PrOsx-2024-01-22-arm64' + poolName: 'PrOsx-2024-05-20-arm64' vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index 25bc10db09..c3966f6879 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -22,23 +22,14 @@ This is the checklist for what the vcpkg team does when updating the macOS machi - [ ] Go to https://dev.azure.com/vcpkg/public/_settings/agentqueues , pick the current osx queue, and delete one of the agents that are idle. - [ ] Go to that machine in the KVM. (Passwords are stored as secrets in the CPP_GITHUB\vcpkg\vcpkgmm-passwords key vault) -- [ ] Open a terminal and destroy any old vagrant VMs or boxes - ```sh - cd ~/vagrant - vagrant halt - vagrant destroy - vagrant box list - vagrant box remove - brew remove hashicorp-vagrant - ``` - [ ] Open the Parallels Control Center, and delete the active VM. - [ ] Update the macos host - [ ] Update or install parallels - [ ] Download the macOS installer from the app store. See https://support.apple.com/en-us/102662 Note: This portion of the instructions is that which breaks most often depending on what Parallels and macOS are doing. - You might need to use `softwareupdate --fetch-full-installer --full-installer-version 14.2` and point Parallels + You might need to use `softwareupdate --fetch-full-installer --full-installer-version 14.5` and point Parallels at that resulting installer in 'Applications' instead. -- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx--amd64", for example "vcpkg-osx-2024-01-18-amd64". +- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx--amd64", for example "vcpkg-osx-2024-05-20-amd64". - [ ] When creating the VM, customize the hardware to the following: * 12 processors * 24000 MB of memory @@ -48,13 +39,13 @@ This is the checklist for what the vcpkg team does when updating the macOS machi * Apple ID: 'Set Up Later' / Skip * Account name: vcpkg * A very similar password :) + * Don't enable Ask Siri - [ ] Install Parallels Tools - [ ] Restart the VM - [ ] Change the desktop background to a solid color - [ ] Enable remote login in System Settings -> General -> Sharing -> Remote Login -- [ ] Shut down the VM cleanly -- [ ] Set the VM 'Isolated' -- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/3.232.0/vsts-agent-osx-x64-3.232.0.tar.gz +- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/3.239.1/vsts-agent-osx-x64-3.239.1.tar.gz +- [ ] Start the VM. Change the screen resolution to not be teeny weeny eyestrain o vision. - [ ] In the guest, set the vcpkg user to be able to use sudo without a password: ```sh printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg' @@ -62,24 +53,31 @@ This is the checklist for what the vcpkg team does when updating the macOS machi ``` - [ ] Copy setup-guest, setup-box.sh, and the xcode installer renamed to 'clt.dmg' to the host, and run setup-guest.sh. For example: ```sh - scp ./setup-guest.sh vcpkg@MACHINE:/Users/vcpkg/Downloads - scp ./setup-box.sh vcpkg@MACHINE:/Users/vcpkg/Downloads - scp path/to/console/tools.dmg vcpkg@MACHINE:/Users/vcpkg/Downloads/clt.dmg + scp ./setup-guest.sh vcpkg@MACHINE:/Users/vcpkg + scp ./setup-box.sh vcpkg@MACHINE:/Users/vcpkg + scp path/to/console/tools.dmg vcpkg@MACHINE:/Users/vcpkg/clt.dmg ssh vcpkg@MACHINE - cd /Users/vcpkg/Downloads - chmod +x ./setup-guest.sh - ./setup-guest.sh - exit + rm ~/.ssh/known_hosts + chmod +x setup-guest.sh + rm setup-guest.sh + rm setup-box.sh + rm clt.dmg ``` -- [ ] Shut down the VM cleanly. +- [ ] In the guest, check that 'm4' works in the terminal. If it tries to reinstall the command line tools, let it do that. You might need to manually run this workaround from https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Known-Issues + ```sh + sudo mkdir -p /Library/Developer/CommandLineTools + sudo touch /Library/Developer/CommandLineTools/.beta + ``` +- [ ] Shut down the VM cleanly +- [ ] Set the VM 'Isolated' - [ ] In Parallels control center, right click the VM and select "Prepare for Transfer" - [ ] In Parallels control center, right click the VM and remove it, but "Keep Files" - [ ] Copy the packaged VM to Azure Storage, with something like: ```sh ssh vcpkg@MACHINE brew install azcopy - azcopy copy ~/Parallels/vcpkg-macos-2024-01-18-amd64.pvmp "https://vcpkgimageminting...../pvms?" - azcopy copy ~/Parallels/vcpkg-macos-2024-01-18-amd64.sha256.txt "https://vcpkgimageminting...../pvms?" + azcopy copy ~/Parallels/vcpkg-osx-2024-05-20-amd64.pvmp "https://vcpkgimageminting...../pvms?" + azcopy copy ~/Parallels/vcpkg-osx-2024-05-20-amd64.sha256.txt "https://vcpkgimageminting...../pvms?" ``` - [ ] Go to https://dev.azure.com/vcpkg/public/_settings/agentqueues and create a new self hosted Agent pool named `PrOsx-YYYY-MM-DD` based on the current date. Check 'Grant access permission to all pipelines.' - [ ] Remove the macOS installer from Applications @@ -97,13 +95,13 @@ This is the checklist for what the vcpkg team does when updating the macOS machi tar xvf macosvm-0.2-1-arm64-darwin21.tar.gz rm macosvm-0.2-1-arm64-darwin21.tar.gz ``` -- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2024WinterFCS/fullrestores/042-78241/B45074EB-2891-4C05-BCA4-7463F3AC0982/UniversalMac_14.3_23D56_Restore.ipsw -- [ ] Determine the VM name using the form "vcpkg-osx--arm64", for example "vcpkg-osx-2024-01-22-arm64". -- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2024-01-22-arm64 and UniversalMac_14.3_23D56_Restore.ipsw replaced as appropriate. +- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2024SpringFCS/fullrestores/062-01897/C874907B-9F82-4109-87EB-6B3C9BF1507D/UniversalMac_14.5_23F79_Restore.ipsw +- [ ] Determine the VM name using the form "vcpkg-osx--arm64", for example "vcpkg-osx-2024-05-20-arm64". +- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2024-05-20-arm64 and UniversalMac_14.5_23F79_Restore.ipsw replaced as appropriate. ```sh - mkdir -p ~/Parallels/vcpkg-osx-2024-01-22-arm64 - cd ~/Parallels/vcpkg-osx-2024-01-22-arm64 - ~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_14.3_23D56_Restore.ipsw ./vm.json + mkdir -p ~/Parallels/vcpkg-osx-2024-05-20-arm64 + cd ~/Parallels/vcpkg-osx-2024-05-20-arm64 + ~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_14.5_23F79_Restore.ipsw ./vm.json ~/macosvm -g ./vm.json ``` - [ ] Follow prompts as you would on real hardware. @@ -116,12 +114,13 @@ This is the checklist for what the vcpkg team does when updating the macOS machi - [ ] Enable remote login in the VM: Settings -> General -> Sharing -> Remote Login - [ ] Set the vcpkg user to be able to use sudo without a password: ```sh - ssh -o StrictHostKeychecking=no vcpkg@vcpkgs-Virtual-Machine.local + rm ~/.ssh/known_hosts + ssh vcpkg@vcpkgs-Virtual-Machine.local printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg' sudo chmod 0440 '/etc/sudoers.d/vcpkg' exit ``` -- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/3.232.1/vsts-agent-osx-arm64-3.232.1.tar.gz +- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/3.239.1/vsts-agent-osx-arm64-3.239.1.tar.gz - [ ] Copy setup-box.sh and the xcode installer renamed to 'clt.dmg' to the host. For example from a dev workstation: ```sh scp ./setup-guest.sh vcpkg@MACHINE:/Users/vcpkg @@ -132,9 +131,14 @@ This is the checklist for what the vcpkg team does when updating the macOS machi ./setup-guest.sh rm setup-guest.sh rm setup-box.sh + rm clt.dmg + ``` +- [ ] In the guest, check that 'm4' works in the terminal. If it tries to reinstall the command line tools, let it do that. You might need to manually run this workaround from https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Known-Issues + ```sh + sudo mkdir -p /Library/Developer/CommandLineTools + sudo touch /Library/Developer/CommandLineTools/.beta ``` - [ ] Shut down the VM cleanly. -- [ ] Remove the VM in Parallels Control Center, and 'Keep Files' - [ ] Mint a SAS token to vcpkgimageminting/pvms with read, add, create, write, and list permissions. - [ ] Open a terminal on the host and package the VM into a tarball: ```sh @@ -155,15 +159,6 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i - [ ] If this machine was used before, delete it from the pool of which it is a member from https://dev.azure.com/vcpkg/public/_settings/agentqueues - [ ] Log in to the machine using the KVM. -- [ ] Open a terminal and destroy any old vagrant VMs or boxes - ```sh - $ cd ~/vagrant - $ vagrant halt - $ vagrant destroy - $ vagrant box list - $ vagrant box remove - $ brew remove hashicorp-vagrant - ``` - [ ] Check for software updates in macOS system settings - [ ] Check for software updates in Parallels' UI - [ ] Mint a SAS token URI to the box to use from the Azure portal if you don't already have one, and download the VM. (Recommend running this via SSH from domain joined machine due to containing SAS tokens) @@ -180,12 +175,13 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i ```sh scp ./register-guest.sh vcpkg@MACHINE:/Users/vcpkg ssh vcpkg@MACHINE + rm ~/.ssh/known_hosts chmod +x /Users/vcpkg/register-guest.sh /Users/vcpkg/register-guest.sh ``` - [ ] Open a terminal window on the host and run the agent ``` - ssh -i ~/Parallels/*/id_guest -o StrictHostKeychecking=no vcpkg@`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'` + ssh -i ~/Parallels/*/id_guest vcpkg@`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'` ~/myagent/run.sh ``` - [ ] Check that the machine shows up in the pool, and lock the vcpkg user on the host. @@ -224,6 +220,7 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i ```sh scp ./register-guest.sh vcpkg@MACHINE:/Users/vcpkg ssh vcpkg@MACHINE + rm ~/.ssh/known_hosts chmod +x register-guest.sh ./register-guest.sh rm register-guest.sh @@ -235,7 +232,7 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i ``` - [ ] Open a terminal window on the host and run the agent ```sh - ssh -i ~/Parallels/*/id_guest -o StrictHostKeychecking=no vcpkg@vcpkgs-Virtual-Machine.local + ssh -i ~/Parallels/*/id_guest vcpkg@vcpkgs-Virtual-Machine.local ~/myagent/run.sh ``` - [ ] Check that the machine shows up in the pool, and lock the vcpkg user on the host. diff --git a/scripts/azure-pipelines/osx/register-guest.sh b/scripts/azure-pipelines/osx/register-guest.sh index 5448a6ff6c..360b14ad2a 100644 --- a/scripts/azure-pipelines/osx/register-guest.sh +++ b/scripts/azure-pipelines/osx/register-guest.sh @@ -14,7 +14,7 @@ export POOL=`echo ~/Parallels/*.pvm | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpk export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'` export SSH_COOKIE=vcpkg@$GUEST_IP fi -ssh $SSH_COOKIE -i ~/Parallels/*/id_guest -o StrictHostKeychecking=no "~/myagent/config.sh --unattended --url https://dev.azure.com/vcpkg --work ~/Data/work --auth pat --token $1 --pool $POOL --agent $AGENT --replace --acceptTeeEula" +ssh $SSH_COOKIE -i ~/Parallels/*/id_guest "~/myagent/config.sh --unattended --url https://dev.azure.com/vcpkg --work ~/Data/work --auth pat --token $1 --pool $POOL --agent $AGENT --replace --acceptTeeEula" if [ `uname -m` = 'arm64' ]; then -ssh $SSH_COOKIE -i ~/Parallels/*/id_guest -o StrictHostKeychecking=no "sudo shutdown -h now" +ssh $SSH_COOKIE -i ~/Parallels/*/id_guest "sudo shutdown -h now" fi diff --git a/scripts/azure-pipelines/osx/setup-box.sh b/scripts/azure-pipelines/osx/setup-box.sh index 104decf871..64182e5526 100644 --- a/scripts/azure-pipelines/osx/setup-box.sh +++ b/scripts/azure-pipelines/osx/setup-box.sh @@ -1,4 +1,9 @@ #!/bin/sh + +# The next 2 lines are a workaround for an XCode Command Line Tools bug: +# https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Known-Issues +sudo mkdir -p /Library/Developer/CommandLineTools +sudo touch /Library/Developer/CommandLineTools/.beta hdiutil attach clt.dmg -mountpoint /Volumes/setup-installer sudo installer -pkg "/Volumes/setup-installer/Command Line Tools.pkg" -target / hdiutil detach /Volumes/setup-installer @@ -11,12 +16,12 @@ else (echo; echo 'eval "$(/usr/local/bin/brew shellenv)"') >> /Users/vcpkg/.zprofile eval "$(/usr/local/bin/brew shellenv)" fi -brew install autoconf-archive autoconf automake bison cmake gettext gfortran gperf gtk-doc libtool meson mono nasm ninja pkg-config powershell texinfo yasm +brew install autoconf-archive autoconf automake bison cmake gettext gfortran gperf gtk-doc libtool meson mono nasm ninja pkg-config powershell python-setuptools texinfo yasm mkdir ~/Data if [ `uname -m` = 'arm64' ]; then -curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/3.232.1/vsts-agent-osx-arm64-3.232.1.tar.gz +curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/3.239.1/vsts-agent-osx-arm64-3.239.1.tar.gz else -curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/3.232.1/vsts-agent-osx-x64-3.232.1.tar.gz +curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/3.239.1/vsts-agent-osx-x64-3.239.1.tar.gz fi mkdir ~/myagent tar xf ~/Downloads/azure-agent.tar.gz -C ~/myagent diff --git a/scripts/azure-pipelines/osx/setup-guest.sh b/scripts/azure-pipelines/osx/setup-guest.sh index 73e55aa90d..8efd97dcc4 100644 --- a/scripts/azure-pipelines/osx/setup-guest.sh +++ b/scripts/azure-pipelines/osx/setup-guest.sh @@ -12,9 +12,10 @@ export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{ export SSH_COOKIE=vcpkg@$GUEST_IP fi echo Type 'vcpkg' and press enter -ssh-copy-id -o StrictHostKeychecking=no -i "$SSH_PUBLIC_KEY" $SSH_COOKIE +ssh-copy-id -i "$SSH_PUBLIC_KEY" $SSH_COOKIE echo Keys deployed -ssh $SSH_COOKIE -o StrictHostKeychecking=no -i "$SSH_KEY" echo hello from \`hostname\` -scp -o StrictHostKeychecking=no -i "$SSH_KEY" ./setup-box.sh $SSH_COOKIE:/Users/vcpkg/setup-box.sh -ssh $SSH_COOKIE -o StrictHostKeychecking=no -i "$SSH_KEY" chmod +x /Users/vcpkg/setup-box.sh -ssh $SSH_COOKIE -o StrictHostKeychecking=no -i "$SSH_KEY" /Users/vcpkg/setup-box.sh +ssh $SSH_COOKIE -i "$SSH_KEY" echo hello from \`hostname\` +scp -i "$SSH_KEY" ./clt.dmg $SSH_COOKIE:/Users/vcpkg/clt.dmg +scp -i "$SSH_KEY" ./setup-box.sh $SSH_COOKIE:/Users/vcpkg/setup-box.sh +ssh $SSH_COOKIE -i "$SSH_KEY" chmod +x /Users/vcpkg/setup-box.sh +ssh $SSH_COOKIE -i "$SSH_KEY" /Users/vcpkg/setup-box.sh diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b57a7bbd83..609120ae03 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -269,9 +269,9 @@ cppslippi:arm-neon-android=fail cppslippi:arm64-android=fail cppslippi:x64-android=fail cppslippi:x64-linux=fail -cppslippi:x64-osx=fail -cppslippi:arm64-osx=fail +cppcoro:arm64-osx=fail cppcoro:x64-linux=fail +cppcoro:x64-osx=fail cpputest:arm-neon-android=fail crashpad:x64-linux=fail cserialport:arm-neon-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 7ec16c7d33..8b512a035d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1698,7 +1698,7 @@ }, "clockutils": { "baseline": "1.1.1", - "port-version": 1 + "port-version": 2 }, "clrng": { "baseline": "2020-12-01", @@ -2682,7 +2682,7 @@ }, "ffmpeg": { "baseline": "6.1.1", - "port-version": 5 + "port-version": 6 }, "ffnvcodec": { "baseline": "12.1.14.0", @@ -2982,7 +2982,7 @@ }, "geogram": { "baseline": "1.8.3", - "port-version": 1 + "port-version": 2 }, "geographiclib": { "baseline": "2.3", @@ -7194,7 +7194,7 @@ }, "qt5-location": { "baseline": "5.15.14", - "port-version": 0 + "port-version": 1 }, "qt5-macextras": { "baseline": "5.15.14", @@ -7370,7 +7370,7 @@ }, "qtinterfaceframework": { "baseline": "6.7.0", - "port-version": 0 + "port-version": 1 }, "qtkeychain": { "baseline": "0.14.1", @@ -8465,8 +8465,8 @@ "port-version": 1 }, "stormlib": { - "baseline": "2019-05-10", - "port-version": 5 + "baseline": "9.25", + "port-version": 0 }, "strict-variant": { "baseline": "0.5", diff --git a/versions/c-/clockutils.json b/versions/c-/clockutils.json index 98504ce751..b36b30b5de 100644 --- a/versions/c-/clockutils.json +++ b/versions/c-/clockutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5491981971509dc1260393cea620c731aa418b0", + "version": "1.1.1", + "port-version": 2 + }, { "git-tree": "08f337ddf39f1cda9dd6431374cdb0ee748745da", "version": "1.1.1", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index de08bfa54c..c7e560388d 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bad8797d669a583736212969fbbf6298497880b2", + "version": "6.1.1", + "port-version": 6 + }, { "git-tree": "85d4d87ea35d942b4f5ed800f6c6c7c0a00c3e5d", "version": "6.1.1", diff --git a/versions/g-/geogram.json b/versions/g-/geogram.json index a75e45274e..12a0dbb79d 100644 --- a/versions/g-/geogram.json +++ b/versions/g-/geogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95a627c98a4a4202c46104fbb8a974573e198e18", + "version": "1.8.3", + "port-version": 2 + }, { "git-tree": "ee6286e71522b6c0bd498066597094e57ff505b4", "version": "1.8.3", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 8859e039a5..7fc04f875a 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8a87780b543e7e9d72d23b684ad6d389fb7d963", + "version": "5.15.14", + "port-version": 1 + }, { "git-tree": "cf7751c0c413f0043501d81098f930f36129e91c", "version": "5.15.14", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 970877e379..ac291727de 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a24b3891ebf5c1875ed5be91218025de48029b8", + "version": "6.7.0", + "port-version": 1 + }, { "git-tree": "f42b78256d78f322fb0a0a053c7704b9cd9702ab", "version": "6.7.0", diff --git a/versions/s-/stormlib.json b/versions/s-/stormlib.json index a3b7aa7d52..e42baf6e33 100644 --- a/versions/s-/stormlib.json +++ b/versions/s-/stormlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3fc71772572a4bff064f754ef71c6631cb9bca9", + "version": "9.25", + "port-version": 0 + }, { "git-tree": "be1785249ddff2cfdcee25685c3775946edf9d6e", "version-date": "2019-05-10",