diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 929c067329817b..50752ce8d77c1b 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,14 +10,7 @@ jobs: - uses: actions/stale@v6 with: stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.' - only-labels: 'category:question' - days-before-issue-stale: 28 - days-before-pr-stale: -1 - days-before-close: 14 - - uses: actions/stale@v6 - with: - stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.' - only-labels: 'requires:repro' + any-of-labels: 'category:question,requires:repro,requires:more-information' days-before-issue-stale: 28 days-before-pr-stale: -1 days-before-close: 14 @@ -29,3 +22,10 @@ jobs: days-before-issue-stale: 60 days-before-pr-stale: -1 days-before-close: 14 + - uses: actions/stale@v6 + with: + stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 180 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment." + exempt-issue-labels: 'no-stale,category:new-port,category:question,requires:repro,requires:more-information' + days-before-issue-stale: 180 + days-before-pr-stale: -1 + days-before-close: 14 diff --git a/README.md b/README.md index 155d5a5335b8aa..b5fac1e634efd8 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [Español](README_es.md) [한국어](README_ko_KR.md) [Français](README_fr.md) +[Tiếng Việt](README_vn.md) Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This tool and ecosystem are constantly evolving, and we always appreciate contributions! @@ -32,7 +33,7 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help. - [Visual Studio Code with CMake Tools](#visual-studio-code-with-cmake-tools) - [Vcpkg with Visual Studio CMake Projects](#vcpkg-with-visual-studio-cmake-projects) - [Vcpkg with CLion](#vcpkg-with-clion) - - [Vcpkg as a Submodule](#vcpkg-as-a-submodule) + - [Vcpkg as a Submodule](#vcpkg-as-a-submodule-with-cmake) - [Tab-Completion/Auto-Completion](#tab-completionauto-completion) - [Examples](#examples) - [Contributing](#contributing) @@ -320,7 +321,7 @@ places the associated license(s) in the location `installed//share/ git clone https://github.com/microsoft/vcpkg @@ -130,8 +131,8 @@ Prerrequisitos para macOS: - [Herramientas de desarrollo de Apple][getting-started:macos-dev-tools] -Primero, descargue y compile vcpkg, puede ser instalado donde sea, -pero recomendamos usar vcpkg como submodulo para proyectos de CMake. +Primero, descargue y compile vcpkg, puede ser instalado donde lo desee, +pero recomendamos usar vcpkg como un submodulo. ```sh $ git clone https://github.com/microsoft/vcpkg diff --git a/README_vn.md b/README_vn.md new file mode 100644 index 00000000000000..b57b107f2a3427 --- /dev/null +++ b/README_vn.md @@ -0,0 +1,330 @@ +# Vcpkg: Tổng quan + +[English](README.md) +[中文总览](README_zh_CN.md) +[Español](README_es.md) +[한국어](README_ko_KR.md) +[Français](README_fr.md) + +Vcpkg giúp bạn quản lý các thư viện C và C++ trên Windows, Linux và MacOS. +Phần mềm này và hệ sinh thái của nó vẫn đang không ngừng phát triển, và chúng tôi luôn trân trọng những đóng góp của bạn! + +Nếu bạn chưa từng sử dụng vcpkg trước đây, hoặc nếu bạn đang tìm hiểu cách để sử dụng vcpkg, xin hãy xem phần [Bắt Đầu](#bắt-đầu) cho hướng dẫn cài đặt vcpkg. + +Để xem mô tả ngắn về những lệnh khả thi, khi bạn đã cài đặt vcpkg, bạn có thể chạy `vcpkg help`, hoặc `vcpkg help [command]` cho những lệnh nhất định. + +* GitHub: Các port ở [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg), phần mềm ở [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool) +* Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), kênh #vcpkg +* Discord: [\#include \](https://www.includecpp.org), kênh #🌏vcpkg +* Docs: [Tài liệu](https://learn.microsoft.com/vcpkg) + +# Mục Lục + +- [Vcpkg: Tổng quan](#vcpkg-tổng-quan) +- [Mục Lục](#mục-lục) +- [Bắt Đầu](#bắt-đầu) + - [Bắt Đầu Nhanh: Windows](#bắt-đầu-nhanh-windows) + - [Bắt Đầu Nhanh: Unix](#bắt-đầu-nhanh-unix) + - [Cài đặt Developer Tools cho Linux](#cài-đặt-developer-tools-cho-linux) + - [Cài đặt Developer Tools cho macOS](#cài-đặt-developer-tools-cho-macos) + - [Sử dụng vcpkg với CMake](#sử-dụng-vcpkg-với-cmake) + - [Visual Studio Code với Công cụ CMake](#visual-studio-code-với-công-cụ-cmake) + - [Vcpkg với Visual Studio CMake Projects](#vcpkg-với-visual-studio-cmake-projects) + - [Vcpkg với CLion](#vcpkg-với-clion) + - [Vcpkg dưới dạng Submodule](#vcpkg-dưới-dạng-submodule) +- [Gợi ý/Tự động điền](#gợi-ýtự-động-điền) +- [Các ví dụ](#các-ví-dụ) +- [Đóng Góp](#đóng-góp) +- [Giấy Phép](#giấy-phép) +- [Bảo Mật](#bảo-mật) +- [Thu Thập Dữ Liệu](#thu-thập-dữ-liệu) + +# Bắt Đầu +Đầu tiên, hãy làm theo hướng dẫn cài đặt cho [Windows](#bắt-đầu-nhanh-windows), hoặc [macOS và Linux](#bắt-đầu-nhanh-unix), tùy theo hệ điều hành mà bạn đang sử dụng. + +Ngoài ra, hãy xem [Cài đặt và Sử dụng Packages][getting-started:using-a-package]. +Nếu một thư viện bạn cần hiện đang chưa có trong vcpkg, bạn có thể [mở một issue trên GitHub repo][contributing:submit-issue] nơi mà đội ngũ vcpkg và cộng đồng có thể thấy và có khả năng thêm port đó vào vcpkg. + +Sau khi bạn đã cài đặt vcpkg, bạn có thể muốn thêm [tự động điền](#gợi-ýtự-động-điền) vào shell của bạn. + +## Bắt Đầu Nhanh: Windows + +Yêu cầu: +- Windows 7 trở lên +- [Git][getting-started:git] +- [Visual Studio][getting-started:visual-studio] 2015 Update 3 trở lên với gói ngôn ngữ Tiếng Anh + +Đầu tiên, tải và khởi động vcpkg; nó có thể được cài đặt bất kỳ đâu, nhưng +chúng tôi khuyến cáo sử dụng vcpkg như một submoudle cho các project CMake, +và cài đặt nó toàn máy cho các project Visual Studio. +Chúng tôi gợi ý cài ở những nơi như `C:\src\vcpkg` hoặc `C:\dev\vcpkg`, +bởi vì nếu cài những nơi khác bạn có thể gặp các lỗi đường dẫn đối với +hệ thống build của một vài port. + +```cmd +> git clone https://github.com/microsoft/vcpkg +> .\vcpkg\bootstrap-vcpkg.bat +``` + +Để cài đặt các thư viện cho project của bạn, hãy chạy: + +```cmd +> .\vcpkg\vcpkg install [packages to install] +``` + +Lưu ý: Lệnh này sẽ mặc định cài đặt phiên bản x86 của thư viện, để cài x64 hãy chạy: + +```cmd +> .\vcpkg\vcpkg install [package name]:x64-windows +``` + +Hoặc + +```cmd +> .\vcpkg\vcpkg install [packages to install] --triplet=x64-windows +``` + +Bạn cũng có thể tìm kiếm các thư viện bạn cần với lệnh `search`: + +```cmd +> .\vcpkg\vcpkg search [search term] +``` + +Để sử dụng vcpkg với Visual Studio, +hãy chạy lệnh sau (có thể yêu cầu quyền administrator): + +```cmd +> .\vcpkg\vcpkg integrate install +``` + +Sau khi xong, bạn có thể tạo một project mới (trừ CMake), hoặc mở một project có sẵn. +Tất cả các thư viện sẽ ngay lập tức có sẵn để được `#include` và sử dụng +trong project của bạn mà không cần cấu hình gì thêm. + +Nếu bạn đang sử dụng CMake với Visual Studio, +hãy tiếp tục [ở đây](#vcpkg-với-visual-studio-cmake-projects). + +Để sử dụng vcpkg với CMake bên ngoài một IDE, +bạn có thể sử dụng file toolchain: + +```cmd +> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" +> cmake --build [build directory] +``` + +Với CMake, bạn vẫn sẽ cần thêm `find_package` và những lệnh khác để sử dụng thư viện. +Hãy xem [phần CMake](#sử-dụng-vcpkg-với-cmake) để biết thêm, +bao gồm việc sử dụng CMake với một IDE. + +## Bắt Đầu Nhanh: Unix + +Yêu cầu cho Linux: +- [Git][getting-started:git] +- [g++][getting-started:linux-gcc] >= 6 + +Yêu cầu cho macOS: +- [Apple Developer Tools][getting-started:macos-dev-tools] + +Đầu tiên, tải và khởi động vcpkg; nó có thể được cài đặt bất kỳ đâu, nhưng +chúng tôi khuyến cáo sử dụng vcpkg như một submoudle cho các project CMake. + +```sh +$ git clone https://github.com/microsoft/vcpkg +$ ./vcpkg/bootstrap-vcpkg.sh +``` + +Để cài đặt các thư viện cho project của bạn, hãy chạy: + +```sh +$ ./vcpkg/vcpkg install [packages to install] +``` + +Bạn cũng có thể tìm kiếm các thư viện bạn cần với lệnh `search`: + +```sh +$ ./vcpkg/vcpkg search [search term] +``` + +Để sử dụng vcpkg với CMake, bạn có thể sử dụng file toolchain: + +```sh +$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" +$ cmake --build [build directory] +``` + +Với CMake, bạn vẫn sẽ cần thêm `find_package` và những lệnh khác để sử dụng thư viện. +Hãy xem [phần CMake](#sử-dụng-vcpkg-với-cmake) để biết thêm +về các tốt nhất để sử dụng vcpkg với CMake, +và Công cụ CMake cho VSCode. + +## Cài đặt Developer Tools cho Linux + +Dưới nhiều phiên bản Linux, có các package sau đây bạn sẽ cần phải cài đặt: + +- Debian, Ubuntu, popOS, và các phiên bản khác dựa trên Debian: + +```sh +$ sudo apt-get update +$ sudo apt-get install build-essential tar curl zip unzip +``` + +- CentOS + +```sh +$ sudo yum install centos-release-scl +$ sudo yum install devtoolset-7 +$ scl enable devtoolset-7 bash +``` + +Cho bất kỳ phiên bản nào khác, hãy chắc chắn rằng bạn cài đặt g++ 6 trở lên. +Nếu bạn muốn thêm hướng dẫn cho phiên bản của bạn, +[xin hãy mở một PR][contributing:submit-pr]! + +## Cài đặt Developer Tools cho macOS + +Trên macOS, thứ duy nhất bạn cần làm là chạy lệnh sau đây trong terminal: + +```sh +$ xcode-select --install +``` + +Sau đó làm theo hướng dẫn trong cửa sổ được mở ra. + +Sau đó bạn sẽ có thể khởi động vcpkg theo hướng dẫn ở [bắt đầu nhanh](#bắt-đầu-nhanh-unix) + +## Sử dụng vcpkg với CMake + +### Visual Studio Code với Công cụ CMake + +Thêm phần sau đây vào file `settings.json` trong workspace của bạn +sẽ làm cho Công cụ CMake tự động sử dụng vcpkg cho các thư viện +của bạn: + +```json +{ + "cmake.configureSettings": { + "CMAKE_TOOLCHAIN_FILE": "[vcpkg root]/scripts/buildsystems/vcpkg.cmake" + } +} +``` + +### Vcpkg với Visual Studio CMake Projects + +Mở CMake Settings Editor, dưới phần `CMake toolchain file`, +thêm đường dẫn tới file vcpkg toolchain: + +``` +[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +### Vcpkg với CLion + +Mở Toolchains settings +(File > Settings on Windows and Linux, CLion > Preferences on macOS), +và đi tới phần CMake settings (Build, Execution, Deployment > CMake). +Sau đó, trong `CMake options`, thên dòng sau đây: + +``` +-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +Bạn phải thêm dòng này vào mỗi profile khác nhau. + +### Vcpkg dưới dạng Submodule + +Khi sử dụng vcpkg như một submodule cho project của bạn, +bạn có thể thêm dòng sau đây vào file CMakeLists.txt trước dòng `project()` đầu tiên, +thay vì phải sự dụng lệnh `CMAKE_TOOLCHAIN_FILE`. + +```cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" + CACHE STRING "Vcpkg toolchain file") +``` + +Cách này vẫn hỗ trợ những người không dùng vcpkg, +bằng cách trực tiếp thêm `CMAKE_TOOLCHAIN_FILE`, +nhưng nó sẽ khiến việc cấu hình-build trở nên dễ dàng hơn. + +[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages +[getting-started:git]: https://git-scm.com/downloads +[getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools +[getting-started:linux-gcc]: #cài-đặt-developer-tools-cho-linux +[getting-started:macos-dev-tools]: #cài-đặt-developer-tools-cho-macos +[getting-started:macos-brew]: #installing-gcc-on-macos +[getting-started:macos-gcc]: #installing-gcc-on-macos +[getting-started:visual-studio]: https://visualstudio.microsoft.com/ + +# Gợi ý/Tự động điền + +`vcpkg` hỗ trợ tự động điền các lệnh, tên package, và các +cài đặt trong lẫn powershell và bash. +Để bật tự động điền trong shell của bạn, hãy chạy: + +```pwsh +> .\vcpkg integrate powershell +``` + +Hoặc + +```sh +$ ./vcpkg integrate bash # or zsh +``` + +tùy theo shell mà bạn sử dụng, rồi khởi động lại console. + +# Các ví dụ + +Hãy xem [tài liệu](https://learn.microsoft.com/vcpkg) cho các hướng dẫn chi tiết, +bao gồm [cài đặt và sử dụng một package](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages), +[thêm package mới từ file zip](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles), +và [thêm package mới từ GitHub repo](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos). + +Tài liệu của chúng tôi hiện đang có sẵn tại website https://vcpkg.io/. Chúng tôi rất trân trọng +bất kỳ phản hồi nào của các bạn! Bạn có thể tạo một issue trong https://github.com/vcpkg/vcpkg.github.io/issues. + +Xem [video demo](https://www.youtube.com/watch?v=y41WFKbQFTw) dài 4 phút. + +# Đóng Góp + +Vcpkg là một dự án mã nguồn mở, và được xây dụng từ sự đóng góp của các bạn. +Sau đây là các cách mà bạn có thể đóng góp: + +* [Tạo Issues][contributing:submit-issue] về vcpkg hoặc các package. +* [Sửa lỗi và Thêm các package mới][contributing:submit-pr] + +Xin hãy xem chi tiết trong [Hướng dẫn Đóng góp](CONTRIBUTING.md). + +Dự án này áp dụng [Bộ Quy tắc Ứng xử Mã Nguồn Mở của Microsoft][contributing:coc]. +Các thông tin thêm, hãy xem [Quy tắc Ứng xử FAQ][contributing:coc-faq] +hoặc gửi mail cho chúng tôi tại [opencode@microsoft.com](mailto:opencode@microsoft.com) +với các câu hỏi hoặc bình luận. + +[contributing:submit-issue]: https://github.com/microsoft/vcpkg/issues/new/choose +[contributing:submit-pr]: https://github.com/microsoft/vcpkg/pulls +[contributing:coc]: https://opensource.microsoft.com/codeofconduct/ +[contributing:coc-faq]: https://opensource.microsoft.com/codeofconduct/ + +# Giấy Phép + +Mã nguồn trong repository này được cấp phép theo [Giấy phép MIT](LICENSE.txt). Các thư viện +cung cấp bởi các port được cấp phép theo các điều khoản của tác giả gốc. Khi khả thi, vcpkg +đặt (các) giấy phép liên quan tại `installed//share//copyright`. + +# Bảo Mật + +Hầu hết các port đều build các thư viện liên quan sử dụng các hệ thống build gốc được khuyến cáo +bởi tác giả gốc của các thư viện đó, và tải mã nguồn và công cụ build từ nguồn chính thức của họ. +Để sử dụng dưới tường lửa, các quyền truy cập nhất định sẽ dựa vào port nào đang được cài đặt. +Nếu bạn buộc phải cài đặt trong một môi trường "cách ly không khí", xin hãy cân nhắc việc cài đặt +một lần trong môi trường không "cách ly không khí", để tạo [asset cache](https://learn.microsoft.com/vcpkg/users/assetcaching) được chia sẻ với môi trường "cách ly không khí" kia. + +# Thu Thập Dữ Liệu + +vcpkg thu thập dữ liệu trong lúc sử dụng để giúp chúng tôi cải thiện trải nghiệm của bạn. +Dữ liệu thu thập được bởi Microsoft là ẩn danh. +Bạn có thể tùy chọn không thu thập dữ liệu bằng cách +- chạy bootstrap-vcpkg với lệnh -disableMetrics +- chạy vcpkg với lệnh --disable-metrics +- thêm VCPKG_DISABLE_METRICS vào biến môi trường + +Đọc thêm về việc thu thập dữ liệu của vcpkg tại [https://learn.microsoft.com/vcpkg/about/privacy](https://learn.microsoft.com/vcpkg/about/privacy). diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt index 4f5559a3580e1c..2f6298a09cef06 100644 --- a/ports/7zip/CMakeLists.txt +++ b/ports/7zip/CMakeLists.txt @@ -10,6 +10,7 @@ endif() add_library(7zip) +# Check makefile in srcdir/CPP/7zip/Archive/7z/makefile target_sources(7zip PRIVATE CPP/7zip/Compress/Bcj2Coder.cpp CPP/7zip/Compress/Bcj2Register.cpp @@ -23,6 +24,7 @@ target_sources(7zip PRIVATE CPP/7zip/Compress/BZip2Decoder.cpp CPP/7zip/Compress/BZip2Encoder.cpp CPP/7zip/Compress/BZip2Register.cpp + CPP/7zip/Compress/CodecExports.cpp CPP/7zip/Compress/CopyCoder.cpp CPP/7zip/Compress/CopyRegister.cpp CPP/7zip/Compress/Deflate64Register.cpp @@ -30,7 +32,10 @@ target_sources(7zip PRIVATE CPP/7zip/Compress/DeflateEncoder.cpp CPP/7zip/Compress/DeflateRegister.cpp CPP/7zip/Compress/DeltaFilter.cpp + #CPP/7zip/Compress/DllExports2Compress.cpp + #CPP/7zip/Compress/DllExportsCompress.cpp CPP/7zip/Compress/ImplodeDecoder.cpp + CPP/7zip/Compress/ImplodeHuffmanDecoder.cpp CPP/7zip/Compress/LzfseDecoder.cpp CPP/7zip/Compress/LzhDecoder.cpp CPP/7zip/Compress/Lzma2Decoder.cpp @@ -57,10 +62,9 @@ target_sources(7zip PRIVATE CPP/7zip/Compress/XpressDecoder.cpp CPP/7zip/Compress/XzDecoder.cpp CPP/7zip/Compress/XzEncoder.cpp + CPP/7zip/Compress/ZDecoder.cpp CPP/7zip/Compress/ZlibDecoder.cpp CPP/7zip/Compress/ZlibEncoder.cpp - CPP/7zip/Compress/ZDecoder.cpp - CPP/7zip/Compress/CodecExports.cpp CPP/7zip/Crypto/7zAes.cpp CPP/7zip/Crypto/7zAesRegister.cpp @@ -109,6 +113,7 @@ target_sources(7zip PRIVATE C/Sha1.c C/Sha256.c C/Sort.c + C/SwapBytes.c C/Threads.c C/Xz.c C/XzDec.c diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake index e1e42476c12ce8..07b76d57b15e79 100644 --- a/ports/7zip/portfile.cmake +++ b/ports/7zip/portfile.cmake @@ -1,8 +1,8 @@ -set(7ZIP_VERSION "2201") +set(7ZIP_VERSION "2301") vcpkg_download_distfile(ARCHIVE URLS "https://www.7-zip.org/a/7z${7ZIP_VERSION}-src.7z" FILENAME "7z${7ZIP_VERSION}-src.7z" - SHA512 c37cede4b7253b8dc4372e9e011ef0fee0c1cd53cf9705bf106672a455e7ce1e5a0a288c763d73d3c28b2a41fb860c9bacb702b01d9192eed810787c7da1e0d8 + SHA512 45038fc49b0be8e7435939a79ad9f46f360b43b651148a8cde74fafdb8536f51a4be3b1ea91e06203267e5121267f6601f8ae6678feaf18e4b7a4f79a16730e7 ) vcpkg_extract_source_archive( diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json index 57a2a50b0c83ae..ecd006d66d6c88 100644 --- a/ports/7zip/vcpkg.json +++ b/ports/7zip/vcpkg.json @@ -1,7 +1,6 @@ { "name": "7zip", - "version-string": "22.01", - "port-version": 1, + "version-string": "23.01", "description": "Library for archiving file with a high compression ratio.", "homepage": "https://www.7-zip.org", "license": "LGPL-2.1-or-later", diff --git a/ports/ableton-link/vcpkg.json b/ports/ableton-link/vcpkg.json index 805564c576b944..463aabaf71d861 100644 --- a/ports/ableton-link/vcpkg.json +++ b/ports/ableton-link/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ableton-link", "version": "3.0.6", + "port-version": 1, "description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.", "homepage": "https://www.ableton.com/en/link/", "documentation": "http://ableton.github.io/link/", @@ -19,12 +20,14 @@ "features": { "coretest": { "description": "Build LinkCoreTest suite", + "supports": "!uwp", "dependencies": [ "catch2" ] }, "discoverytest": { "description": "Build LinkDiscoveryTest suite", + "supports": "!uwp", "dependencies": [ "catch2" ] @@ -39,7 +42,8 @@ ] }, "hutsilent": { - "description": "Build LinkHutSilent command line tool" + "description": "Build LinkHutSilent command line tool", + "supports": "!uwp" } } } diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 4dcfd5e9daea75..7737254f8d825c 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp REF "${VERSION}" - SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02 + SHA512 14390380655c41483a98487e3b012110dd8d1743fdd68d8cde7e0d7c2730312d564b15726d8c9d2fff237d2fce3983bbbb5213f59612c7c6feaeb402dff9609f HEAD_REF master ) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 15395f66eec1a3..80a5876b1def11 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "abseil", - "version": "20230802.0", + "version": "20230802.1", "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 1d663e7ae41c2f..1dcb75fe4435df 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ace", "version": "7.1.1", - "port-version": 1, + "port-version": 2, "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://github.com/DOCGroup/ACE_TAO", @@ -22,7 +22,8 @@ ] }, "tao": { - "description": "The ACE ORB" + "description": "The ACE ORB", + "supports": "native | !(windows & arm)" }, "wchar": { "description": "Enable extra wide char functions in ACE", diff --git a/ports/ada-url/portfile.cmake b/ports/ada-url/portfile.cmake index 02c4378cffac81..4ae225547876fb 100644 --- a/ports/ada-url/portfile.cmake +++ b/ports/ada-url/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ada-url/ada REF "v${VERSION}" - SHA512 49f50eefd6b7940ab0acc35de3f8b26c75db9ee46e0c9c28cb3b98aacb4ebca3e147e4880f288f6554599ce8b9e099021bce9203cb6d59ee1308e91b1f366818 + SHA512 bd9af16dee99a2b3f43e823b9ae6f8893741172d63ffe38337a4b3eab632167241b95df56d4220bc3240a3593e751df6a562e52e31b73e0ba99d41f5bf9922d5 HEAD_REF main ) diff --git a/ports/ada-url/vcpkg.json b/ports/ada-url/vcpkg.json index 5fe370d8a5ddd0..9f9e0dd0652a4c 100644 --- a/ports/ada-url/vcpkg.json +++ b/ports/ada-url/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ada-url", - "version": "2.6.0", + "version": "2.6.8", "description": "WHATWG-compliant and fast URL parser written in modern C++", "homepage": "https://ada-url.com/", "license": "MIT", diff --git a/ports/ade/portfile.cmake b/ports/ade/portfile.cmake index 9a72058da05e19..9f54cfa2f158ee 100644 --- a/ports/ade/portfile.cmake +++ b/ports/ade/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/ade - REF v0.1.2 - SHA512 2761cf9ccb92d1df6f2d61964a64085470fff78b92d040fd8411d4c3a1f238b95eb4484a9624ab800e8fb4e5144eea32dee9a9047b9b67fad83d0856d32c91e9 + REF "v${VERSION}" + SHA512 5ee9a13b8bff062fc742d117dc0315bb5d6ff2c747ce5c7df0c233870506ec5f2afbd2852fc3d6bb28b86426013fd7fdf0a1e49164f7cd644e78443904dc8711 HEAD_REF master ) diff --git a/ports/ade/vcpkg.json b/ports/ade/vcpkg.json index 53ac306ff9ccb1..3bc942ef8a9d87 100644 --- a/ports/ade/vcpkg.json +++ b/ports/ade/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ade", - "version": "0.1.2", + "version-string": "0.1.2c", "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.", "dependencies": [ { diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index f5c90aaceb7bde..47f5a103a86223 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alembic/alembic REF "${VERSION}" - SHA512 89a480970eb09893112bf650011ede852205d1fa3718680a3983392bbcf3eb3f22f4ec01f42d12bfcaf655ce43d7d6f583b764ec03f4c5a84023359502b3636e + SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b HEAD_REF master PATCHES fix-runtime-destination.patch diff --git a/ports/alembic/vcpkg.json b/ports/alembic/vcpkg.json index e3d6c17aa24630..a472781f61d1c3 100644 --- a/ports/alembic/vcpkg.json +++ b/ports/alembic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "alembic", - "version": "1.8.5", + "version": "1.8.6", "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.", "homepage": "https://alembic.io/", "supports": "!(windows & x86) & !uwp", diff --git a/ports/alsa/portfile.cmake b/ports/alsa/portfile.cmake index bd1bd80946778d..84a5bd58c0f3bf 100644 --- a/ports/alsa/portfile.cmake +++ b/ports/alsa/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alsa-project/alsa-lib REF "v${VERSION}" - SHA512 34ebeb64fd43432df779bfd6de08fb26cfd59d75586100cab7308d1ecf60d722cf137f1209426a288bdbaa27c31e963ce09690272b8d85653989a935a6fc50af + SHA512 923cd9f19afa77cf46bb15b4fefdaa2db75054052af0f11b6d18e1703a0d3d05fecca235606ea06bca380a4306c134f88b71be73839eca3f4ce077dbdcb13c6a HEAD_REF master PATCHES "fix-plugin-dir.patch" diff --git a/ports/alsa/vcpkg.json b/ports/alsa/vcpkg.json index abd0244acce389..a7eb663173a43d 100644 --- a/ports/alsa/vcpkg.json +++ b/ports/alsa/vcpkg.json @@ -1,7 +1,6 @@ { "name": "alsa", - "version": "1.2.8", - "port-version": 1, + "version": "1.2.10", "description": "The Advanced Linux Sound Architecture (ALSA) - library", "homepage": "https://www.alsa-project.org/", "license": "LGPL-2.1-or-later", diff --git a/ports/anari/portfile.cmake b/ports/anari/portfile.cmake new file mode 100644 index 00000000000000..334e64649c0935 --- /dev/null +++ b/ports/anari/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/ANARI-SDK + REF "v${VERSION}" + SHA512 51937d160a9508c56cf123eda13002c705acff501366710f83da1c62d875f8427cec27f10ea2d05f4637be141fb9a87935f4b0b9f0fabb6bd6a7cca6a4f48ee1 + HEAD_REF main +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_CTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_HELIDE_DEVICE=OFF + -DBUILD_TESTING=OFF + -DBUILD_VIEWER=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}-${VERSION}" +) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +vcpkg_install_copyright( + FILE_LIST "${SOURCE_PATH}/LICENSE" +) diff --git a/ports/anari/vcpkg.json b/ports/anari/vcpkg.json new file mode 100644 index 00000000000000..86143ae9c3438c --- /dev/null +++ b/ports/anari/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "anari", + "version": "0.7.0", + "port-version": 1, + "description": "Cross-Platform 3D Rendering Engine API.", + "homepage": "https://www.khronos.org/anari", + "license": "Apache-2.0", + "dependencies": [ + "glm", + "python3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index b5529f3ea06306..80d1e857b0755f 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( REPO antlr/antlr4 HEAD_REF dev REF "${VERSION}" - SHA512 947ecca28712aa4dd98d7b7e0753e91881e55642f7951ca65a576b94db87440767a1b93d08e82db69ad527ee28bf89f0b2f9c0aaa604a999a7e48c163764ee12 + SHA512 79ac3cdfc8f2368c647d06aec85d87507629a75527205ff2cbf7d9802989b0c6e6a8fac76148ad101f539c9ef922e431e22ba489f899f847ccc3d3d889bb2b70 PATCHES set-export-macro-define-as-private.patch ) diff --git a/ports/antlr4/vcpkg.json b/ports/antlr4/vcpkg.json index e1964c98d29b2e..b41d9908052c44 100644 --- a/ports/antlr4/vcpkg.json +++ b/ports/antlr4/vcpkg.json @@ -1,6 +1,6 @@ { "name": "antlr4", - "version": "4.13.0", + "version": "4.13.1", "description": "ANother Tool for Language Recognition", "homepage": "https://www.antlr.org", "license": "BSD-3-Clause", diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake index 31e2e596f53860..52b3c6cdbff609 100644 --- a/ports/apr-util/portfile.cmake +++ b/ports/apr-util/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2" - FILENAME "apr-util-1.6.1.tar.bz2" - SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d + URLS "https://archive.apache.org/dist/apr/apr-util-${VERSION}.tar.bz2" + FILENAME "apr-util-${VERSION}.tar.bz2" + SHA512 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/apr-util/use-vcpkg-expat.patch b/ports/apr-util/use-vcpkg-expat.patch index 8a35f2bc56896d..6c9fa280a694db 100644 --- a/ports/apr-util/use-vcpkg-expat.patch +++ b/ports/apr-util/use-vcpkg-expat.patch @@ -1,124 +1,114 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ae90b1..71a50b0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -21,16 +21,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) - - FIND_PACKAGE(OpenSSL) - --FIND_PACKAGE(expat) -- - OPTION(APU_HAVE_CRYPTO "Crypto support" OFF) - OPTION(APU_HAVE_ODBC "Build ODBC DBD driver" ON) - OPTION(APR_HAS_LDAP "LDAP support" ON) - OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) - OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) - OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF) --SET(APR_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with APR include files") --SET(APR_LIBRARIES "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib" CACHE STRING "APR library to link with") -+find_path(APR_INCLUDE_DIR apr.h) -+find_library(APR_LIBRARIES NAMES libapr-1 apr-1) - - IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h") - MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.") -@@ -61,13 +59,13 @@ IF(APR_HAS_LDAP) - SET(apr_has_ldap_10 1) - ENDIF() - --IF(NOT EXPAT_FOUND) -+find_package(expat) -+set(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS}) -+set(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES}) -+IF(NOT XMLLIB_LIBRARIES) - MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!") - ENDIF() - --SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS}) --SET(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES}) -- - SET(LDAP_LIBRARIES) - IF(APR_HAS_LDAP) - SET(LDAP_LIBRARIES wldap32) -@@ -229,17 +227,21 @@ SET(dbd_drivers) - # Note: The WINNT definition on some targets is used only by libaprutil.rc. - - # libaprutil-1 is shared, aprutil-1 is static -+if(BUILD_SHARED_LIBS) - ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc) - SET(install_targets ${install_targets} libaprutil-1) - SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb) - TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES}) --SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;XML_STATIC;WINNT") -+SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_IMPORT;XML_STATIC;WINNT") - -+else(BUILD_SHARED_LIBS) - ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) - SET(install_targets ${install_targets} aprutil-1) - TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES}) - SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC") -+endif(BUILD_SHARED_LIBS) - -+if(BUILD_SHARED_LIBS) - IF(APU_HAVE_CRYPTO) - IF(NOT OPENSSL_FOUND) - MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build") -@@ -249,7 +251,7 @@ IF(APU_HAVE_CRYPTO) - SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb) - SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}") - SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_DEFINITIONS "WINNT") -- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_crypto_openssl") -+ SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_crypto_openssl") - TARGET_LINK_LIBRARIES(apr_crypto_openssl-1 libaprutil-1 ${APR_LIBRARIES} ${OPENSSL_LIBRARIES}) - ENDIF() - -@@ -260,8 +262,8 @@ IF(APU_HAVE_ODBC) - SET(dbd_drivers ${dbd_drivers} odbc) - TARGET_LINK_LIBRARIES(apr_dbd_odbc-1 libaprutil-1 ${APR_LIBRARIES} odbc32 odbccp32) - SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver) -- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT") -- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_dbd_odbc") -+ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_IMPORT;APR_DECLARE_IMPORT;APU_DSO_MODULE_BUILD;WINNT") -+ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_dbd_odbc") - ENDIF() - - IF(APR_HAS_LDAP) -@@ -271,11 +273,12 @@ IF(APR_HAS_LDAP) - SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb) - TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1 ${APR_LIBRARIES} ${LDAP_LIBRARIES}) - SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT") -- SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_ldap") -+ SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_ldap") - SET(apr_ldap_libraries apr_ldap-1) - ELSE() - SET(apr_ldap_libraries) - ENDIF() -+endif(BUILD_SHARED_LIBS) - - IF(APR_BUILD_TESTAPR) - ENABLE_TESTING() -@@ -289,7 +292,7 @@ IF(APR_BUILD_TESTAPR) - ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml - ${PROJECT_BINARY_DIR}/data/billion-laughs.xml) - -- IF(TEST_STATIC_LIBS) -+ IF(NOT BUILD_SHARED_LIBS) - SET(whichapr aprutil-1) - SET(apiflag "-DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC") - ELSE() -@@ -325,13 +328,9 @@ INSTALL(TARGETS ${install_targets} - ARCHIVE DESTINATION lib - ) - --IF(INSTALL_PDB) -- INSTALL(FILES ${install_bin_pdb} -- DESTINATION bin -- CONFIGURATIONS RelWithDebInfo Debug) --ENDIF() -- --INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include) -+if(NOT DISABLE_INSTALL_HEADERS) -+ INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include) -+endif() - - STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype) - MESSAGE(STATUS "") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fcbfc58..7781131 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,16 +21,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + + FIND_PACKAGE(OpenSSL) + +-FIND_PACKAGE(EXPAT) +- + OPTION(APU_HAVE_CRYPTO "Crypto support" OFF) + OPTION(APU_HAVE_ODBC "Build ODBC DBD driver" ON) + OPTION(APR_HAS_LDAP "LDAP support" ON) + OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) + OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) + OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF) +-SET(APR_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with APR include files") +-SET(APR_LIBRARIES "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib" CACHE STRING "APR library to link with") ++find_path(APR_INCLUDE_DIR apr.h) ++find_library(APR_LIBRARIES NAMES libapr-1 apr-1) + + IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h") + MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.") +@@ -61,13 +59,13 @@ IF(APR_HAS_LDAP) + SET(apr_has_ldap_10 1) + ENDIF() + +-IF(NOT EXPAT_FOUND) ++find_package(expat) ++set(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS}) ++set(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES}) ++IF(NOT XMLLIB_LIBRARIES) + MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!") + ENDIF() + +-SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS}) +-SET(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES}) +- + SET(LDAP_LIBRARIES) + IF(APR_HAS_LDAP) + SET(LDAP_LIBRARIES wldap32) +@@ -229,17 +227,21 @@ SET(dbd_drivers) + # Note: The WINNT definition on some targets is used only by libaprutil.rc. + + # libaprutil-1 is shared, aprutil-1 is static ++if(BUILD_SHARED_LIBS) + ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc) + SET(install_targets ${install_targets} libaprutil-1) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb) + TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES}) + SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_IMPORT;XML_STATIC;WINNT") + ++else(BUILD_SHARED_LIBS) + ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} aprutil-1) + TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES}) + SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC") ++endif() + ++if(BUILD_SHARED_LIBS) + IF(APU_HAVE_CRYPTO) + IF(NOT OPENSSL_FOUND) + MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build") +@@ -265,7 +267,7 @@ IF(APU_HAVE_ODBC) + ENDIF() + + IF(APR_HAS_LDAP) +- ADD_LIBRARY(apr_ldap-1 SHARED ldap/apr_ldap_init.c ldap/apr_ldap_option.c ++ ADD_LIBRARY(apr_ldap-1 SHARED ldap/apr_ldap_init.c ldap/apr_ldap_option.c + ldap/apr_ldap_rebind.c libaprutil.rc) + SET(install_targets ${install_targets} apr_ldap-1) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb) +@@ -276,6 +278,7 @@ IF(APR_HAS_LDAP) + ELSE() + SET(apr_ldap_libraries) + ENDIF() ++endif() + + IF(APR_BUILD_TESTAPR) + ENABLE_TESTING() +@@ -283,13 +286,13 @@ IF(APR_BUILD_TESTAPR) + ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose) + + # copy data files to build directory so that we can run programs from there +- EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ++ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory + ${PROJECT_BINARY_DIR}/data) +- EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different ++ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml + ${PROJECT_BINARY_DIR}/data/billion-laughs.xml) + +- IF(TEST_STATIC_LIBS) ++ IF(NOT BUILD_SHARED_LIBS) + SET(whichapr aprutil-1) + SET(apiflag "-DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC") + ELSE() +@@ -325,13 +328,9 @@ INSTALL(TARGETS ${install_targets} + ARCHIVE DESTINATION lib + ) + +-IF(INSTALL_PDB) +- INSTALL(FILES ${install_bin_pdb} +- DESTINATION bin +- CONFIGURATIONS RelWithDebInfo Debug) +-ENDIF() +- +-INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include) ++if(NOT DISABLE_INSTALL_HEADERS) ++ INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include) ++endif() + + STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype) + MESSAGE(STATUS "") diff --git a/ports/apr-util/vcpkg.json b/ports/apr-util/vcpkg.json index 5ae07edeb3242b..f1c815bf40ace5 100644 --- a/ports/apr-util/vcpkg.json +++ b/ports/apr-util/vcpkg.json @@ -1,7 +1,6 @@ { "name": "apr-util", - "version": "1.6.1", - "port-version": 10, + "version": "1.6.3", "description": "Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation", "homepage": "https://apr.apache.org/", "license": "Apache-2.0", diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 38512a454493d1..84b04326b5df8f 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -1,10 +1,10 @@ -set(VERSION 1.7.2) +set(VERSION 1.7.4) vcpkg_download_distfile(ARCHIVE URLS "https://archive.apache.org/dist/apr/apr-${VERSION}.tar.bz2" FILENAME "apr-${VERSION}.tar.bz2" - SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e + SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd ) vcpkg_extract_source_archive(SOURCE_PATH diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index 5120dbb1e2b7c1..dafc8d0fa3c649 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -1,7 +1,6 @@ { "name": "apr", - "version": "1.7.2", - "port-version": 1, + "version": "1.7.4", "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", "license": "Apache-2.0", diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake index 4c6622e51611bc..ad9dfee9baa787 100644 --- a/ports/apsi/portfile.cmake +++ b/ports/apsi/portfile.cmake @@ -17,10 +17,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) set(CROSSCOMP_OPTIONS "") -if (NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET) +if (VCPKG_CROSSCOMPILING) if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_ARM64_EXITCODE=0 -DAPSI_FOURQ_ARM64_EXITCODE__TRYRUN_OUTPUT="") endif() + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_AMD64_EXITCODE=0 -DHAVE_AVX_EXTENSIONS_EXITCODE=0 -DHAVE_AVX2_EXTENSIONS_EXITCODE=1) + endif() endif() vcpkg_cmake_configure( diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json index dd32f03aa20f9d..cf3ac0c7bbef4e 100644 --- a/ports/apsi/vcpkg.json +++ b/ports/apsi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "apsi", "version-semver": "0.9.0", - "port-version": 1, + "port-version": 2, "description": "APSI is a research library for asymmetric private set intersection.", "homepage": "https://github.com/microsoft/APSI", "license": "MIT", diff --git a/ports/argagg/portfile.cmake b/ports/argagg/portfile.cmake index 70e162b12f3b7f..018f0353b58ff1 100644 --- a/ports/argagg/portfile.cmake +++ b/ports/argagg/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vietjtnguyen/argagg - REF 0.4.6 - SHA512 7d8cf04a7c679518f01120830637c68719dd67a765457789eb4afedbead7be9efadc6bcdf640999329aaaf8659a5e5d1896f66587068cc668a7c49703aca3070 + REF "${VERSION}" + SHA512 85634bff33236ffcb0aea03a6fa4b3529b6d1faa03f8e030f3c5401fc453bb5e1964f7d0644e4f3fc089ccd7751ea94c466e02b85f7c9701ce21adcc20c0b058 HEAD_REF master ) diff --git a/ports/argagg/vcpkg.json b/ports/argagg/vcpkg.json index 12ec3e78844e7a..616ef9e31db682 100644 --- a/ports/argagg/vcpkg.json +++ b/ports/argagg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "argagg", - "version": "0.4.6", - "port-version": 3, + "version": "0.4.7", "description": "A simple C++11 command line argument parser", "dependencies": [ { diff --git a/ports/argtable3/portfile.cmake b/ports/argtable3/portfile.cmake index 03aa90e5f498dc..71b188fdae4477 100644 --- a/ports/argtable3/portfile.cmake +++ b/ports/argtable3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO argtable/argtable3 - REF 7704006f3cbb556e11da80a5b97469075a32892e # 3.2.1 + minor patches including ARGTABLE3_ENABLE_EXAMPLES support - SHA512 c51aa0a33a247c3801e36ca5d9523acefa31f21a34c1e86965a39290c1b437785e4d7e0ae80a65d811803b8fcbbc3a96ba3d6aefaea9bda15abc0f38bd1f45cc + REF "v${VERSION}" + SHA512 623197142fd1749b2fd5bc3e51758ae49c58ec8699b6afa5ecb2d0199d98f9c05366f92c5169c8039b5c417f4774fb4a09c879a7b04ddbed9d5e43585692ed7f HEAD_REF master PATCHES Fix-dependence-getopt.patch ) diff --git a/ports/argtable3/vcpkg.json b/ports/argtable3/vcpkg.json index 2822477b0c7d60..2ab9e76b19a908 100644 --- a/ports/argtable3/vcpkg.json +++ b/ports/argtable3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "argtable3", - "version": "3.2.1", - "port-version": 3, + "version-string": "3.2.2.f25c624", "description": "A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options", "homepage": "https://www.argtable.org/", "license": "BSD-2-Clause-NetBSD AND TCL", diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index fa8c0f330cafe3..eed1698ce57ffa 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile( ARCHIVE_PATH URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz" FILENAME apache-arrow-${VERSION}.tar.gz - SHA512 551ae200551fcc73b7deddcc5f0b06633159ab1308506901a9086e4e2e34e4437f26d609fdbacba0ebe7d1fe83bdb8e92a268e9e41575d655d5b2d4fbef7a7ce + SHA512 3314d79ef20ac2cfc63f2c16fafb30c3f6187c10c6f5ea6ff036f6db766621d7c65401d85bf1e979bd0ecf831fbb0a785467642792d6bf77016f9807243c064e ) vcpkg_extract_source_archive( SOURCE_PATH @@ -88,6 +88,14 @@ if("acero" IN_LIST FEATURES) ) endif() +if("flight" IN_LIST FEATURES) + vcpkg_cmake_config_fixup( + PACKAGE_NAME ArrowFlight + CONFIG_PATH lib/cmake/ArrowFlight + DO_NOT_DELETE_PARENT_CONFIG_PATH + ) +endif() + if("parquet" IN_LIST FEATURES) vcpkg_cmake_config_fixup( PACKAGE_NAME parquet @@ -111,6 +119,11 @@ if("acero" IN_LIST FEATURES) file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-acero}") endif() +if("flight" IN_LIST FEATURES) + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-flight" usage-flight) + file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-flight}") +endif() + if("example" IN_LIST FEATURES) file(INSTALL "${SOURCE_PATH}/cpp/examples/minimal_build/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example") endif() diff --git a/ports/arrow/usage-flight b/ports/arrow/usage-flight new file mode 100644 index 00000000000000..69abcf6c0c6d29 --- /dev/null +++ b/ports/arrow/usage-flight @@ -0,0 +1,3 @@ + + find_package(ArrowFlight CONFIG REQUIRED) + target_link_libraries(main PRIVATE "$,ArrowFlight::arrow_flight_static,ArrowFlight::arrow_flight_shared>") diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 9090f146bf3644..e2432e5d37cdeb 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,7 @@ { "name": "arrow", - "version": "12.0.1", + "version": "13.0.0", + "port-version": 1, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/ports/asio/fix_coro_compile_error_msvc.patch b/ports/asio/fix_coro_compile_error_msvc.patch deleted file mode 100644 index bde1d1d267801c..00000000000000 --- a/ports/asio/fix_coro_compile_error_msvc.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff --git a/asio/include/asio/experimental/impl/coro.hpp b/asio/include/asio/experimental/impl/coro.hpp -index a4d8d277..9f01687e 100644 ---- a/asio/include/asio/experimental/impl/coro.hpp -+++ b/asio/include/asio/experimental/impl/coro.hpp -@@ -1069,17 +1069,17 @@ struct coro::initiate_async_resume - std::true_type /* error is noexcept */, - std::true_type /* result is void */) //noexcept - { -- return [this, coro = coro_, -+ return [this, coro_promise_ = coro_, - h = std::forward(handler), - exec = std::move(exec)]() mutable - { -- assert(coro); -+ assert(coro_promise_); - -- auto ch = detail::coroutine_handle::from_promise(*coro); -+ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); - assert(ch && !ch.done()); - -- coro->awaited_from = post_coroutine(std::move(exec), std::move(h)); -- coro->reset_error(); -+ coro_promise_->awaited_from = post_coroutine(std::move(exec), std::move(h)); -+ coro_promise_->reset_error(); - ch.resume(); - }; - } -@@ -1090,18 +1090,18 @@ struct coro::initiate_async_resume - std::true_type /* error is noexcept */, - std::false_type /* result is void */) //noexcept - { -- return [coro = coro_, -+ return [coro_promise_ = coro_, - h = std::forward(handler), - exec = std::move(exec)]() mutable - { -- assert(coro); -+ assert(coro_promise_); - -- auto ch = detail::coroutine_handle::from_promise(*coro); -+ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); - assert(ch && !ch.done()); - -- coro->awaited_from = detail::post_coroutine( -- exec, std::move(h), coro->result_).handle; -- coro->reset_error(); -+ coro_promise_->awaited_from = detail::post_coroutine( -+ exec, std::move(h), coro_promise_->result_).handle; -+ coro_promise_->reset_error(); - ch.resume(); - }; - } -@@ -1111,16 +1111,16 @@ struct coro::initiate_async_resume - std::false_type /* error is noexcept */, - std::true_type /* result is void */) - { -- return [coro = coro_, -+ return [coro_promise_ = coro_, - h = std::forward(handler), - exec = std::move(exec)]() mutable - { -- if (!coro) -+ if (!coro_promise_) - return asio::post(exec, - asio::append(std::move(h), - detail::coro_error::invalid())); - -- auto ch = detail::coroutine_handle::from_promise(*coro); -+ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); - if (!ch) - return asio::post(exec, - asio::append(std::move(h), -@@ -1131,9 +1131,9 @@ struct coro::initiate_async_resume - detail::coro_error::done())); - else - { -- coro->awaited_from = detail::post_coroutine( -- exec, std::move(h), coro->error_).handle; -- coro->reset_error(); -+ coro_promise_->awaited_from = detail::post_coroutine( -+ exec, std::move(h), coro_promise_->error_).handle; -+ coro_promise_->reset_error(); - ch.resume(); - } - }; -@@ -1144,17 +1144,17 @@ struct coro::initiate_async_resume - std::false_type /* error is noexcept */, - std::false_type /* result is void */) - { -- return [coro = coro_, -+ return [coro_promise_ = coro_, - h = std::forward(handler), - exec = std::move(exec)]() mutable - { -- if (!coro) -+ if (!coro_promise_) - return asio::post(exec, - asio::append(std::move(h), - detail::coro_error::invalid(), result_type{})); - - auto ch = -- detail::coroutine_handle::from_promise(*coro); -+ detail::coroutine_handle::from_promise(*coro_promise_); - if (!ch) - return asio::post(exec, - asio::append(std::move(h), -@@ -1165,9 +1165,9 @@ struct coro::initiate_async_resume - detail::coro_error::done(), result_type{})); - else - { -- coro->awaited_from = detail::post_coroutine( -- exec, std::move(h), coro->error_, coro->result_).handle; -- coro->reset_error(); -+ coro_promise_->awaited_from = detail::post_coroutine( -+ exec, std::move(h), coro_promise_->error_, coro_promise_->result_).handle; -+ coro_promise_->reset_error(); - ch.resume(); - } - }; -@@ -1203,9 +1203,9 @@ struct coro::initiate_async_resume - [h = handle(exec, std::forward(handler), - std::integral_constant{}, - std::is_void{}), -- in = std::forward(input), coro = coro_]() mutable -+ in = std::forward(input), coro_promise_ = coro_]() mutable - { -- coro->input_ = std::move(in); -+ coro_promise_->input_ = std::move(in); - std::move(h)(); - }); - } diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 1fca290e9fd183..844cfe79254a40 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-28-0 - SHA512 0d635c40a28b6427e2cb6b9c89ab53dba7d3a237df2279148ca05fa899d6f8039a131929230e5ca1dbc7477be784e3da9a6cb68456cbf194178510621556e467 + REF asio-1-28-1 + SHA512 4ba0944b203e18524016de2e21ffa0fa6325414af5f6cff6d02450c15e0d7111cec91f7f125ae78d3b3a6f76c6b2c7155738d1830b3250e98c68b5304328f345 HEAD_REF master - PATCHES fix_coro_compile_error_msvc.patch #upstream PR: https://github.com/chriskohlhoff/asio/pull/1313 ) # Always use "ASIO_STANDALONE" to avoid boost dependency diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 3886e667b79b29..727d1f2da5b8d4 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "asio", - "version": "1.28.0", - "port-version": 1, + "version": "1.28.1", "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", "documentation": "https://think-async.com/Asio/asio-1.28.0/doc/", diff --git a/ports/assimp/build_fixes.patch b/ports/assimp/build_fixes.patch index 93d007cd8730c5..6d4a878722f5b9 100644 --- a/ports/assimp/build_fixes.patch +++ b/ports/assimp/build_fixes.patch @@ -2,39 +2,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 458a328..b8c2fc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED) - add_definitions(-DASSIMP_USE_HUNTER) - ENDIF() - --PROJECT(Assimp VERSION 5.2.4) -+PROJECT(Assimp VERSION 5.2.5) - - # All supported options ############################################### - -@@ -273,18 +273,18 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW) - ELSEIF(MSVC) - # enable multi-core compilation with MSVC - IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl -- ADD_COMPILE_OPTIONS(/bigobj /W4 /WX ) -+ ADD_COMPILE_OPTIONS(/bigobj ) - ELSE() # msvc -- ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX) -+ ADD_COMPILE_OPTIONS(/MP /bigobj ) - ENDIF() - # disable "elements of array '' will be default initialized" warning on MSVC2013 - IF(MSVC12) - ADD_COMPILE_OPTIONS(/wd4351) +@@ -291,9 +291,9 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW) ENDIF() - ADD_COMPILE_OPTIONS(/wd4244) #supress warning for double to float conversion if Double precission is activated + # supress warning for double to float conversion if Double precission is activated + ADD_COMPILE_OPTIONS(/wd4244) - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") -- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") +- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") - SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") + # SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") -+ # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") ++ # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + # SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) IF(NOT ASSIMP_HUNTER_ENABLED) - SET(CMAKE_CXX_STANDARD 17) + SET(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -418,7 +418,7 @@ ENDIF() set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") @@ -103,7 +83,7 @@ index 6551dcb..0796448 100644 + find_dependency(minizip CONFIG) + #find_dependency(openddlparser CONFIG) + find_dependency(poly2tri CONFIG) -+ #find_dependency(polyclipping CONFIG) ++ find_dependency(polyclipping CONFIG) + find_dependency(RapidJSON CONFIG) + find_dependency(Stb MODULE) + find_dependency(utf8cpp CONFIG) @@ -130,28 +110,30 @@ diff --git a/code/AssetLib/Blender/BlenderTessellator.h b/code/AssetLib/Blender/ index 0d0ba32..c3703c4 100644 --- a/code/AssetLib/Blender/BlenderTessellator.h +++ b/code/AssetLib/Blender/BlenderTessellator.h -@@ -147,7 +147,7 @@ namespace Assimp - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include "../contrib/poly2tri/poly2tri/poly2tri.h" -+# include - #endif +@@ -143,7 +143,7 @@ namespace Assimp + + #if ASSIMP_BLEND_WITH_POLY_2_TRI + +-#include "contrib/poly2tri/poly2tri/poly2tri.h" ++#include namespace Assimp + { diff --git a/code/AssetLib/IFC/IFCGeometry.cpp b/code/AssetLib/IFC/IFCGeometry.cpp index ef59542..17e00cd 100644 --- a/code/AssetLib/IFC/IFCGeometry.cpp +++ b/code/AssetLib/IFC/IFCGeometry.cpp -@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # include - # include - #else --# include "../contrib/poly2tri/poly2tri/poly2tri.h" -+# include - # include "../contrib/clipper/clipper.hpp" - #endif - +@@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include "IFCUtil.h" + #include "Common/PolyTools.h" + #include "PostProcessing/ProcessHelper.h" +-#include "contrib/poly2tri/poly2tri/poly2tri.h" +-#include "contrib/clipper/clipper.hpp" ++#include ++#include + + #include + #include diff --git a/code/AssetLib/IFC/IFCLoader.cpp b/code/AssetLib/IFC/IFCLoader.cpp index 0c20686..e6b20a3 100644 --- a/code/AssetLib/IFC/IFCLoader.cpp @@ -169,15 +151,17 @@ diff --git a/code/AssetLib/IFC/IFCOpenings.cpp b/code/AssetLib/IFC/IFCOpenings.c index 3c4a0b3..3fab616 100644 --- a/code/AssetLib/IFC/IFCOpenings.cpp +++ b/code/AssetLib/IFC/IFCOpenings.cpp -@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # include - # include - #else --# include "../contrib/poly2tri/poly2tri/poly2tri.h" -+# include - # include "../contrib/clipper/clipper.hpp" - #endif - +@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include "IFCUtil.h" + #include "Common/PolyTools.h" + #include "PostProcessing/ProcessHelper.h" +-#include "contrib/poly2tri/poly2tri/poly2tri.h" +-#include "contrib/clipper/clipper.hpp" ++#include ++#include + + #include + #include diff --git a/code/AssetLib/MMD/MMDPmxParser.cpp b/code/AssetLib/MMD/MMDPmxParser.cpp index ca37ba1..2ce7bdd 100644 --- a/code/AssetLib/MMD/MMDPmxParser.cpp @@ -232,7 +216,7 @@ index 5339454..45e07c0 100644 find_package(pugixml CONFIG REQUIRED) ELSE() SET( Pugixml_SRCS -@@ -910,15 +910,15 @@ ELSE() +@@ -919,30 +919,30 @@ ELSE() ENDIF() # utf8 @@ -246,24 +230,38 @@ index 5339454..45e07c0 100644 ENDIF() # polyclipping --IF(ASSIMP_HUNTER_ENABLED) -+IF(0) - hunter_add_package(polyclipping) - find_package(polyclipping CONFIG REQUIRED) - ELSE() -@@ -930,8 +930,8 @@ ELSE() - ENDIF() +-#IF(ASSIMP_HUNTER_ENABLED) ++IF(1) + # hunter_add_package(polyclipping) +-# find_package(polyclipping CONFIG REQUIRED) +-#ELSE() ++ find_package(polyclipping CONFIG REQUIRED) ++ELSE() + SET( Clipper_SRCS + ../contrib/clipper/clipper.hpp + ../contrib/clipper/clipper.cpp + ) + SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS}) +-#ENDIF() ++ENDIF() # poly2tri --IF(ASSIMP_HUNTER_ENABLED) -- hunter_add_package(poly2tri) +-#IF(ASSIMP_HUNTER_ENABLED) +IF(1) -+ #hunter_add_package(poly2tri) - find_package(poly2tri CONFIG REQUIRED) - ELSE() + # hunter_add_package(poly2tri) +-# find_package(poly2tri CONFIG REQUIRED) +-#ELSE() ++ find_package(poly2tri CONFIG REQUIRED) ++ELSE() SET( Poly2Tri_SRCS -@@ -951,8 +951,8 @@ ELSE() - ENDIF() + ../contrib/poly2tri/poly2tri/common/shapes.cc + ../contrib/poly2tri/poly2tri/common/shapes.h +@@ -957,11 +957,11 @@ ELSE() + ../contrib/poly2tri/poly2tri/sweep/sweep_context.h + ) + SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) +-#ENDIF() ++ENDIF() # minizip/unzip -IF(ASSIMP_HUNTER_ENABLED) @@ -377,13 +375,14 @@ index 5339454..45e07c0 100644 +IF(1) TARGET_LINK_LIBRARIES(assimp - PUBLIC -- polyclipping::polyclipping +- #polyclipping::polyclipping - openddlparser::openddl_parser + PRIVATE -+ #polyclipping::polyclipping ++ polyclipping::polyclipping + #openddlparser::openddl_parser + ${OPENDDL_PARSER_LIBRARIES} - poly2tri::poly2tri +- #poly2tri::poly2tri ++ poly2tri::poly2tri minizip::minizip - ZLIB::zlib - RapidJSON::rapidjson @@ -463,8 +462,8 @@ index 5339454..45e07c0 100644 # Add RT-extension library for glTF importer with Open3DGC-compression. IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) -- TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY}) -+ TARGET_LINK_LIBRARIES(assimp PRIVATE ${RT_LIBRARY}) +- TARGET_LINK_LIBRARIES(assimp rt) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE rt) ENDIF () @@ -472,8 +471,17 @@ diff --git a/code/Common/StbCommon.h b/code/Common/StbCommon.h index 1265d25..18f4564 100644 --- a/code/Common/StbCommon.h +++ b/code/Common/StbCommon.h -@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #pragma GCC diagnostic ignored "-Wunused-function" +@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #pragma clang diagnostic ignored "-Wunused-function" + #endif + +-#ifndef STB_USE_HUNTER ++#if 0 + /* Use prefixed names for the symbols from stb_image as it is a very commonly embedded library. + Including vanilla stb_image symbols causes duplicate symbol problems if assimp is linked + statically together with another library or executable that also embeds stb_image. +@@ -111,7 +111,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #define stbi_zlib_decode_noheader_malloc assimp_stbi_zlib_decode_noheader_malloc #endif -#include "stb/stb_image.h" diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index babb0153ece867..6b0867ecd48788 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO assimp/assimp - REF v5.2.5 - SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb + REF v${VERSION} + SHA512 49963f84ed0a8145f3af249890a533f0b12f5553ae09581289cb1f20cb49cb1a3ed3f3c4c966ceb43aa897b90deca268aa6554066b2bd34f2ac9c15041420ddb HEAD_REF master PATCHES build_fixes.patch @@ -10,7 +10,7 @@ vcpkg_from_github( file(REMOVE "${SOURCE_PATH}/cmake-modules/FindZLIB.cmake") -#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/clipper") # https://github.com/assimp/assimp/issues/788 +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/clipper") file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/draco") file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/gtest") #file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/Open3DGC") #TODO @@ -56,19 +56,34 @@ if(VCPKG_TARGET_IS_WINDOWS) endforeach() endif() -find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH) +find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH) find_library(ASSIMP_DBG NAMES assimp assimpd ${DBG_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH) if(ASSIMP_REL) get_filename_component(ASSIMP_NAME_REL "${ASSIMP_REL}" NAME_WLE) + string(REGEX REPLACE "^lib(.*)" "\\1" ASSIMP_NAME_REL "${ASSIMP_NAME_REL}") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_REL}") endif() if(ASSIMP_DBG) get_filename_component(ASSIMP_NAME_DBG "${ASSIMP_DBG}" NAME_WLE) + string(REGEX REPLACE "^lib(.*)" "\\1" ASSIMP_NAME_DBG "${ASSIMP_NAME_DBG}") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_DBG}") endif() -vcpkg_fixup_pkgconfig() # Probably requires more fixing for static builds. See qt5-3d and the config changes below + +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(assimp_PC_REQUIRES "draco polyclipping pugixml minizip") + set(assimp_LIBS_REQUIRES "-lpoly2tri") + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "Libs:" "Requires.private: ${assimp_PC_REQUIRES}\nLibs:") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "Libs.private:" "Libs.private: ${assimp_LIBS_REQUIRES}") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "Libs:" "Requires.private: ${assimp_PC_REQUIRES}\nLibs:") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "Libs.private:" "Libs.private: ${assimp_LIBS_REQUIRES}") + endif() +endif() + +vcpkg_fixup_pkgconfig() 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/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/assimp/vcpkg.json b/ports/assimp/vcpkg.json index 95a8179be3db88..72899aa58a2b48 100644 --- a/ports/assimp/vcpkg.json +++ b/ports/assimp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "assimp", - "version": "5.2.5", + "version": "5.3.1", "description": "The Open Asset import library", "homepage": "https://github.com/assimp/assimp", "license": "BSD-3-Clause", @@ -9,6 +9,7 @@ "kubazip", "minizip", "poly2tri", + "polyclipping", "pugixml", "rapidjson", "stb", diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake index 24d97438639d0e..774741ce498ec4 100644 --- a/ports/async-mqtt/portfile.cmake +++ b/ports/async-mqtt/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/async_mqtt REF "${VERSION}" - SHA512 1040b0cc23c385db713ccc6fe54a0caf0597d497bb2d1ec817d2b86fc77f14f6a82e287ef305e416bd454ab2be2ed01d8d7ceb859461f52c1b13fbb55e45bd34 + SHA512 0bcb0bc3a08329a11ebe3efee4f919efc7bb8192373efd924f29f63c3bc7ca3ddd2c6e669f5800baf2fb3c5d67ae423e89cc802275d088848da83b2f343f7318 HEAD_REF main ) diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json index 385e103c95dd4f..469131298febea 100644 --- a/ports/async-mqtt/vcpkg.json +++ b/ports/async-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "async-mqtt", - "version": "1.0.9", + "version": "2.0.0", "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.", "homepage": "https://github.com/redboltz/async_mqtt", "license": "BSL-1.0", diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index 92c2e192823953..176c0624649e1c 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -10,9 +10,6 @@ vcpkg_from_gitlab( ) if("introspection" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature introspection currently only supports dynamic build.") - endif() list(APPEND OPTIONS_DEBUG -Dintrospection=false) list(APPEND OPTIONS_RELEASE -Dintrospection=true) else() diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index 65077842504056..ec81afa24302b3 100644 --- a/ports/atk/vcpkg.json +++ b/ports/atk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "atk", "version": "2.38.0", - "port-version": 7, + "port-version": 8, "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", "license": "LGPL-2.0-or-later", @@ -30,14 +30,7 @@ "introspection": { "description": "build with introspection", "dependencies": [ - { - "name": "gobject-introspection", - "host": true - }, - { - "name": "gobject-introspection", - "platform": "windows & x86" - } + "gobject-introspection" ] } } diff --git a/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch b/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch new file mode 100644 index 00000000000000..e6af7c477482f7 --- /dev/null +++ b/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch @@ -0,0 +1,46 @@ +From 4a7935e1f8d1756cbeafb2564066551f9bd766f0 Mon Sep 17 00:00:00 2001 +From: jjll +Date: Wed, 6 Sep 2023 14:25:30 +0200 +Subject: [PATCH] compatibility boost >= 1.83 + +--- + src/lib/parallel_progress.h | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/lib/parallel_progress.h b/src/lib/parallel_progress.h +index 958b170..ee938d9 100755 +--- a/src/lib/parallel_progress.h ++++ b/src/lib/parallel_progress.h +@@ -23,7 +23,14 @@ + #ifndef VINA_PARALLEL_PROGRESS_H + #define VINA_PARALLEL_PROGRESS_H + ++#include ++#if BOOST_VERSION < 107200 + #include ++typedef boost::progress_display boost_progress; ++#else ++#include ++typedef boost::timer::progress_display boost_progress; ++#endif + #include + + #include +@@ -34,7 +41,7 @@ struct parallel_progress : public incrementable { + parallel_progress(std::function* c = NULL) : p(NULL), callback(c) {} + void init(unsigned long n) { + count = n; +- p = new boost::progress_display(count); ++ p = new boost_progress(count); + } + void operator++() { + if(p) { +@@ -47,7 +54,7 @@ struct parallel_progress : public incrementable { + virtual ~parallel_progress() { delete p; } + private: + boost::mutex self; +- boost::progress_display* p; ++ boost_progress* p; + std::function* callback; + unsigned long count; + }; diff --git a/ports/autodock-vina/portfile.cmake b/ports/autodock-vina/portfile.cmake index 9011459abc4063..31b694d16263c2 100644 --- a/ports/autodock-vina/portfile.cmake +++ b/ports/autodock-vina/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF v${VERSION} SHA512 d36908e5833d22bcbc4dae353ef32b905d6eb46511302f7583a291398bfadff5e75fc99ce7b380860578b2257e5c32434cc75b1ca51fafb4b5f12d9477a878e9 HEAD_REF develop + PATCHES fix-compatibility-with-boost-1.83.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/autodock-vina/vcpkg.json b/ports/autodock-vina/vcpkg.json index d49f2b1d0c22be..34248c6357558a 100644 --- a/ports/autodock-vina/vcpkg.json +++ b/ports/autodock-vina/vcpkg.json @@ -1,6 +1,7 @@ { "name": "autodock-vina", "version-semver": "1.2.5", + "port-version": 1, "description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.", "homepage": "http://vina.scripps.edu/", "dependencies": [ diff --git a/ports/avro-cpp/portfile.cmake b/ports/avro-cpp/portfile.cmake index d6c5e7f36c5bfa..89d92f64b0dec8 100644 --- a/ports/avro-cpp/portfile.cmake +++ b/ports/avro-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/avro - REF e44b680621328c4e6524bd2983af1ce11afeebed - SHA512 932f642f272997b5c0be467d3a3ccc354c6edf425c36b33aa7e61984f67312c712bb1d74cb1a5fd8066169104851e73830f0ed3fdb450e005a5c5bef33c34f20 + REF "release-${VERSION}" + SHA512 728609f562460e1115366663ede2c5d4acbdd6950c1ee3e434ffc65d28b72e3a43c3ebce93d0a8459f0c4f6c492ebb9444e2127a0385f38eb7cdf74b28f0c3ed HEAD_REF master PATCHES fix-cmake.patch diff --git a/ports/avro-cpp/vcpkg.json b/ports/avro-cpp/vcpkg.json index a1817d9f8b3f2d..dc4c4b20ac740b 100644 --- a/ports/avro-cpp/vcpkg.json +++ b/ports/avro-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "avro-cpp", - "version-date": "2022-11-07", - "port-version": 1, + "version": "1.11.3", "description": "Apache Avro is a data serialization system", "homepage": "https://github.com/apache/avro", "license": "Apache-2.0", diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake index c3d6a9e992688f..1b84cfd9c64671 100644 --- a/ports/aws-c-auth/portfile.cmake +++ b/ports/aws-c-auth/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-auth REF "v${VERSION}" - SHA512 db8509ca8e17be45722dae7c4c9b49d942b758e56e662f2bcfc3ff007ad4441ee25c5a69864161fd723453026f381323b38639d325379e358843acbb450793b9 + SHA512 1afcdcd9899b9630af52173f172b2e3a0b10fe0979e80da59dbf0ff3dad07de5be9076a3cc3db76544fa2b479fe7c8aaeb319dd9b81c0a2637bd89433cb11b9d HEAD_REF master ) diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json index 0be4fc5fdc220f..ae6363828d006d 100644 --- a/ports/aws-c-auth/vcpkg.json +++ b/ports/aws-c-auth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-auth", - "version": "0.7.0", + "version": "0.7.4", "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", "homepage": "https://github.com/awslabs/aws-c-auth", "license": "Apache-2.0", diff --git a/ports/aws-c-cal/portfile.cmake b/ports/aws-c-cal/portfile.cmake index c3dc0b5f9a0d10..4782cce5420e48 100644 --- a/ports/aws-c-cal/portfile.cmake +++ b/ports/aws-c-cal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-cal REF "v${VERSION}" - SHA512 da1768cc6d55ae906b390f4a47c68f5f20d2173a4f27ce5e2eb9c5924db1c62ca488a86c0ad5d44821ffc949c4cf1e72ed664c2543bbe5a1c9bb1cd13367194b + SHA512 b1116977b467c2c7f10f84912a3bc2a8329e3ec22c58f19f7b8a244a2b08fb3420bed62791b7ad6f06b8aeff6c361a33ddc0ac28cf781dfa1aafc83a62aa24ec HEAD_REF master PATCHES remove-libcrypto-messages.patch ) diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json index 4b776710a9cdfc..49f97f29c2b79c 100644 --- a/ports/aws-c-cal/vcpkg.json +++ b/ports/aws-c-cal/vcpkg.json @@ -1,12 +1,17 @@ { "name": "aws-c-cal", - "version": "0.6.0", + "version": "0.6.2", + "port-version": 1, "description": "C99 wrapper for cryptography primitives.", "homepage": "https://github.com/awslabs/aws-c-cal", "license": "Apache-2.0", "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", + { + "name": "openssl", + "platform": "!windows & !osx" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/aws-c-common/disable-internal-crt-option.patch b/ports/aws-c-common/disable-internal-crt-option.patch index 6fec4b214d190d..28cb478763f571 100644 --- a/ports/aws-c-common/disable-internal-crt-option.patch +++ b/ports/aws-c-common/disable-internal-crt-option.patch @@ -1,20 +1,20 @@ diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake -index 249b7d5..41a31e2 100644 +index 470f6db..537536b 100644 --- a/cmake/AwsCFlags.cmake +++ b/cmake/AwsCFlags.cmake -@@ -38,15 +38,6 @@ function(aws_set_common_properties target) +@@ -82,15 +82,6 @@ function(aws_set_common_properties target) list(APPEND AWS_C_FLAGS /DAWS_SUPPORT_WIN7=1) endif() - -- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE) -- if(STATIC_CRT) -- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}") + +- # Set MSVC runtime libary. +- # Note: there are other ways of doing this if we bump our CMake minimum to 3.14+ +- # See: https://cmake.org/cmake/help/latest/policy/CMP0091.html +- if (AWS_STATIC_MSVC_RUNTIME_LIBRARY OR STATIC_CRT) +- list(APPEND AWS_C_FLAGS "/MT$<$:d>") - else() -- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}") +- list(APPEND AWS_C_FLAGS "/MD$<$:d>") - endif() -- string(REPLACE " " ";" _FLAGS "${_FLAGS}") -- list(APPEND AWS_C_FLAGS "${_FLAGS}") - else() list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes) - + diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index 749daa638e1bf6..e9e0adf7cf7a7b 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-common REF "v${VERSION}" - SHA512 4847b676d5fc72b22e0c8f1b432a40ba966b8e39c754a02ba856938b10aec68682c0da811b53c0f14fd897c9ce8928f7e7edd4e41c9f74176a7d08ee5cbc56f9 + SHA512 203e6d313c0a435d0e042f79a4c87f91765206fd997b12c7d18cafe9551945fc1d976bd3a5c6fc9c60f4bbca52ebb15771a6ac2783666581b79d5d7153822485 HEAD_REF master PATCHES disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json index dbecfad8795a24..d8a56856681572 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-common", - "version": "0.8.23", + "version": "0.9.4", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", "license": "Apache-2.0", diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake index 7bd2cb1989083a..e725a88532b085 100644 --- a/ports/aws-c-event-stream/portfile.cmake +++ b/ports/aws-c-event-stream/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-event-stream REF "v${VERSION}" - SHA512 e2f3a411f11a876736b0426a1f10caff6d508db3349d5b54aa862f67f5c5ca1f4821727179ca09c595c8612bae70a9874c0537e7ca00be77a7331b594a2964d3 + SHA512 295ee4b1f647f5b15790e000cd5f0102e64ef03912c1c7378739f52229b82090384c66367c4caf8fa7f34f3275b3da71bc031cf6000053ad31d53ce075721da2 HEAD_REF master ) diff --git a/ports/aws-c-event-stream/vcpkg.json b/ports/aws-c-event-stream/vcpkg.json index d729627be0bfe9..1c3135a5ed57ec 100644 --- a/ports/aws-c-event-stream/vcpkg.json +++ b/ports/aws-c-event-stream/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-event-stream", - "version": "0.3.1", + "version": "0.3.2", "description": "C99 implementation of the vnd.amazon.event-stream content-type.", "homepage": "https://github.com/awslabs/aws-c-event-stream", "license": "Apache-2.0", diff --git a/ports/aws-c-http/portfile.cmake b/ports/aws-c-http/portfile.cmake index 2caf549142bf31..1370e36e72e651 100644 --- a/ports/aws-c-http/portfile.cmake +++ b/ports/aws-c-http/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-http REF "v${VERSION}" - SHA512 b8049b12020e026b173c7062df902eee099a2f9d687d2a9dba44e8be54c0fbe5b318a8250e8c8100b2174b822bbc449d486678a89b9f174d73d2c3dbe65a09f0 + SHA512 48132df910d67d58e6a28481fcb19401272fa929f8e0b14e0c6b1f5c425221099d32671bbdd05d973f54b1463e8e20ae2fe6ffe56fcc1b02b684c9a0ba43e204 HEAD_REF master ) diff --git a/ports/aws-c-http/vcpkg.json b/ports/aws-c-http/vcpkg.json index 9ef6c9056711b3..b12be55b31afec 100644 --- a/ports/aws-c-http/vcpkg.json +++ b/ports/aws-c-http/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-http", - "version": "0.7.10", + "version": "0.7.13", "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications", "homepage": "https://github.com/awslabs/aws-c-http", "license": "Apache-2.0", diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake index 26c271221ab216..96bbd92917232e 100644 --- a/ports/aws-c-io/portfile.cmake +++ b/ports/aws-c-io/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-io REF "v${VERSION}" - SHA512 2b171d2a76d15321d0a04f95b567cf6f0acbc728f0fb1eb5f93403a0510aecf5c48ffdebbcfacadbb5f430d6b5974f1934d86e4037f429bdb87e8d8d92acbcd4 + SHA512 54f6ef23ab7fb65c9d1425d21d59daf1b13a50595f7f06c7d4f74bfb5941a7ddf0185ae3249b940473422c1880bb034c0610876c6e13ae499ccd2dcc888c1b23 HEAD_REF master ) diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json index f1c293f4f51746..f7720445def08d 100644 --- a/ports/aws-c-io/vcpkg.json +++ b/ports/aws-c-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-io", - "version": "0.13.27", + "version": "0.13.32", "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", "license": "Apache-2.0", diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake index a59503d6e93dfc..fcd05e047b6c38 100644 --- a/ports/aws-c-mqtt/portfile.cmake +++ b/ports/aws-c-mqtt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-mqtt REF "v${VERSION}" - SHA512 f3418ab1ceff42024cef6ff435d006e8bb29b60a0298103e3299ac3d7911aedbce44ea67cadfa11582369a484206010eb1865bd9b1a600d3676b4605c6962e35 + SHA512 25f2097978174f15186a22bab37af36ef41aef9dba7a2d035495ea5cd60159d09ca6b22eb123eb9d911f2555d5688ffe1194e4015d080651d0a44323e15aee2a HEAD_REF master ) diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json index 6c35f932f68d82..039a75d4c73bae 100644 --- a/ports/aws-c-mqtt/vcpkg.json +++ b/ports/aws-c-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-mqtt", - "version": "0.8.14", + "version": "0.9.6", "description": "C99 implementation of the MQTT 3.1.1 specification.", "homepage": "https://github.com/awslabs/aws-c-mqtt", "license": "Apache-2.0", diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake index ac462e3df86515..6c60e22af29dfb 100644 --- a/ports/aws-c-s3/portfile.cmake +++ b/ports/aws-c-s3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-s3 REF "v${VERSION}" - SHA512 a4c80bd31406ed70ceb1817703cddc3a1bfa9ea865bd636addaa05be9a5a6d9670d0d4911e7b301746f5228444261b11b23cae1a6f43f85bc2003bbbed8515bb + SHA512 f96cab50c0f96d6cb3cb8e142cc95c91e9efd0b02d115e91ec5d2fc7c4be350d58342f5846065216a49c080aaf3954fa9732ff423bad20b250afe4227ee3aaef HEAD_REF master ) diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json index 7b0a89283fefb8..0616b5d83a55ad 100644 --- a/ports/aws-c-s3/vcpkg.json +++ b/ports/aws-c-s3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-s3", - "version": "0.3.12", + "version": "0.3.17", "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.", "homepage": "https://github.com/awslabs/aws-c-s3", "license": "Apache-2.0", diff --git a/ports/aws-c-sdkutils/portfile.cmake b/ports/aws-c-sdkutils/portfile.cmake index d3a94d5a5c74a5..c36cdd2d096d35 100644 --- a/ports/aws-c-sdkutils/portfile.cmake +++ b/ports/aws-c-sdkutils/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-sdkutils REF "v${VERSION}" - SHA512 c9d46ec2afeb12a6546d19456981a4652782a3e3d80c0d604b3763c82fa47f414183bf8623fe378f0ea71137d952a4ff3327f63831cbb51c70a2cd0be9ca205c + SHA512 34d5bc5190fc6890533247d304b791625f59b0f60aca972b03e00f684b37dd3b806b7c371f1f8b048a30cb9960326d1534c53874621c9630215e597ba8700685 HEAD_REF master ) diff --git a/ports/aws-c-sdkutils/vcpkg.json b/ports/aws-c-sdkutils/vcpkg.json index 0c3655d1009e4c..bb91dda4e0dba4 100644 --- a/ports/aws-c-sdkutils/vcpkg.json +++ b/ports/aws-c-sdkutils/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-sdkutils", - "version": "0.1.11", + "version": "0.1.12", "description": "C99 library implementing AWS SDK specific utilities. Includes utilities for ARN parsing, reading AWS profiles, etc...", "homepage": "https://github.com/awslabs/aws-c-sdkutils", "license": "Apache-2.0", diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake index 34b94137dc60b6..07234e6ca53ba2 100644 --- a/ports/aws-checksums/portfile.cmake +++ b/ports/aws-checksums/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-checksums REF "v${VERSION}" - SHA512 68e4acf8d57fb124951b854001641bd977aeac849ff96c0b5c35e69b9340c00ffdded4c22ffc2d32dacbddcecae1177afef7e1df36fa7d485b0f01eed55b16ae + SHA512 b75f5442db9a61f8856756c4a784339fd446effca0cdb02c67e51ce9f14ea76f5ca94d29a69f2a452c63c868598489343ec1d097432a8a0159868731422cfbf4 HEAD_REF master ) diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json index 27fec206f5d3c2..c915c21576cc5d 100644 --- a/ports/aws-checksums/vcpkg.json +++ b/ports/aws-checksums/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-checksums", - "version": "0.1.16", + "version": "0.1.17", "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", "homepage": "https://github.com/awslabs/aws-checksums", "license": "Apache-2.0", diff --git a/ports/aws-crt-cpp/no-werror.patch b/ports/aws-crt-cpp/no-werror.patch index 2b2e84058cbbb4..27b7c8f8ab6ee9 100644 --- a/ports/aws-crt-cpp/no-werror.patch +++ b/ports/aws-crt-cpp/no-werror.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt (revision f2adef31d778cfe90b8a5bb377425f825ebf92f0) +++ b/CMakeLists.txt (date 1675009099302) @@ -337,9 +337,9 @@ - # set extra warning flags + # set extra warning flags if(AWS_WARNINGS_ARE_ERRORS) if(MSVC) - target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /wd4068) diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake index bdc3aa0be95468..1d0b4306e9369e 100644 --- a/ports/aws-crt-cpp/portfile.cmake +++ b/ports/aws-crt-cpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-crt-cpp REF "v${VERSION}" - SHA512 52271d94ae4321fcb7f51c8b953bb816f34eac31412933fcfe7f4a5d6359b977435c8debf59cd18cc3e1406c50472d12f460cf477ff59915d9b68372d54df2bc + SHA512 88631845bf78e526b3160d0ba6ff67922b09f8e25864bfeeb4cf16f2d217bf00c9686e53e70382129d8209612453190024a16aa3cff153198960c8895f2e1772 PATCHES no-werror.patch ) diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json index f2814e38f4049a..6a5f6e4128c31b 100644 --- a/ports/aws-crt-cpp/vcpkg.json +++ b/ports/aws-crt-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-crt-cpp", - "version": "0.20.3", + "version": "0.23.1", "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.", "homepage": "https://github.com/awslabs/aws-crt-cpp", "license": "Apache-2.0", diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake index 645075a34e9e85..27b93c24bc7575 100644 --- a/ports/aws-sdk-cpp/compute_build_only.cmake +++ b/ports/aws-sdk-cpp/compute_build_only.cmake @@ -5,6 +5,9 @@ endif() if("accessanalyzer" IN_LIST FEATURES) list(APPEND BUILD_ONLY accessanalyzer) endif() +if("account" IN_LIST FEATURES) + list(APPEND BUILD_ONLY account) +endif() if("acm" IN_LIST FEATURES) list(APPEND BUILD_ONLY acm) endif() @@ -23,6 +26,9 @@ endif() if("amplifybackend" IN_LIST FEATURES) list(APPEND BUILD_ONLY amplifybackend) endif() +if("amplifyuibuilder" IN_LIST FEATURES) + list(APPEND BUILD_ONLY amplifyuibuilder) +endif() if("apigateway" IN_LIST FEATURES) list(APPEND BUILD_ONLY apigateway) endif() @@ -35,6 +41,12 @@ endif() if("appconfig" IN_LIST FEATURES) list(APPEND BUILD_ONLY appconfig) endif() +if("appconfigdata" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appconfigdata) +endif() +if("appfabric" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appfabric) +endif() if("appflow" IN_LIST FEATURES) list(APPEND BUILD_ONLY appflow) endif() @@ -62,6 +74,9 @@ endif() if("appsync" IN_LIST FEATURES) list(APPEND BUILD_ONLY appsync) endif() +if("arc-zonal-shift" IN_LIST FEATURES) + list(APPEND BUILD_ONLY arc-zonal-shift) +endif() if("athena" IN_LIST FEATURES) list(APPEND BUILD_ONLY athena) endif() @@ -83,9 +98,18 @@ endif() if("backup" IN_LIST FEATURES) list(APPEND BUILD_ONLY backup) endif() +if("backup-gateway" IN_LIST FEATURES) + list(APPEND BUILD_ONLY backup-gateway) +endif() +if("backupstorage" IN_LIST FEATURES) + list(APPEND BUILD_ONLY backupstorage) +endif() if("batch" IN_LIST FEATURES) list(APPEND BUILD_ONLY batch) endif() +if("billingconductor" IN_LIST FEATURES) + list(APPEND BUILD_ONLY billingconductor) +endif() if("braket" IN_LIST FEATURES) list(APPEND BUILD_ONLY braket) endif() @@ -98,9 +122,30 @@ endif() if("chime" IN_LIST FEATURES) list(APPEND BUILD_ONLY chime) endif() +if("chime-sdk-identity" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime-sdk-identity) +endif() +if("chime-sdk-media-pipelines" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime-sdk-media-pipelines) +endif() +if("chime-sdk-meetings" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime-sdk-meetings) +endif() +if("chime-sdk-messaging" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime-sdk-messaging) +endif() +if("chime-sdk-voice" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime-sdk-voice) +endif() +if("cleanrooms" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cleanrooms) +endif() if("cloud9" IN_LIST FEATURES) list(APPEND BUILD_ONLY cloud9) endif() +if("cloudcontrol" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudcontrol) +endif() if("clouddirectory" IN_LIST FEATURES) list(APPEND BUILD_ONLY clouddirectory) endif() @@ -125,12 +170,18 @@ endif() if("cloudtrail" IN_LIST FEATURES) list(APPEND BUILD_ONLY cloudtrail) endif() +if("cloudtrail-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudtrail-data) +endif() if("codeartifact" IN_LIST FEATURES) list(APPEND BUILD_ONLY codeartifact) endif() if("codebuild" IN_LIST FEATURES) list(APPEND BUILD_ONLY codebuild) endif() +if("codecatalyst" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codecatalyst) +endif() if("codecommit" IN_LIST FEATURES) list(APPEND BUILD_ONLY codecommit) endif() @@ -140,6 +191,9 @@ endif() if("codeguru-reviewer" IN_LIST FEATURES) list(APPEND BUILD_ONLY codeguru-reviewer) endif() +if("codeguru-security" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codeguru-security) +endif() if("codeguruprofiler" IN_LIST FEATURES) list(APPEND BUILD_ONLY codeguruprofiler) endif() @@ -182,9 +236,18 @@ endif() if("connect-contact-lens" IN_LIST FEATURES) list(APPEND BUILD_ONLY connect-contact-lens) endif() +if("connectcampaigns" IN_LIST FEATURES) + list(APPEND BUILD_ONLY connectcampaigns) +endif() +if("connectcases" IN_LIST FEATURES) + list(APPEND BUILD_ONLY connectcases) +endif() if("connectparticipant" IN_LIST FEATURES) list(APPEND BUILD_ONLY connectparticipant) endif() +if("controltower" IN_LIST FEATURES) + list(APPEND BUILD_ONLY controltower) +endif() if("cur" IN_LIST FEATURES) list(APPEND BUILD_ONLY cur) endif() @@ -230,6 +293,12 @@ endif() if("docdb" IN_LIST FEATURES) list(APPEND BUILD_ONLY docdb) endif() +if("docdb-elastic" IN_LIST FEATURES) + list(APPEND BUILD_ONLY docdb-elastic) +endif() +if("drs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY drs) +endif() if("ds" IN_LIST FEATURES) list(APPEND BUILD_ONLY ds) endif() @@ -290,6 +359,12 @@ endif() if("emr-containers" IN_LIST FEATURES) list(APPEND BUILD_ONLY emr-containers) endif() +if("emr-serverless" IN_LIST FEATURES) + list(APPEND BUILD_ONLY emr-serverless) +endif() +if("entityresolution" IN_LIST FEATURES) + list(APPEND BUILD_ONLY entityresolution) +endif() if("es" IN_LIST FEATURES) list(APPEND BUILD_ONLY es) endif() @@ -299,6 +374,9 @@ endif() if("events" IN_LIST FEATURES) list(APPEND BUILD_ONLY events) endif() +if("evidently" IN_LIST FEATURES) + list(APPEND BUILD_ONLY evidently) +endif() if("finspace" IN_LIST FEATURES) list(APPEND BUILD_ONLY finspace) endif() @@ -329,6 +407,9 @@ endif() if("gamelift" IN_LIST FEATURES) list(APPEND BUILD_ONLY gamelift) endif() +if("gamesparks" IN_LIST FEATURES) + list(APPEND BUILD_ONLY gamesparks) +endif() if("glacier" IN_LIST FEATURES) list(APPEND BUILD_ONLY glacier) endif() @@ -338,6 +419,9 @@ endif() if("glue" IN_LIST FEATURES) list(APPEND BUILD_ONLY glue) endif() +if("grafana" IN_LIST FEATURES) + list(APPEND BUILD_ONLY grafana) +endif() if("greengrass" IN_LIST FEATURES) list(APPEND BUILD_ONLY greengrass) endif() @@ -377,6 +461,12 @@ endif() if("inspector" IN_LIST FEATURES) list(APPEND BUILD_ONLY inspector) endif() +if("inspector2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY inspector2) +endif() +if("internetmonitor" IN_LIST FEATURES) + list(APPEND BUILD_ONLY internetmonitor) +endif() if("iot" IN_LIST FEATURES) list(APPEND BUILD_ONLY iot) endif() @@ -386,6 +476,9 @@ endif() if("iot-jobs-data" IN_LIST FEATURES) list(APPEND BUILD_ONLY iot-jobs-data) endif() +if("iot-roborunner" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot-roborunner) +endif() if("iot1click-devices" IN_LIST FEATURES) list(APPEND BUILD_ONLY iot1click-devices) endif() @@ -407,6 +500,9 @@ endif() if("iotfleethub" IN_LIST FEATURES) list(APPEND BUILD_ONLY iotfleethub) endif() +if("iotfleetwise" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotfleetwise) +endif() if("iotsecuretunneling" IN_LIST FEATURES) list(APPEND BUILD_ONLY iotsecuretunneling) endif() @@ -416,18 +512,36 @@ endif() if("iotthingsgraph" IN_LIST FEATURES) list(APPEND BUILD_ONLY iotthingsgraph) endif() +if("iottwinmaker" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iottwinmaker) +endif() if("iotwireless" IN_LIST FEATURES) list(APPEND BUILD_ONLY iotwireless) endif() if("ivs" IN_LIST FEATURES) list(APPEND BUILD_ONLY ivs) endif() +if("ivs-realtime" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ivs-realtime) +endif() +if("ivschat" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ivschat) +endif() if("kafka" IN_LIST FEATURES) list(APPEND BUILD_ONLY kafka) endif() +if("kafkaconnect" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kafkaconnect) +endif() if("kendra" IN_LIST FEATURES) list(APPEND BUILD_ONLY kendra) endif() +if("kendra-ranking" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kendra-ranking) +endif() +if("keyspaces" IN_LIST FEATURES) + list(APPEND BUILD_ONLY keyspaces) +endif() if("kinesis" IN_LIST FEATURES) list(APPEND BUILD_ONLY kinesis) endif() @@ -440,6 +554,9 @@ endif() if("kinesis-video-signaling" IN_LIST FEATURES) list(APPEND BUILD_ONLY kinesis-video-signaling) endif() +if("kinesis-video-webrtc-storage" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesis-video-webrtc-storage) +endif() if("kinesisanalytics" IN_LIST FEATURES) list(APPEND BUILD_ONLY kinesisanalytics) endif() @@ -473,6 +590,12 @@ endif() if("license-manager" IN_LIST FEATURES) list(APPEND BUILD_ONLY license-manager) endif() +if("license-manager-linux-subscriptions" IN_LIST FEATURES) + list(APPEND BUILD_ONLY license-manager-linux-subscriptions) +endif() +if("license-manager-user-subscriptions" IN_LIST FEATURES) + list(APPEND BUILD_ONLY license-manager-user-subscriptions) +endif() if("lightsail" IN_LIST FEATURES) list(APPEND BUILD_ONLY lightsail) endif() @@ -491,6 +614,9 @@ endif() if("lookoutvision" IN_LIST FEATURES) list(APPEND BUILD_ONLY lookoutvision) endif() +if("m2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY m2) +endif() if("machinelearning" IN_LIST FEATURES) list(APPEND BUILD_ONLY machinelearning) endif() @@ -503,6 +629,9 @@ endif() if("managedblockchain" IN_LIST FEATURES) list(APPEND BUILD_ONLY managedblockchain) endif() +if("managedblockchain-query" IN_LIST FEATURES) + list(APPEND BUILD_ONLY managedblockchain-query) +endif() if("marketplace-catalog" IN_LIST FEATURES) list(APPEND BUILD_ONLY marketplace-catalog) endif() @@ -527,6 +656,9 @@ endif() if("mediapackage-vod" IN_LIST FEATURES) list(APPEND BUILD_ONLY mediapackage-vod) endif() +if("mediapackagev2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediapackagev2) +endif() if("mediastore" IN_LIST FEATURES) list(APPEND BUILD_ONLY mediastore) endif() @@ -536,15 +668,30 @@ endif() if("mediatailor" IN_LIST FEATURES) list(APPEND BUILD_ONLY mediatailor) endif() +if("medical-imaging" IN_LIST FEATURES) + list(APPEND BUILD_ONLY medical-imaging) +endif() +if("memorydb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY memorydb) +endif() if("meteringmarketplace" IN_LIST FEATURES) list(APPEND BUILD_ONLY meteringmarketplace) endif() if("mgn" IN_LIST FEATURES) list(APPEND BUILD_ONLY mgn) endif() +if("migration-hub-refactor-spaces" IN_LIST FEATURES) + list(APPEND BUILD_ONLY migration-hub-refactor-spaces) +endif() if("migrationhub-config" IN_LIST FEATURES) list(APPEND BUILD_ONLY migrationhub-config) endif() +if("migrationhuborchestrator" IN_LIST FEATURES) + list(APPEND BUILD_ONLY migrationhuborchestrator) +endif() +if("migrationhubstrategy" IN_LIST FEATURES) + list(APPEND BUILD_ONLY migrationhubstrategy) +endif() if("mobile" IN_LIST FEATURES) list(APPEND BUILD_ONLY mobile) endif() @@ -563,6 +710,9 @@ endif() if("neptune" IN_LIST FEATURES) list(APPEND BUILD_ONLY neptune) endif() +if("neptunedata" IN_LIST FEATURES) + list(APPEND BUILD_ONLY neptunedata) +endif() if("network-firewall" IN_LIST FEATURES) list(APPEND BUILD_ONLY network-firewall) endif() @@ -572,6 +722,18 @@ endif() if("nimble" IN_LIST FEATURES) list(APPEND BUILD_ONLY nimble) endif() +if("oam" IN_LIST FEATURES) + list(APPEND BUILD_ONLY oam) +endif() +if("omics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY omics) +endif() +if("opensearch" IN_LIST FEATURES) + list(APPEND BUILD_ONLY opensearch) +endif() +if("opensearchserverless" IN_LIST FEATURES) + list(APPEND BUILD_ONLY opensearchserverless) +endif() if("opsworks" IN_LIST FEATURES) list(APPEND BUILD_ONLY opsworks) endif() @@ -581,9 +743,24 @@ endif() if("organizations" IN_LIST FEATURES) list(APPEND BUILD_ONLY organizations) endif() +if("osis" IN_LIST FEATURES) + list(APPEND BUILD_ONLY osis) +endif() if("outposts" IN_LIST FEATURES) list(APPEND BUILD_ONLY outposts) endif() +if("panorama" IN_LIST FEATURES) + list(APPEND BUILD_ONLY panorama) +endif() +if("payment-cryptography" IN_LIST FEATURES) + list(APPEND BUILD_ONLY payment-cryptography) +endif() +if("payment-cryptography-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY payment-cryptography-data) +endif() +if("pca-connector-ad" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pca-connector-ad) +endif() if("personalize" IN_LIST FEATURES) list(APPEND BUILD_ONLY personalize) endif() @@ -602,12 +779,24 @@ endif() if("pinpoint-email" IN_LIST FEATURES) list(APPEND BUILD_ONLY pinpoint-email) endif() +if("pinpoint-sms-voice-v2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pinpoint-sms-voice-v2) +endif() +if("pipes" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pipes) +endif() if("polly" IN_LIST FEATURES) list(APPEND BUILD_ONLY polly) endif() if("pricing" IN_LIST FEATURES) list(APPEND BUILD_ONLY pricing) endif() +if("privatenetworks" IN_LIST FEATURES) + list(APPEND BUILD_ONLY privatenetworks) +endif() +if("proton" IN_LIST FEATURES) + list(APPEND BUILD_ONLY proton) +endif() if("qldb" IN_LIST FEATURES) list(APPEND BUILD_ONLY qldb) endif() @@ -623,6 +812,9 @@ endif() if("ram" IN_LIST FEATURES) list(APPEND BUILD_ONLY ram) endif() +if("rbin" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rbin) +endif() if("rds" IN_LIST FEATURES) list(APPEND BUILD_ONLY rds) endif() @@ -635,9 +827,18 @@ endif() if("redshift-data" IN_LIST FEATURES) list(APPEND BUILD_ONLY redshift-data) endif() +if("redshift-serverless" IN_LIST FEATURES) + list(APPEND BUILD_ONLY redshift-serverless) +endif() if("rekognition" IN_LIST FEATURES) list(APPEND BUILD_ONLY rekognition) endif() +if("resiliencehub" IN_LIST FEATURES) + list(APPEND BUILD_ONLY resiliencehub) +endif() +if("resource-explorer-2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY resource-explorer-2) +endif() if("resource-groups" IN_LIST FEATURES) list(APPEND BUILD_ONLY resource-groups) endif() @@ -647,15 +848,30 @@ endif() if("robomaker" IN_LIST FEATURES) list(APPEND BUILD_ONLY robomaker) endif() +if("rolesanywhere" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rolesanywhere) +endif() if("route53" IN_LIST FEATURES) list(APPEND BUILD_ONLY route53) endif() +if("route53-recovery-cluster" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53-recovery-cluster) +endif() +if("route53-recovery-control-config" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53-recovery-control-config) +endif() +if("route53-recovery-readiness" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53-recovery-readiness) +endif() if("route53domains" IN_LIST FEATURES) list(APPEND BUILD_ONLY route53domains) endif() if("route53resolver" IN_LIST FEATURES) list(APPEND BUILD_ONLY route53resolver) endif() +if("rum" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rum) +endif() if("s3" IN_LIST FEATURES) list(APPEND BUILD_ONLY s3) endif() @@ -683,12 +899,21 @@ endif() if("sagemaker-featurestore-runtime" IN_LIST FEATURES) list(APPEND BUILD_ONLY sagemaker-featurestore-runtime) endif() +if("sagemaker-geospatial" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker-geospatial) +endif() +if("sagemaker-metrics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker-metrics) +endif() if("sagemaker-runtime" IN_LIST FEATURES) list(APPEND BUILD_ONLY sagemaker-runtime) endif() if("savingsplans" IN_LIST FEATURES) list(APPEND BUILD_ONLY savingsplans) endif() +if("scheduler" IN_LIST FEATURES) + list(APPEND BUILD_ONLY scheduler) +endif() if("schemas" IN_LIST FEATURES) list(APPEND BUILD_ONLY schemas) endif() @@ -701,6 +926,9 @@ endif() if("securityhub" IN_LIST FEATURES) list(APPEND BUILD_ONLY securityhub) endif() +if("securitylake" IN_LIST FEATURES) + list(APPEND BUILD_ONLY securitylake) +endif() if("serverlessrepo" IN_LIST FEATURES) list(APPEND BUILD_ONLY serverlessrepo) endif() @@ -725,12 +953,18 @@ endif() if("signer" IN_LIST FEATURES) list(APPEND BUILD_ONLY signer) endif() +if("simspaceweaver" IN_LIST FEATURES) + list(APPEND BUILD_ONLY simspaceweaver) +endif() if("sms" IN_LIST FEATURES) list(APPEND BUILD_ONLY sms) endif() if("sms-voice" IN_LIST FEATURES) list(APPEND BUILD_ONLY sms-voice) endif() +if("snow-device-management" IN_LIST FEATURES) + list(APPEND BUILD_ONLY snow-device-management) +endif() if("snowball" IN_LIST FEATURES) list(APPEND BUILD_ONLY snowball) endif() @@ -749,6 +983,9 @@ endif() if("ssm-incidents" IN_LIST FEATURES) list(APPEND BUILD_ONLY ssm-incidents) endif() +if("ssm-sap" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ssm-sap) +endif() if("sso" IN_LIST FEATURES) list(APPEND BUILD_ONLY sso) endif() @@ -770,6 +1007,9 @@ endif() if("support" IN_LIST FEATURES) list(APPEND BUILD_ONLY support) endif() +if("support-app" IN_LIST FEATURES) + list(APPEND BUILD_ONLY support-app) +endif() if("swf" IN_LIST FEATURES) list(APPEND BUILD_ONLY swf) endif() @@ -788,6 +1028,9 @@ endif() if("timestream-write" IN_LIST FEATURES) list(APPEND BUILD_ONLY timestream-write) endif() +if("tnb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY tnb) +endif() if("transcribe" IN_LIST FEATURES) list(APPEND BUILD_ONLY transcribe) endif() @@ -800,6 +1043,15 @@ endif() if("translate" IN_LIST FEATURES) list(APPEND BUILD_ONLY translate) endif() +if("verifiedpermissions" IN_LIST FEATURES) + list(APPEND BUILD_ONLY verifiedpermissions) +endif() +if("voice-id" IN_LIST FEATURES) + list(APPEND BUILD_ONLY voice-id) +endif() +if("vpc-lattice" IN_LIST FEATURES) + list(APPEND BUILD_ONLY vpc-lattice) +endif() if("waf" IN_LIST FEATURES) list(APPEND BUILD_ONLY waf) endif() @@ -812,6 +1064,9 @@ endif() if("wellarchitected" IN_LIST FEATURES) list(APPEND BUILD_ONLY wellarchitected) endif() +if("wisdom" IN_LIST FEATURES) + list(APPEND BUILD_ONLY wisdom) +endif() if("workdocs" IN_LIST FEATURES) list(APPEND BUILD_ONLY workdocs) endif() @@ -827,6 +1082,9 @@ endif() if("workspaces" IN_LIST FEATURES) list(APPEND BUILD_ONLY workspaces) endif() +if("workspaces-web" IN_LIST FEATURES) + list(APPEND BUILD_ONLY workspaces-web) +endif() if("xray" IN_LIST FEATURES) list(APPEND BUILD_ONLY xray) endif() diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1 index 89265ddbd4cc2c..f10ee40e7a2bc5 100644 --- a/ports/aws-sdk-cpp/generateFeatures.ps1 +++ b/ports/aws-sdk-cpp/generateFeatures.ps1 @@ -23,7 +23,7 @@ if (-not (Test-Path $ExtractedSources)) { Write-Host "Using sources directory: $ExtractedSources" -$subfolders = Get-Item $ExtractedSources\aws-cpp-sdk-* +$subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name $manifest = Get-Content $ManifestIn | ConvertFrom-Json $manifest | Add-Member ` @@ -47,6 +47,12 @@ function GetDescription($dir, $modulename) else { "C++ SDK for the AWS $modulename service" } } +$featureDependencies = @{} +Select-String -Path "$ExtractedSources\cmake\sdksCommon.cmake" -Pattern "list\(APPEND SDK_DEPENDENCY_LIST `"([\w-]+):([\w-,]+)`"\)" -AllMatches ` +| ForEach-Object { $_.Matches } ` +| ForEach-Object { $featureDependencies[$_.Groups[1].Value] = @($_.Groups[2].Value -split "," ` +| Where-Object { $_ -ne "core" }) } + foreach ($subfolder in $subfolders) { $modulename = $subfolder.name -replace "^aws-cpp-sdk-","" @@ -56,7 +62,13 @@ foreach ($subfolder in $subfolders) $lowermodulename = $modulename.ToLower() - $manifest.features.Add("$lowermodulename", @{ description=(GetDescription $subfolder $modulename) }) + $featureObj = @{ description = (GetDescription $subfolder $modulename) } + + if ($featureDependencies.ContainsKey($lowermodulename)) { + $featureObj.dependencies = ,@{ name = "aws-sdk-cpp"; "default-features" = $false; "features" = $featureDependencies[$lowermodulename] } + } + + $manifest.features.Add("$lowermodulename", $featureObj) $cmakefragmenttext += @( "if(`"$lowermodulename`" IN_LIST FEATURES)", @@ -65,7 +77,7 @@ foreach ($subfolder in $subfolders) ) } -[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 5 -InputObject $manifest)) +[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 10 -InputObject $manifest)) Write-Verbose ($cmakefragmenttext -join "`n") [IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n") diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index de9d640b89d90e..cc455a92c9d765 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp REF "${VERSION}" - SHA512 14bf3f9bd6b3f4216977addd20b2c97d2f021868435ce83c39c1131f3eb1609477da7d15ff99b1350f64d39e78e61faa03458b7205b2b176a98de43c40a4353b + SHA512 63de900870e9bec23d42e9458e0e9b1579a9e2dc7b0f404eae1b0dd406898b6d6841c5e2f498710b3828f212705437da3a2fe94813a6c3a842945100a05ae368 PATCHES patch-relocatable-rpath.patch fix-aws-root.patch diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json new file mode 100644 index 00000000000000..a16daf2387efc0 --- /dev/null +++ b/ports/aws-sdk-cpp/vcpkg.in.json @@ -0,0 +1,37 @@ +{ + "name": "aws-sdk-cpp", + "version": "1.11.160", + "description": "AWS SDK for C++", + "homepage": "https://github.com/aws/aws-sdk-cpp", + "license": "Apache-2.0", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-crt-cpp", + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ], + "platform": "!uwp & !windows" + }, + { + "name": "openssl", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "dynamodb", + "kinesis", + "s3" + ] +} \ No newline at end of file diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 69877901900132..1a3e214bc10300 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.11.132", + "version": "1.11.169", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", @@ -37,11 +37,24 @@ ], "features": { "access-management": { - "description": "C++ SDK for the AWS access-management service" + "description": "C++ SDK for the AWS access-management service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "cognito-identity", + "iam" + ] + } + ] }, "accessanalyzer": { "description": "C++ SDK for the AWS accessanalyzer service" }, + "account": { + "description": "C++ SDK for the AWS account service" + }, "acm": { "description": "C++ SDK for the AWS acm service" }, @@ -60,6 +73,9 @@ "amplifybackend": { "description": "C++ SDK for the AWS amplifybackend service" }, + "amplifyuibuilder": { + "description": "C++ SDK for the AWS amplifyuibuilder service" + }, "apigateway": { "description": "C++ SDK for the AWS apigateway service" }, @@ -72,6 +88,12 @@ "appconfig": { "description": "C++ SDK for the AWS appconfig service" }, + "appconfigdata": { + "description": "C++ SDK for the AWS appconfigdata service" + }, + "appfabric": { + "description": "C++ SDK for the AWS appfabric service" + }, "appflow": { "description": "C++ SDK for the AWS appflow service" }, @@ -99,6 +121,9 @@ "appsync": { "description": "C++ SDK for the AWS appsync service" }, + "arc-zonal-shift": { + "description": "C++ SDK for the AWS arc-zonal-shift service" + }, "athena": { "description": "C++ SDK for the AWS athena service" }, @@ -120,9 +145,18 @@ "backup": { "description": "C++ SDK for the AWS backup service" }, + "backup-gateway": { + "description": "C++ SDK for the AWS backup-gateway service" + }, + "backupstorage": { + "description": "C++ SDK for the AWS backupstorage service" + }, "batch": { "description": "C++ SDK for the AWS batch service" }, + "billingconductor": { + "description": "C++ SDK for the AWS billingconductor service" + }, "braket": { "description": "C++ SDK for the AWS braket service" }, @@ -135,9 +169,30 @@ "chime": { "description": "C++ SDK for the AWS chime service" }, + "chime-sdk-identity": { + "description": "C++ SDK for the AWS chime-sdk-identity service" + }, + "chime-sdk-media-pipelines": { + "description": "C++ SDK for the AWS chime-sdk-media-pipelines service" + }, + "chime-sdk-meetings": { + "description": "C++ SDK for the AWS chime-sdk-meetings service" + }, + "chime-sdk-messaging": { + "description": "C++ SDK for the AWS chime-sdk-messaging service" + }, + "chime-sdk-voice": { + "description": "C++ SDK for the AWS chime-sdk-voice service" + }, + "cleanrooms": { + "description": "C++ SDK for the AWS cleanrooms service" + }, "cloud9": { "description": "C++ SDK for the AWS cloud9 service" }, + "cloudcontrol": { + "description": "C++ SDK for the AWS cloudcontrol service" + }, "clouddirectory": { "description": "C++ SDK for the AWS clouddirectory service" }, @@ -162,12 +217,18 @@ "cloudtrail": { "description": "C++ SDK for the AWS cloudtrail service" }, + "cloudtrail-data": { + "description": "C++ SDK for the AWS cloudtrail-data service" + }, "codeartifact": { "description": "C++ SDK for the AWS codeartifact service" }, "codebuild": { "description": "C++ SDK for the AWS codebuild service" }, + "codecatalyst": { + "description": "C++ SDK for the AWS codecatalyst service" + }, "codecommit": { "description": "C++ SDK for the AWS codecommit service" }, @@ -177,6 +238,9 @@ "codeguru-reviewer": { "description": "C++ SDK for the AWS codeguru-reviewer service" }, + "codeguru-security": { + "description": "C++ SDK for the AWS codeguru-security service" + }, "codeguruprofiler": { "description": "C++ SDK for the AWS codeguruprofiler service" }, @@ -219,9 +283,18 @@ "connect-contact-lens": { "description": "C++ SDK for the AWS connect-contact-lens service" }, + "connectcampaigns": { + "description": "C++ SDK for the AWS connectcampaigns service" + }, + "connectcases": { + "description": "C++ SDK for the AWS connectcases service" + }, "connectparticipant": { "description": "C++ SDK for the AWS connectparticipant service" }, + "controltower": { + "description": "C++ SDK for the AWS controltower service" + }, "cur": { "description": "C++ SDK for the AWS cur service" }, @@ -267,6 +340,12 @@ "docdb": { "description": "C++ SDK for the AWS docdb service" }, + "docdb-elastic": { + "description": "C++ SDK for the AWS docdb-elastic service" + }, + "drs": { + "description": "C++ SDK for the AWS drs service" + }, "ds": { "description": "C++ SDK for the AWS ds service" }, @@ -327,6 +406,12 @@ "emr-containers": { "description": "C++ SDK for the AWS emr-containers service" }, + "emr-serverless": { + "description": "C++ SDK for the AWS emr-serverless service" + }, + "entityresolution": { + "description": "C++ SDK for the AWS entityresolution service" + }, "es": { "description": "C++ SDK for the AWS es service" }, @@ -336,6 +421,9 @@ "events": { "description": "C++ SDK for the AWS events service" }, + "evidently": { + "description": "C++ SDK for the AWS evidently service" + }, "finspace": { "description": "C++ SDK for the AWS finspace service" }, @@ -366,6 +454,9 @@ "gamelift": { "description": "C++ SDK for the AWS gamelift service" }, + "gamesparks": { + "description": "C++ SDK for the AWS gamesparks service" + }, "glacier": { "description": "C++ SDK for the AWS glacier service" }, @@ -375,6 +466,9 @@ "glue": { "description": "C++ SDK for the AWS glue service" }, + "grafana": { + "description": "C++ SDK for the AWS grafana service" + }, "greengrass": { "description": "C++ SDK for the AWS greengrass service" }, @@ -400,7 +494,17 @@ "description": "C++ SDK for the AWS iam service" }, "identity-management": { - "description": "C++ SDK for the AWS identity-management service" + "description": "C++ SDK for the AWS identity-management service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "cognito-identity", + "sts" + ] + } + ] }, "identitystore": { "description": "C++ SDK for the AWS identitystore service" @@ -414,6 +518,12 @@ "inspector": { "description": "C++ SDK for the AWS inspector service" }, + "inspector2": { + "description": "C++ SDK for the AWS inspector2 service" + }, + "internetmonitor": { + "description": "C++ SDK for the AWS internetmonitor service" + }, "iot": { "description": "C++ SDK for the AWS iot service" }, @@ -423,6 +533,9 @@ "iot-jobs-data": { "description": "C++ SDK for the AWS iot-jobs-data service" }, + "iot-roborunner": { + "description": "C++ SDK for the AWS iot-roborunner service" + }, "iot1click-devices": { "description": "C++ SDK for the AWS iot1click-devices service" }, @@ -444,6 +557,9 @@ "iotfleethub": { "description": "C++ SDK for the AWS iotfleethub service" }, + "iotfleetwise": { + "description": "C++ SDK for the AWS iotfleetwise service" + }, "iotsecuretunneling": { "description": "C++ SDK for the AWS iotsecuretunneling service" }, @@ -453,18 +569,36 @@ "iotthingsgraph": { "description": "C++ SDK for the AWS iotthingsgraph service" }, + "iottwinmaker": { + "description": "C++ SDK for the AWS iottwinmaker service" + }, "iotwireless": { "description": "C++ SDK for the AWS iotwireless service" }, "ivs": { "description": "C++ SDK for the AWS ivs service" }, + "ivs-realtime": { + "description": "C++ SDK for the AWS ivs-realtime service" + }, + "ivschat": { + "description": "C++ SDK for the AWS ivschat service" + }, "kafka": { "description": "C++ SDK for the AWS kafka service" }, + "kafkaconnect": { + "description": "C++ SDK for the AWS kafkaconnect service" + }, "kendra": { "description": "C++ SDK for the AWS kendra service" }, + "kendra-ranking": { + "description": "C++ SDK for the AWS kendra-ranking service" + }, + "keyspaces": { + "description": "C++ SDK for the AWS keyspaces service" + }, "kinesis": { "description": "C++ SDK for the AWS kinesis service" }, @@ -477,6 +611,9 @@ "kinesis-video-signaling": { "description": "C++ SDK for the AWS kinesis-video-signaling service" }, + "kinesis-video-webrtc-storage": { + "description": "C++ SDK for the AWS kinesis-video-webrtc-storage service" + }, "kinesisanalytics": { "description": "C++ SDK for the AWS kinesisanalytics service" }, @@ -510,6 +647,12 @@ "license-manager": { "description": "C++ SDK for the AWS license-manager service" }, + "license-manager-linux-subscriptions": { + "description": "C++ SDK for the AWS license-manager-linux-subscriptions service" + }, + "license-manager-user-subscriptions": { + "description": "C++ SDK for the AWS license-manager-user-subscriptions service" + }, "lightsail": { "description": "C++ SDK for the AWS lightsail service" }, @@ -528,6 +671,9 @@ "lookoutvision": { "description": "C++ SDK for the AWS lookoutvision service" }, + "m2": { + "description": "C++ SDK for the AWS m2 service" + }, "machinelearning": { "description": "C++ SDK for the AWS machinelearning service" }, @@ -540,6 +686,9 @@ "managedblockchain": { "description": "C++ SDK for the AWS managedblockchain service" }, + "managedblockchain-query": { + "description": "C++ SDK for the AWS managedblockchain-query service" + }, "marketplace-catalog": { "description": "C++ SDK for the AWS marketplace-catalog service" }, @@ -564,6 +713,9 @@ "mediapackage-vod": { "description": "C++ SDK for the AWS mediapackage-vod service" }, + "mediapackagev2": { + "description": "C++ SDK for the AWS mediapackagev2 service" + }, "mediastore": { "description": "C++ SDK for the AWS mediastore service" }, @@ -573,15 +725,30 @@ "mediatailor": { "description": "C++ SDK for the AWS mediatailor service" }, + "medical-imaging": { + "description": "C++ SDK for the AWS medical-imaging service" + }, + "memorydb": { + "description": "C++ SDK for the AWS memorydb service" + }, "meteringmarketplace": { "description": "C++ SDK for the AWS meteringmarketplace service" }, "mgn": { "description": "C++ SDK for the AWS mgn service" }, + "migration-hub-refactor-spaces": { + "description": "C++ SDK for the AWS migration-hub-refactor-spaces service" + }, "migrationhub-config": { "description": "C++ SDK for the AWS migrationhub-config service" }, + "migrationhuborchestrator": { + "description": "C++ SDK for the AWS migrationhuborchestrator service" + }, + "migrationhubstrategy": { + "description": "C++ SDK for the AWS migrationhubstrategy service" + }, "mobile": { "description": "C++ SDK for the AWS mobile service" }, @@ -600,6 +767,9 @@ "neptune": { "description": "C++ SDK for the AWS neptune service" }, + "neptunedata": { + "description": "C++ SDK for the AWS neptunedata service" + }, "network-firewall": { "description": "C++ SDK for the AWS network-firewall service" }, @@ -609,6 +779,18 @@ "nimble": { "description": "C++ SDK for the AWS nimble service" }, + "oam": { + "description": "C++ SDK for the AWS oam service" + }, + "omics": { + "description": "C++ SDK for the AWS omics service" + }, + "opensearch": { + "description": "C++ SDK for the AWS opensearch service" + }, + "opensearchserverless": { + "description": "C++ SDK for the AWS opensearchserverless service" + }, "opsworks": { "description": "C++ SDK for the AWS opsworks service" }, @@ -618,9 +800,24 @@ "organizations": { "description": "C++ SDK for the AWS organizations service" }, + "osis": { + "description": "C++ SDK for the AWS osis service" + }, "outposts": { "description": "C++ SDK for the AWS outposts service" }, + "panorama": { + "description": "C++ SDK for the AWS panorama service" + }, + "payment-cryptography": { + "description": "C++ SDK for the AWS payment-cryptography service" + }, + "payment-cryptography-data": { + "description": "C++ SDK for the AWS payment-cryptography-data service" + }, + "pca-connector-ad": { + "description": "C++ SDK for the AWS pca-connector-ad service" + }, "personalize": { "description": "C++ SDK for the AWS personalize service" }, @@ -639,12 +836,24 @@ "pinpoint-email": { "description": "C++ SDK for the AWS pinpoint-email service" }, + "pinpoint-sms-voice-v2": { + "description": "C++ SDK for the AWS pinpoint-sms-voice-v2 service" + }, + "pipes": { + "description": "C++ SDK for the AWS pipes service" + }, "polly": { "description": "C++ SDK for the AWS polly service" }, "pricing": { "description": "C++ SDK for the AWS pricing service" }, + "privatenetworks": { + "description": "C++ SDK for the AWS privatenetworks service" + }, + "proton": { + "description": "C++ SDK for the AWS proton service" + }, "qldb": { "description": "C++ SDK for the AWS qldb service" }, @@ -652,7 +861,16 @@ "description": "C++ SDK for the AWS qldb-session service" }, "queues": { - "description": "C++ SDK for the AWS queues service" + "description": "C++ SDK for the AWS queues service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "sqs" + ] + } + ] }, "quicksight": { "description": "C++ SDK for the AWS quicksight service" @@ -660,6 +878,9 @@ "ram": { "description": "C++ SDK for the AWS ram service" }, + "rbin": { + "description": "C++ SDK for the AWS rbin service" + }, "rds": { "description": "C++ SDK for the AWS rds service" }, @@ -672,9 +893,18 @@ "redshift-data": { "description": "C++ SDK for the AWS redshift-data service" }, + "redshift-serverless": { + "description": "C++ SDK for the AWS redshift-serverless service" + }, "rekognition": { "description": "C++ SDK for the AWS rekognition service" }, + "resiliencehub": { + "description": "C++ SDK for the AWS resiliencehub service" + }, + "resource-explorer-2": { + "description": "C++ SDK for the AWS resource-explorer-2 service" + }, "resource-groups": { "description": "C++ SDK for the AWS resource-groups service" }, @@ -684,15 +914,30 @@ "robomaker": { "description": "C++ SDK for the AWS robomaker service" }, + "rolesanywhere": { + "description": "C++ SDK for the AWS rolesanywhere service" + }, "route53": { "description": "C++ SDK for the AWS route53 service" }, + "route53-recovery-cluster": { + "description": "C++ SDK for the AWS route53-recovery-cluster service" + }, + "route53-recovery-control-config": { + "description": "C++ SDK for the AWS route53-recovery-control-config service" + }, + "route53-recovery-readiness": { + "description": "C++ SDK for the AWS route53-recovery-readiness service" + }, "route53domains": { "description": "C++ SDK for the AWS route53domains service" }, "route53resolver": { "description": "C++ SDK for the AWS route53resolver service" }, + "rum": { + "description": "C++ SDK for the AWS rum service" + }, "s3": { "description": "C++ SDK for the AWS s3 service" }, @@ -700,7 +945,17 @@ "description": "C++ SDK for the AWS s3-crt service" }, "s3-encryption": { - "description": "C++ SDK for the AWS s3-encryption service" + "description": "C++ SDK for the AWS s3-encryption service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "kms", + "s3" + ] + } + ] }, "s3control": { "description": "C++ SDK for the AWS s3control service" @@ -720,12 +975,21 @@ "sagemaker-featurestore-runtime": { "description": "C++ SDK for the AWS sagemaker-featurestore-runtime service" }, + "sagemaker-geospatial": { + "description": "C++ SDK for the AWS sagemaker-geospatial service" + }, + "sagemaker-metrics": { + "description": "C++ SDK for the AWS sagemaker-metrics service" + }, "sagemaker-runtime": { "description": "C++ SDK for the AWS sagemaker-runtime service" }, "savingsplans": { "description": "C++ SDK for the AWS savingsplans service" }, + "scheduler": { + "description": "C++ SDK for the AWS scheduler service" + }, "schemas": { "description": "C++ SDK for the AWS schemas service" }, @@ -738,6 +1002,9 @@ "securityhub": { "description": "C++ SDK for the AWS securityhub service" }, + "securitylake": { + "description": "C++ SDK for the AWS securitylake service" + }, "serverlessrepo": { "description": "C++ SDK for the AWS serverlessrepo service" }, @@ -762,12 +1029,18 @@ "signer": { "description": "C++ SDK for the AWS signer service" }, + "simspaceweaver": { + "description": "C++ SDK for the AWS simspaceweaver service" + }, "sms": { "description": "C++ SDK for the AWS sms service" }, "sms-voice": { "description": "C++ SDK for the AWS sms-voice service" }, + "snow-device-management": { + "description": "C++ SDK for the AWS snow-device-management service" + }, "snowball": { "description": "C++ SDK for the AWS snowball service" }, @@ -786,6 +1059,9 @@ "ssm-incidents": { "description": "C++ SDK for the AWS ssm-incidents service" }, + "ssm-sap": { + "description": "C++ SDK for the AWS ssm-sap service" + }, "sso": { "description": "C++ SDK for the AWS sso service" }, @@ -807,6 +1083,9 @@ "support": { "description": "C++ SDK for the AWS support service" }, + "support-app": { + "description": "C++ SDK for the AWS support-app service" + }, "swf": { "description": "C++ SDK for the AWS swf service" }, @@ -814,7 +1093,16 @@ "description": "C++ SDK for the AWS synthetics service" }, "text-to-speech": { - "description": "C++ SDK for the AWS text-to-speech service" + "description": "C++ SDK for the AWS text-to-speech service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "polly" + ] + } + ] }, "textract": { "description": "C++ SDK for the AWS textract service" @@ -825,6 +1113,9 @@ "timestream-write": { "description": "C++ SDK for the AWS timestream-write service" }, + "tnb": { + "description": "C++ SDK for the AWS tnb service" + }, "transcribe": { "description": "C++ SDK for the AWS transcribe service" }, @@ -832,11 +1123,29 @@ "description": "C++ SDK for the AWS transcribestreaming service" }, "transfer": { - "description": "C++ SDK for the AWS transfer service" + "description": "C++ SDK for the AWS transfer service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "s3" + ] + } + ] }, "translate": { "description": "C++ SDK for the AWS translate service" }, + "verifiedpermissions": { + "description": "C++ SDK for the AWS verifiedpermissions service" + }, + "voice-id": { + "description": "C++ SDK for the AWS voice-id service" + }, + "vpc-lattice": { + "description": "C++ SDK for the AWS vpc-lattice service" + }, "waf": { "description": "C++ SDK for the AWS waf service" }, @@ -849,6 +1158,9 @@ "wellarchitected": { "description": "C++ SDK for the AWS wellarchitected service" }, + "wisdom": { + "description": "C++ SDK for the AWS wisdom service" + }, "workdocs": { "description": "C++ SDK for the AWS workdocs service" }, @@ -864,6 +1176,9 @@ "workspaces": { "description": "C++ SDK for the AWS workspaces service" }, + "workspaces-web": { + "description": "C++ SDK for the AWS workspaces-web service" + }, "xray": { "description": "C++ SDK for the AWS xray service" } diff --git a/ports/azmq/portfile.cmake b/ports/azmq/portfile.cmake index 3e1c73683bf157..a222657cfbe333 100644 --- a/ports/azmq/portfile.cmake +++ b/ports/azmq/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/azmq - REF 7da2fd0a1b2bd4e6f50ccd17d54579e6084ef1f7 # v1.0.3 - SHA512 3f6b07fab9345c7506a46d7418eb672e1ee28a72bb02914ee1f945b3c41090d94722079469359664232e9688beac4e354e49d99711fc5b0bd1d6f7936ed62a3c + REF 2c1adac46bced4eb74ed9be7c74563bb113eaacf + SHA512 4614b9e8f502da067231cf0ce2b645289fd1343b9bc46f1028fecb9dad4bb8a5190d723c3bf888a7c708b7b588b6c72f7e4da637f499389481b6cf80f4999671 HEAD_REF master ) diff --git a/ports/azmq/vcpkg.json b/ports/azmq/vcpkg.json index 12dacac0ef88b4..45019327ffd2c0 100644 --- a/ports/azmq/vcpkg.json +++ b/ports/azmq/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azmq", - "version": "1.0.3", + "version-date": "2023-03-23", "description": [ "Boost Asio style bindings for ZeroMQ", "This library is built on top of ZeroMQ's standard C interface and is intended to work well with C++ applications which use the Boost libraries in general, and Asio in particular.", diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake index 12ba7074a6248d..76e2e05910924e 100644 --- a/ports/azure-core-amqp-cpp/portfile.cmake +++ b/ports/azure-core-amqp-cpp/portfile.cmake @@ -1,12 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core-amqp_1.0.0-beta.2 - SHA512 ccbcf564027f8f4d0c596548bc67aa27dbfba63fc6afbad9ba22139b7aff42da2c09085b9510efbaa4dd81326673b5aa06441b4be43474d711506bd255612822 + REF azure-core-amqp_1.0.0-beta.3 + SHA512 93af776c164942584025fdca8493a9ac6145bba5afc061d2d9a8976c887e818baef3b8797b56fc5278c5e01875dc8813b94f3919d581a5b8e660f6ca27ecd702 ) +if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/core/azure-core-amqp" "${SOURCE_PATH}/sdk/core/_") + file(RENAME "${SOURCE_PATH}/sdk/core" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/core/azure-core-amqp/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json index 72586614ddef68..03df1ddc8b09a6 100644 --- a/ports/azure-core-amqp-cpp/vcpkg.json +++ b/ports/azure-core-amqp-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-amqp-cpp", - "version-semver": "1.0.0-beta.2", + "version-semver": "1.0.0-beta.3", "port-version": 1, "description": [ "Microsoft Azure AMQP SDK for C++", diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index e5f3fde4b49bc3..9478984a157c6f 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -12,8 +12,18 @@ vcpkg_check_features( winhttp BUILD_TRANSPORT_WINHTTP ) +if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/core/azure-core" "${SOURCE_PATH}/sdk/core/_") + file(RENAME "${SOURCE_PATH}/sdk/core" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/core/azure-core/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS ${FEATURE_OPTIONS} -DWARNINGS_AS_ERRORS=OFF diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 94f6ebd360f1b1..fe7e5385313180 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-core-cpp", "version-semver": "1.10.2", - "port-version": 1, + "port-version": 5, "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." @@ -20,6 +20,10 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "wil", + "platform": "windows" } ], "default-features": [ @@ -38,8 +42,7 @@ "default-features": false, "features": [ "ssl" - ], - "version>=": "7.48" + ] } ] }, @@ -66,14 +69,7 @@ }, "winhttp": { "description": "WinHTTP HTTP transport implementation", - "supports": "windows", - "dependencies": [ - { - "name": "azure-core-cpp", - "default-features": false - }, - "wil" - ] + "supports": "windows" } } } diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake index de527c389ece32..88a9bf04856c78 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake +++ b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake @@ -5,8 +5,18 @@ vcpkg_from_github( SHA512 645c616fe54024f30a6e4b9c2626bfeaf906086be7bbeccc4a1155178670fb70d9818938db2f9fa8e3b9593ca45e0b10042dcd67fde04d2542f6f72a74884697 ) +if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry" "${SOURCE_PATH}/sdk/core/_") + file(RENAME "${SOURCE_PATH}/sdk/core" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry/ + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json index 43f19f76625774..c678ba9de6fed1 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json +++ b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-core-tracing-opentelemetry-cpp", "version-semver": "1.0.0-beta.4", + "port-version": 1, "description": [ "Microsoft Azure Core Tracing OpenTelemetry SDK for C++", "This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs." diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake index a71124e3832206..06cc7bbce16008 100644 --- a/ports/azure-identity-cpp/portfile.cmake +++ b/ports/azure-identity-cpp/portfile.cmake @@ -5,8 +5,18 @@ vcpkg_from_github( SHA512 f3e12c0685ec7a1cde724feafbc84a8aa66688ed7b54bb9c4787d516aee3142310863013a5d49869e1a1e64af8f5ce908640fee64190bc9c2f9715e3afa833bc ) +if(EXISTS "${SOURCE_PATH}/sdk/identity/azure-identity") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/identity/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/identity/azure-identity" "${SOURCE_PATH}/sdk/identity/_") + file(RENAME "${SOURCE_PATH}/sdk/identity" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/identity/azure-identity/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json index 998a923f5a74b3..2cccb7b873ce9d 100644 --- a/ports/azure-identity-cpp/vcpkg.json +++ b/ports/azure-identity-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-identity-cpp", "version-semver": "1.5.1", + "port-version": 1, "description": [ "Microsoft Azure Identity SDK for C++", "This library provides common authentication-related abstractions for Azure SDK." diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake index eadb9d2c92b45e..2eac053723aa4d 100644 --- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake @@ -1,12 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-messaging-eventhubs_1.0.0-beta.1 - SHA512 752e926da48fe89af0cbc7d17685f716c3e232ed83a98b9bc756718a3c7fe131b548cf90cbfe87429e8ebbc2ce2a0a9a164d3b1701d0e49989862d2c029784ec + REF azure-messaging-eventhubs_1.0.0-beta.2 + SHA512 3677edf50218c39e378a968661c0ec0600b8760d3af33f204f3267e104449c0aef42b9520cb63b5e5810b89bf91f06979d009ffdd6d6d04d2c14e1a21f0e111f ) +if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs" "${SOURCE_PATH}/sdk/eventhubs/_") + file(RENAME "${SOURCE_PATH}/sdk/eventhubs" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json index 9b2df6622855bd..4270cac3735138 100644 --- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-messaging-eventhubs-cpp", - "version-semver": "1.0.0-beta.1", + "version-semver": "1.0.0-beta.2", + "port-version": 1, "description": [ "Microsoft Azure Messaging Event Hubs SDK for C++", "This library provides Azure Messaging Event Hubs SDK." diff --git a/ports/azure-security-attestation-cpp/portfile.cmake b/ports/azure-security-attestation-cpp/portfile.cmake index ddc575363e460b..f1fc4d6680f31f 100644 --- a/ports/azure-security-attestation-cpp/portfile.cmake +++ b/ports/azure-security-attestation-cpp/portfile.cmake @@ -5,8 +5,18 @@ vcpkg_from_github( SHA512 bf5c0ab830122838045e3e5ff03aae38f81082b50b9b0c61fa21a8c101a2fd98ad98b136d49702665d720f59baa6a89c8af3f161a44c09d24ad747fb1828cbca ) +if(EXISTS "${SOURCE_PATH}/sdk/attestation/azure-security-attestation") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/attestation/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/attestation/azure-security-attestation" "${SOURCE_PATH}/sdk/attestation/_") + file(RENAME "${SOURCE_PATH}/sdk/attestation" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/attestation/azure-security-attestation/ + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-attestation-cpp/vcpkg.json b/ports/azure-security-attestation-cpp/vcpkg.json index ccc84788bc398f..4ec72e8e770e58 100644 --- a/ports/azure-security-attestation-cpp/vcpkg.json +++ b/ports/azure-security-attestation-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-security-attestation-cpp", "version-semver": "1.1.0", + "port-version": 1, "description": [ "Microsoft Azure Attestation Service SDK for C++", "This library provides API access to the Microsoft Azure Attestation service." diff --git a/ports/azure-security-keyvault-administration-cpp/portfile.cmake b/ports/azure-security-keyvault-administration-cpp/portfile.cmake index c232d70966ca09..d1f7ae837065b0 100644 --- a/ports/azure-security-keyvault-administration-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-administration-cpp/portfile.cmake @@ -5,8 +5,18 @@ vcpkg_from_github( SHA512 1209811b470821f929ffd5d09df58ff19b19f13a657acf304fefd457ee533acb3e91774ca6d72d0106e42d601d0bd4d23fbd563f62a4c9a62d686afe61cb4e6c ) +if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration" "${SOURCE_PATH}/sdk/keyvault/_") + file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-administration-cpp/vcpkg.json b/ports/azure-security-keyvault-administration-cpp/vcpkg.json index ea4daed6b5394a..5f04262e573898 100644 --- a/ports/azure-security-keyvault-administration-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-administration-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-security-keyvault-administration-cpp", "version-semver": "4.0.0-beta.3", + "port-version": 1, "description": [ "Microsoft Azure Key Vault Administration SDK for C++", "This library provides Azure Key Vault Administration SDK." diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake index 2c8d0408e3e774..b0cba5d37ad48a 100644 --- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -5,8 +5,18 @@ vcpkg_from_github( SHA512 bcfbeb47bbf0871113be3a7704b519af2b3209304be8f9c29874325e8efd3e4e440706aae1f86139076097b31e3777b85e3c9b01861bc5ace9113645d8a97260 ) +if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates" "${SOURCE_PATH}/sdk/keyvault/_") + file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json index 0b69efb1caa348..841abd2114b846 100644 --- a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-security-keyvault-certificates-cpp", "version-semver": "4.2.0", + "port-version": 1, "description": [ "Microsoft Azure Key Vault Certificates SDK for C++", "This library provides Azure Key Vault Certificates SDK." diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index b33975db40bb3b..08d8764a64fce7 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -5,8 +5,18 @@ vcpkg_from_github( SHA512 00fc21a1ecf4b40543a1a381777970739579f3384392cdb9a2eb44563d05a5ac648f797cb5198df27f74cd4b45d341b06e45f552ed2a878f2cfd50f3461ad4fd ) +if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys" "${SOURCE_PATH}/sdk/keyvault/_") + file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index c754a70e6bf75e..76b30472e038b4 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-security-keyvault-keys-cpp", "version-semver": "4.4.0", + "port-version": 1, "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake index 5f5b3bf01dd933..4709ea977c32a3 100644 --- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -5,8 +5,18 @@ vcpkg_from_github( SHA512 1f464e60f9cb234bb28c3daa5abb0a27fdb9c75327f7eb84b3d5215524457aae9b6c64617a35175341afcaf0da39373190c867fb1d5a1780b9395062a7420aaa ) +if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets" "${SOURCE_PATH}/sdk/keyvault/_") + file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json index 943a299cfedade..f912e278088f4a 100644 --- a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-security-keyvault-secrets-cpp", "version-semver": "4.2.0", + "port-version": 1, "description": [ "Microsoft Azure Key Vault Secrets SDK for C++", "This library provides Azure Key Vault Secrets SDK." diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index f8a12fe24582e2..8b00f84e70671a 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,12 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.8.0 - SHA512 2ff085f6e4152cd65cc234ea44773e48577d938a3e733189dbb77d88f0882c00b5c5ae136287b87437a34ce571a54dea6d0a16f178df4f6102363e9371f403f2 + REF azure-storage-blobs_12.9.0 + SHA512 10126fa8f34357d941cc7ac031c7811cdbf5fe998d2b6741e9e97325c67df5ed9c490ec42034d9b1ba56716e7de3b7283eb9059554d32b2f4d907e839b64b59f ) +if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-blobs") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-blobs" "${SOURCE_PATH}/sdk/storage/_") + file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-blobs/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 0d22be3a81f5fc..178263c79d9286 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.8.0", + "version-semver": "12.9.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." @@ -11,7 +12,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.3.1" + "version>=": "12.4.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index e033ad8630db07..bc1ef6918562fe 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,12 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.3.3 - SHA512 a9167e5b3d3cfe0585ef201f07cc80fdef6e6147be2a72f217dceca6c006579c341360f35bd7c5c7de6b0c7c122732107cb920baf74e5fef053a99512ee28515 + REF azure-storage-common_12.4.0 + SHA512 999bbd93b645849720d2fd4401b8f9e9f12ce31ea1362786cd1aa0392efd0a05de717d87b2db43a190c2a40f42477daddebcc00812efc4de3ccc08e7563001dd ) +if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-common" "${SOURCE_PATH}/sdk/storage/_") + file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-common/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 39729d1ecb01e2..3040c4efb2a1bf 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.3.3", + "version-semver": "12.4.0", + "port-version": 1, "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index efd23c2868f294..adaf077d7310e0 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,12 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.7.0 - SHA512 5c0ce675666e64aca05dc64254afaba75af89d3c836aa0168a6f6b92c16b3fc148274a686bc3f6b13670205cf0939cba55fe62be3892ac26bb4edfe46816d114 + REF azure-storage-files-datalake_12.8.0 + SHA512 4539b8ba806abdf71cdf82e2bdcffe1adae1d19e6ea62f72cea6ac7e0beef32895d13cff53df4afe06b53ed5740c19bba858c09f75b74cd446d5c125e36ca2b3 ) +if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake" "${SOURCE_PATH}/sdk/storage/_") + file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index 71649f223c5f2b..d9e2670e66d621 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.7.0", + "version-semver": "12.8.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." @@ -11,7 +12,7 @@ { "name": "azure-storage-blobs-cpp", "default-features": false, - "version>=": "12.7.0" + "version>=": "12.9.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index a516fbe57b4f94..77265ee56ff2de 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,12 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.6.1 - SHA512 63132d560967ffff62896691c88403f85acdf4a49f0b6d8fc07fa27f225693fd93a9e030ff459e34f14b9c8f6a30804f31dee3f57c1ba9d533478f7acc36bfc1 + REF azure-storage-files-shares_12.7.0 + SHA512 2482a7c437bd36e63efc8c77d917a09d73bde2bc12d49afd1e24cf0977656e991c59c15d34b52c1bd19c6988fe7c40c95b5edea8740977ffc676f3dd6758dc5e ) +if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares" "${SOURCE_PATH}/sdk/storage/_") + file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/" + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 8406bd9c14ffc1..dca31f29e90dc5 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.6.1", + "version-semver": "12.7.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." @@ -11,7 +12,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.3.2" + "version>=": "12.4.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake index cabef618740f54..f52d77dca6c676 100644 --- a/ports/azure-storage-queues-cpp/portfile.cmake +++ b/ports/azure-storage-queues-cpp/portfile.cmake @@ -1,14 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-queues_12.0.0 - SHA512 f393d481a9bb098d1a361605d9d55e1385ec5417a20ea05c53d479dbe4dcb0e8be34c2b9fc31b64e7d78b81fd642461f27beb02b6ed047f87c968c0bb718b85b + REF azure-storage-queues_12.1.0 + SHA512 98f1b44f408418e43aedf57392c79a625348bbbe516a84d1682486d77655851546e191ea409397cc5c0d822d77bfe9ee2628e9a581334abe86d478418ac0ba9d ) +if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-queues") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-queues" "${SOURCE_PATH}/sdk/storage/_") + file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-queues/ + SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json index e81924b0dec227..003196aa8b9977 100644 --- a/ports/azure-storage-queues-cpp/vcpkg.json +++ b/ports/azure-storage-queues-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-storage-queues-cpp", - "version-semver": "12.0.0", + "version-semver": "12.1.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Queues SDK for C++", "This library provides Azure Storage Queues SDK." @@ -11,7 +12,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.3" + "version>=": "12.4.0" }, { "name": "vcpkg-cmake", diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake index 5af407973423eb..a3f84372067133 100644 --- a/ports/baresip-libre/portfile.cmake +++ b/ports/baresip-libre/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baresip/re REF "v${VERSION}" - SHA512 fce61b96fd4a330c82045c470486e90e1128e242b7c311e9c6002d9752b775bbc430bf256de85f63841172c60630be3aa91e11bfa1501c71599d213701c6b459 + SHA512 9813f66e73df80e00f1947c8c2af0f9dc6afe8d197a453b622458f80d522edd5b420bfc783161d311b36936947764a7a1733038c121210ab65f8621a3502d372 HEAD_REF main PATCHES wip.patch diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json index a2fc0f19abb909..deca1cb2fd4488 100644 --- a/ports/baresip-libre/vcpkg.json +++ b/ports/baresip-libre/vcpkg.json @@ -1,7 +1,6 @@ { "name": "baresip-libre", - "version": "3.2.0", - "port-version": 2, + "version": "3.3.0", "description": "Generic library for real-time communications with async IO support", "homepage": "https://github.com/baresip/re", "license": "BSD-3-Clause", diff --git a/ports/baresip-libre/wip.patch b/ports/baresip-libre/wip.patch index 41341536bfb103..260a640cf9f479 100644 --- a/ports/baresip-libre/wip.patch +++ b/ports/baresip-libre/wip.patch @@ -1,8 +1,7 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f85cb1e..b364219 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -93,7 +93,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang") +diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt +--- re-3.3.0-orig/CMakeLists.txt 2023-07-05 08:55:20.000000000 +0200 ++++ re-3.3.0/CMakeLists.txt 2023-10-02 13:08:47.000000000 +0200 +@@ -93,7 +93,7 @@ endif() set(re_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake) @@ -11,25 +10,7 @@ index f85cb1e..b364219 100644 list(APPEND RE_DEFINITIONS -DVERSION="${PROJECT_VERSION_FULL}" -@@ -642,7 +642,7 @@ if(WIN32) - dbghelp - ) - else() -- list(APPEND LINKLIBS -lm) -+ list(APPEND LINKLIBS m) - endif() - - if(UNIX) -@@ -668,7 +668,7 @@ target_include_directories(re-objs PRIVATE - ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS}) - target_include_directories(re-objs PUBLIC - $ -- $ -+ $ # pointless, object libs don't get installed. - ) - - -@@ -697,11 +697,14 @@ endif() +@@ -696,11 +696,14 @@ if(LIBRE_BUILD_STATIC) list(APPEND RE_INSTALL_TARGETS re) add_library(re STATIC $) @@ -45,7 +26,7 @@ index f85cb1e..b364219 100644 endif() endif() -@@ -714,6 +717,28 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +@@ -713,6 +716,28 @@ add_subdirectory(packaging) endif() @@ -74,7 +55,7 @@ index f85cb1e..b364219 100644 configure_file(packaging/libre.pc.in libre.pc @ONLY) -@@ -725,6 +750,9 @@ configure_file(packaging/libre.pc.in libre.pc @ONLY) +@@ -724,6 +749,9 @@ install(TARGETS ${RE_INSTALL_TARGETS} EXPORT libre @@ -84,7 +65,7 @@ index f85cb1e..b364219 100644 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -@@ -743,7 +771,9 @@ install(FILES ${HEADERS} +@@ -742,7 +770,9 @@ install(EXPORT libre DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre @@ -94,7 +75,7 @@ index f85cb1e..b364219 100644 ) if(LIBRE_BUILD_SHARED) -@@ -755,12 +785,8 @@ if(LIBRE_BUILD_SHARED) +@@ -754,12 +784,8 @@ ) endif() @@ -109,10 +90,9 @@ index f85cb1e..b364219 100644 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre COMPONENT Development ) -diff --git a/cmake/libre-config.cmake b/cmake/libre-config.cmake -index 0965b84..af7f2de 100644 ---- a/cmake/libre-config.cmake -+++ b/cmake/libre-config.cmake +diff -Naur re-3.3.0-orig/cmake/libre-config.cmake re-3.3.0/cmake/libre-config.cmake +--- re-3.3.0-orig/cmake/libre-config.cmake 2023-07-05 08:55:20.000000000 +0200 ++++ re-3.3.0/cmake/libre-config.cmake 2023-10-02 13:08:47.000000000 +0200 @@ -1 +1,23 @@ -include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake") +if("@LIBRE_BUILD_STATIC@") @@ -138,11 +118,10 @@ index 0965b84..af7f2de 100644 + set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re) + endif() +endif() -diff --git a/packaging/libre.pc.in b/packaging/libre.pc.in -index 5817066..2df8f6c 100644 ---- a/packaging/libre.pc.in -+++ b/packaging/libre.pc.in -@@ -7,6 +7,7 @@ Name: libre +diff -Naur re-3.3.0-orig/packaging/libre.pc.in re-3.3.0/packaging/libre.pc.in +--- re-3.3.0-orig/packaging/libre.pc.in 2023-07-05 08:55:20.000000000 +0200 ++++ re-3.3.0/packaging/libre.pc.in 2023-10-02 13:08:47.000000000 +0200 +@@ -7,6 +7,7 @@ Description: @CMAKE_PROJECT_DESCRIPTION@ Version: @PROJECT_VERSION@ URL: @CMAKE_PROJECT_HOMEPAGE_URL@ diff --git a/ports/bde/portfile.cmake b/ports/bde/portfile.cmake index 92017b0a848977..3d83db6ace0364 100644 --- a/ports/bde/portfile.cmake +++ b/ports/bde/portfile.cmake @@ -11,8 +11,8 @@ vcpkg_from_github( OUT_SOURCE_PATH TOOLS_PATH REPO "bloomberg/bde-tools" REF "${BDE_TOOLS_VERSION}" - SHA512 3c39da8d1ea40459e36e11ada93cc2821ae1b16a831f93cccab463996394a400cc08bb1654642eae1aa5187f139d7fb80c4729e464051eee182133eb8a74158d - HEAD_REF main + SHA512 e59560810acfe562d85a13585d908decce17ec76c89bd61f43dac56cddfdf6c56269566da75730f8eda14b5fc046d2ebce959b24110a428e8eac0e358d2597c2 + HEAD_REF 3.123.0.0 ) message(STATUS "Configure bde-tools-v${BDE_TOOLS_VERSION}") @@ -24,8 +24,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "bloomberg/bde" REF "${VERSION}" - SHA512 810b4a06a08739dcd990751dd543aa7dc58355f9d64a7c96ef0cf45c81501946434db42ad5bcf5d16110d5a463586b587ce09a446136e824298f39a8a871b490 - HEAD_REF main + SHA512 f1c3c5ddec7ff1d301ca6f8ab00e6be42ab6a5fa3c889639e7797df74f68425d57d8b71978098331c9247820c7c831edeaf4427ae64c890d81f704343b1bb112 + HEAD_REF 3.123.0.0 ) vcpkg_cmake_configure( @@ -49,12 +49,16 @@ vcpkg_cmake_build() # Install release vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/) +list(APPEND SUBPACKAGES "ryu" "inteldfp" "pcre2" "s_baltst" "bsl" "bdl" "bal") +include(GNUInstallDirs) # needed for CMAKE_INSTALL_LIBDIR +foreach(subpackage IN LISTS SUBPACKAGES) + vcpkg_cmake_config_fixup(PACKAGE_NAME ${subpackage} CONFIG_PATH /${CMAKE_INSTALL_LIBDIR}/cmake/${subpackage} DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/${CMAKE_INSTALL_LIBDIR}/cmake") # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bde RENAME copyright ) - vcpkg_fixup_pkgconfig() diff --git a/ports/bde/vcpkg.json b/ports/bde/vcpkg.json index 0cda0f4a028f0f..963f91527e77e6 100644 --- a/ports/bde/vcpkg.json +++ b/ports/bde/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bde", - "version": "3.117.0.0", + "version": "3.123.0.0", "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.", "supports": "!windows & !arm & !android & !osx", "dependencies": [ diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index a15d5c9c1937c9..521e9b089471f8 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -1,12 +1,9 @@ -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/${VERSION}.tar.gz" - FILENAME "BehaviorTree.CPP.${VERSION}.tar.gz" - SHA512 4505c4c8798ccbbc02f58320810eb86e791fb6ef57d8c85882e62bd2b509b41e0549dc311ed61926a873b5b956eda979efda488f01d00746e1e8db559f60253c -) - -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE "${ARCHIVE}" +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BehaviorTree/BehaviorTree.CPP + REF ${VERSION} + SHA512 f2ee647c734e39e50f92405c5dc9fd2876602ff074a86416959fbf6548e37130d35f312cafb084ca4a40da7ee81386502a75ad839ce99a2859c30ff187820fdf + HEAD_REF master PATCHES fix-x86_build.patch ) diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index 7305ae8c9ef05d..32f343b67070bd 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "behaviortree-cpp", - "version": "4.1.1", + "version": "4.3.7", "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", "supports": "!uwp", diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index cc17566a7d3ea4..2e13e0df8f6cbb 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF v1.8.2 - SHA512 532f2cee66cf527ef4452a060cfdedba6417e5d8f72225d6bf50adf6422d9a769b0f54f48982b438fa9ced975ac47bcc5e62c3c23ce871b5cfdbcf9cc0d2b829 + REF "v${VERSION}" + SHA512 4e12114251c79a426873cfba6e27270b69fc980cef9a68e9cb3170f8e2e203f77dee19ab1e65cad51cd67e60991d3bbfdd52553f22522ce5e6c611b5aa07602c HEAD_REF main ) diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json index db9c8e81d1d620..f2f48eb748b751 100644 --- a/ports/benchmark/vcpkg.json +++ b/ports/benchmark/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", "name": "benchmark", - "version-semver": "1.8.2", + "version-semver": "1.8.3", "description": "A library to support the benchmarking of functions, similar to unit-tests.", "homepage": "https://github.com/google/benchmark", "license": "Apache-2.0", diff --git a/ports/bento4/fix-install.patch b/ports/bento4/fix-install.patch deleted file mode 100644 index 5de2edc72c01f9..00000000000000 --- a/ports/bento4/fix-install.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6de3bfe..2b2239a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -81,3 +81,20 @@ foreach(app ${BENTO4_APPS}) - endif() - endforeach() - endif(BUILD_APPS) -+ -+file(GLOB AP4_INCLUDES -+ ${SOURCE_CODECS}/*.h -+ ${SOURCE_CORE}/*.h -+ ${SOURCE_CRYPTO}/*.h -+ ${SOURCE_METADATA}/*.h -+) -+ -+# Install targets -+install(TARGETS ap4 -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) -+ -+# Install headers -+install(FILES ${AP4_INCLUDES} DESTINATION include/bento4) diff --git a/ports/bento4/portfile.cmake b/ports/bento4/portfile.cmake index ae6e04103dad14..dab20b97013e6a 100644 --- a/ports/bento4/portfile.cmake +++ b/ports/bento4/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axiomatic-systems/Bento4 - REF 83c48e6e2a3f8e4be7ad2eddaa0639303184146d # v1.6.0-639 - SHA512 764c1102dc1e2a0f48395427b5b0a96f87d7124cceb61eb24008f245cf1f5f057753307c38f6f7e74d6838d6600c436d8540e94cbca12385cb4fffb02995069b - HEAD_REF master - PATCHES - fix-install.patch + REF "v${VERSION}" + SHA512 2c5b9b5cc2aaa6a59eaaf3cf47f91b8748362319c6bf9b954d8fc1fe309fda42e28f03a704783bef215b05578cec1832c6ae07d8f53a2173009e135ae630fae5 + HEAD_REF master ) vcpkg_cmake_configure( @@ -17,9 +15,10 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bento4) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/Documents/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Documents/LICENSE.txt") diff --git a/ports/bento4/vcpkg.json b/ports/bento4/vcpkg.json index 9103b59ebb176d..42745f853776b7 100644 --- a/ports/bento4/vcpkg.json +++ b/ports/bento4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "bento4", - "version": "1.6.0-639", - "port-version": 1, + "version": "1.6.0-640", "description": "Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15.", "homepage": "https://github.com/axiomatic-systems/Bento4", "license": null, @@ -9,6 +8,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/bext-sml2/portfile.cmake b/ports/bext-sml2/portfile.cmake new file mode 100644 index 00000000000000..9d851cbac1b35c --- /dev/null +++ b/ports/bext-sml2/portfile.cmake @@ -0,0 +1,15 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boost-ext/sml2 + REF 6989e01776ab0d51a7b9463c307855d4a274888f + SHA512 215e404769b80da01735d4038ec8fd63804ef3dfb6b65fcbce38b9e90491d4758c28338a1d259776b2258e35f14a4fb27330fa730800cf7289d147cf5e580d4e + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/sml2" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/boost" +) + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/bext-sml2/vcpkg.json b/ports/bext-sml2/vcpkg.json new file mode 100644 index 00000000000000..2422e2ddb97219 --- /dev/null +++ b/ports/bext-sml2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "bext-sml2", + "version-date": "2023-09-20", + "description": "Your scalable C++20 one header only State Machine Library with no dependencies", + "homepage": "https://github.com/boost-ext/sml2", + "license": "BSL-1.0" +} diff --git a/ports/bitmagic/portfile.cmake b/ports/bitmagic/portfile.cmake index 240a52cf698d40..6ee8a0cf468c5f 100644 --- a/ports/bitmagic/portfile.cmake +++ b/ports/bitmagic/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tlk00/BitMagic - REF v7.12.3 - SHA512 03b9261d102b3c610a4b284f74092feb451b7a5fe80d60002dd2a42e2eeae4b763d212d2647eeb1fc9a61c93500f006ab2bcc46598207903682b70b1e4336b6a + REF "v${VERSION}" + SHA512 d034f66b8631d09cb0be11b96f5f12dea416ef2cfca42ed7f0865aeb65102a4951821805ec65bee793541ce1a665e5d11ba4bedb0d79956c0eee6c856afb29b2 HEAD_REF master ) diff --git a/ports/bitmagic/vcpkg.json b/ports/bitmagic/vcpkg.json index 93a900be1e3b84..fdb3c5bc81687d 100644 --- a/ports/bitmagic/vcpkg.json +++ b/ports/bitmagic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bitmagic", - "version": "7.12.3", + "version": "7.13.4", "description": "Algorithms and tools for Algebra of Sets for information retrieval, indexing of databases, scientific algorithms, ranking, clustering, unsupervised machine learning and signal processing.", "homepage": "http://bitmagic.io" } diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index 818e3324cd9a1f..39267875886476 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -1,11 +1,11 @@ # All components of BitSerializer is "header only" except CSV archive vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_bitbucket( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO Pavel_Kisliak/BitSerializer - REF 0.50 - SHA512 d223e4487251e375b2f5d8b1dca9a3db3f5661c3eb308b12f019864e49d58fb0b7d45a45c3e7e232ba1d023adb1f9a3a287255099b205f57c6cade04167119d6 + REPO PavelKisliak/BitSerializer + REF v0.65 + SHA512 fa49c6409b691c8e67fd2bf6ba740367334283bbfe3d984256420da3f9b439b56a04e718844466875b4cc01380d4d3a4ff3f3a6b347d3fd391895551eb8c8f91 HEAD_REF master ) diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json index 66fd0993d9ac39..e67460c44b9ed2 100644 --- a/ports/bitserializer/vcpkg.json +++ b/ports/bitserializer/vcpkg.json @@ -1,8 +1,8 @@ { "name": "bitserializer", - "version": "0.50", + "version": "0.65", "description": "C++ 17 library for serialization to JSON, XML, YAML, CSV", - "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer", + "homepage": "https://github.com/PavelKisliak/BitSerializer", "license": "MIT", "dependencies": [ { diff --git a/ports/blake3/fix-windows-arm-build-error.patch b/ports/blake3/fix-windows-arm-build-error.patch new file mode 100644 index 00000000000000..a1df6c18d5dea1 --- /dev/null +++ b/ports/blake3/fix-windows-arm-build-error.patch @@ -0,0 +1,13 @@ +diff --git a/c/blake3_dispatch.c b/c/blake3_dispatch.c +index af6c3da..dce85b4 100644 +--- a/c/blake3_dispatch.c ++++ b/c/blake3_dispatch.c +@@ -31,7 +31,7 @@ + #define ATOMIC_INT _Atomic int + #define ATOMIC_LOAD(x) x + #define ATOMIC_STORE(x, y) x = y +-#elif defined(_MSC_VER) ++#elif defined(IS_X86) and defined(_MSC_VER) + #define ATOMIC_INT LONG + #define ATOMIC_LOAD(x) InterlockedOr(&x, 0) + #define ATOMIC_STORE(x, y) InterlockedExchange(&x, y) diff --git a/ports/blake3/portfile.cmake b/ports/blake3/portfile.cmake index 2004ba4924f57f..76cade75ea6ff1 100644 --- a/ports/blake3/portfile.cmake +++ b/ports/blake3/portfile.cmake @@ -2,8 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BLAKE3-team/BLAKE3 REF "${VERSION}" - SHA512 e2a3a4811a0a8c88492efb74123dcbe26176fd307e1ba527b67001ae076970a36fd26282d4cd728c875ab228827962564a00ff0c3a8d99e2f12a29bbf431c547 + SHA512 eb782d48240cf2fa8cc3cddd699dce3a362eb480b3ca58a97d54cd3595a0c969e51fe14374b91136036e8e29c8f745efbd5a4d1aaed2c17f23cb89fb756645d0 HEAD_REF main + PATCHES + fix-windows-arm-build-error.patch ) vcpkg_cmake_configure( diff --git a/ports/blake3/vcpkg.json b/ports/blake3/vcpkg.json index 273e8ca6f03a39..e46a5b990dc4f1 100644 --- a/ports/blake3/vcpkg.json +++ b/ports/blake3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "blake3", - "version": "1.4.0", + "version": "1.5.0", "description": "BLAKE3 cryptographic hash function.", "homepage": "https://github.com/BLAKE3-team/BLAKE3", "license": "CC0-1.0 OR Apache-2.0", diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake index 699b01a231cd0b..c859fee8e58233 100644 --- a/ports/blend2d/portfile.cmake +++ b/ports/blend2d/portfile.cmake @@ -10,7 +10,6 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES - futex BLEND2D_NO_FUTEX jit BLEND2D_NO_JIT logging BLEND2D_NO_JIT_LOGGING tls BLEND2D_NO_TLS @@ -36,6 +35,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DBLEND2D_STATIC=${BLEND2D_STATIC}" + "-DBLEND2D_NO_FUTEX=OFF" ${FEATURE_OPTIONS} ) diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json index 93e862195cf895..07899cbcb3bf36 100644 --- a/ports/blend2d/vcpkg.json +++ b/ports/blend2d/vcpkg.json @@ -1,6 +1,7 @@ { "name": "blend2d", "version-date": "2023-06-16", + "port-version": 1, "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", "homepage": "https://github.com/blend2d/blend2d", "documentation": "https://blend2d.com/doc/index.html", @@ -17,24 +18,17 @@ } ], "default-features": [ - "futex", "jit", "logging", "tls" ], "features": { - "futex": { - "description": "Default feature. Enables use of futex." - }, "jit": { "description": "Default feature. Enables jit pipeline compilation.", "dependencies": [ { "name": "blend2d", "default-features": false, - "features": [ - "futex" - ], "platform": "windows" } ] @@ -57,9 +51,6 @@ { "name": "blend2d", "default-features": false, - "features": [ - "futex" - ], "platform": "windows" } ] diff --git a/ports/blosc/portfile.cmake b/ports/blosc/portfile.cmake index 1ef04dc90754bd..926dc4a63a5c0d 100644 --- a/ports/blosc/portfile.cmake +++ b/ports/blosc/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Blosc/c-blosc REF "v${VERSION}" - SHA512 e9542aa2d1ebae9f6dcc12916d7ac3b920d771281ab96e2b2d59c2951e5f51d02d2684859b8823643d43d320613fb9dd8a3ea411ade34e66e323fcefa8165a91 + SHA512 01e6d80e1114d76c4bd1b413778c293d0455879ec38e1e1ec46e8e7eaf2997b47cc2de35bc52cdc4c2c70341b6f87d70626a9a9c24ffc8b7b170d760efa60c07 HEAD_REF master PATCHES 0001-fix-CMake-config.patch @@ -45,6 +45,6 @@ find_dependency(Threads)]] # cleanup file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSES/BLOSC.txt") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") vcpkg_fixup_pkgconfig() diff --git a/ports/blosc/vcpkg.json b/ports/blosc/vcpkg.json index 0d500dabc38388..a6f7af997517a8 100644 --- a/ports/blosc/vcpkg.json +++ b/ports/blosc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "blosc", - "version": "1.21.3", + "version": "1.21.5", "description": "A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`", "homepage": "https://github.com/Blosc/c-blosc", "license": "BSD-3-Clause", diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake index e9f6fda7360c10..595b12d6375635 100644 --- a/ports/boinc/portfile.cmake +++ b/ports/boinc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BOINC/boinc - REF client_release/7.22/7.22.2 - SHA512 ac1f63ecea4d24a86459d5f58aac45f04dfaee3e358fcb5a0ae201e9289e11debada30bf0f3ab1bba462068788a2eca2f4d6b3c45d3603c7b6ca6ad51effc85b + REF client_release/7.24/7.24.1 + SHA512 7dad36900c13b69a89b5a173fc283130bc4cf15c781ed31ed72ce0b6ba0db4895a12314d0f302c7a91c2762333b7c162f20f32e67ed5e2e7a4099e1f2238c255 HEAD_REF master ) diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 9944ba42c57f00..31c73c72c2d181 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boinc", - "version": "7.22.2", - "port-version": 2, + "version": "7.24.1", "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "license": "LGPL-3.0-or-later", diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index e5e3533e042b9e..9b508f23e64460 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/accumulators - REF boost-1.82.0 - SHA512 8ad900f0f421af1302682a397d1bffb2aee4c5ab4b2103f3afe427905c7fa86cbabaaaffc6fbcef0f3ddb60f865756aafd1e7b5baa42176ed3ed2d2d8388b264 + REF boost-1.83.0 + SHA512 6c7b9b03235945e796eb629e632f074262c46c9201918cd636298b87d464f97923fdb6f9d64c8d3ff70a5e4d6afac4f7d95fb338cf67b9c3ee4c0a7812d62984 HEAD_REF master ) diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json index 3291a810530a63..b6ae3428119199 100644 --- a/ports/boost-accumulators/vcpkg.json +++ b/ports/boost-accumulators/vcpkg.json @@ -1,95 +1,94 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-accumulators", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost accumulators module", "homepage": "https://github.com/boostorg/accumulators", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-circular-buffer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-ublas", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 8219eb6808b11e..5988bb02e450ea 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/algorithm - REF boost-1.82.0 - SHA512 46b49d336360fdaf6b3f28c93e4b4c6949d5b89ea4f718849ef40417811e32819b367513949a3040b343850698dac878a785639e18dc938066a1db9a07490ab6 + REF boost-1.83.0 + SHA512 88321824ce0ec8c804c6a8451d16fb45b611107aaf0fcc0ee9ca4efd6fb17e60638b55867c811b8c3e57a270c21573ccba4d7e49865ee7a8df2e87d7759f46e4 HEAD_REF master ) diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json index a729cf3858eef9..aa517edaf9fcd2 100644 --- a/ports/boost-algorithm/vcpkg.json +++ b/ports/boost-algorithm/vcpkg.json @@ -1,83 +1,82 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-algorithm", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost algorithm module", "homepage": "https://github.com/boostorg/algorithm", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-regex", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-unordered", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index 2af2e091392ee8..79f790abc7eb2d 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/align - REF boost-1.82.0 - SHA512 939a4143d07e3656dcc2625288c2e3cbb77aba4b80d48bf2c3f7c403f634857b7898a7b49d90b225adae27c91643b169b5f52e75b93e9d76e664d4d631c8ba08 + REF boost-1.83.0 + SHA512 4a8a3b9686a29c2d52bb23f52a256aee8f246b72a832af63082b87a8435aeab076a67c0cd220b1bad9d6a9f0184c59a2495594c7a4eb86916495ee2c8d35e5dc HEAD_REF master ) diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json index d807165945e04a..e8ac7c176bc96c 100644 --- a/ports/boost-align/vcpkg.json +++ b/ports/boost-align/vcpkg.json @@ -1,31 +1,30 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-align", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost align module", "homepage": "https://github.com/boostorg/align", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index f4a9415370c5e8..3aadf636e5e195 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/any - REF boost-1.82.0 - SHA512 3d65777d2b2037e996199c56420f6de419661e6dc79a226d42860f526232b31a256c0ddccb605244d98b9fc854fef42134ffe9e20b138c8f2309984345d3fc86 + REF boost-1.83.0 + SHA512 5e0916fb16e14bc0d4702b3fa89a2ed1aadf0297abf627d2774604453d5049b799a9958e1bd525ef477e59fb28d65b3763d945603029200534d550e9137541c2 HEAD_REF master ) diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json index c9f06647ea45a8..6cebf811b3f177 100644 --- a/ports/boost-any/vcpkg.json +++ b/ports/boost-any/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-any", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost any module", "homepage": "https://github.com/boostorg/any", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index d109f4152481ca..070351b5aefbbb 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/array - REF boost-1.82.0 - SHA512 aeec923cf445eb88c67c9cf46a617db4a9e99c8fceca233573907c029e6152dd57e296415a715148cea2acbdc8a4a196bc6d1460685fd05785cd5f975c05fa12 + REF boost-1.83.0 + SHA512 3f1ec923d440139f57a5b7ec652501dad2cb0b6317cf7f064db2fddcc126fcad63e8b6c95b44b50b3e0c0b457245e386540e14d5e881cc611d6f2ce6fe395d00 HEAD_REF master ) diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json index bba38a2d2cf23e..ceb2cf98c1556d 100644 --- a/ports/boost-array/vcpkg.json +++ b/ports/boost-array/vcpkg.json @@ -1,35 +1,34 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-array", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost array module", "homepage": "https://github.com/boostorg/array", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-asio/fix_coro_compile_error_msvc.patch b/ports/boost-asio/fix_coro_compile_error_msvc.patch deleted file mode 100644 index 05c14e190e0e09..00000000000000 --- a/ports/boost-asio/fix_coro_compile_error_msvc.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff --git a/include/boost/asio/experimental/impl/coro.hpp b/include/boost/asio/experimental/impl/coro.hpp -index ec7d956e..ba219453 100644 ---- a/include/boost/asio/experimental/impl/coro.hpp -+++ b/include/boost/asio/experimental/impl/coro.hpp -@@ -1070,17 +1070,17 @@ struct coro::initiate_async_resume - std::true_type /* error is noexcept */, - std::true_type /* result is void */) //noexcept - { -- return [this, coro = coro_, -+ return [this, coro_promise_ = coro_, - h = std::forward(handler), - exec = std::move(exec)]() mutable - { -- assert(coro); -+ assert(coro_promise_); - -- auto ch = detail::coroutine_handle::from_promise(*coro); -+ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); - assert(ch && !ch.done()); - -- coro->awaited_from = post_coroutine(std::move(exec), std::move(h)); -- coro->reset_error(); -+ coro_promise_->awaited_from = post_coroutine(std::move(exec), std::move(h)); -+ coro_promise_->reset_error(); - ch.resume(); - }; - } -@@ -1091,18 +1091,18 @@ struct coro::initiate_async_resume - std::true_type /* error is noexcept */, - std::false_type /* result is void */) //noexcept - { -- return [coro = coro_, -+ return [coro_promise_ = coro_, - h = std::forward(handler), - exec = std::move(exec)]() mutable - { -- assert(coro); -+ assert(coro_promise_); - -- auto ch = detail::coroutine_handle::from_promise(*coro); -+ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); - assert(ch && !ch.done()); - -- coro->awaited_from = detail::post_coroutine( -- exec, std::move(h), coro->result_).handle; -- coro->reset_error(); -+ coro_promise_->awaited_from = detail::post_coroutine( -+ exec, std::move(h), coro_promise_->result_).handle; -+ coro_promise_->reset_error(); - ch.resume(); - }; - } -@@ -1112,16 +1112,16 @@ struct coro::initiate_async_resume - std::false_type /* error is noexcept */, - std::true_type /* result is void */) - { -- return [coro = coro_, -+ return [coro_promise_ = coro_, - h = std::forward(handler), - exec = std::move(exec)]() mutable - { -- if (!coro) -+ if (!coro_promise_) - return boost::asio::post(exec, - boost::asio::append(std::move(h), - detail::coro_error::invalid())); - -- auto ch = detail::coroutine_handle::from_promise(*coro); -+ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); - if (!ch) - return boost::asio::post(exec, - boost::asio::append(std::move(h), -@@ -1132,9 +1132,9 @@ struct coro::initiate_async_resume - detail::coro_error::done())); - else - { -- coro->awaited_from = detail::post_coroutine( -- exec, std::move(h), coro->error_).handle; -- coro->reset_error(); -+ coro_promise_->awaited_from = detail::post_coroutine( -+ exec, std::move(h), coro_promise_->error_).handle; -+ coro_promise_->reset_error(); - ch.resume(); - } - }; -@@ -1145,17 +1145,17 @@ struct coro::initiate_async_resume - std::false_type /* error is noexcept */, - std::false_type /* result is void */) - { -- return [coro = coro_, -+ return [coro_promise_ = coro_, - h = std::forward(handler), - exec = std::move(exec)]() mutable - { -- if (!coro) -+ if (!coro_promise_) - return boost::asio::post(exec, - boost::asio::append(std::move(h), - detail::coro_error::invalid(), result_type{})); - - auto ch = -- detail::coroutine_handle::from_promise(*coro); -+ detail::coroutine_handle::from_promise(*coro_promise_); - if (!ch) - return boost::asio::post(exec, - boost::asio::append(std::move(h), -@@ -1166,9 +1166,9 @@ struct coro::initiate_async_resume - detail::coro_error::done(), result_type{})); - else - { -- coro->awaited_from = detail::post_coroutine( -- exec, std::move(h), coro->error_, coro->result_).handle; -- coro->reset_error(); -+ coro_promise_->awaited_from = detail::post_coroutine( -+ exec, std::move(h), coro_promise_->error_, coro_promise_->result_).handle; -+ coro_promise_->reset_error(); - ch.resume(); - } - }; -@@ -1204,9 +1204,9 @@ struct coro::initiate_async_resume - [h = handle(exec, std::forward(handler), - std::integral_constant{}, - std::is_void{}), -- in = std::forward(input), coro = coro_]() mutable -+ in = std::forward(input), coro_promise_ = coro_]() mutable - { -- coro->input_ = std::move(in); -+ coro_promise_->input_ = std::move(in); - std::move(h)(); - }); - } diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index 2698ac760ed6b5..892cc4ea93bb6c 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -3,12 +3,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/asio - REF boost-1.82.0 - SHA512 d54fd77ca7996da138b10408df1eae28bbcae0c6475467cc19837bf6f6624c38ad7f9e1eec87ceae27f516583b204fdbaeb04daad7cc28e6aeec02ab5f188731 + REF boost-1.83.0 + SHA512 83e6f39a4b8e54c89e7e7d322acc9e52a83a2a37f45c834a0267f0dbc1219314ad008f4f97e4cddc0a0c15dbea1785681181cea2e903773bdb31176875e0af95 HEAD_REF master - PATCHES - windows_alloca_header.patch - fix_coro_compile_error_msvc.patch #upstream PR: https://github.com/chriskohlhoff/asio/pull/1313 + PATCHES windows_alloca_header.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index 8d131a4be65aab..69f51495dba8f8 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -1,89 +1,88 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-asio", - "version": "1.82.0", - "port-version": 3, + "version": "1.83.0", "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-chrono", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-coroutine", "platform": "!(arm & windows) & !uwp & !emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-date-time", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-regex", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ], "features": { diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index bdf7007e71d3e7..5ba6918637c1e9 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assert - REF boost-1.82.0 - SHA512 5f0a4f6edb6a4f933b14bcb5b637224d50ba078565d6f1405bc1eec282ac7fefe22b7ba8d61429159c6814cfab50deccf16c09aff10972bed9180b51c381b1ab + REF boost-1.83.0 + SHA512 6ae5fd1bf3360361fdc0dd7c47752aba866c44766129359f0d00b4d9a6357c50b86d20f7aa6ebb1a324e575c4256a7690de589ca98d49eb6e0677def8aded5ca HEAD_REF master ) diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json index fe5a19d6b71d29..85ba47c2542d17 100644 --- a/ports/boost-assert/vcpkg.json +++ b/ports/boost-assert/vcpkg.json @@ -1,19 +1,18 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-assert", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost assert module", "homepage": "https://github.com/boostorg/assert", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 51bf600d98ddf1..f2f620f990cd08 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assign - REF boost-1.82.0 - SHA512 8b9e8999b9a8375eedcb37a0261484a4c592382bb7c3cc2eb58ed3c9f2b74330ac31a5776ffb121d52ca022d8493dc46c6f977fe9440bacfce250eb1efab92c6 + REF boost-1.83.0 + SHA512 cdcab29f429528aff53c009e6ee822c70e763534561be97be5ceb806d58ea2906b19b3e81f667f27fb08a320385a9207122d5bdba704e314eda040377d63ea6a HEAD_REF master ) diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json index f51f64a0e82ea2..a87c622fe261b7 100644 --- a/ports/boost-assign/vcpkg.json +++ b/ports/boost-assign/vcpkg.json @@ -1,59 +1,58 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-assign", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost assign module", "homepage": "https://github.com/boostorg/assign", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-ptr-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 7586dcb2dc3371..54ac7a4bc15505 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.82.0 - SHA512 d14db6e1fc5d1d23f564a2117784b94951a6d4daffd48c505d13c2c697f84eb0f05b843a66b79dd9fc7a2cb764d6b015fed897e5f92dcb9546567ded111b7e8a + REF boost-1.83.0 + SHA512 d6ee15758d9de6c64e9bb307e3b9a5a9aea6d4555be2df78c8ed8089d9da75926f6ec376c2917fbb8c2f985f23b0b926b39fb2d02921c443a83edb77e0455996 HEAD_REF master ) diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index 642b10f9f89597..bbdb68070987fb 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -1,57 +1,56 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-atomic", - "version": "1.82.0", - "port-version": 3, + "version": "1.83.0", "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index 89edf3b4a4fd48..bd81a5f132a5bb 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/beast - REF boost-1.82.0 - SHA512 85dd18b1ecc56cdd3ab18fa95b14971ccc91270c262ff204cdb807aa2a77b88e0bcb5b873f2c2bb444d99e9d9815d14c8a26770104875f6796c137d48f831ce4 + REF boost-1.83.0 + SHA512 d79ab6eb972e2beff4751809b3038c816578d6ea10422eca89bb75652686315bc31579761982a098c100272320b0e36ba2b4b70c2d5d30d7f2aa9a1a60e78ec8 HEAD_REF master ) diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json index f20f2036fd256f..2738c5d17a6f9e 100644 --- a/ports/boost-beast/vcpkg.json +++ b/ports/boost-beast/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-beast", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost beast module", "homepage": "https://github.com/boostorg/beast", "license": "BSL-1.0", @@ -10,91 +9,91 @@ "dependencies": [ { "name": "boost-asio", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-endian", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-logic", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-string", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 3c0281e75d1570..44ea51f7ac0f89 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bimap - REF boost-1.82.0 - SHA512 3ab80d2750b472f4f3f365dc695a28df128d2b9302a6c78e94fb0974780523583e20a88a3c4e28f3c349672911bc0b730b52ef1f272a9cd70f7f219418effffa + REF boost-1.83.0 + SHA512 e4de66ad6c185be505abbe077ce22862466dd11c2d11d3879032e43e0fd08cd9b4b27276422fd4f5909b5367e483f891c75e1895407ca8d67a4284d9821c04eb HEAD_REF master ) diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json index 7d36c3dc88e279..5843fc0518ce0a 100644 --- a/ports/boost-bimap/vcpkg.json +++ b/ports/boost-bimap/vcpkg.json @@ -1,67 +1,66 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-bimap", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost bimap module", "homepage": "https://github.com/boostorg/bimap", "license": "BSL-1.0", "dependencies": [ { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lambda", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index ace8bef2243ce6..01a151f88846ee 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bind - REF boost-1.82.0 - SHA512 f816e3421e34e6f185708ce1cc0590a634f893493fd62d1d75a51e98b84eadf75af55301d1ae79e39f62ae5e81b5fc8f3366d5a6745e75ecfe5cdf770b57de41 + REF boost-1.83.0 + SHA512 7b2e76459b5cd18437f5d8644c532d6f2ba293cc56ffbe979981a9ac81fa8ca87b0354a1a488321742be1c3448e3ce13637f590856c671993de3a2512e040d07 HEAD_REF master ) diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json index 4f69852729d46a..10dfccbb57479e 100644 --- a/ports/boost-bind/vcpkg.json +++ b/ports/boost-bind/vcpkg.json @@ -1,23 +1,22 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-bind", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost bind module", "homepage": "https://github.com/boostorg/bind", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index b30317ab7b4f8c..2f876bfe0a9830 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -4,13 +4,13 @@ if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME return() endif() -set(BOOST_VERSION 1.82.0) +set(BOOST_VERSION 1.83.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build REF boost-${BOOST_VERSION} - SHA512 5f8d46f48e037737e3465e3562c9bdbcacb4a075305c073fe665a8e9c7381ecaa4f5b91a42a9c509cf1c2e0f2af10dbb19f9d443a06fd09edf7372c008d91204 + SHA512 1dfd98087b41190437ea07a82fca0a85b71d29ee3f059c6d49916d089102d7fd79a721f720019b98f9cdefcada2cc8dc8fc87d3507a70b43fc0e1b4eaa7853f8 HEAD_REF master PATCHES 0002-fix-get-version.patch @@ -27,7 +27,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(BOOSTCPP_ARCHIVE URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/boostcpp.jam" FILENAME "boost-${BOOST_VERSION}-boostcpp.jam" - SHA512 0daa0dd315f7e426e7b9ada9cc4dad03da2eb257456e551de3fb3b2a8244f0117ed41d9d1ff77b5a3eee7a3c5fb466d345b9bb2af46004fc630209043d4862e3 + SHA512 32feae4e13418f68702b18964b17e706255429dd881a098355a0b644da11a97c42aa7eeffa5cc4e30aa8a370dde2097aecc62175fb37cd5cf9766e7fc6303da7 ) # https://github.com/boostorg/boost/pull/206 diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 99d64cbff584f9..3b5b20ce6bfe2c 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-build", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "license": "BSL-1.0", "dependencies": [ { "name": "boost-uninstall", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index 053b7f70ae3413..5a63347b0d560b 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/callable_traits - REF boost-1.82.0 - SHA512 a8768293632678b3f6693103452090f20d5a0f4e5cda600e29b080695eed78db4a5cdc541e737f8c79971da1c02b1972dc41aee94051f456b77c1cff3b8accec + REF boost-1.83.0 + SHA512 102097394e795dea433742941c5708c2bd80c1a59fb2d4acb851ec071822f505889ca3fa8484332e684d210d16820212519674d1a758463258ae6fef6634e0e9 HEAD_REF master ) diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json index 0f14acebc60a34..48cb60b0f43b33 100644 --- a/ports/boost-callable-traits/vcpkg.json +++ b/ports/boost-callable-traits/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-callable-traits", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost callable_traits module", "homepage": "https://github.com/boostorg/callable_traits", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index 9d85d4c2f76bb4..440e2316d9c129 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/chrono - REF boost-1.82.0 - SHA512 f1edef690e9ecacdd5cece1043f68403a428a4b91f38575971976a13b040d6b7275ba2f4fa6cfb4059aaa764df89011cffe21ebd31b2acd1117fce109a5f2564 + REF boost-1.83.0 + SHA512 4e337e93dac9758121afa1a9f404e9b0d02b6a34fa8a81fca09419587cd3f4d6f796dfde5e2d212e94f843db0f7f2996557ef2af0b2b697ed31b72895a7438e8 HEAD_REF master ) diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json index 18640736efc227..a71d0b8e27c3f3 100644 --- a/ports/boost-chrono/vcpkg.json +++ b/ports/boost-chrono/vcpkg.json @@ -1,85 +1,84 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-chrono", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost chrono module", "homepage": "https://github.com/boostorg/chrono", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-ratio", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index 1c0a49a69aba55..ca71f072ba2657 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/circular_buffer - REF boost-1.82.0 - SHA512 6e3bfdf4139bb585be90f54f37f77b3d9ea1dd90b62e0ff3d0c7918a69d4e524d4736999bcc11957eeed1381a96aa499f71e2588d3c8f440062b3216d4aa7f79 + REF boost-1.83.0 + SHA512 8ec66b5b9185971684c72cd6f4ef86c2ed5d0decb1a72949d1dc7423f8f220f14e124151d1c6a7042805ecb9813a2ce67080f2ebef316e24a0b67ea5686a2e1f HEAD_REF master ) diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json index 06f78115ef650c..06a962e903fd95 100644 --- a/ports/boost-circular-buffer/vcpkg.json +++ b/ports/boost-circular-buffer/vcpkg.json @@ -1,47 +1,46 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-circular-buffer", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost circular_buffer module", "homepage": "https://github.com/boostorg/circular_buffer", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-compat/portfile.cmake b/ports/boost-compat/portfile.cmake new file mode 100644 index 00000000000000..71b5be29678e22 --- /dev/null +++ b/ports/boost-compat/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/compat + REF boost-1.83.0 + SHA512 4eb3d73e278da881967d9408822cb6d8a54b98ab7bfe278eed94189a3ff6b1b3987b5317f9765ce2b16b4c0cb75af5755bdb0850a053fa0ccec3e942e67a9347 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-compat/vcpkg.json b/ports/boost-compat/vcpkg.json new file mode 100644 index 00000000000000..04e24cb8b086a8 --- /dev/null +++ b/ports/boost-compat/vcpkg.json @@ -0,0 +1,26 @@ +{ + "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", + "name": "boost-compat", + "version": "1.83.0", + "description": "Boost compat module", + "homepage": "https://github.com/boostorg/compat", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "boost-assert", + "version>=": "1.83.0" + }, + { + "name": "boost-config", + "version>=": "1.83.0" + }, + { + "name": "boost-throw-exception", + "version>=": "1.83.0" + }, + { + "name": "boost-vcpkg-helpers", + "version>=": "1.83.0" + } + ] +} diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index a2a6514bba97fe..4933d57a90f469 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compatibility - REF boost-1.82.0 - SHA512 3ab0133479e8f7a10336b1eded030f81f8300e0cd15ab186fa5f69177aeaeca92106f54b5f5d1ba260c7a86910a29f71ab40d260f42499e707f99709bceb0fd1 + REF boost-1.83.0 + SHA512 bc6ff1c30acc9f7123e9b28a732960776e1a028bf0fc5459f39266546f1e2466c62366cc689dab6f8a59a4a46fa9ae3370b4bca14b51d364c3d16e680d5ff95b HEAD_REF master ) diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json index f33acd0682fdcd..9f50aee0f3fbc1 100644 --- a/ports/boost-compatibility/vcpkg.json +++ b/ports/boost-compatibility/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-compatibility", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost compatibility module", "homepage": "https://github.com/boostorg/compatibility", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index 9da978ea6f8b1a..0c05381cb761b2 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compute - REF boost-1.82.0 - SHA512 3c38f2ee6b6063842cf08afa4bf8e59706bb85cf956c26fbd574abafe7439ba5557ed2a70e922ff32001b645c453a4d1d956a6489c93adc83a6c3ee57b4a3143 + REF boost-1.83.0 + SHA512 bb555cffc7761a1dba3b010aa45782af22d4bac049ecfa9d26695a5eb3c5722b29f5f7b30143d17698b2098f81dcc7eaef2425482c5a6495e29324b1f8f324b2 HEAD_REF master ) diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json index 49028b44822d2c..2b41b23b589767 100644 --- a/ports/boost-compute/vcpkg.json +++ b/ports/boost-compute/vcpkg.json @@ -1,124 +1,123 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-compute", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost compute module", "homepage": "https://github.com/boostorg/compute", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-chrono", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-tree", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-proto", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-thread", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-uuid", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index 25877eb42457f0..453bff850bdb2e 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/concept_check - REF boost-1.82.0 - SHA512 a5e4faf91f8edbca84440fe8ce188abe86088d1249bedabfb866755f238c2dad52312201f764d9b19d15e787824a580b7bb66259e4940c9f7d465b6939648869 + REF boost-1.83.0 + SHA512 525debb2e5a804daf9dfe59afc16022ff32825dc385930167736ae337b7cbb9e54165e1be59c77c8bbf8cd1c7e0d7b1f5689091119ea79d4fb461f03f9d228a3 HEAD_REF master ) diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index fd02850f5ae6de..b8b7d41318e928 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -1,31 +1,30 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-concept-check", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 0721c8a0e121ce..29a6236a45c7c0 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/config - REF boost-1.82.0 - SHA512 175d8c355890703e74e301e478d0257a59dde9c4cec5d7765bf7da770ac8345253caef9bc2e88299b9fd038d7a640352181fd933bca2d619bbe0ec12514f4c86 + REF boost-1.83.0 + SHA512 84ae4e303b9f63e950fc6e01d0318bf223b56518474343a3e0f2d9e5ee631c4ca8ddedb5ec425259806360b30f82b80cd3330ff2ad6cfc8013d7c90d32280516 HEAD_REF master ) diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index 6714385e831018..fcfdc74e5789d0 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-config", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost config module", "homepage": "https://github.com/boostorg/config", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index 0e3456400d690c..a43a7ad6ba9680 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container_hash - REF boost-1.82.0 - SHA512 651fa89c9281c16f6fa4cf56dee7bf050e3fca1b6322560ba89c35671cf4a5c14cc90b1001fbacc4084ed1b43d0084d71189e74ddd38523bab42c3880b91abcb + REF boost-1.83.0 + SHA512 8258ad4888d5780cd083466af1facba2430aba7ac1de32b513cecbf9eae3920c9d2d17622bf6b00ebe75cb3bbb84f64ae48dfb78c913d60ec583f09cabfc4b8d HEAD_REF master ) diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json index cd6e36d7e8b364..040464eddb6f84 100644 --- a/ports/boost-container-hash/vcpkg.json +++ b/ports/boost-container-hash/vcpkg.json @@ -1,31 +1,30 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-container-hash", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost container_hash module", "homepage": "https://github.com/boostorg/container_hash", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-describe", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index 2cae030150f591..6e31165e748019 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container - REF boost-1.82.0 - SHA512 d3da8405ed58bd2d26a71a7a703b597b9888c30d1fab181082aded56af636a5ce3abf56f84b791f1a96d391f7ffe63d7358987890174076309972a5e2c9d43cb + REF boost-1.83.0 + SHA512 4c5054ba5ab55df8fbb58d6f9661ec32e14a6a0c06ac86b916d98de076565f1bc6d76d85aad90b7a198760360bbcd4acea6d8d298347157866593486a1ae0ba8 HEAD_REF master ) diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json index be60f53eb8cc61..7a3e700203bd46 100644 --- a/ports/boost-container/vcpkg.json +++ b/ports/boost-container/vcpkg.json @@ -1,45 +1,44 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-container", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost container module", "homepage": "https://github.com/boostorg/container", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index f9739d6c240da4..b5eef2e9836146 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/context - REF boost-1.82.0 - SHA512 e4474d84a93a21e2e7ba67ce08a60a856080d1e2952097dca8fc61776a7eef7c72bb98ff322ec303e255b462e85fba341db1eb59db4b18fb60da20e56946f07f + REF boost-1.83.0 + SHA512 726d54231de62eb5a30331ff21c334f6fd88a70ec35904315753c695c8470f38904ed65cf468015ef2284901080df17fab28db68a028c6cfe7ef0e3d0cc7545d HEAD_REF master ) diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index 1fa3f331addc18..ebc36913aea0d2 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-context", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "license": "BSL-1.0", @@ -10,45 +9,45 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-pool", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index 5514b36f74329f..a6840bf7c88793 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/contract - REF boost-1.82.0 - SHA512 241df3fd514dd32a98beebb71bb22483e271c0c313ed337d2080ce413eed7c8a77629987d1db185fe8fe254aa99c7c6ff8f17e49a47f030e75fd30c301c30199 + REF boost-1.83.0 + SHA512 70ce8255eb8d32f525dc0af4f6f1cb953a7f5032fc76c70dd51609849100ac6addcadb00e2eca74f688471441a1fe286854dedeae3cb8c925638764f1028dbef HEAD_REF master ) diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json index 82618608c58078..07854dc561dfed 100644 --- a/ports/boost-contract/vcpkg.json +++ b/ports/boost-contract/vcpkg.json @@ -1,89 +1,88 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-contract", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost contract module", "homepage": "https://github.com/boostorg/contract", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-thread", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index 5097dec756961b..1790bc0a047ec1 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/conversion - REF boost-1.82.0 - SHA512 0b0695928c8e1a40156d6fac36b51490c4b9011827c7dbadb747867ebc616e75c9d787ed1120298e990a49b86f1206b886c1995e5e3091685abddbf11320d2e4 + REF boost-1.83.0 + SHA512 c64a6bbdd0089e89b27f778c3c4ffbee606c7239293e2451396d3e0489aea83bc81b1fc720a37539dd592634a6310ffeef810f3f520f561d84fbc062475c3cbb HEAD_REF master ) diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json index 27fa9d5ae2fbac..1b246e5883ffdc 100644 --- a/ports/boost-conversion/vcpkg.json +++ b/ports/boost-conversion/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-conversion", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost conversion module", "homepage": "https://github.com/boostorg/conversion", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index a219f244205fb4..cce4c88917eebd 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/convert - REF boost-1.82.0 - SHA512 683c8c71b52edb76e31ebee6fee6df8cbf2653b3d595df897cbb636ed068c7276877f6460deaefc89eab5e69a4a19552f74fec0b5c9f9e2dc80591b5407bcce5 + REF boost-1.83.0 + SHA512 03e5b4e483eae34bd2c024f147cd54a6d255a041a469a079f544e9bcf9aee2ac1e777103e8bdb696f2ea43cb6012173cc9f4d006e5c0afd343bb91f806c978d5 HEAD_REF master ) diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json index e238589af2afb5..de99ab2fa878fc 100644 --- a/ports/boost-convert/vcpkg.json +++ b/ports/boost-convert/vcpkg.json @@ -1,59 +1,58 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-convert", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost convert module", "homepage": "https://github.com/boostorg/convert", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-math", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-spirit", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index e00a631279b281..18ceafe7a4bfb7 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/core - REF boost-1.82.0 - SHA512 3bc4760b7a5536a838b29704ca1600d2836d6c485161950b6dbfbb4bf1abb840b89624a96f290db3af05c5906573ce0b2a67123b90bc50a389e24ec038d815b5 + REF boost-1.83.0 + SHA512 a67515e7b641eb3c7ae7fe25a4cee67ddec0de86cb40bd6d7b6c4f7472050f1de06285498a4144c3bd4da7a1b00ae330da593a61a37a1ba7e22fb33d1da2f269 HEAD_REF master ) diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json index 9129e8d651158b..9b42315d6a142d 100644 --- a/ports/boost-core/vcpkg.json +++ b/ports/boost-core/vcpkg.json @@ -1,31 +1,30 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-core", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost core module", "homepage": "https://github.com/boostorg/core", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index f17e3e59755674..5af166a4a89c1d 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine - REF boost-1.82.0 - SHA512 f94a3a0dfece7d57a90d7e4dd1454eeb8ab7096be4e14e1b79a63e46d205b83558cc512889e4896664dcdda1657da4c386756ca4e24c2601b9b7b4acc1df06e1 + REF boost-1.83.0 + SHA512 aa2c1f22ac750d9a7f55b6b1c97c0a3db8e409bfbedf6722e77f7c60669db7b8c647c710bf512b2523f1aae819edc647331069e6e25abc5434a16ab4ee1c3105 HEAD_REF master ) diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index dafdd2e4bf1ea8..5d9e99e080be58 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-coroutine", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", "license": "BSL-1.0", @@ -10,58 +9,58 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index 8380890c8a559a..b80aefa79327ab 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine2 - REF boost-1.82.0 - SHA512 1dc72e489c192954db5158e320bab164caa56880fa6f170906ee1d62e87c634809be947544a285701aa8c069d3c73acc90960209ad5e439d5927e7327e178c1d + REF boost-1.83.0 + SHA512 e3cbf798364ed5b5aa6e9d811d356d74bae37463c586ac44a39b2e9f19d4aa366d5703e2f28bb2c8af4509a0695b6e8b5d61fcfdef5a6d0d54136a5aed59f4af HEAD_REF master ) diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json index 3ba238d3a7201d..d4eca980f72900 100644 --- a/ports/boost-coroutine2/vcpkg.json +++ b/ports/boost-coroutine2/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-coroutine2", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost coroutine2 module", "homepage": "https://github.com/boostorg/coroutine2", "license": "BSL-1.0", @@ -10,20 +9,20 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 8ad2072869f87c..434cebba61bec9 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/crc - REF boost-1.82.0 - SHA512 5218fb2e477604f8d93f7acec53788a0b415ca9818e2895a2c9550add8836ae378c7a9d5d1eb9bd7a5f8bb24b8f83b3946a74b5c1289bda74bd6d18b52f96bbf + REF boost-1.83.0 + SHA512 c758c8ecf586689b50df5e8462a09726d46a89a64c8521d9d37a071df6babbdaafa87b60ba612faed37ee327f6e57bea2f07cbd4e264f79bdba1236191e8d2b2 HEAD_REF master ) diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json index 59468fd6a07820..49370feed1e43d 100644 --- a/ports/boost-crc/vcpkg.json +++ b/ports/boost-crc/vcpkg.json @@ -1,31 +1,30 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-crc", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost crc module", "homepage": "https://github.com/boostorg/crc", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 5d95439d28b455..17c1a28c207778 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/date_time - REF boost-1.82.0 - SHA512 a8130ea6aafba0ab2bd82ada42031a3a03e75f7d01adb559509b1d32695203a512d2a8ac6fdc28f2ef7b3376f605ec92c30ea16cb3d7f7888c6aab7578d1c125 + REF boost-1.83.0 + SHA512 efcdb38090295548d7bd9c9f0b3d095360f30b586c92cfe6c72e3de112cd0253a9e5b7307898e0d2498a100f153289b7ad7c423f83beb32d3fd24f5ed0502aac HEAD_REF master ) diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json index de3b8a42cacc4e..9625ed3b0d0dd7 100644 --- a/ports/boost-date-time/vcpkg.json +++ b/ports/boost-date-time/vcpkg.json @@ -1,85 +1,84 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-date-time", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost date_time module", "homepage": "https://github.com/boostorg/date_time", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tokenizer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-describe/portfile.cmake b/ports/boost-describe/portfile.cmake index c209632476d144..68db2eea46713c 100644 --- a/ports/boost-describe/portfile.cmake +++ b/ports/boost-describe/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/describe - REF boost-1.82.0 - SHA512 82a0002966b6bd0fab1d55b58ae7922c4515b1efa942a60b0568952cdf2d73d8ddfbe940d5d75b5f3da1c36035a10b38cf9a74bd343c2264ebfb1290f981f1bb + REF boost-1.83.0 + SHA512 652972000916ce99a54dc8aa6fe5507c8ea04aba9ff9624cdfdfe89e6f0e9aae19c84b08381066a411bf851239dc9c585205df64a72f57f56e52f2f02e1ce6ad HEAD_REF master ) diff --git a/ports/boost-describe/vcpkg.json b/ports/boost-describe/vcpkg.json index 8806eb5ec07b92..db6d78547cf66d 100644 --- a/ports/boost-describe/vcpkg.json +++ b/ports/boost-describe/vcpkg.json @@ -1,19 +1,18 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-describe", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost describe module", "homepage": "https://github.com/boostorg/describe", "license": "BSL-1.0", "dependencies": [ { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index d596095ddcbf42..95a221d798d355 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/detail - REF boost-1.82.0 - SHA512 862bd8310938bf663427ad9201065802e1d233646b987ab813b1b777d988cc21b1526214adc756776e3e4debb8f68401b14264700f87314161bdc1062e7e81aa + REF boost-1.83.0 + SHA512 40e0e7c06c5fa94fe0210b9fb74ece2ef42cc4448d30b6090789b1dc3a31da1c3a2efac5826c4e51f39c716ed20810cbb12350b590197710518f37ff8b028154 HEAD_REF master ) diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json index a9ce2dd6b3a5f2..5d14d4e5065341 100644 --- a/ports/boost-detail/vcpkg.json +++ b/ports/boost-detail/vcpkg.json @@ -1,35 +1,34 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-detail", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost detail module", "homepage": "https://github.com/boostorg/detail", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index 1854323be749d3..fbe1e9e587ee6e 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dll - REF boost-1.82.0 - SHA512 ac9b5c1de0770c67e531a2309c8695630da4eb0f046d1abe1b0ebb55242f97787936e60a437a5a635937a547138ae724e302ca8cbe588e42333a05db0030a862 + REF boost-1.83.0 + SHA512 1a45b45673301809a6ad4f4aadfcebf7566f9ed973e35982b3cf4b39a881e2573517a5ad40af749714474fb13e69087b1a7f3dc1a81df0093a1e60fec022011c HEAD_REF master ) diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json index 16441ce549107b..18d804e037e80a 100644 --- a/ports/boost-dll/vcpkg.json +++ b/ports/boost-dll/vcpkg.json @@ -1,76 +1,75 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-dll", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost dll module", "homepage": "https://github.com/boostorg/dll", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-spirit", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 0e53252fe80c48..94fc7ff6096fc2 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dynamic_bitset - REF boost-1.82.0 - SHA512 782a6e203de483481415db815ae37b7bb29878aa6fe6336fcf4342e910b6067140a76086cd6f024789a0f23ff6ae1beccfb2ba0469229109e117dc3bc6e29198 + REF boost-1.83.0 + SHA512 33795e6323b1a91bec31789e2f1ede38ce952b2a50fbd10f931225a0e83e4ad530827392991e8a6f994e06edb1627cb29927c9111c6ff98e18b2e17fd31b945e HEAD_REF master ) diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json index b57fc1a11097ef..b3c20ec69730e0 100644 --- a/ports/boost-dynamic-bitset/vcpkg.json +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -1,47 +1,46 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-dynamic-bitset", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost dynamic_bitset module", "homepage": "https://github.com/boostorg/dynamic_bitset", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index 2f13db9c2b0d2c..093442319419ab 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/endian - REF boost-1.82.0 - SHA512 07c17826f9a1478e68330da7e57f042d02fd78121b488d1e63c68dc35e17463551dc478de2779f292b6f81ec776249ba161653baf31f873d45913dcd822fe261 + REF boost-1.83.0 + SHA512 8c77b9b5d1931844cdd083d02f6f4eb677ad6344aad704bf7ff8fe0c05fa2775be31d7c776048f11eb54f6601ddcf9a884898747d0286f8440fe4bdf493862b8 HEAD_REF master ) diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json index 42b6f6aaacc2c4..c0127e4d4a1dbd 100644 --- a/ports/boost-endian/vcpkg.json +++ b/ports/boost-endian/vcpkg.json @@ -1,31 +1,30 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-endian", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost endian module", "homepage": "https://github.com/boostorg/endian", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index 0bb45dbce62b44..9192e0f18e17d3 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/exception - REF boost-1.82.0 - SHA512 d025ed356906a7dae2ce55550b216599a62f907f854814d5553a8f1e935276efe768642eec872de325c9ce17904fde4ab706acb93e6d24897b74794d98d12bdd + REF boost-1.83.0 + SHA512 9b5bc191b3f50c529e3f61bfe6acfdfb095a6f462ff9e62bbd7ad63e93e52b6286f13c59847063889623d281d09f607277a42134ab735c3734959db2bf627546 HEAD_REF master ) diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json index aa180ef43e1f9b..4fb1c255dd6c7c 100644 --- a/ports/boost-exception/vcpkg.json +++ b/ports/boost-exception/vcpkg.json @@ -1,53 +1,52 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-exception", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost exception module", "homepage": "https://github.com/boostorg/exception", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index d97af1bdf090a8..b92c51b8d83dfa 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.82.0 - SHA512 00d12393ad8a3d6cf90aa3a8e1011b61d976d4d08b1b1af719ebefecd269f0b2295db4bb3bd58b6b74416e1986af05dad897ed1d3a83fd43812b77833f85aba7 + REF boost-1.83.0 + SHA512 f1ee98497a548661ce5aab19a2a49aea62ed789b7102eaa2a65f5011ead33fa4f19dce549f7d026bf7d93dba80bbc75555ffd1b80aa35da0627f5f4e3cc54ee3 HEAD_REF master ) diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index 8de865d6748e39..29a08d13bb097d 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -1,68 +1,68 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-fiber", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", + "port-version": 1, "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", "license": "BSL-1.0", - "supports": "!uwp & !arm & !emscripten", + "supports": "!uwp & !(arm & windows) & !emscripten", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-format", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index 22a537864a18e4..c55de16262e00f 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/filesystem - REF boost-1.82.0 - SHA512 53141484dbfc0ee399333eaadc87cb5fe077d0be8dbfb69c6a9c4545d254e894f0f0f7fb16f7de72c344f91ac29c2769125324ad2363b36b7a82bc4651472501 + REF boost-1.83.0 + SHA512 7de786c7831971faa9aacbc454dcba3021e41d115a88dbfb05f3cb3f68dcec9bb56521eaba16ee77b16e93670e197964649436b83ceb6a0eef199d29e25ff95e HEAD_REF master ) diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json index 099fc23cfd9768..a4c46cb606365c 100644 --- a/ports/boost-filesystem/vcpkg.json +++ b/ports/boost-filesystem/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-filesystem", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost filesystem module", "homepage": "https://github.com/boostorg/filesystem", "license": "BSL-1.0", @@ -10,73 +9,73 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-atomic", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index 9eae7590d577e4..c435bea91fecd5 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/flyweight - REF boost-1.82.0 - SHA512 97f10dac36d22d065989fb24ad7187c39af5c58cdadbd0672d3cba1c03098314bc121a8bcc3c0cb417598a04cfd021bf937f5118a1323031f9ef9d8399636d0c + REF boost-1.83.0 + SHA512 c054403707a0574c0b2e5c7f34521153f604ae17d10a52ed7ff8e222d006ff4875d3e479abacce18c59edd2d44d8fec63f22a806d7a203094ce9e885ffbd903b HEAD_REF master ) diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json index d4a570c7465474..583dfd94164a72 100644 --- a/ports/boost-flyweight/vcpkg.json +++ b/ports/boost-flyweight/vcpkg.json @@ -1,67 +1,66 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-flyweight", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-interprocess", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index f7263903da1b60..603a32a182fa98 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/foreach - REF boost-1.82.0 - SHA512 ab9113874ebb5c5e34769db78505b1c702a261f33cb63bcd2b7423e158096fe2a71b3635bcc5d759efe2896e39e31c2bf1b30cb9b766b92a07119a1a9b794e4a + REF boost-1.83.0 + SHA512 74b95e1c13c48ef38a4d8bfd50fd896fda6f12cbbc360530a1c69c96ab2a891ef5c6b7162ea5fe13dd978f329e5c618226688ba75307a0243fc0b1845cc9f18a HEAD_REF master ) diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json index bf1ea270c4b9fc..da21862f73121d 100644 --- a/ports/boost-foreach/vcpkg.json +++ b/ports/boost-foreach/vcpkg.json @@ -1,39 +1,38 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-foreach", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index b8d1801c1f9d6b..27f5c7f2cef7ec 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/format - REF boost-1.82.0 - SHA512 9103f42b8a12ebe752e0e4ccb45c2e35d13ce00d3522a49abcc95e0a5b1c389930cb782b0d7618fb0e69b66c99d527ad272098cea480656bfcdf8b4130ab27da + REF boost-1.83.0 + SHA512 e5faefa4aca61498b13522d2606c3fe91c1c23053f2ae6d83f9680d6c19680fafd36232fbcb735fb4d7cb79f498c28fd7095f1568594b050f87060c744960c13 HEAD_REF master ) diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json index d225c21c238a7d..3ad32d2aa66529 100644 --- a/ports/boost-format/vcpkg.json +++ b/ports/boost-format/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-format", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost format module", "homepage": "https://github.com/boostorg/format", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index a4fdf7c22dfa85..cc46072ff765a2 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function_types - REF boost-1.82.0 - SHA512 f47c49056d938b945c7ca51a73ca29d61e30f4a447bd54af17790ad6e474acdc67f187e5fd6ecc93296b38210b1f3e6057fbdfa68e35899f4b6c386d08792e53 + REF boost-1.83.0 + SHA512 6ccaf5f67a7fd50e175b57a6e3cfe47c9bd523a94705d008f9ed7837926e8e84a2d13df2bd8b64e7df6a85d61a51a4c30ab409acd6a3b9f8eb054236dcc68abc HEAD_REF master ) diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json index 0e8c3c2471cb36..2b62673eac48a6 100644 --- a/ports/boost-function-types/vcpkg.json +++ b/ports/boost-function-types/vcpkg.json @@ -1,39 +1,38 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-function-types", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index a78c548a284074..af63bd8314e0fc 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function - REF boost-1.82.0 - SHA512 0dea7ded3895403de62b1446c5737e0e75232c0b881dfeb40751c1ad19adb379850e87f0d6747d7397a2b7e889e87c5e4fb9f79bc6e499e282df24a8617b12e3 + REF boost-1.83.0 + SHA512 2df43a509b4f5ee39c5febc5253369eacbf2421d73fff32525fbdb28e8aa4c2a22173ee1d11a4aefa28975ea6ca7649edc771d047f1893179da119a13ca27681 HEAD_REF master ) diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index f3172a93c58e6c..b24271bf7c1d85 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -1,47 +1,46 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-function", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost function module", "homepage": "https://github.com/boostorg/function", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index 1df1bed81d9df6..417cff00c47077 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/functional - REF boost-1.82.0 - SHA512 ccd6782a6a05e9629211ab403484cf3dfb22eeae35fd393e690f6e4935a4596436d24e2730f746be12b1866dbe7767e735c6a8ea90c19c837a5d33cc60af6796 + REF boost-1.83.0 + SHA512 c63de62b13393a125039ef5b2e28d42de4aebff3d6ac7c137780451471992b7022765f9e28a67050d5bcc406328730cc56a77bdc41fdfbf8a3926aaed80080e9 HEAD_REF master ) diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json index 1037f1c6a308d8..571d06f2c3d9b3 100644 --- a/ports/boost-functional/vcpkg.json +++ b/ports/boost-functional/vcpkg.json @@ -1,51 +1,50 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-functional", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index 44c43a6430df0b..cc7c20feae4a2e 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fusion - REF boost-1.82.0 - SHA512 142ee69b7438bca8feacb7511a99680bdc669044a8eb58eb059bc5bbd62de3f9319fbb759c110412e515a106e0ea43dcdb194ebe522bebf5e77b567627ab11f3 + REF boost-1.83.0 + SHA512 4fefa5c968a7a7f99e408d58d08b25ac52a7e5bc50a7b6d60e185f1b7947382da487d2e97bfc725bef693208b80d072c610bb7d44028d666fd66e3bf2677098e HEAD_REF master ) diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json index 7bf8102e2b26b0..919dc406f94aac 100644 --- a/ports/boost-fusion/vcpkg.json +++ b/ports/boost-fusion/vcpkg.json @@ -1,63 +1,62 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-fusion", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-functional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index a4dbe981abdc8e..f4e30525b9ae09 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/geometry - REF boost-1.82.0 - SHA512 e03a2a1f15dfe140e3fd6fc3725386c094c7d8b1248c713f9530a5b7735d025c7282426adc1de62aa60fe305289605e0f0826936e6b976102f54695f6c4368d5 + REF boost-1.83.0 + SHA512 e6708bdcb2ec9b55e9a68cade2efd0114cfc757c1cbf2aaa84e740c2ce5a26c910afef09343be9d7cd2ac8209bf99310b7404a1938ddac99975eef92b7c1e675 HEAD_REF master ) diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json index cc9a820776265a..a7fb1242cecbd9 100644 --- a/ports/boost-geometry/vcpkg.json +++ b/ports/boost-geometry/vcpkg.json @@ -1,147 +1,134 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-geometry", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-any", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-math", - "version>=": "1.82.0" - }, - { - "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multiprecision", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-polygon", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-qvm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-rational", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" - }, - { - "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-thread", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tokenizer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" - }, - { - "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant2", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index 85806d9e44cd77..4289591da517a4 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/gil - REF boost-1.82.0 - SHA512 58127c4ba4d6cb8a2823092f80d7885e53c27210c48baa8a0924ff4256783b134b48f5a87afb0baa5df48d33439ced045b161d9a691543cf0af9fafdce21241b + REF boost-1.83.0 + SHA512 36efb70a22bf44eea5c8e6a4db2cf4e46754dfc19052a0c73a78dec1c51cdb0913b0565f2236eb5e9c9d59992175964e7766d871240ade1468208e72e3e8d8ac HEAD_REF master ) diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index 280052ed027491..c87d92bc9ddcc0 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -1,59 +1,58 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-gil", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant2", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index 1732561a92c73b..598cb5d420b278 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph_parallel - REF boost-1.82.0 - SHA512 b64c1f4dd1f647e5ca94d5463f20fad35f00e4030cd63f7516b0fbdda69ba8d81ec93234f9812dabdea9219bb1f438a550542d020ceb583ba801257d7d0100d9 + REF boost-1.83.0 + SHA512 8987b10f1f472bffe1075a477ec108ebc52d37cc412667cec2c58434b44ba6b61e24dbfff7783057c40278c574ec9b9d3027858416c845a2751edc89e1555566 HEAD_REF master ) diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json index aeb050405585e1..6c0922501ef895 100644 --- a/ports/boost-graph-parallel/vcpkg.json +++ b/ports/boost-graph-parallel/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-graph-parallel", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", "license": "BSL-1.0", @@ -10,124 +9,124 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-dynamic-bitset", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-foreach", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-graph", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpi", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-map", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-map-parallel", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, "mpi", { diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index 246633c347ab10..9cde614960fa07 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph - REF boost-1.82.0 - SHA512 c7ecfb2a8772026434d3ad89e62448334f6cce42d81ffa94b943a2e2b1a83f6a399bc9d6aadb688df67344a14a0ad459be14b4b6fab2c434645ad5e0f2263f6d + REF boost-1.83.0 + SHA512 fee24d3e62d422811f71139c61372a7d205b6d55215b54387dd5973e84b475b9eed42aafb84174058e29b1ce9b858407dd044614784a81f447f351c43e5d95c0 HEAD_REF master ) diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json index 17f8f47492be45..0a11e71be314f6 100644 --- a/ports/boost-graph/vcpkg.json +++ b/ports/boost-graph/vcpkg.json @@ -1,190 +1,189 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-graph", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-any", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bimap", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-foreach", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-math", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-map", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-tree", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-regex", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-spirit", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tti", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-unordered", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-xpressive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index cc5e9b822a861f..a34ec3acec02da 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hana - REF boost-1.82.0 - SHA512 4095210548cf7e3976e24026a64d0d96319cd4b2a1a613a35f86244c5bf48541374f593a67cce0caba633e27f8bfd88c894bf1a8241ad7765f657ca630345801 + REF boost-1.83.0 + SHA512 7a4e76839f5afece4dd1f8fc333364f5522bac1a02601dcfaf7525a67fd4e36617357d4731a486d03a9f0ad04b67364e6ec156fefc37f5e3e11d6d5e87abb2c3 HEAD_REF master ) diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json index b5c0aab46c3a3b..915ee51f1c018b 100644 --- a/ports/boost-hana/vcpkg.json +++ b/ports/boost-hana/vcpkg.json @@ -1,35 +1,34 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-hana", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index d80eeaaee14906..90273f8f3e65fe 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/heap - REF boost-1.82.0 - SHA512 19e748e38a2863cd5c17ac9aa9d266322fef8e9065c974fdaa316da0862ba58b4f72ea524277b755bfb4dc5dd13e4fa92abe4a6de1c274d197940bbe83cbb233 + REF boost-1.83.0 + SHA512 372bb5b2c92792f0d60a045271eab60eaf1d8743e72afea7686fe24c478aceffc598689e8a65479812c93517701671d5c4505dddf770c73eec1127a6a6318cb2 HEAD_REF master ) diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json index 67b2f87ecfce1e..7699191665bbd9 100644 --- a/ports/boost-heap/vcpkg.json +++ b/ports/boost-heap/vcpkg.json @@ -1,63 +1,62 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-heap", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index ec25ad66971404..d8f9e38e2d56dd 100644 --- a/ports/boost-histogram/portfile.cmake +++ b/ports/boost-histogram/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/histogram - REF boost-1.82.0 - SHA512 8b5dd702c9e27600003cd929a9efa4570253310df411ce98224d23978eb1d45644139b6c00bd77aa8b39bce3ea79a62b3a45ebd6a58a4b20e5b56010e2499b49 + REF boost-1.83.0 + SHA512 dc791fdabc4e7e3c49257acefbe3e31968b9049421c643f5c34002974ab87f660e971c422b4ec02bf662d131df1daca7f7bacfc6966c61d9b7c1356ea1c10cf1 HEAD_REF master ) diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json index 96ee32221d5291..0111523aac4d28 100644 --- a/ports/boost-histogram/vcpkg.json +++ b/ports/boost-histogram/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-histogram", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-math", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant2", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index 95d714ee1802bd..f4d7ed10327b3e 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hof - REF boost-1.82.0 - SHA512 ac281be88a99a8c93d42a6e0db3b8a48d2500b9ea68782fae91ab97ff9c2f75af80da792672e99a42d85489ba2d0669f0f4f027d79914522bfa84b2d8e9c59b7 + REF boost-1.83.0 + SHA512 32b04d64c585e5f390d9a0690cdd18a90b8f512652ef7bb0a0acfe533da26298430cc80f8528eb927d6fde75c2b1841a7abe3996fd48453676f6de8a814d22e3 HEAD_REF master ) diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json index 4be6250436dbee..24d8c43eb9cd8b 100644 --- a/ports/boost-hof/vcpkg.json +++ b/ports/boost-hof/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-hof", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index 5f6702001fb19e..60567ab1300466 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/icl - REF boost-1.82.0 - SHA512 d808e3961b8f84445294f063c8f3d65220ed23410978d76171e505817a19b472c3052b02c270bca114da7d9d03d958510173df17d724c3533ae6927409eede9d + REF boost-1.83.0 + SHA512 1c3a7c2cb127c2ca3ad6133d4aaba78a4839c8a54ce8021dee562f84c279439543b93bce8c389091e195f6b0f9b22491e7f2d0383dc06f899cb0fcf75a75b62e HEAD_REF master ) diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json index 3652e740c63dc6..fe7852788b2b2d 100644 --- a/ports/boost-icl/vcpkg.json +++ b/ports/boost-icl/vcpkg.json @@ -1,75 +1,74 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-icl", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-date-time", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-rational", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index 2bca77a47d3080..1139ebbf261c40 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/integer - REF boost-1.82.0 - SHA512 c15b4883578b5ead3d04a38b4dfe6f194668e9c02b69dff36369fb0252b0ef2bf5abda995973257d78e911c15ba2051a0cd5ab6083339ccb9e3adbb2afa85f90 + REF boost-1.83.0 + SHA512 7e477d9b5cbba4ba0a9153ad312f33bcfc95654b387233c364bbdf9fc51e098cd4db004fec17c2f8fe4f837eb96e96da0f4fcc3392d6657dc91295c295c3c4d1 HEAD_REF master ) diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json index 53434825cb8d1f..6dbbe4fcfbd2b2 100644 --- a/ports/boost-integer/vcpkg.json +++ b/ports/boost-integer/vcpkg.json @@ -1,39 +1,38 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-integer", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index e5b670146f0706..93a6b5581d45d0 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interprocess - REF boost-1.82.0 - SHA512 67771c48b9f4591383d68f2fd79f26048a401f9f8cf8bd8a1c6cddac751c84ef9652396622fe53146f8639359e5baa050ef10baabf0feaafa6b66fc7299c8ade + REF boost-1.83.0 + SHA512 2edc43879058253fcce61f4a63bcb0277b2155c723c402514defda13c2938f617566b67faae186588b54d4944bb80eeeee66b6af001b2c5d30853a4b219968ae HEAD_REF master ) diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json index 931f8e69acba4d..96e2e514f9e6ac 100644 --- a/ports/boost-interprocess/vcpkg.json +++ b/ports/boost-interprocess/vcpkg.json @@ -1,55 +1,54 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-interprocess", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-unordered", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 8234cbab0762e0..35d75bf5234175 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interval - REF boost-1.82.0 - SHA512 5de7ac82c0e37ec7ed298686b7ab8050bb568e4ea246ef766a299acfa715dbb6e245e7722a7be3d525543113a16f0fb691b03861c1a0cdd97b7aa51c8080dc9f + REF boost-1.83.0 + SHA512 a3088e9e987c3f5e4b8b83cd86157ff60972e70b4e936956371f4788e1b9923acd04531b40278dc4e27c3f7f02eaf3a04e7ac995f581960e9361b6f44e3672cd HEAD_REF master ) diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json index e59a19fff5a32f..a36655d3f80a63 100644 --- a/ports/boost-interval/vcpkg.json +++ b/ports/boost-interval/vcpkg.json @@ -1,27 +1,26 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-interval", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-logic", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index 9900c76f642656..0ebc267991a4ae 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/intrusive - REF boost-1.82.0 - SHA512 66afd78359bf510770901a89f668b0bb520ec4c6546cbef83d9fb101989fd406e8baf465f35ff8655618d0b169fc8fd5aa8d2f89349269a091c35ef75285ef07 + REF boost-1.83.0 + SHA512 b19c2eeb9f2870bcc024d62ed363a473459a7b8a7db0c5c7687168a114ac279eef1b65855ed82efeaba74658185914cb9cdfd1225f86dcd8c0d19a3c1efc4ec5 HEAD_REF master ) diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json index d46ba303ce3f62..48dd94be753ea5 100644 --- a/ports/boost-intrusive/vcpkg.json +++ b/ports/boost-intrusive/vcpkg.json @@ -1,35 +1,34 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-intrusive", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index e6a297bf776e9a..91641f78091667 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/io - REF boost-1.82.0 - SHA512 af3b8e922369f8e09f5fd3d91c7bb1ef2b3697199f118a43f1e283dc2675f126994114d11aef531d9d2c63feb070183e7d43a5ce56f6e81b875a29e3ae358814 + REF boost-1.83.0 + SHA512 f9aac28c4ecb9d305e0eb0a7d108abaa3c7f769a8027722a77554b086bc2e5af412279e7fc274d7d13e567a11f0fd89ad8f238f118d4c9d8d84ee2c0f14f9d06 HEAD_REF master ) diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json index 1098385aa19173..3c60bf52922073 100644 --- a/ports/boost-io/vcpkg.json +++ b/ports/boost-io/vcpkg.json @@ -1,19 +1,18 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-io", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost io module", "homepage": "https://github.com/boostorg/io", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index 82c25f001f4dca..622a39a89850b1 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iostreams - REF boost-1.82.0 - SHA512 2949f3612cbc809f723a16168ccfb39249ba1e730ec9fa5201a41189bbce22b35e9adeb1478f7cbf012346f67ac7d8841770c8f977711ef0aea0fd6dd01dd785 + REF boost-1.83.0 + SHA512 a7c9f5712249071960d088fb1a4a2934f50a1323f3ed2c7e69dc85e4252c04b245f0f340e245bdc37d0f775dd7112b302cf0c9b8614b1742144f11cb6d143fa4 HEAD_REF master PATCHES Removeseekpos.patch ) diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 4eee204585dd89..935e3e2cb008c9 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iostreams", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "license": "BSL-1.0", @@ -10,90 +9,90 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-regex", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index d205f31cb6a3e2..e5e67f03bb8c19 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iterator - REF boost-1.82.0 - SHA512 078b8f8a36788295494d9c7224f222c50a15badef143af4a0a4f7fc10ae1aecb76d656de7f5c8d7166257dcad98f2e31f38736deaab12ef60af7720258c5332b + REF boost-1.83.0 + SHA512 b040b64b02705b3f5b7adac40a2cfdbc7a21443891989a1465c74e9d9c4403a51be4b08bca4782ce002a8797bf21602f65faae62dd5bc613d4e8cacb8993b34b HEAD_REF master ) diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json index 4916b8b517f952..d11ea59be24f78 100644 --- a/ports/boost-iterator/vcpkg.json +++ b/ports/boost-iterator/vcpkg.json @@ -1,71 +1,70 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iterator", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-json/0001-Fix-use-of-intrinsics-on-windows-ARM-platforms.patch b/ports/boost-json/0001-Fix-use-of-intrinsics-on-windows-ARM-platforms.patch new file mode 100644 index 00000000000000..91959cca7c299c --- /dev/null +++ b/ports/boost-json/0001-Fix-use-of-intrinsics-on-windows-ARM-platforms.patch @@ -0,0 +1,44 @@ +From c4ce8509d015a0b75cfa9d36609b8409821a9c86 Mon Sep 17 00:00:00 2001 +From: Matt Borland +Date: Fri, 11 Aug 2023 09:20:47 -0400 +Subject: [PATCH 1/2] Fix use of intrinsics on windows ARM platforms + +--- + .../json/detail/charconv/detail/emulated128.hpp | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/include/boost/json/detail/charconv/detail/emulated128.hpp b/include/boost/json/detail/charconv/detail/emulated128.hpp +index 3a1a392..6eadbc7 100644 +--- a/include/boost/json/detail/charconv/detail/emulated128.hpp ++++ b/include/boost/json/detail/charconv/detail/emulated128.hpp +@@ -58,11 +58,15 @@ struct uint128 + + static inline std::uint64_t umul64(std::uint32_t x, std::uint32_t y) noexcept + { +-#if defined(BOOST_JSON_HAS_MSVC_32BIT_INTRINSICS) ++ #if defined(BOOST_JSON_HAS_MSVC_32BIT_INTRINSICS) && !defined(_M_ARM64) ++ + return __emulu(x, y); +-#else ++ ++ #else ++ + return x * static_cast(y); +-#endif ++ ++ #endif + } + + // Get 128-bit result of multiplication of two 64-bit unsigned integers. +@@ -73,7 +77,7 @@ BOOST_JSON_SAFEBUFFERS inline uint128 umul128(std::uint64_t x, std::uint64_t y) + auto result = static_cast(x) * static_cast(y); + return {static_cast(result >> 64), static_cast(result)}; + +- #elif defined(BOOST_JSON_HAS_MSVC_64BIT_INTRINSICS) ++ #elif defined(BOOST_JSON_HAS_MSVC_64BIT_INTRINSICS) && !defined(_M_ARM64) + + std::uint64_t high; + std::uint64_t low = _umul128(x, y, &high); +-- +2.38.1.windows.1 + diff --git a/ports/boost-json/0002-Replace-_M_ARM64-with-_M_ARM-for-32-bit-path.patch b/ports/boost-json/0002-Replace-_M_ARM64-with-_M_ARM-for-32-bit-path.patch new file mode 100644 index 00000000000000..252b14721a2a2c --- /dev/null +++ b/ports/boost-json/0002-Replace-_M_ARM64-with-_M_ARM-for-32-bit-path.patch @@ -0,0 +1,25 @@ +From 0c1b4692f9b1c43830c12244bf402c7a2bce23d9 Mon Sep 17 00:00:00 2001 +From: Matt Borland +Date: Wed, 16 Aug 2023 08:06:45 -0400 +Subject: [PATCH 2/2] Replace _M_ARM64 with _M_ARM for 32 bit path + +--- + include/boost/json/detail/charconv/detail/emulated128.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/json/detail/charconv/detail/emulated128.hpp b/include/boost/json/detail/charconv/detail/emulated128.hpp +index 6eadbc7..7840d51 100644 +--- a/include/boost/json/detail/charconv/detail/emulated128.hpp ++++ b/include/boost/json/detail/charconv/detail/emulated128.hpp +@@ -58,7 +58,7 @@ struct uint128 + + static inline std::uint64_t umul64(std::uint32_t x, std::uint32_t y) noexcept + { +- #if defined(BOOST_JSON_HAS_MSVC_32BIT_INTRINSICS) && !defined(_M_ARM64) ++ #if defined(BOOST_JSON_HAS_MSVC_32BIT_INTRINSICS) && !defined(_M_ARM) + + return __emulu(x, y); + +-- +2.38.1.windows.1 + diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake index 4e391f32011d93..b38d3c70ac0b4e 100644 --- a/ports/boost-json/portfile.cmake +++ b/ports/boost-json/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/json - REF boost-1.82.0 - SHA512 cd5e1d262ae598dd5d4c40af804e4815c26b90effa802385f56e44e6f149ffab1869dc01c27a8b245fb3489893e2d1c4ff8f2dca9461ca851f0eb93472b6a9a0 + REF boost-1.83.0 + SHA512 0640a922507c416d171eff1b60c291e9644dba97770a3277c85233982d8c1022e64cbab88e9cdff7ce0f371965c214dc6da36f9cd7b134d1f5e8dc8deabb31f9 HEAD_REF master + PATCHES + 0001-Fix-use-of-intrinsics-on-windows-ARM-platforms.patch + 0002-Replace-_M_ARM64-with-_M_ARM-for-32-bit-path.patch ) vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json index 5c9ca9b8b38e6c..4d559a168ee553 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -1,65 +1,64 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-json", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost json module", "homepage": "https://github.com/boostorg/json", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-describe", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index d06f97a5062599..cdc3c14137788d 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda - REF boost-1.82.0 - SHA512 77aca9157d9784d0ba3dc4614027c0e411bcf035715f049815b4a27063fd8878477b5ce472bc063db7dd887773ff17164d19d5aede4b3d06365d6c427acc4555 + REF boost-1.83.0 + SHA512 6dd59886678fae152b324efad65e2e7b4626f6713655cec3cc578dd35703e7b090e5e0b2eff34bc896f88fe99bbf15ee3cffe9bd8382381375b01fe405cf2350 HEAD_REF master ) diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json index a9e1f734569d1e..9f16d7d2007910 100644 --- a/ports/boost-lambda/vcpkg.json +++ b/ports/boost-lambda/vcpkg.json @@ -1,55 +1,54 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lambda", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", "license": "BSL-1.0", "dependencies": [ { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-lambda2/portfile.cmake b/ports/boost-lambda2/portfile.cmake index 09cd204c33c6a1..f103a2ebd136ad 100644 --- a/ports/boost-lambda2/portfile.cmake +++ b/ports/boost-lambda2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda2 - REF boost-1.82.0 - SHA512 6d7cc0fdc170aab6aebfc14f76598b2c0d7a5330b594c6796c4c40b0f4e30ecb1473d25c83cb16851cd54cc835360711eb16afca8a6406cd407be980ae5ac31e + REF boost-1.83.0 + SHA512 0848d250675f271a8f7fd68e2b7934cce6e7447365eb28101b40bb9af26d54b2a4bdcba655ee3cd94c01a812b65279d75e0e9492fb69a1006983cf7969da37ce HEAD_REF master ) diff --git a/ports/boost-lambda2/vcpkg.json b/ports/boost-lambda2/vcpkg.json index 30785dbbed36c4..5c359a99c8892a 100644 --- a/ports/boost-lambda2/vcpkg.json +++ b/ports/boost-lambda2/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lambda2", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost lambda2 module", "homepage": "https://github.com/boostorg/lambda2", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-leaf/portfile.cmake b/ports/boost-leaf/portfile.cmake index dc1935f3be63e7..4364254bb657ca 100644 --- a/ports/boost-leaf/portfile.cmake +++ b/ports/boost-leaf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/leaf - REF boost-1.82.0 - SHA512 30c437d38a42f88cde1a06f7b9c09a6a6fbdb9329153c55d66ee1ee4ee87b226d5665bf50014441b972a68f15aedc941e06d99f4aa42236c0d538121c5f82c84 + REF boost-1.83.0 + SHA512 cc79c4551d4974e832e7ffbab3d6565963f50a42e4276c0bea5133d98ef83bb327a9e8b7637ca66d6af6156fcd397f5ff6334c75a4da774b250da3dea2796635 HEAD_REF master ) diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json index ff3ab455416c7a..7a592666ba5504 100644 --- a/ports/boost-leaf/vcpkg.json +++ b/ports/boost-leaf/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-leaf", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 57bb052a8348c5..be0808c2df9771 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lexical_cast - REF boost-1.82.0 - SHA512 9f2d9fc93dfc3d0af494c8cf020f3785482a1c7a3410778b4e42e501627268123eeae1ee31f1de433f6cd3268a644b2c922d4b2c967453e17157005cfeef4ebe + REF boost-1.83.0 + SHA512 22a482dfb87313a3118107ffd5c409a2051e7851cfdae74a03ed2ed5c95d322043c2bc76a843be945d892dacb8f9eddbda18d2bf82a2d3e037f7d37b57dc8989 HEAD_REF master ) diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json index 5f12844dc80eb1..bbf551cc7db717 100644 --- a/ports/boost-lexical-cast/vcpkg.json +++ b/ports/boost-lexical-cast/vcpkg.json @@ -1,59 +1,58 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lexical-cast", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index 915cb098654d6a..9787ae1917cb5f 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/local_function - REF boost-1.82.0 - SHA512 31e08d116f2619ee6071fab9db33d1f338acd2b6a01f2d1b18aef9bdee901a8bdb2407afa93a49558ea816555fc9f333c223d22b118c5fd07984704e8ebc0ddb + REF boost-1.83.0 + SHA512 8dc0a64eba885bae71cb1c7092faba09eaf14ae02534726fad96bc347d90e30f5dc7a62fcf46ed543cd03cec011dcdc459dd27fcd4ac732b8c7c0c38cf632448 HEAD_REF master ) diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json index 4b78476245d505..6fac1b1f1513f9 100644 --- a/ports/boost-local-function/vcpkg.json +++ b/ports/boost-local-function/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-local-function", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-scope-exit", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-locale/0001-fix-build-error-on-MSVC.patch b/ports/boost-locale/0001-fix-build-error-on-MSVC.patch new file mode 100644 index 00000000000000..74f641aa7b86da --- /dev/null +++ b/ports/boost-locale/0001-fix-build-error-on-MSVC.patch @@ -0,0 +1,25 @@ +From 0552ffc29ff11e4fe130b7143ea6ac2bee7b15c6 Mon Sep 17 00:00:00 2001 +From: wevsty +Date: Sat, 12 Aug 2023 22:13:48 +0800 +Subject: [PATCH] fix build error on MSVC + +--- + include/boost/locale/util/string.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/locale/util/string.hpp b/include/boost/locale/util/string.hpp +index 9ab9521..ba066bd 100644 +--- a/include/boost/locale/util/string.hpp ++++ b/include/boost/locale/util/string.hpp +@@ -38,7 +38,7 @@ namespace boost { namespace locale { namespace util { + /// Cast an unsigned char to a (possibly signed) char avoiding implementation defined behavior + constexpr char to_char(unsigned char c) + { +- return static_cast((c - std::numeric_limits::min()) + std::numeric_limits::min()); ++ return static_cast((c - (std::numeric_limits::min)()) + (std::numeric_limits::min)()); + } + + }}} // namespace boost::locale::util +-- +2.38.1.windows.1 + diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index fb8c749bf88944..da01947d5d1715 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -3,10 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.82.0 - SHA512 40c96316016f5fbc7f83061ffc236ac751293db7fc56507dbf160fcfb1388bd8cd7133bf80881ad9893aec95dfab32ad73d00d047d07a32ca24f10e068cc988c + REF boost-1.83.0 + SHA512 8d30de6f2a02768716a109b8784f573e6fdd75fe0ba50fabbe1edf6cd65fb0ec92eccf6929102130d464bfbcdc3a677b53f0ac57ab82464a4f0b8cbbd3d644a6 HEAD_REF master - PATCHES fix-dependencies.patch + PATCHES + 0001-fix-build-error-on-MSVC.patch + fix-dependencies.patch ) vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index 001dec436d716b..0f9cb62ff251e7 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-locale", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", "license": "BSL-1.0", @@ -10,41 +9,45 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-thread", - "version>=": "1.82.0" + "version>=": "1.83.0" + }, + { + "name": "boost-utility", + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "libiconv", diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index b5ebd0d30fc856..69e1ebdd91bbc8 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lockfree - REF boost-1.82.0 - SHA512 50827a56270d587dfb081177d93d4e16221a8b1164c6b2749f29710eaf07e6f440ced7872f4ac95342f4c6eca43877fb9b27a57a992cd40230ee6a1e2bf72ab7 + REF boost-1.83.0 + SHA512 289a45a2ac9aebcf2bb4550f005ee394e6c46b0635125cc5d1d04f81175bdac2bbfa29ffdf3f808004deb80a6e8e924c44af1b859b0a95f6dd0fefd57d8b4b14 HEAD_REF master ) diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json index e114fced2571bb..93e5e0b5b72db4 100644 --- a/ports/boost-lockfree/vcpkg.json +++ b/ports/boost-lockfree/vcpkg.json @@ -1,75 +1,74 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lockfree", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-atomic", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index e3aba311b44b86..460a7983a9804d 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/log - REF boost-1.82.0 - SHA512 ae7b1c02eec0eaf922f46e96cd895a03b74c138e1d1388e468adc0ab9bd6702d0756850b8fc039fc4b2838317b1fbccf1e84b2831c439c906d55de7d9bee55aa + REF boost-1.83.0 + SHA512 35ab1c2b69861ef2c6971c159d13d2f9d4ed463d94a6d000acfdf0d58a358ffb7a371dc5dff047db0d03d588c43f41da2915be16c25e92af4512db6b5d8b8fcc HEAD_REF master ) diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json index ea4137697f3112..484bf1c55f0abf 100644 --- a/ports/boost-log/vcpkg.json +++ b/ports/boost-log/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-log", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost log module", "homepage": "https://github.com/boostorg/log", "license": "BSL-1.0", @@ -10,187 +9,187 @@ "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-asio", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-atomic", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-date-time", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-interprocess", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-phoenix", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-tree", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-proto", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-regex", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-spirit", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-thread", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-xpressive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index b7163a2c991440..74cd26917f4b58 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/logic - REF boost-1.82.0 - SHA512 9456711b5fb4591a26e42850aa4ec39863a84c74501f53de51653e61dcd414c421a7dc0fd5469efba08e86ec8f6ecabf3ed6ae8ded83b6296ea3e628a8516436 + REF boost-1.83.0 + SHA512 9361746ed066e1ca04d9005b38aecda63b22e9dd32f5aa89e49743499af21def4e87acad8df229ad10c2125da560c56f648a1510f1a7f2ed8395a40b5cf374e2 HEAD_REF master ) diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json index a7c8ec0188b94f..a8d943fdce5dd4 100644 --- a/ports/boost-logic/vcpkg.json +++ b/ports/boost-logic/vcpkg.json @@ -1,23 +1,22 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-logic", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index e7d5b250ea656b..3c69ae1d158bab 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/math - REF boost-1.82.0 - SHA512 2788b5cc1ca359544d81c5942465703b11a6c243234adfb4e87a355ebdfdfbd52f99bfab2355b49438bbc0ed4d96d26ac924abd14464519d35099f91bb5129db + REF boost-1.83.0 + SHA512 29d1e9fda7daebdeb6824537234aa9818a15f258227af854c0600ef55dea2f46bca116a848ae9f5f445d5f8ba50d7c2b46956a066786bd0375f1f23e1c5a88fd HEAD_REF master PATCHES 001-remove-checks.patch ) diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json index 97fad11e37a2b3..ab8ab8f2949ea2 100644 --- a/ports/boost-math/vcpkg.json +++ b/ports/boost-math/vcpkg.json @@ -1,66 +1,65 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-math", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost math module", "homepage": "https://github.com/boostorg/math", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 748c89cf788b37..a97bd47007efc4 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/metaparse - REF boost-1.82.0 - SHA512 442b4be2ab40768a34b3805de84b67b2f02a3a9632fb2ea94ec12d436b75508f3c5fcb65b8c58e155fdd5ce94d7e405902bef2f5d8fbe377e3af96859531770c + REF boost-1.83.0 + SHA512 ae862ecf3cdcb9158fb5f3a05382b46f05da18edbe65c9d9f809f70c94e3d4b3e2b63ad30b0be0e3675643697d38b1b45f740ec604a511d87d122a5d3fde84d4 HEAD_REF master ) diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json index 47ca4ce8e8e41c..0ec1bba67dd9f4 100644 --- a/ports/boost-metaparse/vcpkg.json +++ b/ports/boost-metaparse/vcpkg.json @@ -1,39 +1,38 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-metaparse", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 62419f2ccf7671..25cac1d27fa61b 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -71,6 +71,8 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") set(USER_CONFIG_TOOLSET emscripten) elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(USER_CONFIG_TOOLSET clang) +elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "NVHPC") + set(USER_CONFIG_TOOLSET pgi) else() set(USER_CONFIG_TOOLSET gcc) endif() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 38db39c7556a90..65728732413b4b 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,14 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-modular-build-helper", - "version": "1.82.0", - "port-version": 4, + "version": "1.83.0", + "port-version": 1, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ { "name": "boost-uninstall", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index b1e2b36cd2e9f5..9a68d6ad6ba9ca 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/move - REF boost-1.82.0 - SHA512 d904077c491a0129f1eaddfb0f80d83d53bde31c2d45f34fd1da5445c416ad9f6a2dd3f0e76c89acf01964269e8dfc33032edd262fb653b429044c16db4126b8 + REF boost-1.83.0 + SHA512 f9eac21a2d05f22e866c9ed149a6121f9b6332bfc039c3dfadd17126aaa4f464cadd4f22c01628791dcc8d76adfb2f5323623e81164b48bf9d5011cd1d76fc94 HEAD_REF master ) diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json index b0bb339e9fe172..767a821a44c530 100644 --- a/ports/boost-move/vcpkg.json +++ b/ports/boost-move/vcpkg.json @@ -1,19 +1,18 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-move", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost move module", "homepage": "https://github.com/boostorg/move", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index b2fdb804660916..68d4a5f41775ee 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mp11 - REF boost-1.82.0 - SHA512 75735e32ae4acfc511446e9a3c238b9d42d49c2f9cbc1372f031c59eacf6d0b9469da94ece3ee788a29db67bf47233034744d0415808caf50fed708781669cd3 + REF boost-1.83.0 + SHA512 d9db5afc318a0e28649d447b6c08fd0ee446bbc3b0d394607cf0430fd55350ea5dd75769bdb461abd39db6207dec5e76c4c468b9b6925d9608a62b7fdfdcfa05 HEAD_REF master ) diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json index 6a1f27ba44324b..cbb25e11c28fd8 100644 --- a/ports/boost-mp11/vcpkg.json +++ b/ports/boost-mp11/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mp11", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-mpi/fix-build-boost_mpi_python-on-windows.patch b/ports/boost-mpi/fix-build-boost_mpi_python-on-windows.patch deleted file mode 100644 index 884e65d35b8954..00000000000000 --- a/ports/boost-mpi/fix-build-boost_mpi_python-on-windows.patch +++ /dev/null @@ -1,15 +0,0 @@ - build/Jamfile.v2 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 -index 8a2f1ac..abfba37 100644 ---- a/build/Jamfile.v2 -+++ b/build/Jamfile.v2 -@@ -77,6 +77,7 @@ lib boost_mpi - : # Requirements - boost_mpi - /mpi//mpi [ mpi.extra-requirements ] -+ /python//python_for_extensions - /boost/python//boost_python - shared:BOOST_MPI_DYN_LINK=1 - shared:BOOST_MPI_PYTHON_DYN_LINK=1 diff --git a/ports/boost-mpi/fix-build-with-msvc.patch b/ports/boost-mpi/fix-build-with-msvc.patch new file mode 100644 index 00000000000000..697f19ddf3ea84 --- /dev/null +++ b/ports/boost-mpi/fix-build-with-msvc.patch @@ -0,0 +1,30 @@ + include/boost/mpi/detail/offsets.hpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/boost/mpi/detail/offsets.hpp b/include/boost/mpi/detail/offsets.hpp +index 8d33f8e..e6afaa0 100644 +--- a/include/boost/mpi/detail/offsets.hpp ++++ b/include/boost/mpi/detail/offsets.hpp +@@ -17,10 +17,10 @@ namespace detail { + + // Convert a sequence of sizes [S0..Sn] to a sequence displacement + // [O0..On] where O[0] = 0 and O[k+1] = O[k]+S[k]. +-void BOOST_MPI_DECL sizes2offsets(int const* sizes, int* offsets, int n); ++BOOST_MPI_DECL void sizes2offsets(int const* sizes, int* offsets, int n); + + // Same as size2offset(sizes.data(), offsets.data(), sizes.size()) +-void BOOST_MPI_DECL sizes2offsets(std::vector const& sizes, std::vector& offsets); ++BOOST_MPI_DECL void sizes2offsets(std::vector const& sizes, std::vector& offsets); + + // Given a sequence of sizes (typically the number of records dispatched + // to each process in a scater) and a sequence of displacements (typically the +@@ -33,7 +33,7 @@ void offsets2skipped(int const* sizes, int const* offsets, int* skipped, int n); + // displs are not already provided. + // If memory was allocated, returns a pointer to it + // otherwise null. +-int* BOOST_MPI_DECL make_offsets(communicator const& comm, int const* sizes, int const* displs, int root = -1); ++BOOST_MPI_DECL int* make_offsets(communicator const& comm, int const* sizes, int const* displs, int root = -1); + + // Reconstruct skip slots from sizes and offsets. + // Only takes place if on the root process and if + \ No newline at end of file diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index cb6a56c7a392e7..f5506f48452379 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -3,10 +3,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.82.0 - SHA512 32a9fdb9d22f8834d0c0f717a57cf511d707f86c792ad2e1b3b1430310be92bda82ac1fba37297c6a57c44d45dd47facc5857b7a99b53e8e76997f8faf9880b7 + REF boost-1.83.0 + SHA512 f70aedba476b350e217717d420178af9b11539d5a30066edb1a4697dbfee08679a5a7b50f8c8cbb2c645dbd3b67735311ed8562907d3836dd1988a89f05bedc1 HEAD_REF master - PATCHES fix-build-boost_mpi_python-on-windows.patch + PATCHES fix-build-with-msvc.patch ) include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json index a3818c4736833e..b26afa89151b72 100644 --- a/ports/boost-mpi/vcpkg.json +++ b/ports/boost-mpi/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mpi", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", "license": "BSL-1.0", @@ -10,85 +9,85 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-foreach", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-graph", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, "mpi", { @@ -107,7 +106,7 @@ "python3" ], "platform": "!uwp & !emscripten & !ios & !android", - "version>=": "1.82.0" + "version>=": "1.83.0" }, "python3" ] diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index 6d70e24081e0fe..4ede5e3ac22dd3 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpl - REF boost-1.82.0 - SHA512 3f5bb806a0905446ca722696a512d9137d7e2a50d0a4d23c2afe186681c0541c7a567bc5208e1535da7d46f8fa39b36c8045b26c18a57dc4d05ed0427e4aa37d + REF boost-1.83.0 + SHA512 2c14736be6639110774b944218b5bbe77efabe92f74574c631cfd83c9df6df0fccecf8b11e6977a0438af4ba31677a05b6fcbaf6662c97877a4b2bab4a702c45 HEAD_REF master ) diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json index aea16ce410de9c..6f99c42a770465 100644 --- a/ports/boost-mpl/vcpkg.json +++ b/ports/boost-mpl/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mpl", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index 83483c0a598384..ca1140064c672d 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/msm - REF boost-1.82.0 - SHA512 3c505a513670ed73b7515b9acf7a6c949112664841658c7b441721430f3f2722843954f896c16db9ba17fa5e32420d0eaf78f384ef5fcc0494d4a1463f807426 + REF boost-1.83.0 + SHA512 8799de356ab5923e76f85f70181678495c6c7fa25483a0c8528e5a1daf2521add0b05f723cb6bd329aa22748f0c8bda2b33e020418be3c57a03cdaab4cc4d233 HEAD_REF master ) diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json index 86d94adabf10f2..d1333fac100336 100644 --- a/ports/boost-msm/vcpkg.json +++ b/ports/boost-msm/vcpkg.json @@ -1,83 +1,82 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-msm", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-circular-buffer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-phoenix", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-proto", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index fa68efe1b1ff24..29cfb22700ed93 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_array - REF boost-1.82.0 - SHA512 c4a77cb2e4e2615587e3f8037b26d9dbde79de71b1eaa19ce2da8354f79cb8d5d6cf218ab854af1a3426c2a1ee3f041889f4a9c259fc388065d89cb33bb80fb8 + REF boost-1.83.0 + SHA512 9335bfd87a7b20e08f834153565f7efe9f582560d36537182b33942a1705c22f080c5004eb27d42fb478c91ba82a1c7421ea96e360e5e8f45dea82a0aa10ecf2 HEAD_REF master ) diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json index d10e91a88c039d..0806c974f84fd6 100644 --- a/ports/boost-multi-array/vcpkg.json +++ b/ports/boost-multi-array/vcpkg.json @@ -1,55 +1,54 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multi-array", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-functional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index c42a24f31432ac..c665ee871542ee 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_index - REF boost-1.82.0 - SHA512 e9c284a54330fb4cea806ece9f570470e8061d6b52e130d324043eaccdc66fddec1be057ced8a5a41a3b59c72912b2edae9a35cc51592807eec4e0797b4502e9 + REF boost-1.83.0 + SHA512 f742fa3b2cfa555d5f125c117ffcec7962ef7db6e7ab4bcb0bee517c1b583da7685a969fdbb6df8348415f1a2647cffda5f04158335da2880c6baf4bf8be57d2 HEAD_REF master ) diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json index 4ae42c57e9baf9..4b94c94dad59be 100644 --- a/ports/boost-multi-index/vcpkg.json +++ b/ports/boost-multi-index/vcpkg.json @@ -1,79 +1,78 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multi-index", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index d36fba876d40e2..5fff763c31c2a4 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.82.0 - SHA512 f2441a918e595dca1c2618ff37a5ddebb3bc9e6b923e27e2604ea7ec8f003621b2506f4fd1ec41b3ed3de68c01cd19ff637e205aad0341d272a63edf1469ba5c + REF boost-1.83.0 + SHA512 64107cbf115245a297396e37d2620f53c022fddda1c82228b0b21ec4997ed30a6befdbef3c35ca0450e7296164590f7af2bfb5d9aa273681a201f84e9d33b0f3 HEAD_REF master ) diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json index 9707941e1d700a..5602bf8dbbff34 100644 --- a/ports/boost-multiprecision/vcpkg.json +++ b/ports/boost-multiprecision/vcpkg.json @@ -1,52 +1,51 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multiprecision", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-math", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-mysql/portfile.cmake b/ports/boost-mysql/portfile.cmake index 97c6b393786030..8ff06e9cfeca51 100644 --- a/ports/boost-mysql/portfile.cmake +++ b/ports/boost-mysql/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mysql - REF boost-1.82.0 - SHA512 e83a7ab69ee28e5eb19ee2e5a19141979f83342cca8402673829f60eb9d8c969dc41542e357b9ffac3da5917d6c5e2d7b4131044eccfba5b01b2b63c97f05edf + REF boost-1.83.0 + SHA512 5d1cc43bb1b6fd62caedc3276d3b2d8734cf7fbc8fe402bc2a89bfa854a9c907089d65f32c8ec9c66a252e3204ea0098beb29443d5a14856473b9ce4fe2915fc HEAD_REF master ) diff --git a/ports/boost-mysql/vcpkg.json b/ports/boost-mysql/vcpkg.json index c4fd19b4c83af6..33f98f41db3365 100644 --- a/ports/boost-mysql/vcpkg.json +++ b/ports/boost-mysql/vcpkg.json @@ -1,55 +1,58 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mysql", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost mysql module", "homepage": "https://github.com/boostorg/mysql", "license": "BSL-1.0", "dependencies": [ { "name": "boost-asio", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" + }, + { + "name": "boost-describe", + "version>=": "1.83.0" }, { "name": "boost-endian", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant2", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index 018592444fb77d..b0d69a2016cac6 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/nowide - REF boost-1.82.0 - SHA512 f27382299303244be0bb922767cb673e4c46d9a3468c912af7827c4bd5420b79d36d83a7da42affdbbb2d36d2ee051d0e4ffa257d5762c2c429fd076fc09b44c + REF boost-1.83.0 + SHA512 1cdfc8f6087719206ea9affc6262114bfefc5f0e326d40cf5be9bae613a4ed8ebb378d3e59a2db31fec946c02b038a9ffbf5ff33b24cab4863da47236661b24a HEAD_REF master ) diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index c5248530108b4f..812ad097ea80f6 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-nowide", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", "license": "BSL-1.0", @@ -10,25 +9,25 @@ { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index c190debe2beb24..238c6fc4e7a4d0 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/numeric_conversion - REF boost-1.82.0 - SHA512 267365467e07d18e09345281101920f55dc07616337af86c008fb8238538a7b68d30e03dc4ab13f4da5d73e0332f925f1065f8ff12e59989a149ab47004f9c58 + REF boost-1.83.0 + SHA512 41ea20e08416058d264ea11825715a4f5c299bf34152628875436b2a02bb99325ba97b5ebcfea7f4b5bdbfdc64b3b31329a7e7418341a19a294969ae22eef43e HEAD_REF master ) diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json index 1e7953af79c1b3..fc78cdf53d838d 100644 --- a/ports/boost-numeric-conversion/vcpkg.json +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-numeric-conversion", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index 632e566211e1fa..328c22de16ca95 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/odeint - REF boost-1.82.0 - SHA512 929e73bec728cf878ec382b4e0280a2b796d843bab2a9d22276057435aac9b2aaa442daf29415134d8e40dc0380bf60462dd350d53686c9001cfdf2a42ec7577 + REF boost-1.83.0 + SHA512 2c0bd72bfec74389fec86170ad0d739654be563d9fe3b2bd7297c5cf4ed9efbe94c4b15f277c83298f3cae21320574d1b7aa2ef158f6c4b342b153272360a353 HEAD_REF master ) diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index c1635d5c3ec36a..d7bf89e8625885 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -1,95 +1,94 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-odeint", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-compute", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-math", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multi-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-ublas", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-units", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ], "features": { @@ -98,7 +97,7 @@ "dependencies": [ { "name": "boost-mpi", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index dc8fe7ce11b312..b2f53be99375f6 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/optional - REF boost-1.82.0 - SHA512 5439e9a1ecd2e74e7f9dfb958989edc0a68f0a9275fb8d472fcb32b6b8d120c9eb26e92a345485e0bb04950606cc065a9bfdf6a4cfc28602a5bcc8e13629e934 + REF boost-1.83.0 + SHA512 ef677b2e590f39bc84cdc5e840452946c71341db73457116e65f5cd1f50f5a15d01426641ac4fb4a2db4a01c58b29c7c35115629392ba202a7811bc9c9ba709c HEAD_REF master ) diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json index 9083c434945de5..46a541ed82174c 100644 --- a/ports/boost-optional/vcpkg.json +++ b/ports/boost-optional/vcpkg.json @@ -1,55 +1,54 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-optional", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index c8d6cd9f33828f..171873512127d5 100644 --- a/ports/boost-outcome/portfile.cmake +++ b/ports/boost-outcome/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/outcome - REF boost-1.82.0 - SHA512 4c19f6e67997877ddb628c84c874fe3828c4afebe5f36094253b6d5062a8bff677f9fe02032c5a98109354920db516c11f2649611f2aed1984dc47682456a3e7 + REF boost-1.83.0 + SHA512 2347e1250908b96175627b1b2a16ef731cde9574c37ac7392632b21a03bbe46fba84ea107cae37782eb475597fcbb6a21bd7f9868311309c5d6dac90f0f4bfab HEAD_REF master ) diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json index 02c4617e1e0ef0..ffc9bfce249ea4 100644 --- a/ports/boost-outcome/vcpkg.json +++ b/ports/boost-outcome/vcpkg.json @@ -1,31 +1,30 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-outcome", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index fa04d950bc6015..01997d8e1b070e 100644 --- a/ports/boost-parameter-python/portfile.cmake +++ b/ports/boost-parameter-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter_python - REF boost-1.82.0 - SHA512 a004ad1fdc46baf6ebdfed52dc3b6d15e2db6aeaceddd07b8f0138e008efead530ee851fe28c8276927bff382cf095594592fdfae8c7a48227688aab4b365caf + REF boost-1.83.0 + SHA512 c9c58b018439a6efb2eb4b0e2e23dbb9dd7ca73256006a3aaba2c761b6e72b75efb32efb38e71c45b8e0a1d390fb397d029436ccdb1e795ed6a6624058224868 HEAD_REF master ) diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json index 352367bc342951..888d93de9bae0e 100644 --- a/ports/boost-parameter-python/vcpkg.json +++ b/ports/boost-parameter-python/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-parameter-python", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", "license": "BSL-1.0", @@ -10,24 +9,24 @@ "dependencies": [ { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-python", "platform": "!uwp & !emscripten & !ios & !android", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index f9c250d82e3cdb..bd3f75dd75d4ee 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter - REF boost-1.82.0 - SHA512 bf96a37f4939be58e8d21bd49bc5ffb8900604038e3c43b32793cb3d012dbfaf161e6015f583afae96b4c4e9d082930a93f49d631881fd40e03e1872182d2ae2 + REF boost-1.83.0 + SHA512 ac3e541f0ebecbac9bd7154ceb1ada710c7802e6519e2648c8f7ee6ce35bc1b3852380e06a0381f1467b240a2bfb123f70d66f5f37637b99c3fd2311ae64661f HEAD_REF master ) diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json index 142249d6cfaf5d..e7a4b74ba9378f 100644 --- a/ports/boost-parameter/vcpkg.json +++ b/ports/boost-parameter/vcpkg.json @@ -1,55 +1,54 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-parameter", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-pfr/portfile.cmake b/ports/boost-pfr/portfile.cmake index 6380f0dce23eb5..39013d2db86543 100644 --- a/ports/boost-pfr/portfile.cmake +++ b/ports/boost-pfr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pfr - REF boost-1.82.0 - SHA512 9042b1130a2f6291d9bc9d1daa5ee9d4328e6af8ae6baa01f9637f17ace6daa85861d68043778a054a37b7c02796547ae5c0c42e77746cf7588305262df42ec7 + REF boost-1.83.0 + SHA512 90a63e84ff9368ef48f9897eea69dab234666f6bbebfb411db97855ab415b7c4dd092fef6a4c80644eacfa370c10e334497e07263e0ea39245da33274d7e42f3 HEAD_REF master ) diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json index efec615cf3d140..399193b038fc84 100644 --- a/ports/boost-pfr/vcpkg.json +++ b/ports/boost-pfr/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-pfr", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 9c03d83cf07170..d5420e115a3b96 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/phoenix - REF boost-1.82.0 - SHA512 a0dbbff345e669801be5b93766db5bade30ac9978ddbaf6cae2a613bb16564bdc6a9a70dcb747b95fa3aeb8c3ad139c89bcf372a4026b75c74ebf0941f2d100d + REF boost-1.83.0 + SHA512 3535e5ca3b5045eab728b7e3b66d5ebc30f55847ea424c09b6efa291a69f3588972f772ba0a67a990c9880f526cb91ebd4e4998be7406a4d786fc88d121d58d6 HEAD_REF master PATCHES fix-duplicate-symbols.patch ) diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json index 23b749f2cc46f9..d70710784eec20 100644 --- a/ports/boost-phoenix/vcpkg.json +++ b/ports/boost-phoenix/vcpkg.json @@ -1,71 +1,70 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-phoenix", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-proto", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index 41ee933d9e3763..e31430895b3b9e 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/poly_collection - REF boost-1.82.0 - SHA512 64b5c78b25fe7d6150f0381c204976c488b4e0e61c3f33f4d5c323f74535d7a97cbd3cfd45eb9eaf86940d1a54a8431924af0261bf4e255c4aba41013508b77a + REF boost-1.83.0 + SHA512 03f5d17f5a77f9d05ad6a57f04e7987e5efd560e770025d5618c26c7078bd55630f463df51d6e150b45f415357ea6a79d6402a9922d1a986d2521e9d4ce8fe52 HEAD_REF master ) diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json index d2ea00e8f58fd7..02d4fde288403a 100644 --- a/ports/boost-poly-collection/vcpkg.json +++ b/ports/boost-poly-collection/vcpkg.json @@ -1,47 +1,46 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-poly-collection", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-erasure", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index a9093484e45ab9..6b7a5874905b65 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/polygon - REF boost-1.82.0 - SHA512 c45be5d8657844b1a6b4c2f9c2449d2025f116ef7019adda69e3c7461d0e799187a9183749c4d56eed171cb56740af3655d14df25afe2e032b2a39d6a7799a73 + REF boost-1.83.0 + SHA512 b18926f2580da0cf8f975fb86738822fe38784e432ce5f803bda298c21a4c67612607bc8336aece0ba2471f2c98a57ed5171841a239b0a5e04147cac967cf330 HEAD_REF master ) diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json index c7f22e73d89d69..ec95560abe9373 100644 --- a/ports/boost-polygon/vcpkg.json +++ b/ports/boost-polygon/vcpkg.json @@ -1,19 +1,18 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-polygon", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index 033a60c8c18829..ab3ace5af91d87 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pool - REF boost-1.82.0 - SHA512 7259283f64f317131fd2913c6f51e8e9d06d69dcf2c325e5c639911c03f815840f1158fbb2cb0734a284e0f1360b99d4f273c30cc5d25983008e8690840e649b + REF boost-1.83.0 + SHA512 1f885d10f66d1292222fe77c1b0dc43612fe12d0f72f0daaa874dc2f807ee40083cce1d5f32ec6fdcaa9f71c48310b442efc215394282214c8b0407cd84841ea HEAD_REF master ) diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json index 014e75111f80a5..0ffcff246fa745 100644 --- a/ports/boost-pool/vcpkg.json +++ b/ports/boost-pool/vcpkg.json @@ -1,39 +1,38 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-pool", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index 1fff561a35b7d7..03d3313546d754 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/predef - REF boost-1.82.0 - SHA512 6dc20b63de6fc83bbcc9df8967fc1fe9f455c0fe5d46c43699face73878cd95fd918c9ccfc2729b48d2d43d0f7ccb6262e9002316f127e7a308ed6f3d15fb8da + REF boost-1.83.0 + SHA512 54926d14810b268f594848c0f5614728d78e742fc83648eaf8a941c68df7ffafe12f88f009b3af7e398f62c0b1bed273e1d717b2b3a4b8066a4556b35a479e38 HEAD_REF master ) diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json index 9442ca71cd8288..f7121daeeb962c 100644 --- a/ports/boost-predef/vcpkg.json +++ b/ports/boost-predef/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-predef", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index 2de2c8eaf13648..d1b828709b3d30 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/preprocessor - REF boost-1.82.0 - SHA512 e481a4fc4e6c4a778416c509bbbe668311b7d019ad80ade74462368295af17caae4d68a0bafe971d10d9922916145bd023b3725a013d86e36b36231e73d8c828 + REF boost-1.83.0 + SHA512 4ed20e49162029e46b59d49099b7b52f43ef09ebefd312b1ebadcbbd80ba2c2fa689f73c94285b47c9e46b4b80c4f21ff908f04e1885607a44d225b65002d694 HEAD_REF master ) diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json index 5999e1a3662206..bdd8e551bb9e5c 100644 --- a/ports/boost-preprocessor/vcpkg.json +++ b/ports/boost-preprocessor/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-preprocessor", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index cc42f5525785a1..422edc17bf68c9 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/process - REF boost-1.82.0 - SHA512 5676b0986e609c3da702d3905146f54eeb0bc2047e954c81253edcfe48778cc9f90be5e5dcd90bb153281dd12e7c454954f0546f3e3ec04460a4df1cf333b1bc + REF boost-1.83.0 + SHA512 854e101dd1879f6a4a9033201a59297acef5beb0dbb2228b099b94ae4e5755b65a5052df45a9748b7c58f4c515cfc03ec2d80284c1a77baea78611c80c87e7cc HEAD_REF master ) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 2e0a538d40dc54..13bbc5671604e8 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-process", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "license": "BSL-1.0", @@ -10,72 +9,76 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-asio", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tokenizer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-index", - "version>=": "1.82.0" + "version>=": "1.83.0" + }, + { + "name": "boost-type-traits", + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index da12295366cd5b..943558356cd1e6 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/program_options - REF boost-1.82.0 - SHA512 4b7c27cebc1637e3dcd0a2a7fd09f5793409f8900c545b4b504d14f6448cb01f90e80885654259360a96f0da63c23a2972347b6be1151b8679f9acb4d56b88ef + REF boost-1.83.0 + SHA512 246b8d4e23810e1ef34950d15b4c026b62175b2fb239c0e37c142e32040c960966a52c0dbf52c46a1f3237fd6f0fcbec3cc1c7cbceb53b6dd11bdbfb11c28480 HEAD_REF master ) diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json index 8d55c264ee1539..7716527efd1ab0 100644 --- a/ports/boost-program-options/vcpkg.json +++ b/ports/boost-program-options/vcpkg.json @@ -1,77 +1,76 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-program-options", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tokenizer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-property-map-parallel/portfile.cmake b/ports/boost-property-map-parallel/portfile.cmake index ec00161b21e8f5..0fa2b3b3ecc59a 100644 --- a/ports/boost-property-map-parallel/portfile.cmake +++ b/ports/boost-property-map-parallel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map_parallel - REF boost-1.82.0 - SHA512 f23e7970ca24c4a0e964582d21c0c595f5aa6bf9734e79573689e1ba3d3ae969f6a0abc01d7ea058e78711e2f21bc4a22fe5362bd35c3b5848540c08b9078fcc + REF boost-1.83.0 + SHA512 2e4f2022be50985a77985c9b84e9e2a9a9f195bd899dda4082f9349dada99a90ff5646be08ce9c3af51668f83db3b45b84e548958a5811208a23b70eeeeefe8b HEAD_REF master ) diff --git a/ports/boost-property-map-parallel/vcpkg.json b/ports/boost-property-map-parallel/vcpkg.json index f7340fdf1cf53b..fd5c5f1fc40e4f 100644 --- a/ports/boost-property-map-parallel/vcpkg.json +++ b/ports/boost-property-map-parallel/vcpkg.json @@ -1,68 +1,67 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-map-parallel", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost property_map_parallel module", "homepage": "https://github.com/boostorg/property_map_parallel", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpi", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-map", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index 06c6d3de938710..e3bb5a0b2ba0d0 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map - REF boost-1.82.0 - SHA512 ca6507ef4ba7ec671f8b217a94a5b4b3cd07c278752c3a6a5501035cf106ac2a230114f196ea3e96edfe36ecf5e73cfbbfb1ac322af62fda35320d4ea8c1ad54 + REF boost-1.83.0 + SHA512 0c5ca44843a55306b7ceb129d48eba71ba68514000a0dece471906f5244a89054b1ba543d5e0fa3d2af48117cc1b0e24972a9c8f80e972568b2063b14299ce08 HEAD_REF master ) diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json index 74bb9456d36df1..11c2bb89cc9b0e 100644 --- a/ports/boost-property-map/vcpkg.json +++ b/ports/boost-property-map/vcpkg.json @@ -1,75 +1,74 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-map", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index b91b4d9fc4ec20..898a976253df4f 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_tree - REF boost-1.82.0 - SHA512 b6ed3eaa59fed4b9eb27fbc29b5fa98d7159ec4769ddc63fcbcd5a850affccd67c973704ec336175fd1ba6a81af08cb783473fc2222423985f132e1930352d54 + REF boost-1.83.0 + SHA512 fbc2bbb30ccf72494424b7f5f20053b11be8978b3d205476588684f4c8f667fc844c9b8fa148b7363b54b10da85a67ce3299c04b77292dfeb5f78836a94b9985 HEAD_REF master ) diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json index 4c89105272c204..7e94327e3c0461 100644 --- a/ports/boost-property-tree/vcpkg.json +++ b/ports/boost-property-tree/vcpkg.json @@ -1,75 +1,74 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-tree", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-format", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index 3ee43dfc8a72ba..515f7f0f908923 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/proto - REF boost-1.82.0 - SHA512 99550ba664e532f458135c52ad1d739aa6c4a2ba238cbf6209b6cc7d550f360333c0d95e2e86181b4f437310dd4d6915a0e03ea9b9d0df56bd4741d5a65699eb + REF boost-1.83.0 + SHA512 c67d4db66a5843a2fbe27f139d1f7a0f2d844ddbc46ac4c5780b9f6e85ab7c86113c3712de50f03ceb0f6b10ffb1d2522b397447a248d176cc48b2f4657b0483 HEAD_REF master ) diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json index bbcaa3e931e427..793797e57ff946 100644 --- a/ports/boost-proto/vcpkg.json +++ b/ports/boost-proto/vcpkg.json @@ -1,55 +1,54 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-proto", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index 0863c14fc380ab..839d5ba2a03320 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ptr_container - REF boost-1.82.0 - SHA512 a5c65927e208fdab5b9f96ff320e2f7661369b7fd3fd89bc2223248b0377915fd9ca2e06b462e5cbf250f4a1b1e613692fd400f4a8a50f681d57d106730b4a53 + REF boost-1.83.0 + SHA512 5e415290c01132dd62f01a49acfcc4a49c9348a77e7d0aa5dab7821d2e4019ec45a2bd3b0f112ade987583e368700bfa4ed0f79a4d4f68daabfae7c6f6b9acd1 HEAD_REF master ) diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json index bff4472f57fac0..f7a389d030afca 100644 --- a/ports/boost-ptr-container/vcpkg.json +++ b/ports/boost-ptr-container/vcpkg.json @@ -1,67 +1,66 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ptr-container", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-circular-buffer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-unordered", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index bd204369ce44e3..fe8de2b4e8f5ff 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.82.0 - SHA512 ecc7b5cb7943b09e3882572614d276b6b303a5051399a7ea00b8d985152f680a9b929869e503c4088481fef6d09f9027ed0b99ffd1e95f3411474f06ef9d2ba8 + REF boost-1.83.0 + SHA512 ef0b597b8be2550d4fb89eced8cd678f170dba315ef78becc319ef848d69772a6da3b2439cfc799b1663fad15b8ba8e679f0781b43abe2f3685fa1091b60f927 HEAD_REF master ) diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index 567e8022b725cd..e9e1eeda931d21 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-python", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "license": "BSL-1.0", @@ -10,101 +9,101 @@ "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-foreach", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-graph", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-map", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index 960741d7131954..0b9efadfc729fc 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/qvm - REF boost-1.82.0 - SHA512 ed5ada76dde6506fa23be40a62bcf1e4c821cbccc409213eb811df40f35cdb2a825eb5addceba65308b4648772bd6bbe46df56c144db88c6a2275fe10764a72e + REF boost-1.83.0 + SHA512 39098f1c98b219fe74bc75ed6af234476d88c8974a996f057e1cb3f6205c1cf2c4edc5f73d18f4d5ad059f57e91904508e8996fdd438fd39aa6d39467990e609 HEAD_REF master ) diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json index 6d54ef30c7f879..984798430d755c 100644 --- a/ports/boost-qvm/vcpkg.json +++ b/ports/boost-qvm/vcpkg.json @@ -1,15 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-qvm", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index 1f026466f28f3a..0a08f958609ef6 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/random - REF boost-1.82.0 - SHA512 3a7a488c34483893c017fe4d0d7886946ec126c5f777e7927bb540178b830010ba078aa28ec89ef4a776d6f4428a5464fc768649b74ffaf290177180aaeb85a9 + REF boost-1.83.0 + SHA512 17dba6187364a93e8984cc0e75fcfb5a0f6c6acab80bf7abcf93c58e55f81a0a3eeaa9b24dea158a72b32ef01aa3001f9db2f358ca27720b2598549d8aa38f3c HEAD_REF master ) diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json index 0ae33e20fcb497..c7c24d49e166d9 100644 --- a/ports/boost-random/vcpkg.json +++ b/ports/boost-random/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-random", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost random module", "homepage": "https://github.com/boostorg/random", "license": "BSL-1.0", @@ -10,69 +9,69 @@ "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-dynamic-bitset", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index e4238e10e8cd46..33b86ef347acf9 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/range - REF boost-1.82.0 - SHA512 64fc40af785c29ee358ad1b9a1c140cfb4e58648fac07a3151f6b1a13586642dcb11226a8409ccdcfe9555fa7b2fc0ee485b0f717282690f77125a115d60ad4b + REF boost-1.83.0 + SHA512 a1fb0f51c0494e7c018b8b792ab3ae30a08eeb0a6f1eb36dbbce9955f5d83a3ae7f0e630ccb6167ebc4693e42ce3e1d35fcad40dd60b3328918a0d52709523a2 HEAD_REF master ) diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json index 178466391de9b6..b92f7fd46cee60 100644 --- a/ports/boost-range/vcpkg.json +++ b/ports/boost-range/vcpkg.json @@ -1,83 +1,82 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-range", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost range module", "homepage": "https://github.com/boostorg/range", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-regex", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 80574bea507aa8..89fc465b4ac2c7 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ratio - REF boost-1.82.0 - SHA512 5dfcd8ed7ef7848408016a6249198be767fc394443f6116b92e6a5ad7bd96e16434be2097ac69d04d4913d5eb3be1b6ebbb0d4df2a43da92045cd5f886861348 + REF boost-1.83.0 + SHA512 783735e52aff3751130051181c0305001ea921ffb3146f0a7198d77da0f1adab277739ad4294489702404aaf8f199340155fe366aec3c54af92345984a6d6871 HEAD_REF master ) diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json index 8aac78043c866c..5e7b16ea266fc5 100644 --- a/ports/boost-ratio/vcpkg.json +++ b/ports/boost-ratio/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ratio", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-rational", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index ccd43cdda2e894..639930104d9ea1 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/rational - REF boost-1.82.0 - SHA512 dbc86e1472c97b484b871c1cfc63ba6ae290ce2fe0d9083be6909cd579a36b298df6e0614a32e8cf714f9e73344bd3368b7a73b9cfd0fc6abfca33feb33b87a4 + REF boost-1.83.0 + SHA512 fda1c106b3d2b87752892abb0ca096aaae709dc846e9776c8f22cc1b9ef738dc4ae568abb19cd973e15dfb4bbbac113c4de0735841575d525f9c33787c80838e HEAD_REF master ) diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json index ca21f65d6d3fa8..0364d5d51bb9ae 100644 --- a/ports/boost-rational/vcpkg.json +++ b/ports/boost-rational/vcpkg.json @@ -1,47 +1,46 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-rational", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index 9a3a264e910e96..9244746cf4d000 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/regex - REF boost-1.82.0 - SHA512 f4bd05b47fa26c13dbb235f1ce937a4cd07fd39c3fed4cda5d86f13b528f6bb2345569294578ee2d58929f94d37c24ac4e766cd4049b532b2609ea60d045a4a4 + REF boost-1.83.0 + SHA512 9d5513a9aacbf18a221213eb560be69825c37949c9869b9b06c520694a62d0f2adb490703bcbe95d1976805eb16eb3bfb7eeacfe659e28c5dfbab782904772e3 HEAD_REF master ) diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index 49d085f0f0f547..7ddfe760bbf1fa 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -1,73 +1,72 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-regex", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index adae78d293fb61..a4e0a14eb892e9 100644 --- a/ports/boost-safe-numerics/portfile.cmake +++ b/ports/boost-safe-numerics/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/safe_numerics - REF boost-1.82.0 - SHA512 92d995fd08f645cdd60c3e171205e43b66e34507f79e8c9e7a8e02521146767360b9887d7883698c4452caf7768acb43882c6ce2b154f2fb99828c8cb6395aad + REF boost-1.83.0 + SHA512 b9b62491b64a320a57edd3306db7936f0a6a383c17111a72db29aa284ff8955cf00094eff0a315d236cf2c32d4f6a50b4ecf83d3a74f957853002ec676a8ccf9 HEAD_REF master ) diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json index e9f3b65aa6688d..1f01a917f1286a 100644 --- a/ports/boost-safe-numerics/vcpkg.json +++ b/ports/boost-safe-numerics/vcpkg.json @@ -1,39 +1,38 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-safe-numerics", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", "license": "BSL-1.0", "dependencies": [ { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-logic", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index 24357c4cbf537d..a74de479963418 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/scope_exit - REF boost-1.82.0 - SHA512 b759a1c6df861562b3396ee3753a955fbf47d9aac96fa5299de96bd1d27b58e4c2354dfea1efde9af4b77108227346ab5fc81ca50ceb06d5056f0231b0f3028d + REF boost-1.83.0 + SHA512 b93b5e38477e23d6abe6666bff037ce6feecbe4f16a1326f93faba042287838871d79c8d4cc6679c682eb9b4dc3eac04ee44a47db573eb2d6d25cbf1cbbe3dac HEAD_REF master ) diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json index b2d67b0a248af7..8001edbd1e3bd0 100644 --- a/ports/boost-scope-exit/vcpkg.json +++ b/ports/boost-scope-exit/vcpkg.json @@ -1,35 +1,34 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-scope-exit", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index 2f1faa8aa2db60..f95cfd3d6b26ef 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/serialization - REF boost-1.82.0 - SHA512 e59acbe632a80b6fcaa9c53f76d6ea2264bb6859af57b10dc4f0b84dfec1e0617e2d1a60ec0acbcdca9c121b49bcc4ddb16d9dae2b2db42aee30b2b6ec00665c + REF boost-1.83.0 + SHA512 d4d69c383ce486e829e02c95ea714faa776444d457e8ac4cc6e1595853f741a4bbbee35a13d0e625e05854b0799c504472a3912d529ebd3da02c0b6f0adf95a9 HEAD_REF master ) diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json index 986167841a9ceb..cf75de8a80bd50 100644 --- a/ports/boost-serialization/vcpkg.json +++ b/ports/boost-serialization/vcpkg.json @@ -1,109 +1,108 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-serialization", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-spirit", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-unordered", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index b4de5181e23187..a85153ff6b2645 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/signals2 - REF boost-1.82.0 - SHA512 5452431b482b859e0d334bb6105301f781701a168aef2a2de596ff1c981008b357a53587135bd63ba060c55dea73a69b93a864401dd5cad04d21a5f1499e0533 + REF boost-1.83.0 + SHA512 6a9186d956c41527add674d81a345a9f55416ddd5b9c35123ca0e5e38e55e40a5ad4c7f5c999b11781696d2255761b6c46ab6c1790bc62a1966dba4bb5b3ddf5 HEAD_REF master ) diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json index 57a27998bd88bd..c42545c123ee0a 100644 --- a/ports/boost-signals2/vcpkg.json +++ b/ports/boost-signals2/vcpkg.json @@ -1,79 +1,74 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-signals2", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" - }, - { - "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index b355d936148ac8..f909766ae1bc95 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/smart_ptr - REF boost-1.82.0 - SHA512 2089a9cbc968a1b2c5ffbb911a9a237d3b241e9ed9cfa444fafc36806280dfea4fc7d65b81fadff0946b4b5e163480536023abb1eb1bc8a4994ae69916dda721 + REF boost-1.83.0 + SHA512 301b0928a6bc42ec694151820b8caa6b3d8f7055995f103781848fcea282be4889c6e285f4f228e2bb60a49d7bd291aa00315aa156f3d6a6d557299b3eb5d7a6 HEAD_REF master ) diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json index af90e16beeaadb..2ee1ddbf2a3ce9 100644 --- a/ports/boost-smart-ptr/vcpkg.json +++ b/ports/boost-smart-ptr/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-smart-ptr", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 5780bf7b2a6e95..e86352c59f1641 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/sort - REF boost-1.82.0 - SHA512 532fd10752ee6c3ce740844223dc4701f9f47f2a986cddb2ef1289aad3576c5cb3496de2721de9bdd9e2622722608903f738c99448f8ac0921d43a17666839a1 + REF boost-1.83.0 + SHA512 b1509b0e207b1afd38110b7abe0553244a6adddaf3bcb7fddc36fb6666eb4caeae53449380d060e2b967455a86cb4eedc5d434f5691e814b4810c7e79a5b5fb4 HEAD_REF master ) diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json index 4107ce83c3d3ef..2a67ff632c06d3 100644 --- a/ports/boost-sort/vcpkg.json +++ b/ports/boost-sort/vcpkg.json @@ -1,35 +1,34 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-sort", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index 28ba4fc4c1ef82..f8c5ac3ba49222 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/spirit - REF boost-1.82.0 - SHA512 4ac312395d3487476ad55745b784375942dbf41eef09231ca6c68f813dffab24db3068ee7fea2feb5206c63e0323884ae9687f43019b8147aa7176bf378b6069 + REF boost-1.83.0 + SHA512 965bc3a4e9306766d3bf0c5315460bcdaf6c0699277694b52f0f58070c26b754e07143ae019f71a6c388ed1c8bad1f43b643d66e4a8e88805bd3cee77e56dd69 HEAD_REF master ) diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json index 6aab85d5fe1060..3e324eab397788 100644 --- a/ports/boost-spirit/vcpkg.json +++ b/ports/boost-spirit/vcpkg.json @@ -1,131 +1,130 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-spirit", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-endian", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-phoenix", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-pool", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-proto", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-regex", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-thread", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-unordered", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index 5bff51abfa0858..ce111df15ef0c7 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stacktrace - REF boost-1.82.0 - SHA512 18e01cce338e67f9474ff7ca6732e749216e57fc7d5cbf5f78a5e6b7d6c16e70ee0b92a74986c744c6ee9dd2a34c16fc7b6ac918c783b60835e834fac5749707 + REF boost-1.83.0 + SHA512 abc42a9e9cb4d45976db946c200d4f0c140b091724cde42c00a1ad26198292068bfa180c472253d637b0434eda43058b67a5d98f2cd4adadada9d75f2c1d8203 HEAD_REF master ) diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index dd271544531f69..aa1a8ce21d8d97 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-stacktrace", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", "license": "BSL-1.0", @@ -10,49 +9,49 @@ "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index 6547f771f1ae96..93819efabe320d 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/statechart - REF boost-1.82.0 - SHA512 b0966a43651a58f43f58dc1e7156c3d1609201bf38038e2845a7332c3918156d2561d84534e366b35706483ba426abc901d10e8f4b1dbc2dcc715d88047569bb + REF boost-1.83.0 + SHA512 f6eb991c7a020b0fccc013aeac4f15854638823245029ef82ec57c0a7c6fdfc29ef1132984748e1040812e59b8b97f623d0b303eeadcb043a75b407739d92d3b HEAD_REF master ) diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json index 7e9b8d92ecdf9f..c966adb70afb33 100644 --- a/ports/boost-statechart/vcpkg.json +++ b/ports/boost-statechart/vcpkg.json @@ -1,63 +1,62 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-statechart", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-thread", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 524a7b2f5a8b24..eff163ac8d0b35 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_assert - REF boost-1.82.0 - SHA512 334b467feaf8ec091dd21e78cf85b60f79d59316a6c1b43840a006c7bd373734b2f3403ba8bb8924f60f08fe339cee9df392e1c883b8c5f4319ec9efc5ae879e + REF boost-1.83.0 + SHA512 60c126c60f435b3fe0f11d23e05df5836c6f6c7630f383818777931684599fc26ba0d801f714d74e24419699842abb915c350637118e036bfa26d5ae6180e82a HEAD_REF master ) diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json index 0016d14b5dc853..3d595f1e099c60 100644 --- a/ports/boost-static-assert/vcpkg.json +++ b/ports/boost-static-assert/vcpkg.json @@ -1,19 +1,18 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-static-assert", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_assert", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index 23920f456e17f6..cd525e7f33b103 100644 --- a/ports/boost-static-string/portfile.cmake +++ b/ports/boost-static-string/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_string - REF boost-1.82.0 - SHA512 e78aa0faebf3e473927cf75416cc548c7496a36303d1c902ed93fa8294120a26a4d9e3f267ab96790a28a192424a197b97aedded1d2fc1bac341222d4945cd8f + REF boost-1.83.0 + SHA512 c3150f362aa771d6e41f20cd7ebac895c7eb039fdf80a04d65933e8f9c574f214a7164121b0a38b7f6d7e5a9d4a315d98eefec663fceb4251ce7dce50b7e9dee HEAD_REF master ) diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json index 49225d1a0c42c6..b596826458c335 100644 --- a/ports/boost-static-string/vcpkg.json +++ b/ports/boost-static-string/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-static-string", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index 3d0878a2d8989b..d523c3d3c22ec9 100644 --- a/ports/boost-stl-interfaces/portfile.cmake +++ b/ports/boost-stl-interfaces/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stl_interfaces - REF boost-1.82.0 - SHA512 55307949a54b491ae9d6476c92c1f64c550882b9f0c723111a21afe301731270779c100fc7aecc3fc23f7844e56c2de3b6bb83293624b8032d51619b07d9b768 + REF boost-1.83.0 + SHA512 cc0995bb231ead8268de72f2ef13a53eb0c5ac354da102af3dc373e5f8a0c87196c75671c8e93d3f7251da10d87d16c62ef08a9c030475b6c28a5642ef9957f2 HEAD_REF master ) diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json index 00bbf385fa1cee..dd1f032393f3b4 100644 --- a/ports/boost-stl-interfaces/vcpkg.json +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -1,27 +1,26 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-stl-interfaces", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index 924801d5b594e3..e37d60adc51bce 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/system - REF boost-1.82.0 - SHA512 96e2ef5cdc4886be3a8bd113ba542d5c633723761792758b510c6f99c751da1686fb099c32a1c684eace84c75a575bfa43859197e511cb8d3f678ff31c27dd66 + REF boost-1.83.0 + SHA512 f1db7d7cd7967a079821701c82202c5b2de8eda763d95284aaa960738a9e298b018e72099b7afeedea7e057392044df5fd260d396f2de5e6f354be2036aa7a9c HEAD_REF master ) diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json index 06e9e2382610ea..6ce46eca58c555 100644 --- a/ports/boost-system/vcpkg.json +++ b/ports/boost-system/vcpkg.json @@ -1,45 +1,44 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-system", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost system module", "homepage": "https://github.com/boostorg/system", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant2", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 81fef2e4037b10..37d7431c0302fe 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.82.0 - SHA512 7c3d489e6876659811004c5c4353e4c69ffc66f59e56b2179d315717880b2b899c05cf5024eba82668f447260df6b38efb6bb7270b36e3a5187f39bc9168ffa2 + REF boost-1.83.0 + SHA512 012277af2c4a58dea27d71699cfeb5f63385c66c43051beea1cdc642acab671bb29a25292b64d8aaa583e2bfb157a614310b5f869d9959d83cbf439081c8282c HEAD_REF master ) diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json index 85051121f05af8..acde76d88f9266 100644 --- a/ports/boost-test/vcpkg.json +++ b/ports/boost-test/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-test", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost test module", "homepage": "https://github.com/boostorg/test", "license": "BSL-1.0", @@ -10,89 +9,89 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index ac5aa8995370ca..34cf481cb157d3 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/thread - REF boost-1.82.0 - SHA512 2415a1d5cd7874cc16d5a50517d2df3527cfa188d39b4fb58edb693b8e324430069cb01120c33fdb64706f01a6c59b84a58bdc229a24d7ac01cb8521166a87f8 + REF boost-1.83.0 + SHA512 674ead829cd5799121e89b335e5ce73cfb2f934bb2b26c93112c072833fda10e48c56c439d0d40d8150eb7a6606c83900db1a6815d77c57fa4ee840f14413f36 HEAD_REF master ) diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index 04bebe6b0d1f52..26ed5b805a46d8 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -1,141 +1,140 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-thread", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-atomic", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-chrono", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-date-time", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index cb6e4611acf84c..0034f9cc302c01 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/throw_exception - REF boost-1.82.0 - SHA512 0d277736e6c043e84a93d69f5385226b1cf2483f35e860fdcc032998aabec5d2e65c0c02c1b11cee59a0c1e21ba1ab7e1ba975f070ab30918e128ad8b6f45f97 + REF boost-1.83.0 + SHA512 5f730520fbc7d3783257071bbf8db2ecbf0170c5d3ae45c603b98d48ca5920c9cbab0dc0d3584670345970f550bb0ab612eaf18d701a44332168fa9aec847a36 HEAD_REF master ) diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json index ea431321aadc46..2dde22684fd158 100644 --- a/ports/boost-throw-exception/vcpkg.json +++ b/ports/boost-throw-exception/vcpkg.json @@ -1,23 +1,22 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-throw-exception", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index 6fa9a76939791f..c91108030bd766 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/timer - REF boost-1.82.0 - SHA512 24eef96802278f2839e83e9d3213b24bb88e669e97614e03335b0f77e65d1ddb2e0679cdc7bb96fb46e2b513ff0b40d94d3317410e9e5cbeb18079252dc8287d + REF boost-1.83.0 + SHA512 480635346e40ed6fe63c2574d6924a43f0e98278cf9e6e3acd31991cd2da7856258979925e59d9753f3ed535026cbf62edd19bbc1a893459d3f00feb6e617f21 HEAD_REF master ) diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json index 5c64b147f6fb6f..93b482a20d32cd 100644 --- a/ports/boost-timer/vcpkg.json +++ b/ports/boost-timer/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-timer", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", "license": "BSL-1.0", @@ -10,44 +9,28 @@ { "name": "boost-build", "host": true, - "version>=": "1.82.0" - }, - { - "name": "boost-chrono", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" - }, - { - "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" - }, - { - "name": "boost-system", - "version>=": "1.82.0" - }, - { - "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index 852ed98ac3e438..33fea9346f2e91 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tokenizer - REF boost-1.82.0 - SHA512 60412277d7628c3ab8326ff0efffaa192ee39f82371eb3cac13a8f04575f90b1a80faa88e374100b9e0bd8af07521ef20a312f2d9fdf8f61be7935abf890f146 + REF boost-1.83.0 + SHA512 25e3aca064a1aeff65cd9abd8e828a1a25c2f4411d8e66f1bda7bccb9fc30145923eb1ca79d9ae8328584305a4d88e517897b870d45eca17923038edc58619f5 HEAD_REF master ) diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json index 11e474e377909b..03ad8c00038fca 100644 --- a/ports/boost-tokenizer/vcpkg.json +++ b/ports/boost-tokenizer/vcpkg.json @@ -1,39 +1,38 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tokenizer", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index 5b0794035d5fb5..0d0573013a504b 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tti - REF boost-1.82.0 - SHA512 2ec45de7457df78febec14d64850b91b7956036d4b3fc859ce95314e5af183b179960fa36cf2a1b8d6345f513d2c8357e3b1838ee3b61d10795cdacf678eca82 + REF boost-1.83.0 + SHA512 5a134b60981d84858fe55b18c72737ce3c6a6d644972f86db5a465cc28257249c7288e333d14c2c6e8eca21fb3f6c17d74e41dbad6d4806616f230d2bc0c68ae HEAD_REF master ) diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json index bd0c69da33c6b1..5cef1a31cc5908 100644 --- a/ports/boost-tti/vcpkg.json +++ b/ports/boost-tti/vcpkg.json @@ -1,35 +1,34 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tti", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index 3bb9cfb1436373..b053e4068610bf 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tuple - REF boost-1.82.0 - SHA512 c44b29c6513ed0f128d7738626eb2c91a8c4762ce82bccb54de6086a47dd4a38479ba134b72e002db315667fd9d95facc5c870c1827334fdaae9c7ee55a80529 + REF boost-1.83.0 + SHA512 0f963643da633b4fda913d98703fb865349ba12063202defeb6d0fce82d8b06b9e3c12decef0ab866ddfb689ea85e112c32b52bb669a353fca64d0257aeef9a8 HEAD_REF master ) diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json index 90690015a14288..cf7e8b08a9accd 100644 --- a/ports/boost-tuple/vcpkg.json +++ b/ports/boost-tuple/vcpkg.json @@ -1,31 +1,30 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tuple", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 5ffc655c697e32..8494c1670f001d 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_erasure - REF boost-1.82.0 - SHA512 1a14112b95a6b071c3e8b0ed2b18120c1e567e6a545e6cc72309e1970def982a4d9c6da295dff219dda82bb52b5ecad8acd2b9017daaa08e10420934ea477bd7 + REF boost-1.83.0 + SHA512 57188b1e79e3ab9c0ec4124862460c14255f8830d3bc6c09d5266fcd7cc8d33add8c2a126ddce9302450e2420095932a96725073fdb569f847cd41baf49d8867 HEAD_REF master ) diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json index b9d141d9b5f8ba..f5718af77e0c89 100644 --- a/ports/boost-type-erasure/vcpkg.json +++ b/ports/boost-type-erasure/vcpkg.json @@ -1,81 +1,80 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-erasure", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-thread", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vmd", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index 62e8eb5858261a..9b801e1d1e9e5f 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_index - REF boost-1.82.0 - SHA512 28b71480a83f57cfb816042e2d56f21afa870f61f617367c82753e57485ca502817dd5cb3f194a163f3b648e38be8fee4d2f80f2df9a534cc76d24791ade2580 + REF boost-1.83.0 + SHA512 e6da09d06231d9eee05847205220e1f7ea0cd512271a0bbf14254eb794f49357fa141a785db38b5e92a1f8e9d966dd9cde0137300f596f282d31c95446699264 HEAD_REF master ) diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json index 60d94bae138b93..9a0a20d32cd2bf 100644 --- a/ports/boost-type-index/vcpkg.json +++ b/ports/boost-type-index/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-index", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index 7000de50714bec..e1b0c143c55017 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_traits - REF boost-1.82.0 - SHA512 0ffabde32148936aea8564b45f64c55b4243b2d84f23b615efc6057d43a13da5ff2f8c757b09c1c29a7e2209b3449d2b0eebec370717e52bab9110d6903691e1 + REF boost-1.83.0 + SHA512 8763b4f8d2eecade2092ae69503be82c5845804d5ccf8788c412f48b708d517c24c63244905700a8c018c847410f60bafa8803ae0e7dcd1b52506be210ce9635 HEAD_REF master ) diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json index 538ab461f79e41..db94949fc024dd 100644 --- a/ports/boost-type-traits/vcpkg.json +++ b/ports/boost-type-traits/vcpkg.json @@ -1,23 +1,22 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-traits", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index c4fd87d5e9dfa1..5e3e9fb60c495c 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/typeof - REF boost-1.82.0 - SHA512 2650ac233947f7c36d9f93b30c23b68486376552f16975efec7daa459fc8314aeb3f6d4a2dc5f6d972793602621930472940a28008992a3f9defb76f87e73d85 + REF boost-1.83.0 + SHA512 210a9d303f6827e87744104f031b98c30ef3de288e17f5ebe5925e7a2114a2be1dd8990e4f3653a56001c43992d7c6f3cc8b0dd08fe79d0549118524f319791a HEAD_REF master ) diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json index 9c1b8b9b41cbdb..240b34d19aaec7 100644 --- a/ports/boost-typeof/vcpkg.json +++ b/ports/boost-typeof/vcpkg.json @@ -1,27 +1,26 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-typeof", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 875be1878fe0f6..415db170821aba 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ublas - REF boost-1.82.0 - SHA512 09b22a1e13348c110a38f504068bb6ed44945168c3749357cd6783193c11645680a92ebd7cddb5c4d6db4f4870b3f6a95c5e2b40cc4282e994da605700cdf868 + REF boost-1.83.0 + SHA512 bd3c1ae81f903271c5b88ebafb29e032646d4a9ecd4b99c2580bac3adbc20e87c550022d94ada7496e29e5e133516cb1a6b47338db9238ca834c5fa480fb93b4 HEAD_REF master ) diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json index 34227da43b8c6d..4042ba6eeb25d4 100644 --- a/ports/boost-ublas/vcpkg.json +++ b/ports/boost-ublas/vcpkg.json @@ -1,63 +1,62 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ublas", - "version": "1.82.0", - "port-version": 3, + "version": "1.83.0", "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", "license": "BSL-1.0", "dependencies": [ { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-interval", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-uninstall/vcpkg.json b/ports/boost-uninstall/vcpkg.json index b809581ea41aca..e0d4ea2b954dd1 100644 --- a/ports/boost-uninstall/vcpkg.json +++ b/ports/boost-uninstall/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-uninstall", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Internal vcpkg port used to uninstall Boost", "license": "MIT" } diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index af1f688dd57ac8..75d7214c7d489d 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/units - REF boost-1.82.0 - SHA512 af5b0a8f6f317422fb30c9f7fa5122e53f0b78380ff0adbf02f8af10eea8036b3747b949e131969e148804b917322d579fc4b5ce4fb5082f26d027b649dbdcd7 + REF boost-1.83.0 + SHA512 f915fb2b77b98c0482a5d706dc51fc5f8887ce00848a58907f06cb740792221c21bd1785b5cc1c0e5e9a3c7c78bcf5c0528adbdb9b58db01bed5c3cdd4434b4b HEAD_REF master ) diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json index 09297d63f31bce..ebd10d2298ea73 100644 --- a/ports/boost-units/vcpkg.json +++ b/ports/boost-units/vcpkg.json @@ -1,63 +1,62 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-units", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost units module", "homepage": "https://github.com/boostorg/units", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lambda", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-math", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-unordered/0001-unordered-fix-copy-assign.patch b/ports/boost-unordered/0001-unordered-fix-copy-assign.patch new file mode 100644 index 00000000000000..809197f84fc21c --- /dev/null +++ b/ports/boost-unordered/0001-unordered-fix-copy-assign.patch @@ -0,0 +1,16 @@ +diff --git a/include/boost/unordered/detail/foa/core.hpp b/include/boost/unordered/detail/foa/core.hpp +index 239d05d3..7ae9f2c8 100644 +--- a/include/boost/unordered/detail/foa/core.hpp ++++ b/include/boost/unordered/detail/foa/core.hpp +@@ -1870,9 +1870,10 @@ private: + + void fast_copy_elements_from(const table_core& x) + { +- if(arrays.elements){ ++ if(arrays.elements&&x.arrays.elements){ + copy_elements_array_from(x); + copy_groups_array_from(x); ++ size_ctrl.ml=std::size_t(x.size_ctrl.ml); + size_ctrl.size=std::size_t(x.size_ctrl.size); + } + } diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index 1bd27d30ed84c9..1378201724f6cb 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -3,9 +3,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/unordered - REF boost-1.82.0 - SHA512 209ed0ef79f55782cf3a1440125c7b9448240a7a64abe940274346d16f116dba5df0da0438a2881be4813977a03348760bdcb03b1d8d282da93ae6acaca59fb6 + REF boost-1.83.0 + SHA512 52a36f1d279c6fd9e6b480267aa3cb6cab64e3c996230b0bf585973067bf845711f30a8f79402263236420ebbb6e856bbc9e1c6c2dd72e416f571bff150f858a HEAD_REF master + PATCHES 0001-unordered-fix-copy-assign.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json index b9fd04df7297df..6d099a95ddde0d 100644 --- a/ports/boost-unordered/vcpkg.json +++ b/ports/boost-unordered/vcpkg.json @@ -1,63 +1,62 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-unordered", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-url/portfile.cmake b/ports/boost-url/portfile.cmake index aef14f147a1ea5..a9acf70160e611 100644 --- a/ports/boost-url/portfile.cmake +++ b/ports/boost-url/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/url - REF boost-1.82.0 - SHA512 b8d785b3e64fd8b4b9ae6162958ee9d67a6eb220823e50e91977e37b6954440d83302df2afae93119fc707428981f0c07b262e3ea68675ea6cbd47e3dd8c20c1 + REF boost-1.83.0 + SHA512 a980edb3cd1c5d5a0d8606df246e4ef177a08837f93045adff0be8f9e5677e65f1df2d586299f6f4362508d292f4536336877eb56a78026ec368d0de3c453a15 HEAD_REF master ) diff --git a/ports/boost-url/vcpkg.json b/ports/boost-url/vcpkg.json index 0c4ecf33454dfe..7680015348fae5 100644 --- a/ports/boost-url/vcpkg.json +++ b/ports/boost-url/vcpkg.json @@ -1,69 +1,68 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-url", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost url module", "homepage": "https://github.com/boostorg/url", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant2", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index 07fe983816f120..70a5a0810a457e 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/utility - REF boost-1.82.0 - SHA512 424c98ac194ff6eb39694d326a7b5dd9ebebbb32a9bf8db6176f2bfc034a252773e713360ce6afa14a68b6828a767db7ddcfdaf54feea0ce85da3e0b9ef37ab3 + REF boost-1.83.0 + SHA512 73740147342f62ecc7a321f2c940c94a182650e03a18da85df66b496a396ab33ff1b055cb887990738cf92aac3e549cfa529028143746fcd274facb19dd1d038 HEAD_REF master ) diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json index 8e986e9ac8dfde..1811849e06c034 100644 --- a/ports/boost-utility/vcpkg.json +++ b/ports/boost-utility/vcpkg.json @@ -1,43 +1,42 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-utility", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index 8a1eb15018a5e5..32cfdb550dfd3a 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/uuid - REF boost-1.82.0 - SHA512 588c75f7b757a1754ef72bbe3290111e00b531b70be19d63100e996937194de17a571b6a5c6531c389f4db08ea74446911a9f349a3c51959b91d6a7012ec57b4 + REF boost-1.83.0 + SHA512 8b6d2f77b1bb3c3fa7238899a7e88772ec4094f49578102df73a46a3e7be69b8ad4df05d2a5b5322705b53f3f0f86ab1a91c495dc5820433b535bb8d5b15a195 HEAD_REF master ) diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json index 7307e617820e0f..0801f44f845736 100644 --- a/ports/boost-uuid/vcpkg.json +++ b/ports/boost-uuid/vcpkg.json @@ -1,72 +1,71 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-uuid", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tti", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index 4e9491b27730f4..142d129d376f66 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant - REF boost-1.82.0 - SHA512 90ff105b2910c34d3f3ca5ba9341da8625690cc008683c2cb201b31bfecd7e108a7741a17d9fbe102435d3e893c7285d7331f91f4aae3e68e643be5bf8e653a7 + REF boost-1.83.0 + SHA512 8069d706490471892be9d160446fc81439b947e9b7cd8b34980f27a92add4329e4b7dec3f2386b47f93d0f2bcf4da33fc033380ab4d0d5e9d6d7df836e6a8a6e HEAD_REF master ) diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json index ea4b34c087c776..19f9af9f593058 100644 --- a/ports/boost-variant/vcpkg.json +++ b/ports/boost-variant/vcpkg.json @@ -1,75 +1,74 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-variant", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index 0edbf1b09be535..12a9facff5f623 100644 --- a/ports/boost-variant2/portfile.cmake +++ b/ports/boost-variant2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant2 - REF boost-1.82.0 - SHA512 587400708278f40cf02456fcdb1d6f2953740ad56f41b1ade30e7030d7012e59fe444ea1410f18ae5593900597850df8843e430c829e9fb8941ad0321c16c814 + REF boost-1.83.0 + SHA512 7c3d9f28efa6c9cc94502816b45f9d30fdd8c438153790fa4a3311b7ea4ac959f801910a64397ec04be7ade7068e17c603bda06f300ddf92ca97a338bb70c8ec HEAD_REF master ) diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json index 74a67cb4a3eb5f..d67a3e85178ca2 100644 --- a/ports/boost-variant2/vcpkg.json +++ b/ports/boost-variant2/vcpkg.json @@ -1,27 +1,26 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-variant2", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-vcpkg-helpers/vcpkg.json b/ports/boost-vcpkg-helpers/vcpkg.json index 2de29d7364bbad..28a97ab2c2b271 100644 --- a/ports/boost-vcpkg-helpers/vcpkg.json +++ b/ports/boost-vcpkg-helpers/vcpkg.json @@ -1,14 +1,13 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-vcpkg-helpers", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Internal vcpkg port used to modularize Boost", "license": "MIT", "dependencies": [ { "name": "boost-uninstall", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index 27379e83516013..5b61b69363b09e 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/vmd - REF boost-1.82.0 - SHA512 0a0e36c6fa4acfc2145b0b1fac79914895b41fb3de0e6688c3dc7160942f0dc1121c59a2e81d6a7a65ec005fefd12ff9453250d35ce59eee4ddeeb655a47c692 + REF boost-1.83.0 + SHA512 75a1d58d8375cb0196027c4476b5eca9a00f437a72e6a7056eba324b42ace30c447b04cd46fcc5db6170801103d9fb4a8e3095b7ef795373a7ddab00f12da787 HEAD_REF master ) diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json index 9af1094ae94765..db3b6fb6314f0b 100644 --- a/ports/boost-vmd/vcpkg.json +++ b/ports/boost-vmd/vcpkg.json @@ -1,19 +1,18 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-vmd", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", "license": "BSL-1.0", "dependencies": [ { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index aa65640c2b2444..2d4e0778177ae3 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/wave - REF boost-1.82.0 - SHA512 598f7052b66f54d00949f59107ddbfa8a9fcca9ca5c7aa3c60b3d9611edd69797211a0a32d4048b1c78262ddade0e011c6bc01001b12c195950aa3d6ce6fb0d7 + REF boost-1.83.0 + SHA512 7590174cfba34d463685672cfe2a709d562d15496dcffda746c70f8f00ab0f57fc20556d111168eaa2592d1f3c6157d9eb0d2a4e56338e2932cb88e7f6c358ff HEAD_REF master ) diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json index 8df96d7d288f01..901c352f0c66dc 100644 --- a/ports/boost-wave/vcpkg.json +++ b/ports/boost-wave/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-wave", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", "license": "BSL-1.0", @@ -10,94 +9,94 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-format", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-pool", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-spirit", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index ad070452ef6180..6ca4b075e82cdf 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/winapi - REF boost-1.82.0 - SHA512 9da0d67af96a1f5aee7169cfc4acd0778b69dd505a7c3bc364f72871560db858128829b4f1f4b8ca6bb6704b8eddf04b872d085eb5afc3c8a74cd3559f785448 + REF boost-1.83.0 + SHA512 b0aae07b0edf477b690f7435fe25dc3d8db153c11e66a543e4ca05ea9bd22da3a7e2f07e4e7b24999f476f2d1be82f33f760d317ee8f3f8650e08c67c55dd9ae HEAD_REF master ) diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json index 46db8d2c3000af..f16b47af4d6289 100644 --- a/ports/boost-winapi/vcpkg.json +++ b/ports/boost-winapi/vcpkg.json @@ -1,23 +1,22 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-winapi", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 61779f8d87a862..12caf8628a9a28 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/xpressive - REF boost-1.82.0 - SHA512 840720a68de7e3358237d7fd59a0f541fc754283ba0ab96457bbdfc122114f749fb0b47033fc1ccc0b06a2d1b3b8d288a9828585e8870e303f06e4c96c449af4 + REF boost-1.83.0 + SHA512 7b9689eb55cd653b53e598c2911e1d32537125543b57ddf3bc7a2a7ee89fa33623354722cf916c68dd2410c3466d45b40bac02ed8076dc9b8b152d3549dc2015 HEAD_REF master ) diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json index cab7a68870f5f7..d6bd5501cd0648 100644 --- a/ports/boost-xpressive/vcpkg.json +++ b/ports/boost-xpressive/vcpkg.json @@ -1,103 +1,102 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-xpressive", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-proto", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-spirit", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index 4f7fddfbefa032..64db6e3254233a 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/yap - REF boost-1.82.0 - SHA512 248620ea8216fc6d3cb91f41a3606067e6c65b7fdb34b9459d163d06b4e7f6aa7072cf16023f489f950e49ef81b937ebb833d8d0dcbac290e9e00e0cd3820c55 + REF boost-1.83.0 + SHA512 c9f68a439556a9bb1943ab98da2f3a7d95d13b7c4104251c4f28f858392dc05d05fcb6bca31280ef040ea5562910a3c06fa00daeb7a3d74b3f761fc147363b98 HEAD_REF master ) diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json index 2ec4bf7eb029bb..3efe6d33295420 100644 --- a/ports/boost-yap/vcpkg.json +++ b/ports/boost-yap/vcpkg.json @@ -1,27 +1,26 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-yap", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", "license": "BSL-1.0", "dependencies": [ { "name": "boost-hana", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index d5aec1b0fb2b7c..1b59ec2f92ea36 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,603 +1,607 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost", - "version": "1.82.0", - "port-version": 2, + "version": "1.83.0", + "port-version": 1, "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "license": "BSL-1.0", "dependencies": [ { "name": "boost-accumulators", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-algorithm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-align", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-any", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-asio", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-assign", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-atomic", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-beast", "platform": "!emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bimap", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-bind", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-callable-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-chrono", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-circular-buffer", - "version>=": "1.82.0" + "version>=": "1.83.0" + }, + { + "name": "boost-compat", + "version>=": "1.83.0" }, { "name": "boost-compatibility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-compute", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-config", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-contract", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-convert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-core", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-coroutine", "platform": "!(arm & windows) & !uwp & !emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-coroutine2", "platform": "!emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-crc", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-date-time", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-describe", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-detail", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-dll", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-dynamic-bitset", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-endian", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fiber", - "platform": "!uwp & !arm & !emscripten", - "version>=": "1.82.0" + "platform": "!uwp & !(arm & windows) & !emscripten", + "version>=": "1.83.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-flyweight", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-foreach", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-format", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-function-types", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-functional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-fusion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-geometry", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-gil", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-graph", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-hana", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-heap", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-histogram", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-hof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-icl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-integer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-interprocess", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-interval", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-io", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iostreams", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-iterator", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-json", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lambda", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lambda2", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-leaf", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-local-function", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-locale", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-lockfree", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-log", "platform": "!uwp & !emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-logic", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-math", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-metaparse", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-move", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mp11", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpl", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-msm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multi-array", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-multiprecision", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mysql", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-nowide", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-odeint", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-optional", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-outcome", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-parameter-python", "platform": "!emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-pfr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-phoenix", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-poly-collection", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-polygon", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-pool", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-predef", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-process", "platform": "!emscripten", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-program-options", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-map", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-tree", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-proto", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-ptr-container", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-python", "platform": "!uwp & !emscripten & !ios & !android", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-qvm", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-range", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-ratio", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-rational", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-regex", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-safe-numerics", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-scope-exit", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-serialization", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-signals2", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-sort", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-spirit", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-stacktrace", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-statechart", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-static-string", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-stl-interfaces", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-system", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-test", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-thread", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-timer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tokenizer", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tti", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-tuple", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-erasure", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-index", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-typeof", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-ublas", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-units", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-unordered", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-url", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-utility", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-uuid", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-variant2", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-vmd", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-wave", "platform": "!uwp", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-winapi", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-xpressive", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-yap", - "version>=": "1.82.0" + "version>=": "1.83.0" } ], "features": { @@ -606,15 +610,15 @@ "dependencies": [ { "name": "boost-graph-parallel", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-mpi", - "version>=": "1.82.0" + "version>=": "1.83.0" }, { "name": "boost-property-map-parallel", - "version>=": "1.82.0" + "version>=": "1.83.0" } ] } diff --git a/ports/boringssl/0001-static-gtest.patch b/ports/boringssl/0001-static-gtest.patch new file mode 100644 index 00000000000000..1c76b4986bbd4a --- /dev/null +++ b/ports/boringssl/0001-static-gtest.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -479,7 +479,7 @@ endif() + # Add minimal googletest targets. The provided one has many side-effects, and + # googletest has a very straightforward build. + add_library( +- boringssl_gtest ++ boringssl_gtest STATIC + third_party/googletest/googlemock/src/gmock-all.cc + third_party/googletest/googletest/src/gtest-all.cc + ) diff --git a/ports/boringssl/0001-vcpkg.patch b/ports/boringssl/0001-vcpkg.patch deleted file mode 100644 index f871dd92be529f..00000000000000 --- a/ports/boringssl/0001-vcpkg.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 893bca7..83ff477 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -562,7 +562,7 @@ endif() - - # Add minimal googletest targets. The provided one has many side-effects, and - # googletest has a very straightforward build. --add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc) -+add_library(boringssl_gtest STATIC third_party/googletest/src/gtest-all.cc) - target_include_directories(boringssl_gtest PRIVATE third_party/googletest) - - include_directories(third_party/googletest/include) -@@ -649,3 +649,18 @@ add_custom_target( - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any - USES_TERMINAL) -+ -+install(TARGETS crypto ssl -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ -+option(INSTALL_HEADERS "Install headers" ON) -+if(INSTALL_HEADERS) -+ install(DIRECTORY include/ DESTINATION include) -+endif() -+ -+option(INSTALL_TOOLS "Install bssl executable" OFF) -+if(INSTALL_TOOLS) -+ install(TARGETS bssl DESTINATION tools/boringssl) -+endif() diff --git a/ports/boringssl/0002-remove-WX-Werror.patch b/ports/boringssl/0002-remove-WX-Werror.patch index c037b273acf2d0..36e0a42219dc29 100644 --- a/ports/boringssl/0002-remove-WX-Werror.patch +++ b/ports/boringssl/0002-remove-WX-Werror.patch @@ -1,24 +1,23 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83ff477..3008c2a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -117,7 +117,7 @@ endif() - if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) - # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration - # primarily on our normal Clang one. -- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla") -+ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla") - if(MSVC) - # clang-cl sets different default warnings than clang. It also treats -Wall - # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall. -@@ -238,8 +238,8 @@ elseif(MSVC) - ${MSVC_DISABLED_WARNINGS_LIST}) - string(REPLACE "C" " -w4" MSVC_LEVEL4_WARNINGS_STR - ${MSVC_LEVEL4_WARNINGS_LIST}) -- set(CMAKE_C_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") -- set(CMAKE_CXX_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") -+ set(CMAKE_C_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") -+ set(CMAKE_CXX_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") - endif() - - if(WIN32) +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,7 +140,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) + # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration + # primarily on our normal Clang one. + # TODO(bbe) took out -Wmissing-field-initializers for pki - fix and put back or disable only for pki +- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits") ++ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits") + if(MSVC) + # clang-cl sets different default warnings than clang. It also treats -Wall + # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall. +@@ -211,8 +211,8 @@ elseif(MSVC) + ) + string(REPLACE "C" " -wd" MSVC_DISABLED_WARNINGS_STR + ${MSVC_DISABLED_WARNINGS_LIST}) +- set(CMAKE_C_FLAGS "-utf-8 -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}") +- set(CMAKE_CXX_FLAGS "-utf-8 -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}") ++ set(CMAKE_C_FLAGS "-utf-8 -W4 ${MSVC_DISABLED_WARNINGS_STR}") ++ set(CMAKE_CXX_FLAGS "-utf-8 -W4 ${MSVC_DISABLED_WARNINGS_STR}") + endif() + + if(WIN32) diff --git a/ports/boringssl/0003-fix-shared-symbol-visibility.patch b/ports/boringssl/0003-fix-shared-symbol-visibility.patch new file mode 100644 index 00000000000000..1b73d0b48a92b6 --- /dev/null +++ b/ports/boringssl/0003-fix-shared-symbol-visibility.patch @@ -0,0 +1,43 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -252,8 +252,6 @@ if(FUZZ) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address,fuzzer-no-link -fsanitize-coverage=edge,indirect-calls") + endif() + +-add_definitions(-DBORINGSSL_IMPLEMENTATION) +- + if(BUILD_SHARED_LIBS) + add_definitions(-DBORINGSSL_SHARED_LIBRARY) + # Enable position-independent code globally. This is needed because +@@ -563,7 +561,7 @@ if(APPLE) + endif() + + add_library(pki ${PKI_SOURCES}) +-target_compile_definitions(pki PRIVATE _BORINGSSL_LIBPKI_) ++target_compile_definitions(pki PRIVATE _BORINGSSL_LIBPKI_ BORINGSSL_IMPLEMENTATION) + target_link_libraries(pki crypto) + + add_executable(pki_test ${PKI_TEST_SOURCES}) +diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt +--- a/crypto/CMakeLists.txt ++++ b/crypto/CMakeLists.txt +@@ -294,6 +294,7 @@ add_library( + $ + ${CRYPTO_FIPS_OBJECTS} + ) ++target_compile_definitions(crypto PRIVATE BORINGSSL_IMPLEMENTATION) + if(OPENSSL_ASM) + target_sources(crypto PRIVATE ${CRYPTO_SOURCES_ASM}) + endif() +diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt +--- a/ssl/CMakeLists.txt ++++ b/ssl/CMakeLists.txt +@@ -39,6 +39,7 @@ add_library( + tls13_enc.cc + tls13_server.cc + ) ++target_compile_definitions(ssl PRIVATE BORINGSSL_IMPLEMENTATION) + # Although libssl also provides headers that require an include directory, the + # flag is already specified by libcrypto, so we omit target_include_directories + # here. diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index b241a3635adaf8..dee6ccd95e256f 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -3,52 +3,47 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") endif() vcpkg_find_acquire_program(PERL) -get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) -vcpkg_add_to_path(${PERL_EXE_PATH}) +get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY) +vcpkg_add_to_path("${PERL_EXE_PATH}") vcpkg_find_acquire_program(NASM) -get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) -vcpkg_add_to_path(${NASM_EXE_PATH}) +get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) +vcpkg_add_to_path("${NASM_EXE_PATH}") vcpkg_find_acquire_program(GO) -get_filename_component(GO_EXE_PATH ${GO} DIRECTORY) -vcpkg_add_to_path(${GO_EXE_PATH}) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tools INSTALL_TOOLS -) +get_filename_component(GO_EXE_PATH "${GO}" DIRECTORY) +vcpkg_add_to_path("${GO_EXE_PATH}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/boringssl - REF 479adf98d54a21c1d154aac59b2ce120e1d1a6d6 - SHA512 74b5d001c0f5c1846b8818e9e668fa35de5171fc21a8f713d241f57b3e8abe42426fdc66b085cca1853b904def6f4bea573dfed40b8b1422894cca85b0b1a44a + REF cfcb954901e264edb9915e501de64a81732c5edd + SHA512 6fc7fff24c85ed580fb362f788b216ef04ca16976656c68c75d3fd72c84e28ed39a3ab8fcb064b7c7061f93a4d37d5426e36d259e1714fa62d90b99659a3ddc2 HEAD_REF master PATCHES - 0001-vcpkg.patch + 0001-static-gtest.patch 0002-remove-WX-Werror.patch + 0003-fix-shared-symbol-visibility.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} OPTIONS_DEBUG - -DINSTALL_HEADERS=OFF - -DINSTALL_TOOLS=OFF # the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix. -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME OpenSSL CONFIG_PATH lib/cmake/OpenSSL) -include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake") - -if(IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/boringssl") - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_copy_tools(TOOL_NAMES bssl AUTO_CLEAN) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json index 1bf1fef03436eb..c47b1bcc45b4c0 100644 --- a/ports/boringssl/vcpkg.json +++ b/ports/boringssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boringssl", - "version-date": "2021-06-23", - "port-version": 4, + "version-date": "2023-09-25", "description": "BoringSSL is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", @@ -9,11 +8,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } - ], - "features": { - "tools": { - "description": "Build bssl executable" - } - } + ] } diff --git a/ports/brotli/fix-arm-uwp.patch b/ports/brotli/fix-arm-uwp.patch index 7ed3fcd3dc88fe..849c7dd08711cc 100644 --- a/ports/brotli/fix-arm-uwp.patch +++ b/ports/brotli/fix-arm-uwp.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e6c6054..2c4b757 100644 +index d868883..e4c5ecc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -124,6 +124,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - add_definitions(-DOS_FREEBSD) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +@@ -114,6 +114,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") add_definitions(-DOS_MACOSX) + set(CMAKE_MACOS_RPATH TRUE) + set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") +elseif(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() - function(transform_sources_list INPUT_FILE OUTPUT_FILE) + if(BROTLI_EMSCRIPTEN) diff --git a/ports/brotli/install.patch b/ports/brotli/install.patch index 3964c0c193f754..c523f1c785741b 100644 --- a/ports/brotli/install.patch +++ b/ports/brotli/install.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4ff3401..46492d0 100644 +index 61378cd..d868883 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -185,14 +185,13 @@ endforeach() +@@ -142,14 +142,13 @@ endif() - foreach(lib IN LISTS BROTLI_SHARED_LIBS BROTLI_STATIC_LIBS) + foreach(lib ${BROTLI_LIBRARIES_CORE}) target_link_libraries(${lib} ${LIBM_LIBRARY}) - set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS}) set_target_properties(${lib} PROPERTIES @@ -13,12 +13,12 @@ index 4ff3401..46492d0 100644 if(NOT BROTLI_EMSCRIPTEN) set_target_properties(${lib} PROPERTIES POSITION_INDEPENDENT_CODE TRUE) endif() -- set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDE_DIRS}") +- set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$") + set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$" $) endforeach() if(NOT BROTLI_EMSCRIPTEN) -@@ -223,27 +222,36 @@ if(NOT BROTLI_EMSCRIPTEN) +@@ -176,11 +175,14 @@ target_link_libraries(brotli ${BROTLI_LIBRARIES}) if(NOT BROTLI_BUNDLED_MODE) install( TARGETS brotli @@ -28,32 +28,20 @@ index 4ff3401..46492d0 100644 + CONFIGURATIONS Release ) -+ if(BUILD_SHARED_LIBS) install( TARGETS ${BROTLI_LIBRARIES_CORE} + EXPORT brotli ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) -- -+ else() - install( - TARGETS ${BROTLI_LIBRARIES_CORE_STATIC} -+ EXPORT brotli - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) -+ endif() - +@@ -189,7 +191,10 @@ if(NOT BROTLI_BUNDLED_MODE) install( DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + CONFIGURATIONS Release ) + -+ install(EXPORT brotli FILE unofficial-brotli-targets.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli) ++ install(EXPORT brotli FILE unofficial-brotli-config.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli) endif() # BROTLI_BUNDLED_MODE - endif() # BROTLI_EMSCRIPTEN + # Tests diff --git a/ports/brotli/pkgconfig.patch b/ports/brotli/pkgconfig.patch index 30adf3d2461f62..e3c3fa38f12277 100644 --- a/ports/brotli/pkgconfig.patch +++ b/ports/brotli/pkgconfig.patch @@ -1,18 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0cdb73b..33a80a7 100644 +index e4c5ecc..0589fc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -406,6 +406,13 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION) +@@ -348,6 +348,12 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION) string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT}) -+ string(REPLACE [[ -R${libdir}]] "" TEXT ${TEXT}) + if(NOT BUILD_SHARED_LIBS) -+ string(REGEX REPLACE [[( -lbrotli[a-z]*)]] [[\1-static]] TEXT ${TEXT}) + if(LIBM_LIBRARY) -+ string(REPLACE " -lbrotlicommon-static" " -lbrotlicommon-static -l${LIBM_LIBRARY}" TEXT ${TEXT}) ++ string(REPLACE " -lbrotlicommon" " -lbrotlicommon -l${LIBM_LIBRARY}" TEXT ${TEXT}) + endif() + endif() ++ file(WRITE ${OUTPUT_FILE} ${TEXT}) endfunction() diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake index 9c74dc6c8da1de..5b42104792ba46 100644 --- a/ports/brotli/portfile.cmake +++ b/ports/brotli/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/brotli - REF e61745a6b7add50d380cfd7d3883dd6c62fc2c71 # v1.0.9 - SHA512 303444695600b70ce59708e06bf21647d9b8dd33d772c53bbe49320f2f8f95ca8a7d6df2d29b7f36ff99001967e2d28380e0e305d778031940a3a5c6585f9a4f + REF v${VERSION} # v1.1.0 + SHA512 6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9 HEAD_REF master PATCHES install.patch @@ -20,12 +20,10 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-brotli-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-brotli") vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-brotli PACKAGE_NAME unofficial-brotli) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/brotli") +vcpkg_copy_tools(TOOL_NAMES "brotli" SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/brotli") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/brotli/unofficial-brotli-config.cmake b/ports/brotli/unofficial-brotli-config.cmake deleted file mode 100644 index 694db564eb7970..00000000000000 --- a/ports/brotli/unofficial-brotli-config.cmake +++ /dev/null @@ -1,11 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/unofficial-brotli-targets.cmake") -foreach(target IN ITEMS brotlicommon brotlidec brotlienc) - if(TARGET unofficial::brotli::${target} AND NOT TARGET unofficial::brotli::${target}-static) - _add_library(unofficial::brotli::${target}-static INTERFACE IMPORTED) - set_target_properties(unofficial::brotli::${target}-static PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${target}") - endif() - if(NOT TARGET unofficial::brotli::${target} AND TARGET unofficial::brotli::${target}-static) - _add_library(unofficial::brotli::${target} INTERFACE IMPORTED) - set_target_properties(unofficial::brotli::${target} PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${target}-static") - endif() -endforeach() diff --git a/ports/brotli/vcpkg.json b/ports/brotli/vcpkg.json index e352eea247150b..40e5196f861074 100644 --- a/ports/brotli/vcpkg.json +++ b/ports/brotli/vcpkg.json @@ -1,7 +1,6 @@ { "name": "brotli", - "version": "1.0.9", - "port-version": 5, + "version": "1.1.0", "description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.", "homepage": "https://github.com/google/brotli", "license": "MIT", diff --git a/ports/brpc/portfile.cmake b/ports/brpc/portfile.cmake index beba1345c842b7..74b3f25cb9db7c 100644 --- a/ports/brpc/portfile.cmake +++ b/ports/brpc/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/incubator-brpc REF "${VERSION}" - SHA512 0d3693ceff19952623511381d2df3ab3d17e725c0679154ce36f0cf52d1d4b46ad04699c4bacd0a906bcef33d19921fb5e1193a78218b6010b4c35d07ad62563 + SHA512 2c69a1eaaca26da494c1a10d4f6c67ca53c5cfe43243457263e4966101a77207dee5f29b7372895230978c729254b156b7e4223a41d8e909919fbdac6badc75c HEAD_REF master PATCHES fix-build.patch diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json index 3e1b9aa40ea7de..f885e5b6f5e6b1 100644 --- a/ports/brpc/vcpkg.json +++ b/ports/brpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "brpc", - "version": "1.5.0", + "version": "1.6.0", "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", "homepage": "https://github.com/apache/incubator-brpc", "license": "Apache-2.0", diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 38e6acd4744542..18f96e10a4fe90 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,11 +1,11 @@ { "name": "cairo", "version": "1.17.8", - "port-version": 3, + "port-version": 4, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", "license": "LGPL-2.1-only OR MPL-1.1", - "supports": "!xbox", + "supports": "!xbox & !uwp", "dependencies": [ "dirent", "expat", diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json index 798ada8cb7b529..c12a5b0f7d0c6c 100644 --- a/ports/cairomm/vcpkg.json +++ b/ports/cairomm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cairomm", "version": "1.17.1", + "port-version": 1, "description": "A C++ wrapper for the cairo graphics library", "homepage": "https://www.cairographics.org", "license": "LGPL-2.0-only", @@ -8,10 +9,6 @@ "dependencies": [ "cairo", "libsigcpp", - { - "name": "pkgconf", - "host": true - }, { "name": "vcpkg-tool-meson", "host": true diff --git a/ports/capnproto/disable-C-20-co-routines.patch b/ports/capnproto/disable-C-20-co-routines.patch new file mode 100644 index 00000000000000..ab292af0799d74 --- /dev/null +++ b/ports/capnproto/disable-C-20-co-routines.patch @@ -0,0 +1,25 @@ +From da5b439b558e354a8fc59d09dff6a9eb657f54fd Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Mon, 28 Aug 2023 22:28:43 +0200 +Subject: [PATCH] Disable C++20 co-routines + +--- + c++/src/kj/async-prelude.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/c++/src/kj/async-prelude.h b/c++/src/kj/async-prelude.h +index 6289bf3f..c9845cdc 100644 +--- a/c++/src/kj/async-prelude.h ++++ b/c++/src/kj/async-prelude.h +@@ -36,7 +36,7 @@ + #if (__cpp_impl_coroutine >= 201902L) && __has_include() + // C++20 Coroutines detected. + #include +-#define KJ_HAS_COROUTINE 1 ++// #define KJ_HAS_COROUTINE 1 + #define KJ_COROUTINE_STD_NAMESPACE std + #elif (__cpp_coroutines >= 201703L) && __has_include() + // Coroutines TS detected. +-- +2.41.0.windows.3 + diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index bb0f9a47de9858..cd2bbf0d4aed2a 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO capnproto/capnproto - REF v0.10.3 - SHA512 d8f699220f0738a456238f0e3e638940a340c005f378d6845c805d0e4935d19dc21ba1701710963edb59d8982fefe00aae5e834f912cb734e68cdee10154be01 + REF v1.0.1 + SHA512 189d8c483bded3889e903e3998d32d022b5a7bf45d519dc551dc9b2d7909a45a8816a09f4a817aa0fbb14c86c32b838a0c26457c2e89c33ec0eb93bbb93391c0 HEAD_REF master + PATCHES + disable-C-20-co-routines.patch + undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/capnproto/undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch b/ports/capnproto/undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch new file mode 100644 index 00000000000000..6fdc15a1701ca7 --- /dev/null +++ b/ports/capnproto/undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch @@ -0,0 +1,28 @@ +From 306220e57881064da99f89ad4192b3e19c7953a9 Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Thu, 31 Aug 2023 21:20:09 +0200 +Subject: [PATCH] Undef KJ_USE_EPOLL for ANDROID_PLATFORM < 23 + +--- + c++/src/kj/async-unix.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/c++/src/kj/async-unix.h b/c++/src/kj/async-unix.h +index 665305ea..c5f195cf 100644 +--- a/c++/src/kj/async-unix.h ++++ b/c++/src/kj/async-unix.h +@@ -34,7 +34,10 @@ + KJ_BEGIN_HEADER + + #if !defined(KJ_USE_EPOLL) && !defined(KJ_USE_KQUEUE) +-#if __linux__ ++ ++// Android NDK less than API version 23 doesn't have sigtimedwait ++// sigtimedwait is used in async-unix.c++ if KJ_USE_EPOLL is defined ++#if __linux__ && !(__ANDROID__ && __ANDROID_API__ < 23) + // Default to epoll on Linux. + #define KJ_USE_EPOLL 1 + #elif __APPLE__ || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __DragonFly__ +-- +2.41.0.windows.3 + diff --git a/ports/capnproto/vcpkg.json b/ports/capnproto/vcpkg.json index 9bf0b418bdfaaf..65258626bd4224 100644 --- a/ports/capnproto/vcpkg.json +++ b/ports/capnproto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "capnproto", - "version": "0.10.3", + "version": "1.0.1", "description": "Data interchange format and capability-based RPC system", "homepage": "https://capnproto.org/", "license": "MIT", diff --git a/ports/capstone/portfile.cmake b/ports/capstone/portfile.cmake index b86466d536ea48..585f79b83f8063 100644 --- a/ports/capstone/portfile.cmake +++ b/ports/capstone/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "capstone-engine/capstone" - REF 000561b4f74dc15bda9af9544fe714efda7a6e13 # 5.0.0-rc2 - SHA512 66b09a7d2fda297836bbedaeece71dcfe39bdbd633d9b6ecb68ee2e5aa094b697226136ab172cdc4550e8b2ef1448d001c8ee4e0d456c6d277afe0b3d1aab5a1 + REF "${VERSION}" + SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5 HEAD_REF next PATCHES 001-silence-windows-crt-secure-warnings.patch diff --git a/ports/capstone/vcpkg.json b/ports/capstone/vcpkg.json index 3abea0b2905a35..4b9f2a88f09c64 100644 --- a/ports/capstone/vcpkg.json +++ b/ports/capstone/vcpkg.json @@ -1,7 +1,6 @@ { "name": "capstone", - "version": "5.0.0-rc2", - "port-version": 2, + "version": "5.0.1", "description": "Multi-architecture disassembly framework", "homepage": "https://github.com/capstone-engine/capstone", "dependencies": [ diff --git a/ports/cctag/vcpkg.json b/ports/cctag/vcpkg.json index 4960a87277736a..6d20c0938b1664 100644 --- a/ports/cctag/vcpkg.json +++ b/ports/cctag/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cctag", "version-semver": "1.0.2", - "port-version": 4, + "port-version": 5, "maintainers": "alicevision-team@googlegroups.com", "description": "Computer vision library for detecting CCTag markers made up of concentric circles", "homepage": "https://github.com/alicevision/CCTag", @@ -15,6 +15,7 @@ "boost-date-time", "boost-exception", "boost-filesystem", + "boost-foreach", "boost-iterator", "boost-lexical-cast", "boost-math", diff --git a/ports/cctz/CMakeLists.txt b/ports/cctz/CMakeLists.txt deleted file mode 100644 index e21b1ca680e3de..00000000000000 --- a/ports/cctz/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(cctz CXX) - -set(CMAKE_CXX_STANDARD 14) - -set(CMAKE_DEBUG_POSTFIX d) - -if(CMAKE_BUILD_TYPE STREQUAL "Release") - option(INSTALL_HEADERS "Install header files" ON) -else() - option(INSTALL_HEADERS "Install header files" OFF) -endif() - -find_package(benchmark CONFIG REQUIRED) - -file(GLOB SOURCES src/*.cc) -list(FILTER SOURCES EXCLUDE REGEX "_test.cc$|benchmarks|_tool.cc$") - -file(GLOB HEADERS include/cctz/*.h) - -add_library(cctz ${SOURCES}) -target_include_directories(cctz PUBLIC $ $) -target_link_libraries(cctz PRIVATE benchmark::benchmark benchmark::benchmark_main) - -if(INSTALL_HEADERS) - install(FILES ${HEADERS} DESTINATION "include/cctz") -endif() - -install(TARGETS cctz EXPORT unofficial-cctz-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -install( - EXPORT unofficial-cctz-targets - FILE unofficial-cctz-config.cmake - NAMESPACE unofficial:: - DESTINATION share/unofficial-cctz -) diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake index 3c229e7c87b4eb..d6562446b43fe8 100644 --- a/ports/cctz/portfile.cmake +++ b/ports/cctz/portfile.cmake @@ -1,7 +1,3 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -12,16 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TOOLS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-cctz) - -vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/cctz/vcpkg.json b/ports/cctz/vcpkg.json index b8e7078a97c917..4d9fae6b6fac77 100644 --- a/ports/cctz/vcpkg.json +++ b/ports/cctz/vcpkg.json @@ -1,11 +1,10 @@ { "name": "cctz", "version": "2.3", - "port-version": 5, + "port-version": 6, "description": "two libraries that cooperate with to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.", "homepage": "https://github.com/google/cctz", "dependencies": [ - "benchmark", { "name": "vcpkg-cmake", "host": true diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake index 38c62ac17db304..a14db385bbfede 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero REF "v${VERSION}" - SHA512 7f2c22cd030ce59641636aa162b422694f79860c8a76d2227c706af9959d2c5269ae861c123e656ed3ae91835eb7e2b22501bca20fcd6ad0223ae95f312e73aa + SHA512 17bb1525b2e02a78739f2c530aa8453e07ca4c803568264aeb7d99f219244f361bcfd4f7e2bf13b3b06e5da0581a5abe93b94e8efda4dac6b092afa9e65cd1df HEAD_REF master PATCHES fix-bin-install-path.patch @@ -18,7 +18,7 @@ vcpkg_cmake_configure( -DCELERO_ENABLE_EXPERIMENTS=OFF -DCELERO_ENABLE_TESTS=OFF -DCELERO_COMPILE_DYNAMIC_LIBRARIES=${CELERO_COMPILE_DYNAMIC_LIBRARIES} - -DCELERO_TREAT_WARNINGS_AS_ERRORS=OFF + -DCELERO_ENABLE_WARNINGS_AS_ERRORS=OFF ) vcpkg_cmake_install() diff --git a/ports/celero/vcpkg.json b/ports/celero/vcpkg.json index 6096bfff616296..01c919f64ba1c0 100644 --- a/ports/celero/vcpkg.json +++ b/ports/celero/vcpkg.json @@ -1,6 +1,6 @@ { "name": "celero", - "version": "2.8.5", + "version": "2.9.0", "description": "Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++ 11 and later.", "homepage": "https://github.com/DigitalInBlue/Celero", "license": "Apache-2.0", diff --git a/ports/cfitsio/0005-fix-link2019-error.patch b/ports/cfitsio/0005-fix-link2019-error.patch new file mode 100644 index 00000000000000..0ab5886985ca9b --- /dev/null +++ b/ports/cfitsio/0005-fix-link2019-error.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fead70c..f05ae92 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,6 +68,7 @@ IF (USE_PTHREADS) + FIND_PACKAGE(pthreads REQUIRED) + INCLUDE_DIRECTORIES(${PTHREADS_INCLUDE_DIR}) + ADD_DEFINITIONS(-D_REENTRANT) ++ set(PTHREADS_LIBRARY PThreads4W::PThreads4W) + ENDIF() + + # Math library (not available in MSVC or MINGW) +diff --git a/fitsio2.h b/fitsio2.h +index 1adb17b..19f8511 100644 +--- a/fitsio2.h ++++ b/fitsio2.h +@@ -26,7 +26,7 @@ extern int Fitsio_Pthread_Status; + #define FFUNLOCK1(lockname) (Fitsio_Pthread_Status = pthread_mutex_unlock(&lockname)) + #define FFLOCK FFLOCK1(Fitsio_Lock) + #define FFUNLOCK FFUNLOCK1(Fitsio_Lock) +-#define ffstrtok(str, tok, save) strtok_r(str, tok, save) ++#define ffstrtok(str, tok, save) strtok_s(str, tok, save) + + #else + #define FFLOCK diff --git a/ports/cfitsio/portfile.cmake b/ports/cfitsio/portfile.cmake index 13c3a183493eff..75c5d5bc08f0f9 100644 --- a/ports/cfitsio/portfile.cmake +++ b/ports/cfitsio/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive( 0002-export-cmake-targets.patch 0003-add-Wno-error-implicit-funciton-declaration-to-cmake.patch 0004-pkg-config.patch + 0005-fix-link2019-error.patch ) vcpkg_check_features( @@ -69,4 +70,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_ file(INSTALL "${SOURCE_PATH}/FindPthreads.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio") -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") diff --git a/ports/cfitsio/vcpkg.json b/ports/cfitsio/vcpkg.json index 7c47f6b3733669..fe638417c43ad2 100644 --- a/ports/cfitsio/vcpkg.json +++ b/ports/cfitsio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cfitsio", "version": "3.49", - "port-version": 3, + "port-version": 4, "description": "Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format", "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/", "dependencies": [ diff --git a/ports/cglm/portfile.cmake b/ports/cglm/portfile.cmake index 6bf99df5982d33..830f55bdf9b8fc 100644 --- a/ports/cglm/portfile.cmake +++ b/ports/cglm/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO recp/cglm REF "v${VERSION}" - SHA512 a89f76378aee6ee8a7a38b9ce975bff1873590b4cb83daaf658b2875578758d05e15e92ef7141df3109ee37e6b097eda0bb2e60b13fdeca536a72053145c5ece + SHA512 05c1e8d1dadafe1c9155db40dd1a4c209283c41ad2416c11b09967435f8047471afa5ee521ef6b8ef22c3e8b3988ab0865137057b33441e7851bc57979509dd6 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CGLM_BUILD_SHARED) diff --git a/ports/cglm/vcpkg.json b/ports/cglm/vcpkg.json index bc71297174e824..beac8c9277d739 100644 --- a/ports/cglm/vcpkg.json +++ b/ports/cglm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cglm", - "version-semver": "0.8.8", + "version-semver": "0.9.1", "description": "Highly Optimized Graphics Math (glm) for C", "homepage": "https://github.com/recp/cglm", "license": "MIT", diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index 6d1542a02be166..e3c80e0fa27159 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGNS/CGNS - REF ec538ac11dbaff510464a831ef094b0d6bf7216c # v4.3.0 - SHA512 3c04829ff99c0f4f1cd705f0807fda0a65f970c7eecd23ec624cf09fb6fa2a566c63fc94d46c1d0754910bbff8f98c3723e4f32ef66c3e7e41930313454fa10b + REF "v${VERSION}" + SHA512 86c16d40b524519362645c553c91bade9bb7e4bffde7bf4de96a7f471ae3779a15781efa91efa059b2af0b127f08a560d2e903df6b45e1c79eaec6061db226e9 HEAD_REF develop PATCHES hdf5.patch @@ -57,13 +57,12 @@ vcpkg_copy_tools( AUTO_CLEAN ) +set(TOOLS "cgnsupdate") +if("hdf5" IN_LIST FEATURES) + list(APPEND TOOLS "adf2hdf" "hdf2adf") +endif() if(VCPKG_TARGET_IS_WINDOWS) - set(TOOLS "adf2hdf.bat" "hdf2adf.bat" "cgnsupdate.bat") -elseif(VCPKG_TARGET_IS_LINUX) - set(TOOLS "cgnsupdate") - if("hdf5" IN_LIST FEATURES) - list(APPEND TOOLS "adf2hdf" "hdf2adf") - endif() + list(TRANSFORM TOOLS APPEND ".bat") endif() foreach(TOOL ${TOOLS}) diff --git a/ports/cgns/vcpkg.json b/ports/cgns/vcpkg.json index 48fd819bd1ca51..52d746edbcfe27 100644 --- a/ports/cgns/vcpkg.json +++ b/ports/cgns/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cgns", - "version-semver": "4.3.0", - "port-version": 4, + "version-semver": "4.4.0", "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.", "homepage": "http://cgns.org/", "license": "Zlib", diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 5b8c2131ebac50..7d796d09e62399 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -10,22 +10,24 @@ vcpkg_from_github( add-missing-reference.patch # https://github.com/chakra-core/ChakraCore/pull/6862 ) -set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -file(REMOVE_RECURSE ${BUILDTREE_PATH}) -file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) - -if(WIN32) +set(BUILDTREE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(additional_options NO_TOOLCHAIN_PROPS) # don't know how to fix the linker error about __guard_check_icall_thunk + endif() set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(PLATFORM_ARG PLATFORM x86) # it's x86, not Win32 in sln file endif() - vcpkg_install_msbuild( - SOURCE_PATH "${BUILDTREE_PATH}" - PROJECT_SUBPATH "Build/Chakra.Core.sln" + + vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH Build/Chakra.Core.sln OPTIONS "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}" ${PLATFORM_ARG} + ${additional_options} ) file(GLOB_RECURSE LIB_FILES "${CURRENT_PACKAGES_DIR}/lib/*.lib") file(GLOB_RECURSE DEBUG_LIB_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib") @@ -45,11 +47,11 @@ else() message(WARNING "${PORT} requires Clang from the system package manager, this can be installed on Ubuntu systems via sudo apt install clang") endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT DEFINED VCPKG_BUILD_TYPE) list(APPEND configs "debug") execute_process( COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "-j=${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY "${BUILDTREE_PATH}" + WORKING_DIRECTORY "${BUILDTREE_PATH}-dbg" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT ERROR_VARIABLE CHAKRA_BUILD_SH_ERR @@ -58,33 +60,32 @@ else() ECHO_ERROR_VARIABLE ) endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - list(APPEND configs "release") - execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j=${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY "${BUILDTREE_PATH}" - OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT - ERROR_VARIABLE CHAKRA_BUILD_SH_ERR - RESULT_VARIABLE CHAKRA_BUILD_SH_RES - ECHO_OUTPUT_VARIABLE - ECHO_ERROR_VARIABLE - ) - endif() + + list(APPEND configs "release") + execute_process( + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j=${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY "${BUILDTREE_PATH}-rel" + OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT + ERROR_VARIABLE CHAKRA_BUILD_SH_ERR + RESULT_VARIABLE CHAKRA_BUILD_SH_RES + ECHO_OUTPUT_VARIABLE + ECHO_ERROR_VARIABLE + ) + endif() file(INSTALL - "${BUILDTREE_PATH}/lib/Jsrt/ChakraCore.h" - "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommon.h" - "${BUILDTREE_PATH}/lib/Jsrt/ChakraDebug.h" + "${BUILDTREE_PATH}-rel/lib/Jsrt/ChakraCore.h" + "${BUILDTREE_PATH}-rel/lib/Jsrt/ChakraCommon.h" + "${BUILDTREE_PATH}-rel/lib/Jsrt/ChakraDebug.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) -if(WIN32) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) file(INSTALL - "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommonWindows.h" - "${BUILDTREE_PATH}/lib/Jsrt/ChakraCoreWindows.h" + "${BUILDTREE_PATH}-rel/lib/Jsrt/ChakraCommonWindows.h" + "${BUILDTREE_PATH}-rel/lib/Jsrt/ChakraCoreWindows.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) - # Do not install dll/exe/lib files here because they are handled by vcpkg_install_msbuild else() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(out_file libChakraCore.so) @@ -92,10 +93,10 @@ else() set(out_file lib/libChakraCoreStatic.a) endif() - set(destination_dir_debug "${CURRENT_PACKAGES_DIR}/debug/lib") - set(destination_dir_release "${CURRENT_PACKAGES_DIR}/lib") - set(out_dir_debug "${BUILDTREE_PATH}/out/Debug") - set(out_dir_release "${BUILDTREE_PATH}/out/Release") + set(destination_dir_debug "${CURRENT_PACKAGES_DIR}/debug/bin") + set(destination_dir_release "${CURRENT_PACKAGES_DIR}/bin") + set(out_dir_debug "${BUILDTREE_PATH}-dbg/out/Debug") + set(out_dir_release "${BUILDTREE_PATH}-rel/out/Release") foreach(config ${configs}) file(INSTALL ${out_dir_${config}}/${out_file} @@ -112,17 +113,15 @@ else() SEARCH_DIR "${out_dir_release}" ) endif() -endif() -vcpkg_copy_pdbs() + +endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-chakracore-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}" ) -file(INSTALL +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/chakracore" - RENAME copyright ) diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index e64490f3aff31a..e6fffb3c709c94 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chakracore", "version-date": "2022-11-09", - "port-version": 3, + "port-version": 4, "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", "license": "MIT", @@ -14,6 +14,14 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-msbuild", + "host": true, + "features": [ + "pkg-config" + ], + "platform": "windows" } ] } diff --git a/ports/chromaprint/fix_lrintf_detection.patch b/ports/chromaprint/fix_lrintf_detection.patch deleted file mode 100644 index 27248f0c802236..00000000000000 --- a/ports/chromaprint/fix_lrintf_detection.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a0eecb..4fa5e8d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,7 @@ set_property(CACHE FFT_LIB PROPERTY STRINGS avfft fftw3 fftw3f kissfft vdsp) - - include(CMakePushCheckState) - include(CheckFunctionExists) -+include(CheckSymbolExists) - include(CheckCXXCompilerFlag) - - find_package(Threads) -@@ -37,8 +38,8 @@ endif() - - cmake_push_check_state(RESET) - set(CMAKE_REQUIRED_LIBRARIES -lm) --check_function_exists(lrintf HAVE_LRINTF) --check_function_exists(round HAVE_ROUND) -+check_symbol_exists(lrintf math.h HAVE_LRINTF) -+check_symbol_exists(round math.h HAVE_ROUND) - cmake_pop_check_state() - - add_definitions( diff --git a/ports/chromaprint/portfile.cmake b/ports/chromaprint/portfile.cmake index afdcba5886304f..681693fc87e0a9 100644 --- a/ports/chromaprint/portfile.cmake +++ b/ports/chromaprint/portfile.cmake @@ -1,17 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO acoustid/chromaprint - REF v1.5.0 - SHA512 333114949928abdf5d4b11aba1db6ec487eebe526324c68d903b3fa80a3af87a28d942af765a2f873e63a1bf222b658b6438cd10cde4446f61b26ea91f537469 - PATCHES - fix_lrintf_detection.patch # submitted upstream as https://github.com/acoustid/chromaprint/pull/85 + REF "v${VERSION}" + SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66 + HEAD_REF master ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF ) vcpkg_cmake_install() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/chromaprint/vcpkg.json b/ports/chromaprint/vcpkg.json index 3d068853c0fef0..56d01d0ee30356 100644 --- a/ports/chromaprint/vcpkg.json +++ b/ports/chromaprint/vcpkg.json @@ -1,7 +1,6 @@ { "name": "chromaprint", - "version": "1.5.0", - "port-version": 3, + "version": "1.5.1", "description": "C library for generating audio fingerprints used by AcoustID", "homepage": "https://github.com/acoustid/chromaprint", "license": "LGPL-2.1-or-later", @@ -11,10 +10,6 @@ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/ports/cista/portfile.cmake b/ports/cista/portfile.cmake index eab6e83488221f..55ee47b8555451 100644 --- a/ports/cista/portfile.cmake +++ b/ports/cista/portfile.cmake @@ -1,13 +1,13 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO felixguendling/cista REF "v${VERSION}" - SHA512 303d622416e72f771b6fa2b1c7b7ca4cfed3091d89409c96262571162754c9d6d99b62a930c137e01fd8c74a8f46b76ac3a1d86387c918414e26c8a2a8ffd930 + SHA512 bf5c5f527eb2b63775fd9f2e99f60a0ed19bd9805f38bf3e55f4995e01ecaf31c95dcd555520e12b3a1b9d039f702b9c9a4fdec74b9547136e336b5adf78689d HEAD_REF master ) +set(VCPKG_BUILD_TYPE release) # header-only port + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -18,9 +18,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cista) -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug" - "${CURRENT_PACKAGES_DIR}/lib" -) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/cista/usage b/ports/cista/usage new file mode 100644 index 00000000000000..7954c2b5acf5af --- /dev/null +++ b/ports/cista/usage @@ -0,0 +1,4 @@ +cista provides CMake targets: + + find_package(cista CONFIG REQUIRED) + target_link_libraries(main PRIVATE cista::cista) diff --git a/ports/cista/vcpkg.json b/ports/cista/vcpkg.json index 58cb455028670a..a0899eb3abf695 100644 --- a/ports/cista/vcpkg.json +++ b/ports/cista/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cista", - "version": "0.11", + "version": "0.14", "description": "Cista is a simple, high-performance, zero-copy C++ serialization & reflection library.", "homepage": "https://github.com/felixguendling/cista", "license": "MIT", diff --git a/ports/cityhash/portfile.cmake b/ports/cityhash/portfile.cmake index f904d8f4e12cc5..77cf701ea82f24 100644 --- a/ports/cityhash/portfile.cmake +++ b/ports/cityhash/portfile.cmake @@ -22,10 +22,6 @@ else() file(COPY "${SOURCE_PATH}/out/config.h" DESTINATION "${SOURCE_PATH}/src") endif() -if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND "sse" IN_LIST FEATURES) - message(FATAL_ERROR "Feature 'sse' does not support Windows x86 triplet.") -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "sse" ENABLE_SSE diff --git a/ports/cityhash/vcpkg.json b/ports/cityhash/vcpkg.json index 431de018b83a62..afa9b46cac7690 100644 --- a/ports/cityhash/vcpkg.json +++ b/ports/cityhash/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cityhash", "version-date": "2013-01-08", - "port-version": 2, + "port-version": 3, "description": "CityHash, a family of hash functions for strings.", "homepage": "https://github.com/google/cityhash", "dependencies": [ @@ -16,7 +16,8 @@ ], "features": { "sse": { - "description": "Build CityHash variants that depend on the _mm_crc32_u64 intrinsic." + "description": "Build CityHash variants that depend on the _mm_crc32_u64 intrinsic.", + "supports": "x64 | (x86 & !windows)" } } } diff --git a/ports/civetweb/fix-fseeko.patch b/ports/civetweb/fix-fseeko.patch new file mode 100644 index 00000000000000..3e2f58500b5f7d --- /dev/null +++ b/ports/civetweb/fix-fseeko.patch @@ -0,0 +1,17 @@ +diff --git a/src/civetweb.c b/src/civetweb.c +index 9e321ed..0f11407 100644 +--- a/src/civetweb.c ++++ b/src/civetweb.c +@@ -892,6 +892,12 @@ typedef unsigned short int in_port_t; + #if defined(USE_X_DOM_SOCKET) + #include + #endif ++ ++#if defined(__ANDROID_API__) && __ANDROID_API__ < 24 ++ // Cf. https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md#32_bit-and ++ #define fseeko fseek ++#endif ++ + #endif + + #define vsnprintf_impl vsnprintf diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake index e568049d0df748..8387cac907ec16 100644 --- a/ports/civetweb/portfile.cmake +++ b/ports/civetweb/portfile.cmake @@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO civetweb/civetweb - REF eefb26f82b233268fc98577d265352720d477ba4 # v1.15 - SHA512 5ce962e31b3c07b7110cbc645458dba9c0e26e693fbe3b4a7ffe8a28563827049a22fc5596a911fbcea4d88a9adbef3f82000ff61027ff4387f40e4a4045c26d + REF "v${VERSION}" + SHA512 a0b943dfc76d7fd47f5a7d2c834fd38ddd4cf01a11730cf2f7cfaf32fea9698f59672f3a0f86ac80e0abc315d94d2367a500d37013f305c87d45e84cf39ca816 HEAD_REF master PATCHES disable_warnings.patch # cl will simply ignore the other invalid options. + fix-fseeko.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -15,6 +16,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ssl CIVETWEB_ENABLE_SSL ) +# Fixes arm64-windows build. CIVETWEB_ARCHITECTURE is used only for CPack, which is not used by vcpkg +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "determine_target_architecture(CIVETWEB_ARCHITECTURE)" "") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -36,6 +40,11 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/civetweb) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/civetweb.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/civetweb.pc") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/civetweb-cpp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/civetweb-cpp.pc") +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json index 98ce11d2235b86..ab5c083e912a1e 100644 --- a/ports/civetweb/vcpkg.json +++ b/ports/civetweb/vcpkg.json @@ -1,7 +1,6 @@ { "name": "civetweb", - "version": "1.15", - "port-version": 2, + "version": "1.16", "description": "Easy to use, powerful, C/C++ embeddable web server.", "homepage": "https://github.com/civetweb/civetweb", "supports": "!uwp", diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake index db548215426c7a..c722e8b8c4a833 100644 --- a/ports/cjson/portfile.cmake +++ b/ports/cjson/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DaveGamble/cJSON - REF v1.7.15 - SHA512 0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124 + REF "v${VERSION}" + SHA512 3a894de03c33d89f1e7ee572418d5483c844d38e1e64aa4f6297ddaa01f4111f07601f8d26617b424b5af15d469e3955dae075d9f30b5c25e16ec348fdb06e6f HEAD_REF master ) @@ -57,5 +57,5 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h" "${_contents}") # Handle copyright configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/cjson/vcpkg.json b/ports/cjson/vcpkg.json index 0a8e10b1dcd8d5..89563f2a1dde23 100644 --- a/ports/cjson/vcpkg.json +++ b/ports/cjson/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cjson", - "version": "1.7.15", - "port-version": 2, + "version": "1.7.16", "description": "Ultralightweight JSON parser in ANSI C", "homepage": "https://github.com/DaveGamble/cJSON", "license": "MIT", diff --git a/ports/clblast/portfile.cmake b/ports/clblast/portfile.cmake index 700165dafc41c2..3b9afd9077da42 100644 --- a/ports/clblast/portfile.cmake +++ b/ports/clblast/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CNugteren/CLBlast - REF 1.5.2 - SHA512 6693704321bb7623a632ebfc71dcf07bbe4ba6c6f03a2ecf52bc10b401ae546bf82cdd3f6cc28aa9ea10f40dc7b2e86a6530f32cfbd522e24d4cf6a75c8c1100 + REF "${VERSION}" + SHA512 3114b2499f13a8b12dc5dfaf3633d4a25c953da63bea3c2f09a99699ee49239c28a1db0033619ef74234af56068f94413aae8c721d1af6114b862670a32cdb8d HEAD_REF master PATCHES fix_install_path.patch @@ -16,7 +16,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLBLast) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLBlast) vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/ports/clblast/vcpkg.json b/ports/clblast/vcpkg.json index 1156d22d3cd2d9..d58fb5f7fcce06 100644 --- a/ports/clblast/vcpkg.json +++ b/ports/clblast/vcpkg.json @@ -1,7 +1,6 @@ { "name": "clblast", - "version": "1.5.2", - "port-version": 3, + "version": "1.6.1", "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.", "homepage": "https://github.com/CNugteren/CLBlast", "license": "Apache-2.0", diff --git a/ports/clipper2/portfile.cmake b/ports/clipper2/portfile.cmake index 546f204cb4801a..d72dc4ebd9c506 100644 --- a/ports/clipper2/portfile.cmake +++ b/ports/clipper2/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_cmake_configure( OPTIONS -DCLIPPER2_EXAMPLES=OFF -DCLIPPER2_TESTS=OFF - -DCLIPPER2_UTILS=OFF + -DCLIPPER2_UTILS=ON ) vcpkg_cmake_install() vcpkg_fixup_pkgconfig() diff --git a/ports/clipper2/vcpkg.json b/ports/clipper2/vcpkg.json index 45ce8f9d97120b..eea8a73f452dd1 100644 --- a/ports/clipper2/vcpkg.json +++ b/ports/clipper2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "clipper2", "version": "1.2.2", + "port-version": 1, "description": "Polygon Clipping and Offsetting", "homepage": "http://www.angusj.com/clipper2", "license": "BSL-1.0", diff --git a/ports/cmark/portfile.cmake b/ports/cmark/portfile.cmake index b263deaca9e5ac..352a6b50a931f7 100644 --- a/ports/cmark/portfile.cmake +++ b/ports/cmark/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commonmark/cmark - REF 977b128291c0cf6c5053cdcf2ac72e627f09c105 #0.30.1 - SHA512 ff8139fbb45549d6bea70e11c35ae1d8cf6108d0141688cc2b878afa6247147e0c15ac885e6ed8fa2263534dc79e88e398b30d3d3ae800f13dcdd878114adac8 + REF "${VERSION}" + SHA512 27383bfef95ae1390c26aff0dd2cbca33704e7d20116bf29da4695d2c9a4146b86daba0da1e91bdb9eab95671702f885e832b3d31d51601731f1dc630df5237b HEAD_REF master PATCHES add-feature-tools.patch @@ -11,10 +11,6 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CMARK_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CMARK_SHARED) -if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "${PORT} does no support to build tools on UWP") -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tools BUILD_TOOLS diff --git a/ports/cmark/vcpkg.json b/ports/cmark/vcpkg.json index bfb1999a602bcd..4d14e47a5fa7ca 100644 --- a/ports/cmark/vcpkg.json +++ b/ports/cmark/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cmark", - "version-semver": "0.30.1", + "version-semver": "0.30.3", "description": "CommonMark parsing and rendering library", "homepage": "https://github.com/commonmark/cmark", "dependencies": [ @@ -15,7 +15,8 @@ ], "features": { "tools": { - "description": "Build tools" + "description": "Build tools", + "supports": "!uwp" } } } diff --git a/ports/continuable/portfile.cmake b/ports/continuable/portfile.cmake index de542dcfd15a70..23498ccb1d764f 100644 --- a/ports/continuable/portfile.cmake +++ b/ports/continuable/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Naios/continuable - REF 4.2.0 - SHA512 c6b6aef0299d8dd548c3a283fdc436065da13446f965b45210dd998bbe1494776f2c005e7cb7eadc5e23a1f339e6c9124eda18e550bed646df5a0fd2aa92a24d + REF "${VERSION}" + SHA512 069b1fe37d5dd3495639942af40b9d5fe90408ee0f92f61e85c8aab3e1132300eb75df216a84595cb05c35e0fcb1b789fda4dae3fd2b263ac70910f5374536cc HEAD_REF master PATCHES fix-cmakelists.patch diff --git a/ports/continuable/vcpkg.json b/ports/continuable/vcpkg.json index 1fc587b954d469..8ed3a9eea66af1 100644 --- a/ports/continuable/vcpkg.json +++ b/ports/continuable/vcpkg.json @@ -1,6 +1,6 @@ { "name": "continuable", - "version": "4.2.0", + "version": "4.2.2", "description": "C++14 asynchronous allocation aware futures (supporting then, exception handling, coroutines and connections)", "homepage": "https://naios.github.io/continuable/", "license": "MIT", diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 54502932dc6123..f50ef191f95422 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -42,6 +42,7 @@ vcpkg_cmake_configure( -DBUILD_STATIC=${BUILD_STATIC} MAYBE_UNUSED_VARIABLES CORRADE_RC_EXECUTABLE + UTILITY_USE_ANSI_COLORS ) vcpkg_cmake_install() @@ -51,13 +52,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # corrade-rc is not built when CMAKE_CROSSCOMPILING -if("utility" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN) -endif() +vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN) # Ensure no empty folders are left behind -if(NOT FEATURES) - # No features, no binaries (only Corrade.h). +if(FEATURES STREQUAL "core") + # No features, no libs (only Corrade.h). file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json index baacdf279101e5..e34df643ecfd23 100644 --- a/ports/corrade/vcpkg.json +++ b/ports/corrade/vcpkg.json @@ -1,17 +1,14 @@ { "name": "corrade", "version-string": "2020.06", - "port-version": 5, + "port-version": 6, "description": "C++11/C++14 multiplatform utility library.", "homepage": "https://magnum.graphics/corrade/", "dependencies": [ { "name": "corrade", "host": true, - "default-features": false, - "features": [ - "utility" - ] + "default-features": false }, { "name": "vcpkg-cmake", diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index b02c1271f97749..47f2671df9fd9b 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,16 +2,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib REF "v${VERSION}" - SHA512 5181f185bc0bb37429847e2656534ff25512458c0219631c982b776c65fd6be73e038f88d47e42b4f614324e51577bc8815e80952c7c7ca6e66eca4a16a9f30d + SHA512 fac8fd1730e7f828053c61924d3ff9b660ad3cb385aa7a506c50c1ed1ca9820fb07691e28e03effcc60e391ecb78727108f1fdbe8b428917ab494738bed86d78 HEAD_REF master PATCHES fix-find-brotli.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + brotli HTTPLIB_REQUIRE_BROTLI + openssl HTTPLIB_REQUIRE_OPENSSL + zlib HTTPLIB_REQUIRE_ZLIB +) + set(VCPKG_BUILD_TYPE release) # header-only port vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=OFF + -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=OFF + -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF ) vcpkg_cmake_install() diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index 4305b1c3c36f98..44fe9e99cb514a 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,11 +1,10 @@ { "name": "cpp-httplib", - "version": "0.13.3", + "version": "0.14.0", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", "homepage": "https://github.com/yhirose/cpp-httplib", "license": "MIT", "dependencies": [ - "brotli", { "name": "vcpkg-cmake", "host": true @@ -14,5 +13,28 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "brotli" + ], + "features": { + "brotli": { + "description": "Enables brotli compression support using brotli", + "dependencies": [ + "brotli" + ] + }, + "openssl": { + "description": "Enables HTTPS support using OpenSSL", + "dependencies": [ + "openssl" + ] + }, + "zlib": { + "description": "Enables gzip compression support using zlib", + "dependencies": [ + "zlib" + ] + } + } } diff --git a/ports/cpp-netlib/fix-compatibility-with-boost-1.83.patch b/ports/cpp-netlib/fix-compatibility-with-boost-1.83.patch new file mode 100644 index 00000000000000..530b342bafc57e --- /dev/null +++ b/ports/cpp-netlib/fix-compatibility-with-boost-1.83.patch @@ -0,0 +1,24 @@ + boost/network/protocol/http/server/impl/parsers.ipp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/boost/network/protocol/http/server/impl/parsers.ipp b/boost/network/protocol/http/server/impl/parsers.ipp +index c31e60ea..3272c2fa 100644 +--- a/boost/network/protocol/http/server/impl/parsers.ipp ++++ b/boost/network/protocol/http/server/impl/parsers.ipp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #ifdef BOOST_NETWORK_NO_LIB + #ifndef BOOST_NETWORK_INLINE +@@ -32,7 +33,7 @@ typedef std::basic_string u32_string; + template <> // + struct assign_to_container_from_value { + static void call(u32_string const& val, std::string& attr) { +- u32_to_u8_iterator begin = val.begin(), ++ boost::u32_to_u8_iterator begin = val.begin(), + end = val.end(); + for (; begin != end; ++begin) attr += *begin; + } diff --git a/ports/cpp-netlib/portfile.cmake b/ports/cpp-netlib/portfile.cmake index 2e7fc78c541739..5e36bfdb51feeb 100644 --- a/ports/cpp-netlib/portfile.cmake +++ b/ports/cpp-netlib/portfile.cmake @@ -9,7 +9,9 @@ vcpkg_from_github( # Updator's note: cpp-netlib has many templates that are not fully instantiated when not building examples. # This patch specifically fixes one of those issues # To test updates, enable building examples below (may also require patching out uses of cxxopts) - PATCHES stream-handler-executor.patch + PATCHES + fix-compatibility-with-boost-1.83.patch + stream-handler-executor.patch ) vcpkg_cmake_configure( @@ -29,4 +31,4 @@ else() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cppnetlib PACKAGE_NAME cppnetlib) endif() -file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") diff --git a/ports/cpp-netlib/vcpkg.json b/ports/cpp-netlib/vcpkg.json index 78a5844be5cd25..61044d46d2768e 100644 --- a/ports/cpp-netlib/vcpkg.json +++ b/ports/cpp-netlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpp-netlib", "version": "0.13.0", - "port-version": 8, + "port-version": 9, "description": "A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library", "homepage": "https://cpp-netlib.org/", "supports": "!uwp", diff --git a/ports/cpp-peglib/portfile.cmake b/ports/cpp-peglib/portfile.cmake index c365ad7812b032..21c01d44ee9f42 100644 --- a/ports/cpp-peglib/portfile.cmake +++ b/ports/cpp-peglib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-peglib - REF adfd2d6014f6cce9510ac2374b277ac8fb931c49 - SHA512 8a930286a20098efc053988bd5b7e0d3117ce3851a79acf3c9991b75ff85a6340d106522f66ee322f8e7809143f9f74fa1fb051da277db02532dface5cb6f5c3 + REF "v${VERSION}" + SHA512 89fe1112a5db1decde65aa989a74559222b02c897a0f6a3facca295f07467e232c787420243b50786da21f86bc100a869b46963f09051aebade0bb44d2b12800 HEAD_REF master ) diff --git a/ports/cpp-peglib/vcpkg.json b/ports/cpp-peglib/vcpkg.json index 01021728c658c1..905a0d025088c6 100644 --- a/ports/cpp-peglib/vcpkg.json +++ b/ports/cpp-peglib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-peglib", - "version": "1.3.10", + "version": "1.8.5", "description": "C++11 header-only PEG (Parsing Expression Grammars) library.", "license": "MIT" } diff --git a/ports/cppmicroservices/fix-dependency-gtest.patch b/ports/cppmicroservices/fix-dependency-gtest.patch deleted file mode 100644 index 9eb9459f10127b..00000000000000 --- a/ports/cppmicroservices/fix-dependency-gtest.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 136edff..9d29522 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -288,6 +288,10 @@ if(US_COMPILER_APPLE_CLANG OR US_COMPILER_CLANG) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") - endif() - -+# Dependency -+find_package(GTest CONFIG REQUIRED) -+link_libraries(GTest::gtest GTest::gmock) -+ - #----------------------------------------------------------------------------- - # Testing configuration - #----------------------------------------------------------------------------- -@@ -338,7 +342,7 @@ if(US_BUILD_TESTING) - endif() - - if(US_USE_SYSTEM_GTEST) -- find_package(GTest REQUIRED) -+ find_package(GTest CONFIG REQUIRED) - else() - # This keeps GTest CMake variables hidden from users unless they explicitly want to view/modify them. - us_cache_var(BUILD_GMOCK ON BOOL "Build GMock" ADVANCED FORCE) diff --git a/ports/cppmicroservices/fix-warning-c4834.patch b/ports/cppmicroservices/fix-warning-c4834.patch deleted file mode 100644 index 893b28d30e827f..00000000000000 --- a/ports/cppmicroservices/fix-warning-c4834.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/httpservice/src/ServletContainer.cpp b/httpservice/src/ServletContainer.cpp -index b4af8c9..8713066 100644 ---- a/httpservice/src/ServletContainer.cpp -+++ b/httpservice/src/ServletContainer.cpp -@@ -279,7 +279,9 @@ void ServletContainer::SetContextPath(const std::string& path) - - std::string ServletContainer::GetContextPath() const - { -- return Lock(d->m_Mutex), d->m_ContextPath; -+ Lock l(d->m_Mutex); -+ US_UNUSED(l); -+ return d->m_ContextPath; - } - - void ServletContainer::Start() -@@ -306,6 +308,8 @@ std::shared_ptr ServletContainer::GetContext( - std::string ServletContainer::GetContextPath( - const ServletContext* /*context*/) const - { -- return Lock(d->m_Mutex), d->m_ContextPath; -+ Lock l(d->m_Mutex); -+ US_UNUSED(l); -+ return d->m_ContextPath; - } - } diff --git a/ports/cppmicroservices/fix_strnicmp.patch b/ports/cppmicroservices/fix_strnicmp.patch new file mode 100644 index 00000000000000..1a9245f6a4331b --- /dev/null +++ b/ports/cppmicroservices/fix_strnicmp.patch @@ -0,0 +1,13 @@ +diff --git a/framework/src/util/PropsCheck.h b/framework/src/util/PropsCheck.h +index 26acd33..930a328 100644 +--- a/framework/src/util/PropsCheck.h ++++ b/framework/src/util/PropsCheck.h +@@ -47,7 +47,7 @@ + + #ifdef US_PLATFORM_WINDOWS + # include +-# define ci_compare strnicmp ++# define ci_compare _strnicmp + #else + # include + # define ci_compare strncasecmp diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index 60a99f6a38a63d..c535bad18c88c8 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -1,15 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CppMicroServices/CppMicroservices - REF v3.6.0 - SHA512 C1407E1D3C2FD31675C32D8C00F7D005C09B03A835D5B09411B0043DDEAF5E3A1A0C7A5FA34FA04D5A643169D222D0E8D3A3C31CDA69FB64CDF1A8CCA276BE18 + REF "v${VERSION}" + SHA512 4743846a8ba45e6bd320c93bb3bd443b5dac16ea0bbf55bda6212e9200a40ee29031fd74c6141de4c6b5ef9ad3e70789d13fda25b40638547782d386a12dd7e2 HEAD_REF development PATCHES werror.patch - fix-dependency-gtest.patch - fix-warning-c4834.patch + fix_strnicmp.patch ) +#nowide download +vcpkg_from_github( + OUT_SOURCE_PATH NOWIDE_SOURCE_PATH + REPO boostorg/nowide + REF 02f40f0b5f5686627fcddae93ff88ca399db4766 + SHA512 e68e0704896726c7a94b8ace0e03c5206b4c7acd23a6b05f6fb2660abe30611ac6913cf5fab7b57eaff1990a7c28aeee8c9f526b60f7094c0c201f90b715d6c6 + HEAD_REF develop +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/boost/nowide") +file(RENAME "${NOWIDE_SOURCE_PATH}" "${SOURCE_PATH}/third_party/boost/nowide") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/cppmicroservices/vcpkg.json b/ports/cppmicroservices/vcpkg.json index c1c72f5e93d836..54b0e6e64c42bd 100644 --- a/ports/cppmicroservices/vcpkg.json +++ b/ports/cppmicroservices/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cppmicroservices", - "version": "3.6.0", - "port-version": 1, + "version": "3.7.6", "description": "An OSGi-like C++ dynamic module system and service registry", "homepage": "https://github.com/CppMicroServices/CppMicroServices", "dependencies": [ diff --git a/ports/cpprestsdk/fix-uwp.patch b/ports/cpprestsdk/fix-uwp.patch new file mode 100644 index 00000000000000..c7e77ebf6cdda4 --- /dev/null +++ b/ports/cpprestsdk/fix-uwp.patch @@ -0,0 +1,28 @@ +diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt +index b8f3809..3857cfc 100644 +--- a/Release/CMakeLists.txt ++++ b/Release/CMakeLists.txt +@@ -187,7 +187,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /profile /OPT:REF /OPT:ICF") + + if (WINDOWS_STORE OR WINDOWS_PHONE) +- add_compile_options(/ZW) ++ # add_compile_options(/ZW) + else() + if (NOT (MSVC_VERSION LESS 1920)) + add_compile_options(/permissive-) +diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt +index 128f6d6..098d33f 100644 +--- a/Release/src/CMakeLists.txt ++++ b/Release/src/CMakeLists.txt +@@ -47,6 +47,10 @@ target_include_directories(cpprest + pch + ) + ++if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" AND (WINDOWS_STORE OR WINDOWS_PHONE)) ++ target_compile_options(cpprest PUBLIC /ZW) ++endif() ++ + ## Sub-components + # Websockets component + if(CPPREST_WEBSOCKETS_IMPL STREQUAL "none") diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index 237df1a402be6a..b26acfce43e00b 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-find-openssl.patch fix_narrowing.patch + fix-uwp.patch ) set(OPTIONS) diff --git a/ports/cpprestsdk/test.patch b/ports/cpprestsdk/test.patch new file mode 100644 index 00000000000000..c5507e88add8e1 --- /dev/null +++ b/ports/cpprestsdk/test.patch @@ -0,0 +1,23 @@ +diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt +index 098d33f..7f1f650 100644 +--- a/Release/src/CMakeLists.txt ++++ b/Release/src/CMakeLists.txt +@@ -218,15 +218,15 @@ if (WIN32 AND NOT WINDOWS_STORE AND NOT WINDOWS_PHONE) + crypt32.lib + ) + elseif(WINDOWS_STORE) +- if(NOT CMAKE_GENERATOR MATCHES "Visual Studio .*") +- target_compile_definitions(cpprest PRIVATE -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP) ++ ++ target_compile_definitions(cpprest PUBLIC -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP) + get_target_property(LINK_FLAGS cpprest LINK_FLAGS) + if(NOT LINK_FLAGS) + set(LINK_FLAGS "") + endif() + set(LINK_FLAGS "${LINK_FLAGS} /APPCONTAINER") + set_target_properties(cpprest PROPERTIES LINK_FLAGS "${LINK_FLAGS}") +- endif() ++ + endif() + + set_target_properties(cpprest PROPERTIES OUTPUT_NAME "cpprest${CPPREST_ABI_TAG}") diff --git a/ports/cpprestsdk/vcpkg.json b/ports/cpprestsdk/vcpkg.json index 6bacf25d5798ad..a270085312a031 100644 --- a/ports/cpprestsdk/vcpkg.json +++ b/ports/cpprestsdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpprestsdk", "version": "2.10.18", - "port-version": 3, + "port-version": 4, "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/cppslippi/portfile.cmake b/ports/cppslippi/portfile.cmake index e842e2ba79ae28..fbfde4911790cb 100644 --- a/ports/cppslippi/portfile.cmake +++ b/ports/cppslippi/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO cppslippi FILENAME "CppSlippi-${VERSION}.zip" - SHA512 5057758ed7da1f8d3bbdcd0eb783e93aa07d501a5333c48707f588bd3370551fce65a22074da9cbe4aa69fa32fa6c826a2aa039911cff7be5b8548842d135ece + SHA512 b23f7794f1fc5ec56bba1b48882588ce0dc68985edc673108f3c8b1504f61f9e5769baa01af056df527826b66ba4cbaf3767c8117d626ec99832ecab3c5b840c NO_REMOVE_ONE_LEVEL ) diff --git a/ports/cppslippi/vcpkg.json b/ports/cppslippi/vcpkg.json index 25b07f36d8eebf..4e91eb216f39da 100644 --- a/ports/cppslippi/vcpkg.json +++ b/ports/cppslippi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppslippi", - "version": "1.0.3.14", + "version": "1.1.3.14", "description": "C++ Slippi replay file parser.", "homepage": "https://sourceforge.net/projects/cppslippi/", "license": "MIT", diff --git a/ports/cppzmq/portfile.cmake b/ports/cppzmq/portfile.cmake index f9180c849b122d..f672510997217d 100644 --- a/ports/cppzmq/portfile.cmake +++ b/ports/cppzmq/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/cppzmq - REF v4.9.0 - SHA512 a9d1c25084b5b84dfa20a005299213c3bb610e46ac7433236fd8d3c60c7e71153c738da4645343080c0d1cad9008aca1a3091d4247c7a2f08c506ed3054d55a7 + REF "v${VERSION}" + SHA512 4a4f3c2a270b9b21591b08a81f2ab6a72693af213c115f2c0aa5b737fd0363d09dba92437f48268ff982e6c27d6830f79244599bd9198e3402c6cca566cea27a HEAD_REF master ) @@ -25,4 +25,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/${PORT}/libzmq-pkg-config") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/cppzmq/vcpkg.json b/ports/cppzmq/vcpkg.json index a76d194ee89ac5..0accde959ed376 100644 --- a/ports/cppzmq/vcpkg.json +++ b/ports/cppzmq/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cppzmq", - "version": "4.9.0", - "port-version": 1, + "version": "4.10.0", "description": "Header-only C++ binding for ZeroMQ", "homepage": "https://github.com/zeromq/cppzmq", "license": "MIT", diff --git a/ports/cpu-features/make_list_cpu_features_optional.patch b/ports/cpu-features/make_list_cpu_features_optional.patch deleted file mode 100644 index 73ccb5d994c1c3..00000000000000 --- a/ports/cpu-features/make_list_cpu_features_optional.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 68ece3bba0d79ab721a0c50ee1e6014a37f759dc Mon Sep 17 00:00:00 2001 -From: Wei Dai -Date: Mon, 24 May 2021 10:02:07 -0700 -Subject: [PATCH] Added an option to disable the executable target - list_cpu_feature. - ---- - CMakeLists.txt | 23 ++++++++++++++++++----- - 1 file changed, 18 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9daeac..48eea0e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,8 @@ if(NOT CMAKE_BUILD_TYPE) - FORCE) - endif(NOT CMAKE_BUILD_TYPE) - -+# An option to disable the executable target list_cpu_features. -+option(BUILD_EXECUTABLE "Build list_cpu_features executable." ON) - # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make - # it prominent in the GUI. - # cpu_features uses bit-fields which are - to some extends - implementation-defined (see https://en.cppreference.com/w/c/language/bit_field). -@@ -157,9 +159,11 @@ add_library(CpuFeature::cpu_features ALIAS cpu_features) - # program : list_cpu_features - # - --add_executable(list_cpu_features ${PROJECT_SOURCE_DIR}/src/utils/list_cpu_features.c) --target_link_libraries(list_cpu_features PRIVATE cpu_features) --add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features) -+if(BUILD_EXECUTABLE) -+ add_executable(list_cpu_features ${PROJECT_SOURCE_DIR}/src/utils/list_cpu_features.c) -+ target_link_libraries(list_cpu_features PRIVATE cpu_features) -+ add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features) -+endif() - - # - # ndk_compat -@@ -223,18 +227,28 @@ if(BUILD_TESTING) - endif() - - # --# Install cpu_features and list_cpu_features -+# Install cpu_features and optionally list_cpu_features - # - - include(GNUInstallDirs) --install(TARGETS cpu_features list_cpu_features -+install(TARGETS cpu_features - EXPORT CpuFeaturesTargets - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpu_features - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} - ) -+if(BUILD_EXECUTABLE) -+ install(TARGETS list_cpu_features -+ EXPORT CpuFeaturesTargets -+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpu_features -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ) -+endif() - install(EXPORT CpuFeaturesTargets - NAMESPACE CpuFeatures:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CpuFeatures --- -2.25.1 - diff --git a/ports/cpu-features/portfile.cmake b/ports/cpu-features/portfile.cmake index 1803ea82aeec43..af2bea7ce605ee 100644 --- a/ports/cpu-features/portfile.cmake +++ b/ports/cpu-features/portfile.cmake @@ -3,16 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/cpu_features - REF v0.7.0 - SHA512 e602c88c4a104d69dff0297a4c4f8e26d02d548fc35ce2616429ff8280f2a37e9eaa99451a38b7c302907352cf15bdf8c09c2e0e52b09bf4cd3b7e2b21f8ddb0 + REF "v${VERSION}" + SHA512 4e732f46b3b9efe48f0b6d06cfa87b3b25ed00e51c42de84c74cbbd4d66bd0974ff1a757b91574c6a3064cba6e5c2460117dd23b79b4136e5d1cd7e78dda47b1 HEAD_REF master - PATCHES - make_list_cpu_features_optional.patch - windows-x86-fix.patch ) -# If feature "tools" is not specified, disable building/exporting executable targets. -# This is necessary so that downstream find_package(CpuFeatures) does not fail. vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tools BUILD_EXECUTABLE @@ -27,7 +22,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeatures" CONFIG_PATH "lib/cmake/CpuFeatures") +if(VCPKG_TARGET_IS_ANDROID) + vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeatures" CONFIG_PATH "lib/cmake/CpuFeatures" DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeaturesNdkCompat" CONFIG_PATH "lib/cmake/CpuFeaturesNdkCompat") +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeatures" CONFIG_PATH "lib/cmake/CpuFeatures") +endif() if("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES "list_cpu_features" AUTO_CLEAN) @@ -35,4 +35,9 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +if(VCPKG_TARGET_IS_ANDROID) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage_android" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "usage") +else() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +endif() diff --git a/ports/cpu-features/usage b/ports/cpu-features/usage new file mode 100644 index 00000000000000..c9c863a0c4539a --- /dev/null +++ b/ports/cpu-features/usage @@ -0,0 +1,4 @@ +cpu-features provides CMake targets: + + find_package(CpuFeatures CONFIG REQUIRED) + target_link_libraries(main PRIVATE CpuFeatures::cpu_features) diff --git a/ports/cpu-features/usage_android b/ports/cpu-features/usage_android new file mode 100644 index 00000000000000..8fa0d5194a609f --- /dev/null +++ b/ports/cpu-features/usage_android @@ -0,0 +1,7 @@ +cpu-features provides CMake targets: + + find_package(CpuFeatures CONFIG REQUIRED) + target_link_libraries(main PRIVATE CpuFeatures::cpu_features) + + find_package(CpuFeaturesNdkCompat CONFIG REQUIRED) + target_link_libraries(main PRIVATE CpuFeatures::ndk_compat) diff --git a/ports/cpu-features/vcpkg.json b/ports/cpu-features/vcpkg.json index 5fab9a9df67057..5260b649bcd444 100644 --- a/ports/cpu-features/vcpkg.json +++ b/ports/cpu-features/vcpkg.json @@ -1,10 +1,10 @@ { "name": "cpu-features", - "version": "0.7.0", + "version": "0.9.0", "description": "A cross-platform C library to retrieve CPU features (such as available instructions) at runtime", "homepage": "https://github.com/google/cpu_features", "license": "Apache-2.0", - "supports": "!(arm | uwp)", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/cpu-features/windows-x86-fix.patch b/ports/cpu-features/windows-x86-fix.patch deleted file mode 100644 index e22c8d5b24ba92..00000000000000 --- a/ports/cpu-features/windows-x86-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,13 +60,13 @@ - if(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") - set(PROCESSOR_IS_MIPS TRUE) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)") - set(PROCESSOR_IS_AARCH64 TRUE) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") - set(PROCESSOR_IS_ARM TRUE) --elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)") -+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(AMD64|amd64)|(^i.86$)") - set(PROCESSOR_IS_X86 TRUE) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") - set(PROCESSOR_IS_POWER TRUE) - endif() - - macro(add_cpu_features_headers_and_sources HDRS_LIST_NAME SRCS_LIST_NAME) diff --git a/ports/cpuinfo/vcpkg.json b/ports/cpuinfo/vcpkg.json index b02ab9bd29d516..f546ba01191e6d 100644 --- a/ports/cpuinfo/vcpkg.json +++ b/ports/cpuinfo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpuinfo", "version-date": "2022-07-19", - "port-version": 2, + "port-version": 3, "description": "CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)", "homepage": "https://github.com/pytorch/cpuinfo", "license": "BSD-2-Clause", @@ -18,7 +18,8 @@ ], "features": { "tools": { - "description": "Build cpuinfo command-line tools" + "description": "Build cpuinfo command-line tools", + "supports": "!uwp" } } } diff --git a/ports/ctre/portfile.cmake b/ports/ctre/portfile.cmake index e3e04c3cef8fab..6181e1aa0b2e11 100644 --- a/ports/ctre/portfile.cmake +++ b/ports/ctre/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hanickadot/compile-time-regular-expressions REF "v${VERSION}" - SHA512 1ffb56ca88db5c8b0e5a5e1bf25f4eb9d59b43a31f9a38970bb2beaa22390e86a5beaf350b20e336759d7af99509c4c120b4638969719b931e316e01976c24dc + SHA512 bc0382156059999a5d55cd68dcfa35974c5dab56a10e970ce4eefe455fa3e53276bc87c7e7698de4b8a6a4d984f5883926668847816a1a594b94cac9d42ac4b8 HEAD_REF main ) diff --git a/ports/ctre/vcpkg.json b/ports/ctre/vcpkg.json index c9df4fad0f3b67..a8d0f589fad558 100644 --- a/ports/ctre/vcpkg.json +++ b/ports/ctre/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ctre", - "version-semver": "3.7.2", + "version": "3.8", "description": "A Compile time PCRE (almost) compatible regular expression matcher", "homepage": "https://github.com/hanickadot/compile-time-regular-expressions", "license": "Apache-2.0", diff --git a/ports/cubeb/portfile.cmake b/ports/cubeb/portfile.cmake index 28133823ae5781..f8e9b2ba4080c1 100644 --- a/ports/cubeb/portfile.cmake +++ b/ports/cubeb/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mozilla/cubeb - REF dc511c6b3597b6384d28949285b9289e009830ea - SHA512 a4ccd3f0a156db4e2e75a8d231e95a08d555390571551cb3e92c71cdee46dc74dc66b5272fda4b5f1f083b92672b360152cefd38be242f238fe802acc1ea17e9 + REF f1bfefbbd412eaa0fe89f5afb3c11b427dc2446a + SHA512 541bdcdc17c02f51e6faae1c90e0ddf30f40b137bb47498f7845919107190a4acb97d88e26ccf4877dbce7aeddee0f6538fd34c71396bc6a81644438a1a3242e HEAD_REF master ) diff --git a/ports/cubeb/vcpkg.json b/ports/cubeb/vcpkg.json index dc6e135f00423e..252c918e5fd7f7 100644 --- a/ports/cubeb/vcpkg.json +++ b/ports/cubeb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cubeb", - "version-date": "2022-07-22", + "version-date": "2023-09-26", "description": "Cross platform audio library", "homepage": "https://github.com/mozilla/cubeb", "license": "ISC", diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index 71f1d83c9488b9..fd176d8e3d9aad 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -1,15 +1,15 @@ -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 8cea346c3..967312905 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -118,6 +118,10 @@ if(CURL_HAS_LTO) - INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE) - endif() - -+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -+ set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS") -+endif() -+ - if(WIN32) - if(BUILD_SHARED_LIBS) - if(MSVC) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 9bb8f0b..7678f43 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -216,6 +216,10 @@ if(BUILD_SHARED_LIBS) + $) + endif() + ++if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set_property(TARGET ${LIB_SELECTED} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS") ++endif() ++ + add_library(${LIB_NAME} ALIAS ${LIB_SELECTED}) + add_library(${PROJECT_NAME}::${LIB_NAME} ALIAS ${LIB_SELECTED}) + diff --git a/ports/curl/0005_remove_imp_suffix.patch b/ports/curl/0005_remove_imp_suffix.patch index 7f29e35d9e501b..a5367056953852 100644 --- a/ports/curl/0005_remove_imp_suffix.patch +++ b/ports/curl/0005_remove_imp_suffix.patch @@ -1,12 +1,12 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 1d71e14..62b7b33 100644 +index 7678f43..00f61f8 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -125,7 +125,6 @@ if(WIN32) - if(MSVC) - # Add "_imp" as a suffix before the extension to avoid conflicting with - # the statically linked "libcurl.lib" -- set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib") - endif() - endif() - elseif(NOT CMAKE_CROSSCOMPILING) +@@ -105,7 +105,6 @@ endif() + if(WIN32 AND + NOT IMPORT_LIB_SUFFIX AND + CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL CMAKE_IMPORT_LIBRARY_SUFFIX) +- set(IMPORT_LIB_SUFFIX "_imp") + endif() + + # Whether to do a single compilation pass for libcurl sources and reuse these diff --git a/ports/curl/0022-deduplicate-libs.patch b/ports/curl/0022-deduplicate-libs.patch index 16cc0498a3b179..ac447ea8152500 100644 --- a/ports/curl/0022-deduplicate-libs.patch +++ b/ports/curl/0022-deduplicate-libs.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 09d82f1..f0d99e6 100644 +index a35ee52..ee133d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1507,6 +1507,7 @@ else() +@@ -1611,6 +1611,7 @@ if(BUILD_SHARED_LIBS) + else() set(ENABLE_SHARED "no") - set(ENABLE_STATIC "yes") set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}") + set(LIBCURL_LIBS "") + set(CPPFLAG_CURL_STATICLIB "-DCURL_STATICLIB") endif() - # "a" (Linux) or "lib" (Windows) - string(REPLACE "." "" libext "${CMAKE_STATIC_LIBRARY_SUFFIX}") + if(BUILD_STATIC_LIBS) diff --git a/ports/curl/cmake-config.patch b/ports/curl/cmake-config.patch new file mode 100644 index 00000000000000..d80042c990c329 --- /dev/null +++ b/ports/curl/cmake-config.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in +index 056907c4f..56f7c9dd9 100644 +--- a/CMake/curl-config.cmake.in ++++ b/CMake/curl-config.cmake.in +@@ -35,4 +35,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") + check_required_components("@PROJECT_NAME@") + + # Alias for either shared or static library +-add_library(@PROJECT_NAME@::libcurl ALIAS @PROJECT_NAME@::@LIB_SELECTED@) ++if(NOT TARGET @PROJECT_NAME@::libcurl) ++ add_library(@PROJECT_NAME@::libcurl INTERFACE IMPORTED) ++ set_target_properties(@PROJECT_NAME@::libcurl PROPERTIES INTERFACE_LINK_LIBRARIES @PROJECT_NAME@::@LIB_SELECTED@) ++endif() diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 7121f01020e476..36e8d877cf013b 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl REF "${curl_version}" - SHA512 7b0aef4f1cb93d446017a337e752d43254db92e02561875d1eb88eb3020a3efaf5d3f7fdfb1ff12dfd561d526789b284a10bef35af81bd6d9cfb2c3dc325815b + SHA512 f4a6a629e42bf635f5fd01e25b6b8c750cd5db20f63d7f2bada4de08851deb4b58135019da8b76028db7f32475d11ae8a53486fb6927a6257a889468da604ce4 HEAD_REF master PATCHES 0002_fix_uwp.patch @@ -14,6 +14,7 @@ vcpkg_from_github( mbedtls-ws2_32.patch export-components.patch dependencies.patch + cmake-config.patch # https://github.com/curl/curl/pull/11913 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -127,4 +128,21 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(READ "${SOURCE_PATH}/lib/krb5.c" krb5_c) +string(REGEX REPLACE "#i.*" "" krb5_c "${krb5_c}") +set(krb5_copyright "${CURRENT_BUILDTREES_DIR}/krb5.c Notice") +file(WRITE "${krb5_copyright}" "${krb5_c}") + +file(READ "${SOURCE_PATH}/lib/inet_ntop.c" inet_ntop_c) +string(REGEX REPLACE "#i.*" "" inet_ntop_c "${inet_ntop_c}") +set(inet_ntop_copyright "${CURRENT_BUILDTREES_DIR}/inet_ntop.c and inet_pton.c Notice") +file(WRITE "${inet_ntop_copyright}" "${inet_ntop_c}") + +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/COPYING" + "${krb5_copyright}" + "${inet_ntop_copyright}" +) diff --git a/ports/curl/usage b/ports/curl/usage new file mode 100644 index 00000000000000..eea11400eee9f1 --- /dev/null +++ b/ports/curl/usage @@ -0,0 +1,4 @@ +curl is compatible with built-in CMake targets: + + find_package(CURL REQUIRED) + target_link_libraries(main PRIVATE CURL::libcurl) diff --git a/ports/curl/vcpkg-cmake-wrapper.cmake b/ports/curl/vcpkg-cmake-wrapper.cmake index d13b23daeb4432..5e64ef762af3e0 100644 --- a/ports/curl/vcpkg-cmake-wrapper.cmake +++ b/ports/curl/vcpkg-cmake-wrapper.cmake @@ -13,8 +13,12 @@ _find_package(${ARGS} CONFIG) if(CURL_FOUND) include("${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake") - get_target_property(_curl_include_dirs CURL::libcurl INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(_curl_link_libraries CURL::libcurl INTERFACE_LINK_LIBRARIES) + set(_curl_target CURL::libcurl_shared) + if(TARGET CURL::libcurl_static) + set(_curl_target CURL::libcurl_static) + endif() + get_target_property(_curl_include_dirs ${_curl_target} INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(_curl_link_libraries ${_curl_target} INTERFACE_LINK_LIBRARIES) if(NOT _curl_link_libraries) set(_curl_link_libraries "") endif() @@ -46,13 +50,13 @@ if(CURL_FOUND) endif() if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - get_target_property(_curl_location_debug CURL::libcurl IMPORTED_IMPLIB_DEBUG) - get_target_property(_curl_location_release CURL::libcurl IMPORTED_IMPLIB_RELEASE) + get_target_property(_curl_location_debug ${_curl_target} IMPORTED_IMPLIB_DEBUG) + get_target_property(_curl_location_release ${_curl_target} IMPORTED_IMPLIB_RELEASE) endif() if(NOT _curl_location_debug AND NOT _curl_location_release) - get_target_property(_curl_location_debug CURL::libcurl IMPORTED_LOCATION_DEBUG) - get_target_property(_curl_location_release CURL::libcurl IMPORTED_LOCATION_RELEASE) + get_target_property(_curl_location_debug ${_curl_target} IMPORTED_LOCATION_DEBUG) + get_target_property(_curl_location_release ${_curl_target} IMPORTED_LOCATION_RELEASE) endif() set(CURL_INCLUDE_DIRS "${_curl_include_dirs}") @@ -66,5 +70,6 @@ if(CURL_FOUND) unset(_curl_link_libraries) unset(_curl_location_debug) unset(_curl_location_release) + unset(_curl_target) endif() cmake_policy(POP) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 93af13e5bc3ad7..6d5d921acd91c9 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,9 +1,9 @@ { "name": "curl", - "version": "8.2.1", + "version": "8.3.0", "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", - "license": null, + "license": "curl AND ISC AND BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/cwalk/portfile.cmake b/ports/cwalk/portfile.cmake index a795d1a4019ae1..7c71087f3c59a8 100644 --- a/ports/cwalk/portfile.cmake +++ b/ports/cwalk/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO likle/cwalk - REF v1.2.6 - SHA512 d43f339178367facd2f80944f5491631edab24fa4a92e30fd8f4d9c533ec3a2edbc04105066148be8458b64d0fac9e7d86408ca9601db291b93df222dc875fd4 + REF "v${VERSION}" + SHA512 704133fb83beebc5942da5674b5f3563c64ec7017b33570a1f1433aa820a86882c42b16832efc215cd74f619a0a45493748655aa5af97bd3ff82d62f34b68f69 HEAD_REF master ) diff --git a/ports/cwalk/vcpkg.json b/ports/cwalk/vcpkg.json index d3e1cf9c10d869..90ed0cd7d0a931 100644 --- a/ports/cwalk/vcpkg.json +++ b/ports/cwalk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cwalk", - "version": "1.2.6", + "version": "1.2.7", "description": "Path library for C/C++. Cross-Platform for Windows, MacOS and Linux. Supports UNIX and Windows path styles on those platforms.", "homepage": "https://likle.github.io/cwalk/", "dependencies": [ diff --git a/ports/czmq/portfile.cmake b/ports/czmq/portfile.cmake index 5ed28189d0741d..9ff3878daac823 100644 --- a/ports/czmq/portfile.cmake +++ b/ports/czmq/portfile.cmake @@ -62,11 +62,7 @@ file(COPY DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -if ("tool" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES zmakecert) -endif() - -vcpkg_clean_executables_in_bin(FILE_NAMES zmakecert) +vcpkg_copy_tools(TOOL_NAMES zmakecert AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") @@ -84,4 +80,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/czmq/vcpkg.json b/ports/czmq/vcpkg.json index c4fdd0f480e701..ecda439d66d333 100644 --- a/ports/czmq/vcpkg.json +++ b/ports/czmq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "czmq", "version-semver": "4.2.1", - "port-version": 2, + "port-version": 3, "description": "High-level C binding for ZeroMQ", "homepage": "https://github.com/zeromq/czmq", "license": "MPL-2.0", diff --git a/ports/d3d12-memory-allocator/CMakeLists.txt b/ports/d3d12-memory-allocator/CMakeLists.txt index 884610b06184cc..b0202053d81fc5 100644 --- a/ports/d3d12-memory-allocator/CMakeLists.txt +++ b/ports/d3d12-memory-allocator/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(${PROJECT_NAME} STATIC ) set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "src/D3D12MemAlloc.h") -#target_include_directories(${PROJECT_NAME} PRIVATE "src/") +target_include_directories(${PROJECT_NAME} INTERFACE PUBLIC $) install( TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-config diff --git a/ports/d3d12-memory-allocator/portfile.cmake b/ports/d3d12-memory-allocator/portfile.cmake index 89a4093bb4e6df..0ee730ce3269ea 100644 --- a/ports/d3d12-memory-allocator/portfile.cmake +++ b/ports/d3d12-memory-allocator/portfile.cmake @@ -8,10 +8,10 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() @@ -19,4 +19,4 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH cmake/) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/d3d12-memory-allocator/vcpkg.json b/ports/d3d12-memory-allocator/vcpkg.json index b31b48509a0dab..eadeb2167ec328 100644 --- a/ports/d3d12-memory-allocator/vcpkg.json +++ b/ports/d3d12-memory-allocator/vcpkg.json @@ -1,6 +1,7 @@ { "name": "d3d12-memory-allocator", "version-date": "2021-05-05", + "port-version": 1, "description": "Easy to integrate D3d12 memory allocation library from GPUOpen", "homepage": "https://gpuopen.com/gaming-product/d3d12-memory-allocator/", "license": "MIT", diff --git a/ports/date/vcpkg.json b/ports/date/vcpkg.json index dcb30ce169cb48..14b21cd223585e 100644 --- a/ports/date/vcpkg.json +++ b/ports/date/vcpkg.json @@ -1,7 +1,7 @@ { "name": "date", "version": "3.0.1", - "port-version": 4, + "port-version": 5, "description": "A date and time library based on the C++17 header", "homepage": "https://github.com/HowardHinnant/date", "license": "MIT", @@ -18,6 +18,7 @@ "features": { "remote-api": { "description": "support automatic download of tz data", + "supports": "!uwp", "dependencies": [ "curl" ] diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index 3a63ea826d3f04..8bd515fa59389c 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries REF "v${VERSION}" - SHA512 b82973fb71b02263a0c22b1d24c2b2f8cd81bf09f9511d7ec5b656766c361cf6d7f35da2d35ccb2894da3d843b7c342959b7ef701bbe40381e8665ffd5073a9e + SHA512 98b8a8171998a1e00b99a9fc2f3ec868758ae6f9ae081b60574f0be525e17c1f0db37a87571367dfbda66feb76ef9b8024849987c00a0e92502090c25b821ec3 HEAD_REF master ) diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json index e869d8dde8c738..05300831c3af3f 100644 --- a/ports/daw-header-libraries/vcpkg.json +++ b/ports/daw-header-libraries/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-header-libraries", - "version": "2.93.1", + "version": "2.96.1", "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", "homepage": "https://github.com/beached/header_libraries", "license": "BSL-1.0", diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake index 6d714aa39049dd..2fe759b1fcc4ec 100644 --- a/ports/daw-json-link/portfile.cmake +++ b/ports/daw-json-link/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/daw_json_link REF "v${VERSION}" - SHA512 a1cb2ea554d7cd3be5ad66c46697afe05edca15e4a76b77c427dcf85e18b858db107d29636afba1d9b57afb362c68141c917215d6064aab357f5186ea12ad267 + SHA512 0d201ef02a345df6a59be2240594566474b0a9d0634cb0fb5b7ba4798efe5056cb1b34798288d18f52849a8671cc98bf6856b8bc32cf7e7d3837d04feecebea9 HEAD_REF master ) diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json index 69229a7a772888..578454a56608c5 100644 --- a/ports/daw-json-link/vcpkg.json +++ b/ports/daw-json-link/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-json-link", - "version": "3.19.0", + "version": "3.20.1", "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", "homepage": "https://github.com/beached/daw_json_link", "license": "BSL-1.0", diff --git a/ports/daxa/portfile.cmake b/ports/daxa/portfile.cmake index 4b3acb3512875e..258a88b181f341 100644 --- a/ports/daxa/portfile.cmake +++ b/ports/daxa/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://github.com/Ipotrick/Daxa - REF 14d5378a6157b3530c3ff826182706126be135bd + REF 61b699ac12de475cf4a79bc99106b865acddaf18 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -9,7 +9,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS utils-imgui WITH_UTILS_IMGUI utils-mem WITH_UTILS_MEM utils-pipeline-manager-glslang WITH_UTILS_PIPELINE_MANAGER_GLSLANG - utils-task-list WITH_UTILS_TASK_LIST + utils-pipeline-manager-spirv-validation WITH_UTILS_PIPELINE_MANAGER_SPIRV_VALIDATION + utils-task-graph WITH_UTILS_TASK_GRAPH ) set(DAXA_DEFINES) @@ -22,8 +23,11 @@ endif() if(WITH_UTILS_PIPELINE_MANAGER_GLSLANG) list(APPEND DAXA_DEFINES "-DDAXA_ENABLE_UTILS_PIPELINE_MANAGER_GLSLANG=true") endif() -if(WITH_UTILS_TASK_LIST) - list(APPEND DAXA_DEFINES "-DDAXA_ENABLE_UTILS_TASK_LIST=true") +if(WITH_UTILS_PIPELINE_MANAGER_SPIRV_VALIDATION) + list(APPEND DAXA_DEFINES "-DDAXA_ENABLE_UTILS_PIPELINE_MANAGER_SPIRV_VALIDATION=true") +endif() +if(WITH_UTILS_TASK_GRAPH) + list(APPEND DAXA_DEFINES "-DDAXA_ENABLE_UTILS_TASK_GRAPH=true") endif() vcpkg_cmake_configure( @@ -32,6 +36,9 @@ vcpkg_cmake_configure( ${DAXA_DEFINES} -DCMAKE_REQUIRE_FIND_PACKAGE_X11=ON -DCMAKE_REQUIRE_FIND_PACKAGE_WAYLAND=ON + MAYBE_UNUSED_VARIABLES + CMAKE_REQUIRE_FIND_PACKAGE_X11 + CMAKE_REQUIRE_FIND_PACKAGE_WAYLAND ) vcpkg_cmake_install() diff --git a/ports/daxa/vcpkg.json b/ports/daxa/vcpkg.json index 2b155b8d64de99..dc4bf1c3e1f0b3 100644 --- a/ports/daxa/vcpkg.json +++ b/ports/daxa/vcpkg.json @@ -1,11 +1,12 @@ { "name": "daxa", - "version": "1.0.0", + "version": "2.0.0", "description": "Daxa C++ Vulkan Abstraction", "homepage": "https://github.com/Ipotrick/Daxa", "license": "MIT", "supports": "(windows | linux) & !x86", "dependencies": [ + "fmt", { "name": "vcpkg-cmake", "host": true @@ -15,6 +16,7 @@ "host": true }, "vulkan", + "vulkan-headers", "vulkan-memory-allocator", { "name": "wayland", @@ -22,12 +24,6 @@ "platform": "linux" } ], - "default-features": [ - "utils-imgui", - "utils-mem", - "utils-pipeline-manager-glslang", - "utils-task-list" - ], "features": { "utils-imgui": { "description": "The ImGUI Daxa utility", @@ -44,8 +40,14 @@ "glslang" ] }, - "utils-task-list": { - "description": "The Task-List Daxa utility" + "utils-pipeline-manager-spirv-validation": { + "description": "Build with SPIR-V validation", + "dependencies": [ + "spirv-tools" + ] + }, + "utils-task-graph": { + "description": "The Task-Graph Daxa utility" } } } diff --git a/ports/dbg-macro/portfile.cmake b/ports/dbg-macro/portfile.cmake index acdcf728c755c0..92b0a8f719ecde 100644 --- a/ports/dbg-macro/portfile.cmake +++ b/ports/dbg-macro/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sharkdp/dbg-macro REF "v${VERSION}" - SHA512 4f785919843026996ffeb3cd8e3494ecd77f42bee104b6659b664b21a3e518739707f5bd006fc8128c99eef241fc6650ad629444f7005df89100a16d8918d05f + SHA512 9aa41745168409f7c8c9e36e9bae58e2b3b356edd6d5f2414acd7dee9a79d2faa7b63d789821702e33781449b42213855c2ff71dcc39956f5f69c083827118c1 HEAD_REF master ) diff --git a/ports/dbg-macro/vcpkg.json b/ports/dbg-macro/vcpkg.json index 3bede55fa0c1a1..3ca633d3d7e6e8 100644 --- a/ports/dbg-macro/vcpkg.json +++ b/ports/dbg-macro/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dbg-macro", - "version": "0.5.0", + "version": "0.5.1", "description": "A dbg(...) macro for C++", "homepage": "https://github.com/sharkdp/dbg-macro", "license": "MIT" diff --git a/ports/dbus/getpeereid.patch b/ports/dbus/getpeereid.patch index 9be817a5259ea4..5cd2309e391396 100644 --- a/ports/dbus/getpeereid.patch +++ b/ports/dbus/getpeereid.patch @@ -1,19 +1,20 @@ diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake -index 7bc789f0e..ec476d9ed 100644 ---- a/cmake/ConfigureChecks.cmake +index b7f3702..e2336ba 100644 +--- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake -@@ -44,5 +44,6 @@ check_include_file(sys/inotify.h DBUS_BUS_ENABLE_INOTIFY) - +@@ -51,6 +51,7 @@ check_symbol_exists(closefrom "unistd.h" HAVE_CLOSEFROM) # + check_symbol_exists(environ "unistd.h" HAVE_DECL_ENVIRON) + check_symbol_exists(fstatfs "sys/vfs.h" HAVE_FSTATFS) check_symbol_exists(getgrouplist "grp.h" HAVE_GETGROUPLIST) # dbus-sysdeps.c +check_symbol_exists(getpeereid "sys/types.h;unistd.h" HAVE_GETPEEREID) # dbus-sysdeps.c, check_symbol_exists(getpeerucred "ucred.h" HAVE_GETPEERUCRED) # dbus-sysdeps.c, dbus-sysdeps-win.c - check_symbol_exists(nanosleep "time.h" HAVE_NANOSLEEP) # dbus-sysdeps.c check_symbol_exists(getpwnam_r "errno.h;pwd.h" HAVE_GETPWNAM_R) # dbus-sysdeps-util-unix.c + check_symbol_exists(getrandom "sys/random.h" HAVE_GETRANDOM) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake -index cbffcfa91..1f055ddb9 100644 ---- a/cmake/config.h.cmake +index 77fc19c..2f25643 100644 +--- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake -@@ -169,6 +169,9 @@ +@@ -140,6 +140,9 @@ /* Define to 1 if you have getgrouplist */ #cmakedefine HAVE_GETGROUPLIST 1 diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake index b66c68f18132b5..a7a5a1670b792a 100644 --- a/ports/dbus/portfile.cmake +++ b/ports/dbus/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/ OUT_SOURCE_PATH SOURCE_PATH REPO dbus/dbus - REF ed866a94889e13c83dc873d8b5f86a907f908456 #1.15.2 - SHA512 eca9bfabfa6e8a3bf82ecc3c36dbd038c2450aded539a6d405a2709e876ccbf5002391802f6d538a5bbc16723f0d51f059f03cb6d226b400bc032b3bbe59cf10 + REF "dbus-${VERSION}" + SHA512 8e476b408514e6540c36beb84e8025827c22cda8958b6eb74d22b99c64765eb3cd5a6502aea546e3e5f0534039857b37edee89c659acef40e7cab0939947d4af HEAD_REF master PATCHES cmake.dep.patch diff --git a/ports/dbus/vcpkg.json b/ports/dbus/vcpkg.json index 27ddba56f86ca7..af4741cd888b34 100644 --- a/ports/dbus/vcpkg.json +++ b/ports/dbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dbus", - "version": "1.15.2", + "version": "1.15.8", "description": "D-Bus specification and reference implementation, including libdbus and dbus-daemon", "homepage": "https://gitlab.freedesktop.org/dbus/dbus", "license": "AFL-2.1 OR GPL-2.0-or-later", diff --git a/ports/devil/vcpkg.json b/ports/devil/vcpkg.json index b58e683903d530..b37faa5e235bc6 100644 --- a/ports/devil/vcpkg.json +++ b/ports/devil/vcpkg.json @@ -1,9 +1,10 @@ { "name": "devil", "version": "1.8.0", - "port-version": 10, + "port-version": 11, "description": "A full featured cross-platform image library", "homepage": "https://github.com/DentonW/DevIL", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/directx-dxc/portfile.cmake b/ports/directx-dxc/portfile.cmake index 6937f2dba4d8b2..4c10c739b96438 100644 --- a/ports/directx-dxc/portfile.cmake +++ b/ports/directx-dxc/portfile.cmake @@ -1,7 +1,7 @@ set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) -set(DIRECTX_DXC_TAG v1.7.2212.1) -set(DIRECTX_DXC_VERSION 2023_03_01) +set(DIRECTX_DXC_TAG v1.7.2308) +set(DIRECTX_DXC_VERSION 2023_08_14) if (NOT VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") message(STATUS "Note: ${PORT} always requires dynamic library linkage at runtime.") @@ -11,13 +11,13 @@ if (VCPKG_TARGET_IS_LINUX) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/${DIRECTX_DXC_TAG}/linux_dxc_${DIRECTX_DXC_VERSION}.x86_64.tar.gz" FILENAME "linux_dxc_${DIRECTX_DXC_VERSION}.tar.gz" - SHA512 66b421377a92b8ebb700f5df30b538393b826e3f12bb3478430dbbb1f899e435f6ed8c442a38ef9218d6f55d6e5c0441bd8a766bc1960df278567e575f8b969c + SHA512 7f1fb252b27fb00b9ffeadafb47921757c5e4d7df806283fe7629b866d2873896d7a7d599032aa2389f047d9791a447aabb22e3e8e7e1f3f76142675d831b738 ) else() vcpkg_download_distfile(ARCHIVE URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/${DIRECTX_DXC_TAG}/dxc_${DIRECTX_DXC_VERSION}.zip" FILENAME "dxc_${DIRECTX_DXC_VERSION}.zip" - SHA512 9c348d24f406c5072a57961184d5f6c6d6483666bbb2f18dd31a9c666249e1b83e6c035dcdbdd126d084e4a5cbe0973cd823df97ac9b1efc715c15ce5691b27a + SHA512 3bc49f77b55f58de88002a75b38e5acdb8600b0b73729320a25a27af08f1f21d0b4aec92ee9d736eb30bae42f4e0f2f32d25d6635fa71aedcaf82440e6d2433e ) endif() diff --git a/ports/directx-dxc/vcpkg.json b/ports/directx-dxc/vcpkg.json index be22a1e93b9f1f..828146c7c43b90 100644 --- a/ports/directx-dxc/vcpkg.json +++ b/ports/directx-dxc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directx-dxc", - "version-date": "2023-03-01", - "port-version": 2, + "version-date": "2023-08-14", "description": "DirectX Shader Compiler (LLVM/Clang)", "homepage": "https://github.com/microsoft/DirectXShaderCompiler", "documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki", diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 6152c234579a03..df4a022d24bf3c 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTEX_TAG jun2023) +set(DIRECTXTEX_TAG sept2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex REF ${DIRECTXTEX_TAG} - SHA512 7b09903b8fbb15f6e13a50608b80ff1128703f7843517db99dd1c05e01a0ab27ed4ac29f29a59de1f384787fbb75fb4f359bbddcd25483cb323fcc3750f0833d + SHA512 b72941496bcd3193409799905cd6b6d0ce79009b222a589257062f830c2ccc16a97166da92ea59a7954d0f60d1fcd704cdb2cb7449697009f9ddeb00e27c4fb8 HEAD_REF main ) @@ -20,8 +20,10 @@ vcpkg_check_features( tools BUILD_TOOLS ) +set(EXTRA_OPTIONS -DBUILD_SAMPLE=OFF -DBUILD_TESTING=OFF) + if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_TARGET_IS_XBOX OR VCPKG_TARGET_IS_MINGW) AND NOT "dx12" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_directx-headers=TRUE") + list(APPEND EXTRA_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_directx-headers=TRUE") endif() if(VCPKG_TARGET_IS_MINGW AND ("dx11" IN_LIST FEATURES)) @@ -34,7 +36,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} -DBUILD_SAMPLE=OFF -DBUILD_TESTING=OFF + OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} ) vcpkg_cmake_install() @@ -50,21 +52,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}.exe" - SHA512 e013d099b121147137db006d6ebefd90a374777160fcedf09e038eaab6c842aaaf0db7241dca3c56d35a91d4ea9f19fd56a007ac1bc05d12216c079974ec138e + SHA512 30d607e0e0a47917731ef5acebb5d4d269b73bf21120cb976e7bf605f7f5941cb23f63a317fb3d4171f0dce1526f8dd4365e9c2f9b1a6503c320b1f88156acc4 ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv.exe" FILENAME "texconv-${DIRECTXTEX_TAG}.exe" - SHA512 e5ea3a36dc1cc60e1426cec7af0e96f21ddf8e8ed8b2b666a5003db59008558f07f44e962508c28c8e5d2f14c92350a05da9688c40e1d5a41c7851a0c474470f + SHA512 43103276b6a8be23c7b429f089f71df5338b8ef32a2f3fe20492d5294886ddbe9a170c6bc1ead7a2da2179ed8e4828262d7072f136b6586af31d2f3249dff97a ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}.exe" - SHA512 98c4cdb118ed6ef67d0e0a6a8f3e961e7702f1dac2b36f4ba2bc19191989fc72c847d3f65c4acbb63c8bb5adc167055a0adc90e3fce3b65629d01a956427d60e + SHA512 915aa492b3db2a9787492c8e9ae1b51b175db81b38bca73cd5de2ab815308a5d4e63fb584d02f178939fb816c604996e5036b310b4555ecdc0d1e0640aef7ee0 ) file(INSTALL @@ -83,21 +85,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble_arm64.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 7890b3cf3c6d8834c3c6752d2ba82d34d91935f684f7c8b96a3840f4b1662fe2538a30a0a3f88fa3989728c1d4b7b29ca03274f77eaa1b1fa3acf6e5e98aa4f4 + SHA512 c2152d5644798c4f5fa929a889e68ae5b6545dfdb3251f066406c1f66c223756ace1744314ec459637ca1b39923ad8bfd34f0bf906c84b7e7d6d7114833b7a84 ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv_arm64.exe" FILENAME "texconv-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 160cf3fe6d4488fc47e30aba763d8513f224b68e7a4b85360149752b32d52050714bc6f10a7ea7b8ccd1e8a564efccec73a968a5e9551a2f2cedfb6b764fbe9b + SHA512 15901617f1a2ac94f1eec3b287758e50bf0fad6532940345fd9d13c34372acd27d10f8ba3277f21163f991082dbff14506cb4d7068179b5807755d818f98e27d ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag_arm64.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 d70ed9a12a83a2a28a9a8682d25d0c7f569509c422cc8cf0fe66789d62d86d305f7da3275ab3bf969e20bedd6f265c6520400649d8f917cf3106a48dc80e789a + SHA512 cc110a34428a7a7694f890bae6f68d001c2e8bcb85edfe335d9cad299e0205ef2bd786392cd391681ca1f1c0043b869c424a705a182466230f6f683b77c47c3e ) file(INSTALL diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index ce4716ff84c531..38c9ac8f991edf 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directxtex", - "version-date": "2023-06-13", - "port-version": 1, + "version-date": "2023-09-01", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index bcf16f9f7c19d9..ac9625080e1b20 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTK_TAG jun2023) +set(DIRECTXTK_TAG sept2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK REF ${DIRECTXTK_TAG} - SHA512 de98429af5851fafdab4b24b38d0230798eab38c5fee291ea43ef46dabe275e3476d1449f94ebead53d5a4f361257218b165af37f96114cec5890403a044d600 + SHA512 b5b9ea976b1318bbf29915a10cbb11368e0c16d19247bdb3c2da9e733ef6a3db50e530e59e7c5aa0191c372530f22b1edd3f67a1d0a3647e50c09784b9d1e93a HEAD_REF main ) @@ -24,9 +24,11 @@ vcpkg_check_features( xaudio2redist BUILD_XAUDIO_WIN7 ) +set(EXTRA_OPTIONS -DBUILD_TESTING=OFF) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF + OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} ) vcpkg_cmake_install() @@ -38,7 +40,7 @@ if("tools" IN_LIST FEATURES) MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe" FILENAME "makespritefont-${DIRECTXTK_TAG}.exe" - SHA512 1b78df0fe1f1de0e3796c8ac3b3b99f7d44dc955ebd107791bda637a27a94a364cbf974a240a5ac02a79ff8bcc8ee74528bca502e71666d0d99ce28a0cb88fd1 + SHA512 1c4b282482e931c0b5b97bf7359e11889428f35458e65c751521240f15e04915400084d1a28693d8ffe5cd29bc8dd084a5818ecbff4e036de21368c119145d66 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -53,7 +55,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}.exe" - SHA512 b200690f7b81cdf902ec8c84a2be315858796c7ce01fbf9971377a08b8f7e0211415bc4829944041b57ed6a786f2ace0f4991cc8f51241bb7351defcfc9c34de + SHA512 36e060b67390a1798cb5f96142d63b83051cfb60a9330932cd69a4b43f50d4e29fd5bbe6b036a7c64a8eb8c9018481ee406951f0777f30497672ff8eeba79498 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -66,7 +68,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe" - SHA512 ba338c19e4a224cac3b31ed82bf5174f072186845ba5d70aa50a5c485faf6e463559613da213a55c8859e7b6615bfaa8819dd9e79bf955df67973e68fbefcad0 + SHA512 bd594dd0e172a7002e92abf6e01e2efe30fa1cae3ee5ae87254da4443c964aa4fb653c26f145004abcd91135adc4e19fe1b8a752e1a8acb675a8ddc42191e7d6 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index cc245de9c5fc77..50c7973a62aa74 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directxtk", - "version-date": "2023-06-13", + "version-date": "2023-09-01", + "port-version": 1, "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", @@ -34,10 +35,7 @@ "xaudio2redist": { "description": "Build with XAudio2Redist support for Windows 7 SP1 or later", "dependencies": [ - { - "name": "xaudio2redist", - "platform": "!uwp & !arm" - } + "xaudio2redist" ] } } diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 40604e4828f7f6..19b7b815791cea 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTK_TAG jun2023) +set(DIRECTXTK_TAG sept2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 REF ${DIRECTXTK_TAG} - SHA512 61906a03bfba04539941f895cd718d80c9402ea04ece2f4ece43f8ad97231ae2388da5df30061103e25a48bab6dd7db30c192a65cace9d014a7850c6d535d424 + SHA512 1a191c945a0128d02f2a374defca30965d3fe064ef18c111cdb90a763333a69f4eefc5dbd6b8373b2f70276e5022f38e2b48a4f29675f7c10656388f833bca95 HEAD_REF main ) @@ -39,7 +39,7 @@ if("tools" IN_LIST FEATURES) MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe" FILENAME "makespritefont-${DIRECTXTK_TAG}.exe" - SHA512 1b78df0fe1f1de0e3796c8ac3b3b99f7d44dc955ebd107791bda637a27a94a364cbf974a240a5ac02a79ff8bcc8ee74528bca502e71666d0d99ce28a0cb88fd1 + SHA512 1c4b282482e931c0b5b97bf7359e11889428f35458e65c751521240f15e04915400084d1a28693d8ffe5cd29bc8dd084a5818ecbff4e036de21368c119145d66 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -54,7 +54,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}.exe" - SHA512 b200690f7b81cdf902ec8c84a2be315858796c7ce01fbf9971377a08b8f7e0211415bc4829944041b57ed6a786f2ace0f4991cc8f51241bb7351defcfc9c34de + SHA512 36e060b67390a1798cb5f96142d63b83051cfb60a9330932cd69a4b43f50d4e29fd5bbe6b036a7c64a8eb8c9018481ee406951f0777f30497672ff8eeba79498 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -67,7 +67,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe" - SHA512 ba338c19e4a224cac3b31ed82bf5174f072186845ba5d70aa50a5c485faf6e463559613da213a55c8859e7b6615bfaa8819dd9e79bf955df67973e68fbefcad0 + SHA512 bd594dd0e172a7002e92abf6e01e2efe30fa1cae3ee5ae87254da4443c964aa4fb653c26f145004abcd91135adc4e19fe1b8a752e1a8acb675a8ddc42191e7d6 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index 79ee5575919537..c85ab776fadaa0 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directxtk12", - "version-date": "2023-06-13", + "version-date": "2023-09-01", + "port-version": 1, "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", @@ -47,10 +48,7 @@ "xaudio2redist": { "description": "Build with XAudio2Redist", "dependencies": [ - { - "name": "xaudio2redist", - "platform": "!uwp & !arm & !xbox" - } + "xaudio2redist" ] } } diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index d5ce67cb3e6bf4..6e949c2609ae8c 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI REF "v${VERSION}" - SHA512 158beeb5739ab69e5d2977c78030b24cada3e32a9b53ec0195a7b17b30c686ecd3fe29f5f11a530118312bd14db5b8d0ac0707e1675d0a3fc4da355ad66527dd + SHA512 60b63c65bdc32a541a9287afc6de21b0fa3caf717abbd442df08c8e52f1516f1d33b2fc6cf5f230061776aa48af5b4c54c9a0facf061e682371f566c991670a2 HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 08736550badde0..9c49ebf14a6cdc 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version": "1.70", + "version": "2.0", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "MIT", diff --git a/ports/discount/disable-deprecated-warnings.patch b/ports/discount/disable-deprecated-warnings.patch index e8f4f0fb7721fb..1684c74009c790 100644 --- a/ports/discount/disable-deprecated-warnings.patch +++ b/ports/discount/disable-deprecated-warnings.patch @@ -1,11 +1,11 @@ diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 11fa675..34cc9ed 100644 +index ae859a3..77a936a 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt -@@ -20,6 +20,11 @@ set(${PROJECT_NAME}_INSTALL_SAMPLES OFF CACHE BOOL - set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL - "Set to ON to only build markdown library (default is OFF)") - +@@ -23,6 +23,11 @@ set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL + set(${PROJECT_NAME}_CXX_BINDING OFF CACHE BOOL + "Set to ON to install header files with c++ wrappers (default is OFF)") + +# MSVC deprecated warnings (C4996,strdup, ...) +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) diff --git a/ports/discount/portfile.cmake b/ports/discount/portfile.cmake index a615b28e75c213..3eb6423a4896f9 100644 --- a/ports/discount/portfile.cmake +++ b/ports/discount/portfile.cmake @@ -4,11 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Orc/discount - REF v2.2.6 - SHA512 4c5956dea78aacd3a105ddac13f1671d811a5b2b04990cdf8485c36190c8872c4b1b9432a7236f669c34b07564ecd0096632dced54d67de9eaf4f23641417ecc + REF "v${VERSION}" + SHA512 d86bfc6d3e11131622046418a1f54bd9dfa5f1233e510189cd2c89dc857da31e88ffbe6670cc506ca8b9763e8fb74ed215f1018f83e25767c77acb8a7c296b8a HEAD_REF master PATCHES - cmake.patch generate-blocktags-command.patch disable-deprecated-warnings.patch ) @@ -33,6 +32,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/discount) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/discount/vcpkg.json b/ports/discount/vcpkg.json index b22550e6a89861..08441ab834e753 100644 --- a/ports/discount/vcpkg.json +++ b/ports/discount/vcpkg.json @@ -1,7 +1,6 @@ { "name": "discount", - "version": "2.2.6", - "port-version": 3, + "version-string": "3.0.0a", "description": "DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.", "homepage": "https://github.com/Orc/discount", "dependencies": [ diff --git a/ports/dlfcn-win32/portfile.cmake b/ports/dlfcn-win32/portfile.cmake index c9bfea7f7c0eae..4dd5098182d429 100644 --- a/ports/dlfcn-win32/portfile.cmake +++ b/ports/dlfcn-win32/portfile.cmake @@ -1,10 +1,9 @@ -set(SOURCE_VERSION 1.3.1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dlfcn-win32/dlfcn-win32 - REF v${SOURCE_VERSION} - SHA512 0aa01c49ee8628c42cdc8b9782b4741a36502764d4442227ea4e9a8062356ff17e8eaa3cdd4113009ad7ad2044b6cfd24128319d71825e13062259dd1906e27e + REF "v${VERSION}" + SHA512 2ddcaad7fff09be654589642af14689ebbc15212caea5b5fb0238b34188c87cd9cb53d7aee45c7ae4dd6ddf6e637ee945567d7b858b97ceefff8f1ec46b786ae HEAD_REF master ) diff --git a/ports/dlfcn-win32/vcpkg.json b/ports/dlfcn-win32/vcpkg.json index 47a1ee4d434f17..aa27ecba5d8bdc 100644 --- a/ports/dlfcn-win32/vcpkg.json +++ b/ports/dlfcn-win32/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dlfcn-win32", - "version": "1.3.1", - "port-version": 1, + "version": "1.4.1", "description": "dlfcn-win32 is an implementation of dlfcn for Windows.", "homepage": "https://github.com/dlfcn-win32/dlfcn-win32", "license": "MIT", diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake index 225202319901bb..9f1fa7aa4b9749 100644 --- a/ports/double-conversion/portfile.cmake +++ b/ports/double-conversion/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/double-conversion - REF af09fd65fcf24eee95dc62813ba9123414635428 #v3.2.1 - SHA512 721d736a2d065b8ff6058345afe6990ab568174e202361abc7ce36c16931c05128df4fd5034f98f114a7b01972eda3b98bfc209ef45394d0b5d4bbce8140b28a + REF "v${VERSION}" + SHA512 51e84eb7a5c407f7bc8f8b8ca19932ece5c9d8ac18aedff7b7620fc67369d9b2aa8c5a6b133e7f8633d7cc5e3788bad6e60b0e48ac08d0a4bc5e4abe7cee1334 HEAD_REF master ) diff --git a/ports/double-conversion/vcpkg.json b/ports/double-conversion/vcpkg.json index d96afe57c3e194..f7c1da8618ddec 100644 --- a/ports/double-conversion/vcpkg.json +++ b/ports/double-conversion/vcpkg.json @@ -1,7 +1,6 @@ { "name": "double-conversion", - "version": "3.2.1", - "port-version": 1, + "version": "3.3.0", "description": "Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.", "homepage": "https://github.com/google/double-conversion", "dependencies": [ diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index 99c8e6052736be..a97ecb58d71e46 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP REF "v${VERSION}" - SHA512 2f1e5415c121d5f19d2abb1b389512ad22c3cac6779ed897403d430b2c4e62c758ab25d46a3fd02538add711073fadd616a690b4981f3782e46c18ff05d116dc + SHA512 5fa1e807eaeb8ecf53d55e537a804ae1135018008d7b6f4e42225ee21ca975b7f3662f60777527395f8f0672a66077f2a3e95c9a3074f819187921e114ac03f5 ) vcpkg_cmake_configure( diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 016e2b4faadea1..89c50689801038 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dpp", - "version": "10.0.24", + "version": "10.0.26", "description": "D++ Extremely Lightweight C++ Discord Library.", "homepage": "https://dpp.dev/", "license": "Apache-2.0", diff --git a/ports/drlibs/portfile.cmake b/ports/drlibs/portfile.cmake index e3ee273a9f4ae5..5fd271a22f28b6 100644 --- a/ports/drlibs/portfile.cmake +++ b/ports/drlibs/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mackron/dr_libs - REF dd762b861ecadf5ddd5fb03e9ca1db6707b54fbb - SHA512 4ec10ea1d9622879b5bdb61a11768e36b56a558d32aac6f8c8a52168ab401f9d53db0eeba074fe56de39f3809fb0bd73e2e6c5ef4ea8fd158abeb45e18285f08 + REF d35a3bc5efd02455d98cbe12b94647136f09b42d + SHA512 34126c8eb65f0735b77f058db9f1618b3c4e820698804b47f7a629c47df571e9cbbeefd4cce193409ebd715d37ed5faf1c3c27a7240e0f5418089cffe853f1ea HEAD_REF master ) @@ -11,5 +11,4 @@ vcpkg_from_github( file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Put the licence file where vcpkg expects it -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/drlibs/vcpkg.json b/ports/drlibs/vcpkg.json index 27214d90218452..4ee6e5f3c34b4b 100644 --- a/ports/drlibs/vcpkg.json +++ b/ports/drlibs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "drlibs", - "version-date": "2022-09-26", + "version-date": "2023-08-16", "description": "Single-file audio decoding libraries for C/C++", "homepage": "https://github.com/mackron/dr_libs", "license": "Unlicense OR MIT-0" diff --git a/ports/drogon/001_vcpkg.patch b/ports/drogon/0001-vcpkg.patch similarity index 55% rename from ports/drogon/001_vcpkg.patch rename to ports/drogon/0001-vcpkg.patch index dcb226cc7fbfb0..a4f4631122519f 100644 --- a/ports/drogon/001_vcpkg.patch +++ b/ports/drogon/0001-vcpkg.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4406362..0595ab8 100755 +index fbe2288..d7218a6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -360,11 +360,10 @@ endif (NOT WIN32) +@@ -367,11 +367,10 @@ endif (NOT WIN32) if (BUILD_POSTGRESQL) # find postgres @@ -18,7 +18,7 @@ index 4406362..0595ab8 100755 set(DROGON_SOURCES ${DROGON_SOURCES} orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc -@@ -394,7 +393,7 @@ if (BUILD_POSTGRESQL) +@@ -401,7 +400,7 @@ if (BUILD_POSTGRESQL) ${private_headers} orm_lib/src/postgresql_impl/PgConnection.h) endif (libpq_supports_batch) @@ -27,20 +27,3 @@ index 4406362..0595ab8 100755 endif (BUILD_POSTGRESQL) if (BUILD_MYSQL) - -index 9f2f1e7..76bd2ec 100755 ---- a/drogon_ctl/CMakeLists.txt -+++ b/drogon_ctl/CMakeLists.txt -@@ -19,7 +19,11 @@ add_executable(_drogon_ctl - target_link_libraries(_drogon_ctl ${PROJECT_NAME}) - if (WIN32 AND BUILD_SHARED_LIBS) - set(DROGON_FILE $) -- set(TRANTOR_FILE $) -+ if (USE_SUBMODULE) -+ set(TRANTOR_FILE $) -+ else() -+ set(TRANTOR_FILE $) -+ endif() - add_custom_command(TARGET _drogon_ctl POST_BUILD - COMMAND ${CMAKE_COMMAND} - -DCTL_FILE=${DROGON_FILE} diff --git a/ports/drogon/002_drogon_config.patch b/ports/drogon/0002-drogon-config.patch similarity index 100% rename from ports/drogon/002_drogon_config.patch rename to ports/drogon/0002-drogon-config.patch diff --git a/ports/drogon/004_deps_redis.patch b/ports/drogon/0003-deps-redis.patch similarity index 93% rename from ports/drogon/004_deps_redis.patch rename to ports/drogon/0003-deps-redis.patch index ffd715b0f93bd8..be59e49d18bcee 100644 --- a/ports/drogon/004_deps_redis.patch +++ b/ports/drogon/0003-deps-redis.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0595ab8..373e11e 100755 +index d7218a6..ccd08cb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -460,10 +460,10 @@ if (BUILD_SQLITE) +@@ -467,10 +467,10 @@ if (BUILD_SQLITE) endif (BUILD_SQLITE) if (BUILD_REDIS) diff --git a/ports/drogon/005_drogon_ctl.patch b/ports/drogon/0004-drogon-ctl.patch similarity index 100% rename from ports/drogon/005_drogon_ctl.patch rename to ports/drogon/0004-drogon-ctl.patch diff --git a/ports/drogon/003_fix_gcc13.patch b/ports/drogon/003_fix_gcc13.patch deleted file mode 100644 index deb15f5b798799..00000000000000 --- a/ports/drogon/003_fix_gcc13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/inc/drogon/RateLimiter.h b/lib/inc/drogon/RateLimiter.h -index 6940321..2c5f039 100644 ---- a/lib/inc/drogon/RateLimiter.h -+++ b/lib/inc/drogon/RateLimiter.h -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - namespace drogon - { diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 2114db6c0e503c..3aa87b8cf7373c 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,15 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.8.4 - SHA512 381b4b576d316e55690dc0531cfeaeee4c0e00ce540a502e1c1870eea9a463d00d7e4bc9a354c459e5fbc6da5f046757f07ff2077bb3a9603f97f448f2d17ea2 + REF "v${VERSION}" + SHA512 a49b032689869e97505612570285d21c0a68604c70e379f95c70fd5d8014f6890809283956b1b83fda4551c01c526ab2b575351c23a3e58fb4f920c9e1b7e92b HEAD_REF master PATCHES - 001_vcpkg.patch - 002_drogon_config.patch - 003_fix_gcc13.patch #https://github.com/drogonframework/drogon/pull/1563 - 004_deps_redis.patch - 005_drogon_ctl.patch + 0001-vcpkg.patch + 0002-drogon-config.patch + 0003-deps-redis.patch + 0004-drogon-ctl.patch ) vcpkg_check_features( diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index 64baa52589c813..f6ef00d672315a 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,7 +1,6 @@ { "name": "drogon", - "version": "1.8.4", - "port-version": 4, + "version": "1.8.7", "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", "homepage": "https://github.com/an-tao/drogon", "documentation": "https://drogon.docsforge.com/master/overview/", diff --git a/ports/dukglue/portfile.cmake b/ports/dukglue/portfile.cmake new file mode 100644 index 00000000000000..412e2fa065a3a2 --- /dev/null +++ b/ports/dukglue/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Aloshi/dukglue + REF c3ec2a463a03a4fa34715aa75273537d39900edb #2022-11-08 + HEAD_REF master + SHA512 60bf0274113fa7d547ed2890268782176c507ab0b7ea601362640bb2d4d637ce013a4dabeffbd8a82ed672b2de7778355b6e79642d70cfc2c1f1cf2c2fd9f6c1 +) + +file(COPY "${SOURCE_PATH}/include/dukglue" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/dukglue/vcpkg.json b/ports/dukglue/vcpkg.json new file mode 100644 index 00000000000000..c18249e9879522 --- /dev/null +++ b/ports/dukglue/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "dukglue", + "version-date": "2022-11-08", + "description": "A C++ binding/wrapper library for the Duktape JavaScript interpreter.", + "homepage": "https://github.com/Aloshi/dukglue", + "license": "MIT", + "dependencies": [ + "duktape" + ] +} diff --git a/ports/duktape/CMakeLists.txt b/ports/duktape/CMakeLists.txt index 746aaa910b70d0..4480565b767b04 100644 --- a/ports/duktape/CMakeLists.txt +++ b/ports/duktape/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) set(duktape_MAJOR_VERSION 2) -set(duktape_MINOR_VERSION 4) +set(duktape_MINOR_VERSION 7) set(duktape_PATCH_VERSION 0) set(duktape_VERSION ${duktape_MAJOR_VERSION}.${duktape_MINOR_VERSION}.${duktape_PATCH_VERSION}) diff --git a/ports/duktape/portfile.cmake b/ports/duktape/portfile.cmake index b00ec3466335b7..5bfe76e3476198 100644 --- a/ports/duktape/portfile.cmake +++ b/ports/duktape/portfile.cmake @@ -1,53 +1,19 @@ -if(VCPKG_TARGET_IS_LINUX) - message("${PORT} currently requires the following tools from the system package manager:\n python-yaml\n\nThis can be installed on Ubuntu systems via apt-get install python-yaml PYTHON2-yaml (depending on your current python default interpreter)") -endif() +vcpkg_download_distfile( + ARCHIVE + URLS https://github.com/svaarala/duktape/releases/download/v2.7.0/duktape-2.7.0.tar.xz + FILENAME duktape-2.7.0.tar.xz + SHA512 8ff5465c9c335ea08ebb0d4a06569c991b9dc4661b63e10da6b123b882e7375e82291d6b883c2644902d68071a29ccc880dae8229447cebe710c910b54496c1d +) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO svaarala/duktape - REF 6001888049cb42656f8649db020e804bcdeca6a7 # v2.5.0 - SHA512 ffbc7f1b16b7469ddfc0af0054a7891ffda128cc099e693773c6b4597ee6a96f8a08d354f7a7cf3a1f16369bef7b7a94c2670a617ec0355cc3614f56e1668dc4 - HEAD_REF master +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/duktapeConfig.cmake.in" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -if (VCPKG_TARGET_IS_WINDOWS) - set(EXECUTABLE_SUFFIX ".exe") - set(PYTHON_OPTION "") -else() - set(EXECUTABLE_SUFFIX "") - set(PYTHON_OPTION "--user") -endif() - -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -vcpkg_add_to_path("${PYTHON2_DIR}") - -if(NOT EXISTS "${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND ${PYTHON2_DIR}/python${EXECUTABLE_SUFFIX} ${PYFILE_PATH}/get-pip.py ${PYTHON_OPTION}) - endif() - execute_process(COMMAND ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install pyyaml ${PYTHON_OPTION}) -else() - execute_process(COMMAND ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX} pyyaml) -endif() - -vcpkg_execute_required_process( - COMMAND ${PYTHON2} tools/configure.py --source-directory src-input --output-directory src --config-metadata config -DDUK_USE_FASTINT - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME pre-configure -) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(DUK_CONFIG_H_PATH "${SOURCE_PATH}/src/duk_config.h") file(READ "${DUK_CONFIG_H_PATH}" CONTENT) diff --git a/ports/duktape/vcpkg.json b/ports/duktape/vcpkg.json index 2f2f0f2004507a..6be293984c1fe3 100644 --- a/ports/duktape/vcpkg.json +++ b/ports/duktape/vcpkg.json @@ -1,7 +1,6 @@ { "name": "duktape", - "version": "2.5.0", - "port-version": 4, + "version": "2.7.0", "description": "Embeddable Javascript engine with a focus on portability and compact footprint.", "homepage": "https://github.com/svaarala/duktape", "dependencies": [ diff --git a/ports/dv-processing/portfile.cmake b/ports/dv-processing/portfile.cmake index 127907b4900c21..dd0d8015966fa2 100644 --- a/ports/dv-processing/portfile.cmake +++ b/ports/dv-processing/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com/inivation OUT_SOURCE_PATH SOURCE_PATH REPO dv/dv-processing - REF b55a2e7a01ef49a861ee151bd542d4b32edfde30 - SHA512 7abf828e27af0b708c7fc3c6c78f00f9089d202a7e4a1d6c9a1f9416d2e9e394d470dc1b40ae2f491350b87f11cd17869b12ef10cd7c647e06627833f6d205f9 + REF 9cd21eede0c38e079e462cdce8434fcbe2a4d037 + SHA512 fc5d0083166ff4708e6d540d437429784f9f62b7c3b7fb4631abc27ee0e6f46e60314f5fcf571c6141352571fef52a32c85a8160c951b5243910a02a281b0855 HEAD_REF rel_1.7 ) @@ -11,9 +11,9 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com/inivation OUT_SOURCE_PATH CMAKEMOD_SOURCE_PATH REPO dv/cmakemod - REF ec53dae89f6b037e9e640af5340d7bf67d84d278 - SHA512 e7907b1be9d85b02e1a1703cf001765119a7d07b1873148a0fbfe6945c519d85b1f9bc66b24f90d88759c2b32965304e1639f2ff136448be64fc88f81a0d4c2d - HEAD_REF ec53dae89f6b037e9e640af5340d7bf67d84d278 + REF d107c76b73a49a16c3ac733749152037406a515e + SHA512 fe87530ce5fecfe5d1ccdc6a06addc652167c67c4707d9039bf2f022ced2966dc8295b8ed69c3d4154b965f0dd22f43a8830eb4f03e99ff3edfe38de759bd0d5 + HEAD_REF d107c76b73a49a16c3ac733749152037406a515e ) file(GLOB CMAKEMOD_FILES "${CMAKEMOD_SOURCE_PATH}/*") file(COPY ${CMAKEMOD_FILES} DESTINATION "${SOURCE_PATH}/cmake/modules") diff --git a/ports/dv-processing/vcpkg.json b/ports/dv-processing/vcpkg.json index c1e607e99ffca5..7f619c57698523 100644 --- a/ports/dv-processing/vcpkg.json +++ b/ports/dv-processing/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dv-processing", - "version": "1.7.8", - "port-version": 1, + "version": "1.7.9", "description": "Generic algorithms for event cameras. (C++20 required.)", "homepage": "https://gitlab.com/inivation/dv/dv-processing", "license": "Apache-2.0", diff --git a/ports/eastl/fix_cmake_install.patch b/ports/eastl/0001-fix-cmake-install.patch similarity index 85% rename from ports/eastl/fix_cmake_install.patch rename to ports/eastl/0001-fix-cmake-install.patch index a2dbfd8215744d..ceace103e56af8 100644 --- a/ports/eastl/fix_cmake_install.patch +++ b/ports/eastl/0001-fix-cmake-install.patch @@ -1,75 +1,78 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e8700dc..6d3e2f1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,12 +4,17 @@ - cmake_minimum_required(VERSION 3.1) - project(EASTL CXX) - -+include(GNUInstallDirs) -+include(CMakePackageConfigHelpers) -+ - #------------------------------------------------------------------------------------------- - # Options - #------------------------------------------------------------------------------------------- - option(EASTL_BUILD_BENCHMARK "Enable generation of build files for benchmark" OFF) - option(EASTL_BUILD_TESTS "Enable generation of build files for tests" OFF) - -+find_package(EABase CONFIG REQUIRED) -+ - #------------------------------------------------------------------------------------------- - # Compiler Flags - #------------------------------------------------------------------------------------------- -@@ -41,7 +46,10 @@ add_definitions(-DEASTL_OPENSOURCE=1) - #------------------------------------------------------------------------------------------- - # Include dirs - #------------------------------------------------------------------------------------------- --target_include_directories(EASTL PUBLIC include) -+target_include_directories(EASTL PUBLIC -+ $ -+ $ -+ ) - - #------------------------------------------------------------------------------------------- - # Dependencies -@@ -50,5 +58,39 @@ if (NOT TARGET EABase) - add_subdirectory(test/packages/EABase) - endif() - --target_link_libraries(EASTL EABase) -+target_link_libraries(EASTL PUBLIC EABase) -+ -+# create and install an export set for eabase target as EABase::EABase -+set(EASTL_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EASTL") -+ -+configure_package_config_file( -+ EASTLConfig.cmake.in -+ ${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake -+ INSTALL_DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION} -+) -+ -+# create and install an export set for Terra target as Terra -+install( -+ TARGETS EASTL EXPORT EASTLTargets -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} -+) -+ -+ -+install(EXPORT EASTLTargets DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION}) -+ -+write_basic_package_version_file( -+ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake" -+ VERSION 3.16.05 -+ COMPATIBILITY SameMajorVersion -+) -+ -+install(TARGETS EASTL LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -+ -+install( -+ FILES -+ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake" -+ DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION} -+) - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e3eb444..74b4938 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,6 +4,9 @@ + cmake_minimum_required(VERSION 3.1) + project(EASTL CXX) + ++include(GNUInstallDirs) ++include(CMakePackageConfigHelpers) ++ + #------------------------------------------------------------------------------------------- + # Options + #------------------------------------------------------------------------------------------- +@@ -11,6 +14,8 @@ option(EASTL_BUILD_BENCHMARK "Enable generation of build files for benchmark" OF + option(EASTL_BUILD_TESTS "Enable generation of build files for tests" OFF) + option(EASTL_STD_ITERATOR_CATEGORY_ENABLED "Enable compatibility with std:: iterator categories" OFF) + ++find_package(EABase CONFIG REQUIRED) ++ + #------------------------------------------------------------------------------------------- + # Compiler Flags + #------------------------------------------------------------------------------------------- +@@ -54,7 +59,10 @@ endif() + #------------------------------------------------------------------------------------------- + # Include dirs + #------------------------------------------------------------------------------------------- +-target_include_directories(EASTL PUBLIC include) ++target_include_directories(EASTL PUBLIC ++ $ ++ $ ++ ) + + #------------------------------------------------------------------------------------------- + # Dependencies +@@ -63,7 +71,41 @@ if (NOT TARGET EABase) + add_subdirectory(test/packages/EABase) + endif() + +-target_link_libraries(EASTL EABase) ++target_link_libraries(EASTL PUBLIC EABase) ++ ++# create and install an export set for eabase target as EABase::EABase ++set(EASTL_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EASTL") ++ ++configure_package_config_file( ++ EASTLConfig.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake ++ INSTALL_DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION} ++) ++ ++# create and install an export set for Terra target as Terra ++install( ++ TARGETS EASTL EXPORT EASTLTargets ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++ ++ ++install(EXPORT EASTLTargets DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION}) ++ ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake" ++ VERSION 3.16.05 ++ COMPATIBILITY SameMajorVersion ++) ++ ++install(TARGETS EASTL LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") ++ ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake" ++ DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION} ++) + + #------------------------------------------------------------------------------------------- + # Installation diff --git a/ports/eastl/0002-fix-error-C2338.patch b/ports/eastl/0002-fix-error-C2338.patch new file mode 100644 index 00000000000000..61d75dddc6461a --- /dev/null +++ b/ports/eastl/0002-fix-error-C2338.patch @@ -0,0 +1,14 @@ +diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake +index 08b6af5..281665e 100644 +--- a/scripts/CMake/CommonCppFlags.cmake ++++ b/scripts/CMake/CommonCppFlags.cmake +@@ -74,6 +74,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + endif() + elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-") ++ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.31.30911.95") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:static_assert-") ++ endif() + endif() + + diff --git a/ports/eastl/fix-error-C2039.diff b/ports/eastl/fix-error-C2039.diff deleted file mode 100644 index 8b464b6dd61dcc..00000000000000 --- a/ports/eastl/fix-error-C2039.diff +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/include/EASTL/numeric_limits.h b/include/EASTL/numeric_limits.h -index e991e7e9..e933c845 100644 ---- a/include/EASTL/numeric_limits.h -+++ b/include/EASTL/numeric_limits.h -@@ -1435,6 +1435,19 @@ namespace eastl - static value_type round_error() - { return 0.5f; } - -+ #if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL... -+ static value_type infinity() -+ { return __builtin_huge_valf(); } -+ -+ static value_type quiet_NaN() -+ { return __builtin_nanf("0"); } -+ -+ static value_type signaling_NaN() -+ { return __builtin_nansf("1"); } -+ -+ static value_type denorm_min() -+ { return FLT_TRUE_MIN; } -+ #else - static value_type infinity() - { return _CSTD _FInf._Float; } - -@@ -1446,6 +1459,7 @@ namespace eastl - - static value_type denorm_min() - { return _CSTD _FDenorm._Float; } -+ #endif - - #endif - }; -@@ -1553,6 +1567,19 @@ namespace eastl - static value_type round_error() - { return 0.5f; } - -+ #if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL... -+ static value_type infinity() -+ { return __builtin_huge_val(); } -+ -+ static value_type quiet_NaN() -+ { return __builtin_nan("0"); } -+ -+ static value_type signaling_NaN() -+ { return __builtin_nans("1"); } -+ -+ static value_type denorm_min() -+ { return DBL_TRUE_MIN; } -+ #else - static value_type infinity() - { return _CSTD _Inf._Double; } - -@@ -1564,6 +1591,7 @@ namespace eastl - - static value_type denorm_min() - { return _CSTD _Denorm._Double; } -+ #endif - - #endif - }; -@@ -1671,6 +1699,19 @@ namespace eastl - static value_type round_error() - { return 0.5f; } - -+ #if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL... -+ static value_type infinity() -+ { return __builtin_huge_val(); } -+ -+ static value_type quiet_NaN() -+ { return __builtin_nan("0"); } -+ -+ static value_type signaling_NaN() -+ { return __builtin_nans("1"); } -+ -+ static value_type denorm_min() -+ { return LDBL_TRUE_MIN; } -+ #else - static value_type infinity() - { return _CSTD _LInf._Long_double; } - -@@ -1682,6 +1723,7 @@ namespace eastl - - static value_type denorm_min() - { return _CSTD _LDenorm._Long_double; } -+ #endif - - #endif - }; diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index 1c8185fa8c4b25..b5479e2da8c8ef 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -3,13 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF e8bdd5531ed79c30ccef2fd71e070f5ab9f1222a #v3.18.00 - SHA512 3e5d97a77b8610a2efdb9156b47c91e8a8dd5629ff95ea6d2c65016b067ab645df5beddc8c7f93d89c3d1a6f404ff71282efc6db9885a6e6240fa444fe2be79c + REF "${VERSION}" + SHA512 412f894a1d1d0fdcc8f5ae130e977872a8ff243691cf9dfc76a520389f514739511afca63e1aeaaf127132f5dfc3dd482af3e5f80844b5d6d33eae1c68628267 HEAD_REF master PATCHES - fix_cmake_install.patch - Fix-error-C2338.patch - fix-error-C2039.diff + 0001-fix-cmake-install.patch + 0002-fix-error-C2338.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/EASTLConfig.cmake.in" DESTINATION "${SOURCE_PATH}") diff --git a/ports/eastl/vcpkg.json b/ports/eastl/vcpkg.json index 7db58cc90a5f4c..66f32b59a57240 100644 --- a/ports/eastl/vcpkg.json +++ b/ports/eastl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "eastl", - "version-string": "3.18.00", - "port-version": 3, + "version": "3.21.12", "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.", "homepage": "https://github.com/electronicarts/EASTL", "license": "BSD-3-Clause", diff --git a/ports/easyloggingpp/0001_add_cmake_options.patch b/ports/easyloggingpp/0001_add_cmake_options.patch index b20745f1d49b2d..3e2f3f92889495 100644 --- a/ports/easyloggingpp/0001_add_cmake_options.patch +++ b/ports/easyloggingpp/0001_add_cmake_options.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 538cc8a..9221dab 100644 +index 8604a54..e08df91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,10 @@ option(test "Build all tests" OFF) @@ -29,6 +29,6 @@ index 538cc8a..9221dab 100644 + add_definitions(-DELPP_FORCE_USE_STD_THREAD) + endif() + - require_cpp11() + require_cpp14() add_library(easyloggingpp STATIC src/easylogging++.cc) set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/ports/easyloggingpp/0002_fix_build_uwp.patch b/ports/easyloggingpp/0002_fix_build_uwp.patch new file mode 100644 index 00000000000000..7120ac191619a5 --- /dev/null +++ b/ports/easyloggingpp/0002_fix_build_uwp.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e08df91..7c02adf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,6 +28,7 @@ option(lib_utc_datetime "Build library with UTC date/time logging" OFF) + option(no_default_logfile "Do not write to default log file \"myeasylog.log\" (define ELPP_NO_DEFAULT_LOG_FILE)" OFF) + option(thread_safe "Build easyloggingpp thread safe (define ELPP_THREAD_SAFE)" OFF) + option(use_std_threads "Use standard library thread synchronization (define ELPP_FORCE_USE_STD_THREAD)" OFF) ++option(is_uwp "The compilation platform is uwp." OFF) + + set(ELPP_MAJOR_VERSION "9") + set(ELPP_MINOR_VERSION "96") +@@ -76,6 +77,9 @@ if (build_static_lib) + require_cpp14() + add_library(easyloggingpp STATIC src/easylogging++.cc) + set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON) ++ if(is_uwp) ++ target_compile_definitions(easyloggingpp PUBLIC WIN32_LEAN_AND_MEAN ELPP_WINSOCK2) ++ endif() + + install(TARGETS + easyloggingpp diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index 1e84b372483ea7..4b095a27329372 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -2,12 +2,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO muflihun/easyloggingpp - REF v9.97.0 - SHA512 e45789edaf7a43ad6a73861840d24ccce9b9d6bba1aaacf93c6ac26ff7449957251d2ca322c9da85130b893332dd305b13a2499eaffc65ecfaaafa3e11f8d63d + REPO abumq/easyloggingpp + REF "v${VERSION}" + SHA512 3df813f7f9796c81c974ba794624db2602253e14b938370deb4c851fe8725f5c7ebf71d7ae0277fcb770b043ccf8f04bbf8e770d14565f4cb704328973473387 HEAD_REF master PATCHES 0001_add_cmake_options.patch + 0002_fix_build_uwp.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -16,18 +17,21 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS thread-safe thread_safe no-defaultfile no_default_logfile ) - +if(VCPKG_TARGET_IS_UWP) + set(TARGET_IS_UWP ON) +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -Dbuild_static_lib=ON + -Dis_uwp=${TARGET_IS_UWP} ) vcpkg_cmake_install() 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/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_fixup_pkgconfig() diff --git a/ports/easyloggingpp/vcpkg.json b/ports/easyloggingpp/vcpkg.json index 4ebffddaf3799a..a557ad50f88cb8 100644 --- a/ports/easyloggingpp/vcpkg.json +++ b/ports/easyloggingpp/vcpkg.json @@ -1,9 +1,9 @@ { "name": "easyloggingpp", - "version": "9.97.0", - "port-version": 3, + "version": "9.97.1", "description": "Easylogging++ is a single header efficient logging library for C++ applications.", - "homepage": "https://github.com/amrayn/easyloggingpp", + "homepage": "https://github.com/abumq/easyloggingpp", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/ecal/0001-disable-app-plugins.patch b/ports/ecal/0001-disable-app-plugins.patch new file mode 100644 index 00000000000000..e103244c224975 --- /dev/null +++ b/ports/ecal/0001-disable-app-plugins.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4ea1fb066..351fe6c3f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -351,8 +351,10 @@ endif(HAS_QT5) + # -------------------------------------------------------- + # ecal rec addon sdk + # -------------------------------------------------------- ++if (BUILD_APPS) + add_subdirectory(app/rec/rec_addon_core) + add_subdirectory(app/rec/rec_addon_dummy) ++endif() + + # -------------------------------------------------------- + # ecal time diff --git a/ports/ecal/0002-fix-build.patch b/ports/ecal/0002-fix-build.patch new file mode 100644 index 00000000000000..9cc2d9f64252bb --- /dev/null +++ b/ports/ecal/0002-fix-build.patch @@ -0,0 +1,166 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 351fe6c3f..64d5bb384 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,7 +27,8 @@ endif (POLICY CMP0077) + + list(APPEND CMAKE_MODULE_PATH + ${CMAKE_CURRENT_SOURCE_DIR}/cmake +- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules) ++ # Removed project specific Module overrides ++) + + project(eCAL) + set(ECAL_PROJECT_ROOT "${CMAKE_CURRENT_LIST_DIR}") +@@ -212,11 +213,13 @@ foreach (dep IN LISTS possible_subprojects) + endif () + endforeach() + ++if(NOT DISABLE_FIND_PACKAGE_OVERLOAD) + macro(find_package) + if(NOT "${ARGV0}" IN_LIST as_subproject) + _find_package(${ARGV}) + endif() + endmacro() ++endif() + + # if a package does need to be build, include the cmake file with build instructions + foreach (dep IN LISTS possible_subprojects) +@@ -232,7 +235,6 @@ if(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_OLD}") + endif() + +-find_package(CMakeFunctions REQUIRED) + + git_revision_information(DEFAULT ${ECAL_BUILD_VERSION}) + set(eCAL_VERSION_MAJOR ${GIT_REVISION_MAJOR}) +@@ -330,7 +332,9 @@ add_subdirectory(ecal/core) + # custom libs + # -------------------------------------------------------- + add_subdirectory(lib/ThreadingUtils) +-add_subdirectory(lib/CustomTclap) ++# Removed due to only being used by the apps, which are disabled, and for ++# publicly linking tclap::tclap which doesn't exist outside of eCAL ++# add_subdirectory(lib/CustomTclap) + add_subdirectory(lib/ecal_utils) + + if(HAS_QT5) +@@ -549,7 +553,9 @@ endif() + # -------------------------------------------------------- + # create package + # -------------------------------------------------------- ++if(CPACK_PACK_WITH_INNOSETUP) + include(cpack/cpack_variables.cmake) ++endif() + + message(STATUS "Build Options:") + message(STATUS "--------------------------------------------------------------------------------") +diff --git a/contrib/ecalhdf5/CMakeLists.txt b/contrib/ecalhdf5/CMakeLists.txt +index 080c40e28..c167bacd4 100644 +--- a/contrib/ecalhdf5/CMakeLists.txt ++++ b/contrib/ecalhdf5/CMakeLists.txt +@@ -58,7 +58,12 @@ set(ecalhdf5_header_base + include/ecalhdf5/eh5_types.h + ) + ++if (WIN32) ++# This library, ecal::hdf5 does not export any symbols on Windows. Must be static ++ecal_add_static_library(${PROJECT_NAME} ${ecalhdf5_src} ${ecalhdf5_header_base}) ++else() + ecal_add_library(${PROJECT_NAME} ${ecalhdf5_src} ${ecalhdf5_header_base}) ++endif() + add_library(eCAL::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + + target_include_directories(${PROJECT_NAME} +diff --git a/contrib/ecalproto/CMakeLists.txt b/contrib/ecalproto/CMakeLists.txt +index 04f1a1b9a..58df32705 100644 +--- a/contrib/ecalproto/CMakeLists.txt ++++ b/contrib/ecalproto/CMakeLists.txt +@@ -37,7 +37,12 @@ set(ecal_protobuf_header + include/ecal/protobuf/ecal_proto_visitor.h + ) + ++if (WIN32) ++# This library, ecal::proto does not export any symbols on Windows. Must be static ++ecal_add_static_library(${PROJECT_NAME} ${ecal_protobuf_src} ${ecal_protobuf_header}) ++else() + ecal_add_library(${PROJECT_NAME} ${ecal_protobuf_src} ${ecal_protobuf_header}) ++endif() + add_library(eCAL::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + target_include_directories(${PROJECT_NAME} PUBLIC + $ +diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt +index 5c2b6e33d..3c7d57189 100644 +--- a/ecal/core/CMakeLists.txt ++++ b/ecal/core/CMakeLists.txt +@@ -20,8 +20,6 @@ project(core VERSION ${eCAL_VERSION_STRING}) + + find_package(Threads REQUIRED) + find_package(asio REQUIRED) +-find_package(tclap REQUIRED) +-find_package(simpleini REQUIRED) + find_package(tcp_pubsub REQUIRED) + if (ECAL_NPCAP_SUPPORT) + find_package(udpcap REQUIRED) +@@ -492,14 +490,20 @@ target_link_libraries(${PROJECT_NAME} + $<$:wsock32> + $<$:socket> + asio::asio +- tclap::tclap +- simpleini::simpleini + eCAL::core_pb + Threads::Threads + eCAL::ecal-utils + tcp_pubsub::tcp_pubsub + ) + ++# tclap is header only and only used for implementation ++find_path(TCLAP_INCLUDE_DIRS "tclap/Arg.h") ++target_include_directories(${PROJECT_NAME} PRIVATE ${TCLAP_INCLUDE_DIRS}) ++ ++# simpleini is header only and only used for implementation ++find_path(SIMPLEINI_INCLUDE_DIRS "ConvertUTF.c") ++target_include_directories(${PROJECT_NAME} PRIVATE ${SIMPLEINI_INCLUDE_DIRS}) ++ + set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER ecal/core) + set_property(TARGET ${PROJECT_NAME}_c PROPERTY FOLDER ecal/core) + +diff --git a/thirdparty/cmake_functions/CMakeLists.txt b/thirdparty/cmake_functions/CMakeLists.txt +index b3e93261a..3ba185a97 100644 +--- a/thirdparty/cmake_functions/CMakeLists.txt ++++ b/thirdparty/cmake_functions/CMakeLists.txt +@@ -40,4 +40,6 @@ foreach (f ${file_list}) + install( FILES ${f} DESTINATION "${cmake_functions_install_cmake_dir}/${dir}" ) + endforeach() + ++if(CPACK_PACK_WITH_INNOSETUP) + include(cmake/cpack_variables.cmake) ++endif() +diff --git a/thirdparty/cmake_functions/cmake_functions.cmake b/thirdparty/cmake_functions/cmake_functions.cmake +index 0c3659e5c..127eb14e6 100644 +--- a/thirdparty/cmake_functions/cmake_functions.cmake ++++ b/thirdparty/cmake_functions/cmake_functions.cmake +@@ -5,23 +5,12 @@ set (file_list_include + target_definitions/targets_protobuf.cmake + ) + +-if(WIN32) +- list(APPEND file_list_include +- qt/qt_msvc_path.cmake +- qt/qt_windeployqt.cmake +- ) +-endif() + + set(file_list_no_include + protoc_functions/protoc_generate_cpp.cmake + protoc_functions/protoc_generate_python.cmake + ) + +-if(WIN32) +- list(APPEND file_list_no_include +- qt/qt_windeployqt_threadsafe_cmake.bat.in +- ) +-endif() + + # Set list of all files to be installed by CMake Script. + set(file_list diff --git a/ports/ecal/0003-fix-dependencies.patch b/ports/ecal/0003-fix-dependencies.patch new file mode 100644 index 00000000000000..275977f8823e73 --- /dev/null +++ b/ports/ecal/0003-fix-dependencies.patch @@ -0,0 +1,20 @@ +diff --git a/contrib/ecalhdf5/CMakeLists.txt b/contrib/ecalhdf5/CMakeLists.txt +index c167bacd4..45e754340 100644 +--- a/contrib/ecalhdf5/CMakeLists.txt ++++ b/contrib/ecalhdf5/CMakeLists.txt +@@ -18,9 +18,14 @@ + + project(hdf5 LANGUAGES C CXX) + +-if(NOT CMAKE_CROSSCOMPILING) ++if(1) + find_package(HDF5 COMPONENTS C REQUIRED) + find_package(Threads REQUIRED) ++ if (TARGET hdf5::hdf5-shared) ++ set(ECAL_LINK_HDF5_SHARED 1) ++ else() ++ set(ECAL_LINK_HDF5_SHARED 0) ++ endif() + else() + find_library(hdf5_path NAMES hdf5 REQUIRED PATH_SUFFIXES hdf5/serial) + find_path(hdf5_include NAMES hdf5.h PATH_SUFFIXES hdf5/serial REQUIRED) diff --git a/ports/ecal/0004-install-cmake-files-to-share.patch b/ports/ecal/0004-install-cmake-files-to-share.patch new file mode 100644 index 00000000000000..030b55b38a399a --- /dev/null +++ b/ports/ecal/0004-install-cmake-files-to-share.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 64d5bb384..1f08d4bab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -274,7 +274,7 @@ set(eCAL_install_app_dir ${CMAKE_INSTALL_BINDIR}) + set(eCAL_install_archive_dir ${CMAKE_INSTALL_LIBDIR}) + set(eCAL_install_archive_dyn_dir ${CMAKE_INSTALL_LIBDIR}) + set(eCAL_install_bin_dir ${CMAKE_INSTALL_BINDIR}) +-set(eCAL_install_cmake_dir ${CMAKE_INSTALL_LIBDIR}/cmake/eCAL) ++set(eCAL_install_cmake_dir share/eCAL) + set(eCAL_install_config_dir ${CMAKE_INSTALL_SYSCONFDIR}/ecal) + set(eCAL_install_doc_dir ${CMAKE_INSTALL_DOCDIR}) + set(eCAL_install_include_dir ${CMAKE_INSTALL_INCLUDEDIR}) +diff --git a/thirdparty/cmake_functions/CMakeLists.txt b/thirdparty/cmake_functions/CMakeLists.txt +index 3ba185a97..aa9e8a736 100644 +--- a/thirdparty/cmake_functions/CMakeLists.txt ++++ b/thirdparty/cmake_functions/CMakeLists.txt +@@ -4,12 +4,8 @@ include(cmake_functions.cmake) + + project(CMakeFunctions VERSION 0.4.1) + +-if (MSVC) +-# Variable definitions +-set(cmake_functions_install_cmake_dir cmake) +-else (MSVC) +-set(cmake_functions_install_cmake_dir lib/cmake/${PROJECT_NAME}-${PROJECT_VERSION}) +-endif (MSVC) ++set(cmake_functions_install_cmake_dir "share/${PROJECT_NAME}") ++ + set(cmake_functions_config ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake) + set(cmake_functions_config_version ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake) + diff --git a/ports/ecal/0005-remove-install-prefix-macro-value.patch b/ports/ecal/0005-remove-install-prefix-macro-value.patch new file mode 100644 index 00000000000000..5fde0a9ee8490a --- /dev/null +++ b/ports/ecal/0005-remove-install-prefix-macro-value.patch @@ -0,0 +1,12 @@ +diff --git a/ecal/core/src/ecal_defs.h.in b/ecal/core/src/ecal_defs.h.in +index c792a26d1..e5119582b 100644 +--- a/ecal/core/src/ecal_defs.h.in ++++ b/ecal/core/src/ecal_defs.h.in +@@ -39,6 +39,6 @@ + #define ECAL_INSTALL_LIB_DIR "@eCAL_install_lib_dir@" + #define ECAL_INSTALL_CONFIG_DIR "@eCAL_install_config_dir@" + #define ECAL_INSTALL_INCLUDE_DIR "@eCAL_install_include_dir@" +-#define ECAL_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" ++#define ECAL_INSTALL_PREFIX "" + + #endif // ecal_defs_h_included diff --git a/ports/ecal/0006-use-find_dependency-in-cmake-config.patch b/ports/ecal/0006-use-find_dependency-in-cmake-config.patch new file mode 100644 index 00000000000000..e38039b86762c6 --- /dev/null +++ b/ports/ecal/0006-use-find_dependency-in-cmake-config.patch @@ -0,0 +1,36 @@ +diff --git a/cmake/eCALConfig.cmake.in b/cmake/eCALConfig.cmake.in +index 704da4de8..e8cfb765c 100644 +--- a/cmake/eCALConfig.cmake.in ++++ b/cmake/eCALConfig.cmake.in +@@ -25,12 +25,21 @@ set(eCAL_VERSION_MAJOR @eCAL_VERSION_MAJOR@) + set(eCAL_VERSION_MINOR @eCAL_VERSION_MINOR@) + set(eCAL_VERSION_PATCH @eCAL_VERSION_PATCH@) + set(eCAL_VERSION_STRING @eCAL_VERSION_STRING@) ++set(eCAL_IS_SHARED @BUILD_SHARED_LIBS@) + + # eCAL is provided only with Release and Debug Version, thus map the other configs to Release build. + set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL Release "") + set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release "") + +-find_package(Protobuf REQUIRED) ++include(CMakeFindDependencyMacro) ++find_dependency(Protobuf CONFIG) ++ ++# Ensure transitive dependencies are present for static builds ++if(NOT eCAL_IS_SHARED) ++ find_dependency(asio) ++ find_dependency(tcp_pubsub) ++ find_dependency(HDF5) ++endif() + + include("@PACKAGE_eCAL_install_cmake_dir@/helper_functions/ecal_add_functions.cmake") + include("@PACKAGE_eCAL_install_cmake_dir@/helper_functions/ecal_helper_functions.cmake") +@@ -44,6 +53,6 @@ include("@PACKAGE_eCAL_install_cmake_dir@/eCALTargets.cmake") + # list(APPEND CMAKE_PREFIX_PATH "${PACKAGE_PREFIX_DIR}/../../../../cmake") + #endif() + +-find_package(CMakeFunctions REQUIRED) ++find_dependency(CMakeFunctions CONFIG) + +-find_package(Threads REQUIRED) ++find_dependency(Threads) diff --git a/ports/ecal/0007-allow-static-build-of-core.patch b/ports/ecal/0007-allow-static-build-of-core.patch new file mode 100644 index 00000000000000..18cb2d31bb5da2 --- /dev/null +++ b/ports/ecal/0007-allow-static-build-of-core.patch @@ -0,0 +1,74 @@ +diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt +index 3c7d57189..775f8a7c8 100644 +--- a/ecal/core/CMakeLists.txt ++++ b/ecal/core/CMakeLists.txt +@@ -397,7 +397,7 @@ set(ecal_header_base + ${ecal_header_msg} + ) + +-ecal_add_ecal_shared_library(${PROJECT_NAME} ++ecal_add_library(${PROJECT_NAME} + ${ecal_custom_tclap_cpp_src} + ${ecal_io_cpp_src} + ${ecal_io_mem_cpp_src} +@@ -433,7 +433,7 @@ if(UNIX) + set_source_files_properties(src/convert_utf.cpp PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough) + endif() + +-ecal_add_ecal_shared_library(${PROJECT_NAME}_c ${ecal_c_src} ${ecal_c_win_src}) ++ecal_add_library(${PROJECT_NAME}_c ${ecal_c_src} ${ecal_c_win_src}) + + add_library(eCAL::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + add_library(eCAL::${PROJECT_NAME}_c ALIAS ${PROJECT_NAME}_c) +@@ -457,6 +457,11 @@ target_compile_definitions(${PROJECT_NAME} + $<$:ECAL_HAS_ROBUST_MUTEX> + $<$:ECAL_USE_CLOCKLOCK_MUTEX>) + ++if(BUILD_SHARED_LIBS) ++ target_compile_definitions(${PROJECT_NAME}_c PUBLIC eCAL_SHARED_LIB) ++ target_compile_definitions(${PROJECT_NAME} PUBLIC eCAL_SHARED_LIB) ++endif() ++ + if(ECAL_NPCAP_SUPPORT) + target_compile_definitions(${PROJECT_NAME} + PRIVATE ECAL_NPCAP_SUPPORT) +@@ -507,8 +512,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${SIMPLEINI_INCLUDE_DIRS}) + set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER ecal/core) + set_property(TARGET ${PROJECT_NAME}_c PROPERTY FOLDER ecal/core) + +-ecal_install_ecal_shared_library(${PROJECT_NAME}_c) +-ecal_install_ecal_shared_library(${PROJECT_NAME}) ++ecal_install_ecal_library(${PROJECT_NAME}_c) ++ecal_install_ecal_library(${PROJECT_NAME}) + + install(DIRECTORY + "include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk +diff --git a/ecal/core/include/ecal/ecal_os.h b/ecal/core/include/ecal/ecal_os.h +index a962036f2..5d466cc86 100644 +--- a/ecal/core/include/ecal/ecal_os.h ++++ b/ecal/core/include/ecal/ecal_os.h +@@ -47,7 +47,7 @@ + #define ECAL_OS_FREEBSD + #endif + +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && defined(eCAL_SHARED_LIB) + #ifdef eCAL_EXPORTS + #define ECALC_API __declspec(dllexport) + #else /* eCAL_EXPORTS */ +@@ -64,11 +64,15 @@ + #endif + + #ifdef _MSC_VER ++ #ifdef eCAL_SHARED_LIB + #ifdef eCAL_EXPORTS + #define ECALC_API_DEPRECATED __declspec(dllexport deprecated) + #else /* eCAL_EXPORTS */ + #define ECALC_API_DEPRECATED __declspec(dllimport deprecated) + #endif /* eCAL_EXPORTS */ ++ #else ++ #define ECALC_API_DEPRECATED ++ #endif + #elif defined(__GNUC__) || defined(__clang__) + #define ECALC_API_DEPRECATED __attribute__((deprecated)) + #else diff --git a/ports/ecal/portfile.cmake b/ports/ecal/portfile.cmake new file mode 100644 index 00000000000000..c8600cdac36d1f --- /dev/null +++ b/ports/ecal/portfile.cmake @@ -0,0 +1,78 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eclipse-ecal/ecal + REF v${VERSION} + SHA512 e9bc6c579a5331bdecc0384fb1cbac6bf63cb3910e26a4004d48c3a25528fed66413a2c80f4d866d3958d3800579c57a7298e61fca20adf9b24f5daa2e07ed3d + HEAD_REF master + PATCHES + 0001-disable-app-plugins.patch + 0002-fix-build.patch + 0003-fix-dependencies.patch + 0004-install-cmake-files-to-share.patch + 0005-remove-install-prefix-macro-value.patch + 0006-use-find_dependency-in-cmake-config.patch + 0007-allow-static-build-of-core.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DHAS_HDF5=ON + -DHAS_QT5=OFF + -DHAS_CURL=OFF + -DHAS_CAPNPROTO=OFF + -DHAS_FTXUI=OFF + -DBUILD_DOCS=OFF + -DBUILD_APPS=OFF + -DBUILD_SAMPLES=OFF + -DBUILD_TIME=OFF + -DBUILD_PY_BINDING=OFF + -DBUILD_CSHARP_BINDING=OFF + -DBUILD_ECAL_TESTS=OFF + -DECAL_INCLUDE_PY_SAMPLES=OFF + -DECAL_INSTALL_SAMPLE_SOURCES=OFF + -DECAL_JOIN_MULTICAST_TWICE=OFF + -DECAL_NPCAP_SUPPORT=OFF + -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON + -DECAL_THIRDPARTY_BUILD_SPDLOG=OFF + -DECAL_THIRDPARTY_BUILD_TINYXML2=OFF + -DECAL_THIRDPARTY_BUILD_FINEFTP=OFF + -DECAL_THIRDPARTY_BUILD_TERMCOLOR=OFF + -DECAL_THIRDPARTY_BUILD_TCP_PUBSUB=OFF + -DECAL_THIRDPARTY_BUILD_RECYCLE=OFF + -DECAL_THIRDPARTY_BUILD_FTXUI=OFF + -DECAL_THIRDPARTY_BUILD_GTEST=OFF + -DECAL_THIRDPARTY_BUILD_UDPCAP=OFF + -DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF + -DECAL_THIRDPARTY_BUILD_YAML-CPP=OFF + -DECAL_THIRDPARTY_BUILD_CURL=OFF + -DECAL_THIRDPARTY_BUILD_HDF5=OFF + -DCPACK_PACK_WITH_INNOSETUP=OFF + -DDISABLE_FIND_PACKAGE_OVERLOAD=ON # From patch, disable find_package macro + -DECAL_BUILD_VERSION="${VERSION}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME eCAL CONFIG_PATH share/eCAL) +vcpkg_cmake_config_fixup(PACKAGE_NAME CMakeFunctions CONFIG_PATH share/CMakeFunctions) + +# Remove extra debug files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# global ini files not strictly required +if (VCPKG_TARGET_IS_WINDOWS) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/cfg" "${CURRENT_PACKAGES_DIR}/debug/cfg") +else() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/debug/etc") +endif() + +# Install copyright and usage +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/ecal/usage b/ports/ecal/usage new file mode 100644 index 00000000000000..4d8af57a46c804 --- /dev/null +++ b/ports/ecal/usage @@ -0,0 +1,4 @@ +The package eCAL provides CMake targets: + + find_package(eCAL CONFIG REQUIRED) + target_link_libraries(main PRIVATE eCAL::core eCAL::core_c eCAL::core_pb eCAL::hdf5) \ No newline at end of file diff --git a/ports/ecal/vcpkg.json b/ports/ecal/vcpkg.json new file mode 100644 index 00000000000000..35c836188aa49a --- /dev/null +++ b/ports/ecal/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "ecal", + "version-semver": "5.12.0", + "description": "eCAL - enhanced Communication Abstraction Layer", + "homepage": "https://eclipse-ecal.github.io/ecal/", + "license": "Apache-2.0", + "supports": "!emscripten", + "dependencies": [ + "asio", + { + "name": "hdf5", + "default-features": false + }, + { + "name": "protobuf", + "default-features": false + }, + "simpleini", + "tclap", + "tcp-pubsub", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ecos/portfile.cmake b/ports/ecos/portfile.cmake index 618a4d14a50248..226af887218182 100644 --- a/ports/ecos/portfile.cmake +++ b/ports/ecos/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO embotech/ecos - REF v2.0.8 - SHA512 c1adb188d6b2c400f817de15272472adfd013e2a174f49ec0bb2f7f889f26ba2b7ea165d9bedac3031bd2da7a770f2a285ad825d5b22ccc6cf43c756a20f844f + REF "v${VERSION}" + SHA512 b79434c194b5681f323b275eff0126f56beba792d270bd1773307cdf33297bee550b13bd2f96f5923dc4b8e200216d897ea01978f65da69dd81f1a669f8fd6e2 HEAD_REF develop ) diff --git a/ports/ecos/vcpkg.json b/ports/ecos/vcpkg.json index 7b276e11466158..4396dabbf50587 100644 --- a/ports/ecos/vcpkg.json +++ b/ports/ecos/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ecos", - "version": "2.0.8", - "port-version": 3, + "version": "2.0.10", "description": "A lightweight conic solver for second-order cone programming.", "dependencies": [ { diff --git a/ports/effolkronium-random/portfile.cmake b/ports/effolkronium-random/portfile.cmake index 3acd390fb36ab7..6ed197b9b0ee74 100644 --- a/ports/effolkronium-random/portfile.cmake +++ b/ports/effolkronium-random/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO effolkronium/random - REF v1.4.1 - SHA512 215fd34ea3a99c955a1fcd70d6c317e3829b3c562c737d22be1371213b3e14346b2f61fc76afbbcc55e26b4fdf630fa428b8bc34104170cbfc4afebcf24d160b + REF "v${VERSION}" + SHA512 778667d3b3a4bd51b67ef7d1842652dcf6d7df210345f667d0474cdfe48bb75fa2c891f8843f3fc4946fb2ef71da652c296eaaa03718ed889dee4926d743b7dd HEAD_REF master ) diff --git a/ports/effolkronium-random/vcpkg.json b/ports/effolkronium-random/vcpkg.json index 9c4be3d55b80a0..e3c29efa9e3332 100644 --- a/ports/effolkronium-random/vcpkg.json +++ b/ports/effolkronium-random/vcpkg.json @@ -1,6 +1,6 @@ { "name": "effolkronium-random", - "version": "1.4.1", + "version": "1.5.0", "description": "Random with a modern C++ API", "homepage": "https://github.com/effolkronium/random", "license": "MIT", diff --git a/ports/elfio/portfile.cmake b/ports/elfio/portfile.cmake index de7f61392a3604..4268db0d40d82d 100644 --- a/ports/elfio/portfile.cmake +++ b/ports/elfio/portfile.cmake @@ -1,8 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO serge1/ELFIO - REF Release_3.11 - SHA512 3a254aad62e707f2809e2997998aab6a9794d70791dc535a6de90bad3e9de3cbcc4f8e7787067ca7cd47ce2dc71cf52809747267bc36cfb08369b49a6b92cf5e) + REF "Release_${VERSION}" + SHA512 f5c8bc6cc98da845f6c011fc85b98476935c5d20d72b36bff5ad2472434494115ee7c06cfa37152c528e5931c39fe3cc084bfc8e6952b2c3e8f24b8601ae212f +) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/elfio/vcpkg.json b/ports/elfio/vcpkg.json index d32f103ba3bc01..f28702a234b8bd 100644 --- a/ports/elfio/vcpkg.json +++ b/ports/elfio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "elfio", - "version": "3.11", + "version": "3.12", "description": "A header-only C++ library intended for reading and generating files in the ELF binary format.", "homepage": "https://github.com/serge1/ELFIO", "license": "MIT", diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake index d94cedd62c2b66..66fcfbf157f742 100644 --- a/ports/ensmallen/portfile.cmake +++ b/ports/ensmallen/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mlpack/ensmallen REF "${VERSION}" - SHA512 3c101385d75aa13d21406fd98d4220b5ebd88655ff42039d6d4b22e3a2f21f7dc59dc935c67b8178cbfd104c4c50e611bc787f254973c3410a349648b5ed0342 + SHA512 9cc058dcb777b7a59c361afcd02d2ce787b08c86a26aefc1d67c42658d67d7b62e8d7b5138c02912c182bc9b0e1e039c4036478985e12e2e35746853a169e067 HEAD_REF master PATCHES dependencies.patch diff --git a/ports/ensmallen/vcpkg.json b/ports/ensmallen/vcpkg.json index eea08deca03245..ae9b21bd0782bd 100644 --- a/ports/ensmallen/vcpkg.json +++ b/ports/ensmallen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ensmallen", - "version-semver": "2.19.0", + "version-semver": "2.19.1", "description": "A header-only C++ library for mathematical optimization", "homepage": "http://ensmallen.org/", "license": "BSD-3-Clause", diff --git a/ports/etl/portfile.cmake b/ports/etl/portfile.cmake index fb6a9b0ad6d7db..64247243b1600f 100644 --- a/ports/etl/portfile.cmake +++ b/ports/etl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ETLCPP/etl - REF 20.35.4 - SHA512 04c68b50cbd7d1052f7253170806b0b67e2b9f78d57da2405284bf84695eb20c81be104b93a07f4d4a97fe14f5a1d3882aa7d96f418d6fbaec67db44375b7b75 + REF "${VERSION}" + SHA512 aee68d50cdc82e0a2248390acc87d9b4186bb883631fd5febd011d81fb9d944e811e08da46998cadf1738a52d70e28ec4188bc4dc5822f32443896f991764f46 HEAD_REF master ) diff --git a/ports/etl/vcpkg.json b/ports/etl/vcpkg.json index 935b1dee4b176f..a0d9895932f6d7 100644 --- a/ports/etl/vcpkg.json +++ b/ports/etl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "etl", - "version": "20.35.4", + "version": "20.38.0", "description": "A C++ template library for embedded applications", "homepage": "https://www.etlcpp.com", "license": "MIT", diff --git a/ports/eventpp/portfile.cmake b/ports/eventpp/portfile.cmake index bd689e51c482e6..ff315bfac6918c 100644 --- a/ports/eventpp/portfile.cmake +++ b/ports/eventpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wqking/eventpp - REF v0.1.2 - SHA512 01fd536024dfef8c4025fc184f6b6326a901849dbf73d81430d7cfadeff25c9c140ab6a28b0143a4090703668c1d9e743a54e874c0321c3453cf40aeb4583db3 + REF "v${VERSION}" + SHA512 b39994e9bd581d6bb61b634c434c46075e41ec2217e1174578fefd206a927bd725744ae0724d319cde8f2b2a43d2e030a04c271197500d94c6b1afd849f779fd HEAD_REF master ) @@ -19,4 +19,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/license" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license") diff --git a/ports/eventpp/vcpkg.json b/ports/eventpp/vcpkg.json index a2740ba56d504b..373108df5bd359 100644 --- a/ports/eventpp/vcpkg.json +++ b/ports/eventpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "eventpp", - "version-semver": "0.1.2", + "version-semver": "0.1.3", "description": "C++ library for event dispatcher and callback list", "homepage": "https://github.com/wqking/eventpp", "license": "Apache-2.0", diff --git a/ports/exiv2/dont-find-python.patch b/ports/exiv2/dont-find-python.patch new file mode 100644 index 00000000000000..0529efd6d26930 --- /dev/null +++ b/ports/exiv2/dont-find-python.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake +index 664522c2a..cbfa5d908 100644 +--- a/cmake/findDependencies.cmake ++++ b/cmake/findDependencies.cmake +@@ -30,10 +30,12 @@ endif() + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/") + ++if(EXIV2_BUILD_UNIT_TESTS) + find_package (Python3 COMPONENTS Interpreter) + if (NOT Python3_Interpreter_FOUND) + message(WARNING "Python3 was not found. Python tests under the 'tests' folder will not be executed") + endif() ++endif() + + find_package(Filesystem REQUIRED) + diff --git a/ports/exiv2/fix-brotli.patch b/ports/exiv2/fix-brotli.patch new file mode 100644 index 00000000000000..13a513b54e2a91 --- /dev/null +++ b/ports/exiv2/fix-brotli.patch @@ -0,0 +1,27 @@ +diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake +index bec2128a5..664522c2a 100644 +--- a/cmake/findDependencies.cmake ++++ b/cmake/findDependencies.cmake +@@ -47,7 +47,7 @@ if( EXIV2_ENABLE_PNG ) + endif( ) + + if( EXIV2_ENABLE_BMFF AND EXIV2_ENABLE_BROTLI ) +- find_package( Brotli REQUIRED ) ++ find_package( BROTLI NAMES unofficial-brotli CONFIG REQUIRED ) + endif( ) + + if( EXIV2_ENABLE_WEBREADY ) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 15bab8c8a..3db5bdd08 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -240,8 +240,7 @@ if( EXIV2_ENABLE_PNG ) + endif() + + if( EXIV2_ENABLE_BMFF AND BROTLI_FOUND ) +- target_link_libraries( exiv2lib PRIVATE ${Brotli_LIBRARIES}) +- target_include_directories(exiv2lib PRIVATE ${Brotli_INCLUDE_DIRS}) ++ target_link_libraries( exiv2lib PRIVATE unofficial::brotli::brotlidec) + list(APPEND requires_private_list "libbrotlidec") + endif() + diff --git a/ports/exiv2/fix-expat.patch b/ports/exiv2/fix-expat.patch new file mode 100644 index 00000000000000..98669c4f914f37 --- /dev/null +++ b/ports/exiv2/fix-expat.patch @@ -0,0 +1,28 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 41a672e8..1311c856 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -182,7 +182,7 @@ target_include_directories(exiv2lib SYSTEM PRIVATE + ) + + if (EXIV2_ENABLE_XMP OR EXIV2_ENABLE_EXTERNAL_XMP) + target_include_directories(exiv2lib PRIVATE ${EXPAT_INCLUDE_DIR}) +- target_link_libraries(exiv2lib PRIVATE EXPAT::EXPAT) ++ target_link_libraries(exiv2lib PRIVATE expat::expat) + list(APPEND requires_private_list "expat") + endif() + + if (EXIV2_ENABLE_XMP) +diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt +index 9c148a61..0fed7cde 100644 +--- a/xmpsdk/CMakeLists.txt ++++ b/xmpsdk/CMakeLists.txt +@@ -28,7 +28,7 @@ add_library(exiv2-xmp OBJECT + + target_link_libraries(exiv2-xmp + PRIVATE +- EXPAT::EXPAT ++ expat::expat + ) + + target_include_directories(exiv2-xmp SYSTEM diff --git a/ports/exiv2/fix-inih.patch b/ports/exiv2/fix-inih.patch new file mode 100644 index 00000000000000..853531f9b311f9 --- /dev/null +++ b/ports/exiv2/fix-inih.patch @@ -0,0 +1,32 @@ +diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake +index 1075c3031..bec2128a5 100644 +--- a/cmake/findDependencies.cmake ++++ b/cmake/findDependencies.cmake +@@ -77,7 +77,7 @@ if( ICONV_FOUND ) + endif() + + if( EXIV2_ENABLE_INIH ) +- find_package(inih) ++ find_package(unofficial-inih CONFIG REQUIRED) + message ( "-- inih_INCLUDE_DIRS : " ${inih_INCLUDE_DIRS} ) + message ( "-- inih_LIBRARIES : " ${inih_LIBRARIES} ) + message ( "-- inih_inireader_INCLUDE_DIRS : " ${inih_inireader_INCLUDE_DIRS} ) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index dba7af99c..15bab8c8a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -263,10 +263,10 @@ if( Iconv_FOUND AND Iconv_LIBRARIES ) + endif() + + if( EXIV2_ENABLE_INIH ) +- target_link_libraries( exiv2lib_int PRIVATE inih::libinih ) +- target_link_libraries( exiv2lib_int PRIVATE inih::inireader ) +- target_link_libraries( exiv2lib PRIVATE inih::libinih ) +- target_link_libraries( exiv2lib PRIVATE inih::inireader ) ++ target_link_libraries( exiv2lib_int PRIVATE unofficial::inih::libinih ) ++ target_link_libraries( exiv2lib_int PRIVATE unofficial::inih::inireader ) ++ target_link_libraries( exiv2lib PRIVATE unofficial::inih::libinih ) ++ target_link_libraries( exiv2lib PRIVATE unofficial::inih::inireader ) + list(APPEND requires_private_list "INIReader") + endif() + diff --git a/ports/exiv2/ios.patch b/ports/exiv2/ios.patch new file mode 100644 index 00000000000000..3775f0148bd0f1 --- /dev/null +++ b/ports/exiv2/ios.patch @@ -0,0 +1,31 @@ +diff --git a/src/futils.cpp b/src/futils.cpp +index 3e30c9996..c746838d5 100644 +--- a/src/futils.cpp ++++ b/src/futils.cpp +@@ -38,6 +38,10 @@ namespace fs = std::experimental::filesystem; + #include // for stat() + #endif + ++#if __has_include() ++#include // for _NSGetExecutablePath() ++#endif ++ + #if defined(__FreeBSD__) + // clang-format off + #include +@@ -360,9 +364,12 @@ std::string getProcessPath() { + TCHAR pathbuf[MAX_PATH]; + GetModuleFileName(nullptr, pathbuf, MAX_PATH); + auto path = fs::path(pathbuf); +-#elif __has_include() +- char pathbuf[PROC_PIDPATHINFO_MAXSIZE]; +- proc_pidpath(getpid(), pathbuf, sizeof(pathbuf)); ++#elif defined(__APPLE__) ++ char pathbuf[2048]; ++ uint32_t size = sizeof(pathbuf); ++ const int get_exec_path_failure = _NSGetExecutablePath(pathbuf, &size); ++ if (get_exec_path_failure) ++ return "unknown"; // pathbuf not big enough + auto path = fs::path(pathbuf); + #elif defined(__sun__) + auto path = fs::read_symlink(Internal::stringFormat("/proc/%d/path/a.out", getpid())); diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index 24ce46d51ea077..bde1fd91f194c4 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -2,15 +2,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 REF "v${VERSION}" - SHA512 7d7121770a9394efd31acb74709583e587351fc48c485a2f684cacce4ed19a2d07a6cb1cea986c16bf64851fd53b22a7277c1e1ae1a6cd69a5761afae3c5c731 + SHA512 35e483c6123f099167ed8647fae7c6e5512434c24d0afe684180ba6a5114068d5678280a01c8e6cfee0d1e555e1dc2a1606989d46950ce3ef1a3859caeed4dad HEAD_REF master PATCHES fix-find_expat.patch + fix-inih.patch + fix-brotli.patch + fix-expat.patch + dont-find-python.patch + ios.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - unicode EXIV2_ENABLE_WIN_UNICODE xmp EXIV2_ENABLE_XMP video EXIV2_ENABLE_VIDEO png EXIV2_ENABLE_PNG @@ -31,12 +35,10 @@ vcpkg_cmake_configure( -DEXIV2_BUILD_SAMPLES=OFF -DEXIV2_BUILD_DOC=OFF -DEXIV2_ENABLE_EXTERNAL_XMP=OFF - -DEXIV2_ENABLE_PRINTUCS2=OFF -DEXIV2_ENABLE_LENSDATA=ON -DEXIV2_ENABLE_DYNAMIC_RUNTIME=${EXIV2_CRT_DYNAMIC} -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_CURL=OFF - -DEXIV2_ENABLE_SSH=OFF -DEXIV2_TEAM_EXTRA_WARNINGS=OFF -DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF -DEXIV2_TEAM_PACKAGING=OFF @@ -64,3 +66,5 @@ file(REMOVE_RECURSE ) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) diff --git a/ports/exiv2/usage b/ports/exiv2/usage new file mode 100644 index 00000000000000..6d31c60264be26 --- /dev/null +++ b/ports/exiv2/usage @@ -0,0 +1,4 @@ +exiv2 provides CMake targets: + + find_package(exiv2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE exiv2lib) \ No newline at end of file diff --git a/ports/exiv2/vcpkg-cmake-wrapper.cmake b/ports/exiv2/vcpkg-cmake-wrapper.cmake index a6fa81dbfd39f1..3eaaf3c791f7ce 100644 --- a/ports/exiv2/vcpkg-cmake-wrapper.cmake +++ b/ports/exiv2/vcpkg-cmake-wrapper.cmake @@ -7,12 +7,25 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if("@EXIV2_ENABLE_NLS@") find_package(Intl REQUIRED) endif() + if("@EXIV2_ENABLE_BMFF@") + find_package(unofficial-brotli CONFIG REQUIRED) + endif() + if("@EXIV2_ENABLE_XMP@") + find_package(expat CONFIG REQUIRED) + endif() + if("@EXIV2_ENABLE_PNG@") + find_package( ZLIB REQUIRED ) + endif() + find_package(unofficial-inih CONFIG REQUIRED) if(TARGET exiv2lib) if(NOT "@VCPKG_TARGET_IS_WINDOWS@") set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES Iconv::Iconv) endif() if("@EXIV2_ENABLE_NLS@") - set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${Intl_LIBRARIES}) + set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES + "\$<\$>:${Intl_LIBRARY_RELEASE}>" + "\$<\$:${Intl_LIBRARY_DEBUG}>" + ) endif() endif() endif() diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json index cd3032e959ba6a..6221cfbb84d5c2 100644 --- a/ports/exiv2/vcpkg.json +++ b/ports/exiv2/vcpkg.json @@ -1,12 +1,13 @@ { "name": "exiv2", - "version": "0.27.6", - "port-version": 3, + "version": "0.28.0", + "port-version": 1, "description": "Image metadata library and tools", "homepage": "https://exiv2.org", "license": "GPL-2.0-or-later", "supports": "!uwp & !xbox", "dependencies": [ + "inih", { "name": "libiconv", "platform": "!windows" @@ -22,7 +23,10 @@ ], "features": { "bmff": { - "description": "Support for BMFF files (e.g., CR3, HEIF, HEIC, AVIF, and JPEG XL)" + "description": "Support for BMFF files (e.g., CR3, HEIF, HEIC, AVIF, and JPEG XL)", + "dependencies": [ + "brotli" + ] }, "nls": { "description": "Build native language support", @@ -44,10 +48,6 @@ "zlib" ] }, - "unicode": { - "description": "Compile with Unicode support on Windows", - "supports": "windows" - }, "video": { "description": "Build video support into library" }, diff --git a/ports/fakeit/portfile.cmake b/ports/fakeit/portfile.cmake index cf6b5765559d51..596a641059038a 100644 --- a/ports/fakeit/portfile.cmake +++ b/ports/fakeit/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eranpeer/FakeIt - REF 78ca536e6b32f11e2883d474719a447915e40005 #v2.3.0 - SHA512 b3a76d278217d177e2222d6e4c782c8ee08a7b6244e5f89fd25b22faffc8f0cf402c1d04763fb6f6ef37272738adf5dd7ff7a0437c1bc9a5043765058fa2a648 + REF "${VERSION}" + SHA512 3575dc2247a97ea6d3c584e9b933e32cc0d1936fec480b19caf8305e8ba39bb11b4437930a5343b343df66347354ef5aaa8d2811e0ff3119bfc619629a0c2b8b HEAD_REF master ) diff --git a/ports/fakeit/vcpkg.json b/ports/fakeit/vcpkg.json index 6650ba76012b17..066ce9a9509585 100644 --- a/ports/fakeit/vcpkg.json +++ b/ports/fakeit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fakeit", - "version": "2.3.0", + "version": "2.4.0", "description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.", "homepage": "https://github.com/eranpeer/FakeIt", "license": "MIT" diff --git a/ports/fameta-counter/portfile.cmake b/ports/fameta-counter/portfile.cmake new file mode 100644 index 00000000000000..60e2dca5f78425 --- /dev/null +++ b/ports/fameta-counter/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO falemagn/fameta-counter + REF 35f4421524b61eaa658c23e9c3667dc914df72fa + SHA512 624baa2646a4141a1b326910f567d8a4799b72ee4cf569497940a877be2f035a19cf9a709f3bb64be7055175bd72c698d3f82df5bd47996eacbe6bbc2f4a42cd + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include/fameta/counter.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/fameta-counter") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/fameta-counter/vcpkg.json b/ports/fameta-counter/vcpkg.json new file mode 100644 index 00000000000000..6bb487499e239b --- /dev/null +++ b/ports/fameta-counter/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fameta-counter", + "version-date": "2021-02-13", + "description": "Compile time counter that works with all major modern compilers, compatible with C++11 and above.", + "homepage": "https://github.com/falemagn/fameta-counter", + "license": "Unlicense" +} diff --git a/ports/farmhash/portfile.cmake b/ports/farmhash/portfile.cmake index 5f19a87ae7bb70..dcc594fe73d74c 100644 --- a/ports/farmhash/portfile.cmake +++ b/ports/farmhash/portfile.cmake @@ -2,9 +2,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(WIN_PR_PATCH - URLS "https://github.com/google/farmhash/pull/40.diff" + URLS "https://github.com/google/farmhash/pull/40.diff?full_index=1" FILENAME farmhash-pr-40.patch - SHA512 265f5c15c17da2b88c82e6016a181abe73d2d94492cdb0cba892acf67a9d40815d54fa81e07351254fe2a39aea143b125924db0e7df14aac84a7469a78612cbd + SHA512 a479450e3e2c4810ef67bb0704c30c2779e12a8768524f179235fae8687d064e62ee225b4b167a30fda59c39de40587629813804f452841badf308e1e76607a7 ) vcpkg_from_github( diff --git a/ports/farmhash/vcpkg.json b/ports/farmhash/vcpkg.json index 99fded3e1bb994..af9bc261656933 100644 --- a/ports/farmhash/vcpkg.json +++ b/ports/farmhash/vcpkg.json @@ -1,8 +1,9 @@ { "name": "farmhash", "version": "1.1", - "port-version": 5, + "port-version": 6, "description": "FarmHash, a family of hash functions.", "homepage": "https://github.com/google/farmhash", + "license": "MIT", "supports": "!arm" } diff --git a/ports/fast-float/portfile.cmake b/ports/fast-float/portfile.cmake index d0b860c7d627f6..ba15cd260763b7 100644 --- a/ports/fast-float/portfile.cmake +++ b/ports/fast-float/portfile.cmake @@ -2,17 +2,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fastfloat/fast_float REF "v${VERSION}" - SHA512 e3a1941364413f008d4bff190df45f95d7100263e57e714a907dba85b705fd19dcd34ac6db3fc332e5232fd4b67442542f2344a81d296ef04282e3d615dfe0fb + SHA512 c703c7cba3c69775317c66a62ce145646fd7d3d063124501e3d6a7deebb8c62c14a2ccdffed18de2d73d9d3a8ba2061ef1d34cc780ee0b6d607935d5f1b1de81 HEAD_REF master ) +set(VCPKG_BUILD_TYPE release) # header-only port + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFASTFLOAT_INSTALL=ON ) vcpkg_cmake_install() - vcpkg_cmake_config_fixup(PACKAGE_NAME FastFloat CONFIG_PATH share/cmake/FastFloat) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-MIT") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-APACHE" "${SOURCE_PATH}/LICENSE-BOOST" "${SOURCE_PATH}/LICENSE-MIT") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/fast-float/usage b/ports/fast-float/usage new file mode 100644 index 00000000000000..3282afc6acedc8 --- /dev/null +++ b/ports/fast-float/usage @@ -0,0 +1,4 @@ +fast-float provides CMake targets: + + find_package(FastFloat CONFIG REQUIRED) + target_link_libraries(main PRIVATE FastFloat::fast_float) diff --git a/ports/fast-float/vcpkg.json b/ports/fast-float/vcpkg.json index 63ff24daca5fa1..d4654dc7c9b1d9 100644 --- a/ports/fast-float/vcpkg.json +++ b/ports/fast-float/vcpkg.json @@ -1,9 +1,9 @@ { "name": "fast-float", - "version": "4.0.0", + "version": "5.2.0", "description": "Fast and exact implementation of the C++ from_chars functions for float and double types: 4x faster than strtod", "homepage": "https://github.com/fastfloat/fast_float", - "license": "Apache-2.0 OR MIT", + "license": "Apache-2.0 OR BSL-1.0 OR MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake index 0f448c8fbc7dd7..26ce8589f1bb01 100644 --- a/ports/fastcdr/portfile.cmake +++ b/ports/fastcdr/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eProsima/Fast-CDR REF v${VERSION} - SHA512 6b31e9ba2f7fe719eb4ac7af59a34cdff1c0d13ed40340d8bea8bfa477c0ffe080f4d6c73096add62f3b20af5fbf8ee8bde288dd9074bfb094b5b355016184f2 + SHA512 66040acb563d7c06efb67a1536eb178183776e71a6b54c7e02efbe50ff0926aa24d87fb7869273e985c5c0f2b5d1496d3b1a20f10358373c73171b51c71e7e6a HEAD_REF master PATCHES pdb-file.patch diff --git a/ports/fastcdr/vcpkg.json b/ports/fastcdr/vcpkg.json index 374d94dc005ae6..6e21acc09f1080 100644 --- a/ports/fastcdr/vcpkg.json +++ b/ports/fastcdr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fastcdr", - "version-semver": "1.0.26", + "version-semver": "1.1.0", "description": "eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.", "homepage": "https://github.com/eProsima/Fast-CDR", "license": "Apache-2.0", diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index a1c3c9f7108c18..719e47f87c1823 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # due to fix-xtime.patch ) vcpkg_cmake_install() diff --git a/ports/fastrtps/vcpkg.json b/ports/fastrtps/vcpkg.json index 0ed31e35e51b0a..a82d7a8c3c298f 100644 --- a/ports/fastrtps/vcpkg.json +++ b/ports/fastrtps/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fastrtps", "version": "2.7.0", - "port-version": 2, + "port-version": 3, "description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.", "homepage": "https://www.eprosima.com/", "license": "Apache-2.0", diff --git a/ports/fbthrift/0002-fix-dependency.patch b/ports/fbthrift/0002-fix-dependency.patch index d06d2d79d51473..6740a2a41427bd 100644 --- a/ports/fbthrift/0002-fix-dependency.patch +++ b/ports/fbthrift/0002-fix-dependency.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d2b69ad..84b2bf8 100644 +index 5eea37c..145e5b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -96,22 +96,24 @@ endif () +@@ -96,23 +96,25 @@ endif () # Find required dependencies for thrift/lib if (THRIFT_LIB_ONLY OR build_all) @@ -22,6 +22,7 @@ index d2b69ad..84b2bf8 100644 + elseif(TARGET zstd::libzstd_static) + set(ZSTD_LIBRARIES zstd::libzstd_static) + endif() + find_package(mvfst CONFIG REQUIRED) # https://cmake.org/cmake/help/v3.9/module/FindThreads.html set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads) @@ -34,21 +35,23 @@ index d2b69ad..84b2bf8 100644 add_definitions("-DTHRIFT_HAVE_LIBSNAPPY=0") if (THRIFT_LIB_ONLY) diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in -index e1297ed..c7d9d59 100644 +index 1d38221..ab96215 100644 --- a/thrift/cmake/FBThriftConfig.cmake.in +++ b/thrift/cmake/FBThriftConfig.cmake.in -@@ -28,7 +28,14 @@ else() +@@ -28,8 +28,15 @@ else() set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") endif() -find_dependency(ZLIB REQUIRED) +-find_package(mvfst CONFIG REQUIRED) ++find_dependency(ZLIB) ++find_dependency(mvfst CONFIG) +find_dependency(fizz CONFIG ) +find_dependency(fmt CONFIG ) +find_dependency(folly CONFIG ) +find_dependency(gflags CONFIG) +find_dependency(glog CONFIG ) +find_dependency(wangle CONFIG ) -+find_dependency(ZLIB) +find_dependency(zstd CONFIG) if (NOT TARGET FBThrift::thriftcpp2) diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index c83da27c427d6b..2230f64525621e 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift REF "v${VERSION}" - SHA512 abba38b2451459f86735c010a9492875a70aa9935978a2032a7882b3d37a136c17bc7ffcd70aff617539e5602302df2957ba153f8fc8dcae866e9baf364261a2 + SHA512 8730c2ecfeccf221e746df9f8e449d31934fd7e6f7861631d4c38e891cfc7b5ab07ffb48b56048031820f771966d6435bee2996738934bca9324548aeba5b30d HEAD_REF master PATCHES fix-glog.patch @@ -38,6 +38,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/detail/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/debug_thrift_data_difference/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test" diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 0eab2d95be815e..7103b58369bdca 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2023.07.03.00", + "version-string": "2023.10.02.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", @@ -17,6 +17,7 @@ "folly", "gflags", "glog", + "mvfst", "openssl", { "name": "vcpkg-cmake", diff --git a/ports/ffmpeg/0001-create-lib-libraries.patch b/ports/ffmpeg/0001-create-lib-libraries.patch index 493e24c1bb02f0..64e44e8d9a9b83 100644 --- a/ports/ffmpeg/0001-create-lib-libraries.patch +++ b/ports/ffmpeg/0001-create-lib-libraries.patch @@ -2,7 +2,7 @@ diff --git a/configure b/configure index 34c2adb..1c8008a 100755 --- a/configure +++ b/configure -@@ -5352,15 +5352,17 @@ case $target_os in +@@ -5631,15 +5631,17 @@ case $target_os in ;; win32|win64) disable symver @@ -16,10 +16,10 @@ index 34c2adb..1c8008a 100755 - fi +# disable static +# fi + ! enabled small && test_cmd $windres --version && enable gnu_windres enabled x86_32 && check_ldflags -LARGEADDRESSAWARE shlibdir_default="$bindir_default" + LIBPREF="" + LIBSUF=".lib" SLIBPREF="" SLIBSUF=".dll" - SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' diff --git a/ports/ffmpeg/0005-fix-nasm.patch b/ports/ffmpeg/0005-fix-nasm.patch index 2bbe36b6de9b7d..9308e714a6bbaa 100644 --- a/ports/ffmpeg/0005-fix-nasm.patch +++ b/ports/ffmpeg/0005-fix-nasm.patch @@ -1,21 +1,7 @@ diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile -@@ -138,8 +138,11 @@ X86ASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \ - X86ASM-OBJS-$(CONFIG_RV34DSP) += x86/rv34dsp.o - X86ASM-OBJS-$(CONFIG_VC1DSP) += x86/vc1dsp_loopfilter.o \ - x86/vc1dsp_mc.o --X86ASM-OBJS-$(CONFIG_IDCTDSP) += x86/simple_idct10.o \ -- x86/simple_idct.o -+ifdef ARCH_X86_64 -+X86ASM-OBJS-$(CONFIG_IDCTDSP) += x86/simple_idct10.o -+else -+X86ASM-OBJS-$(CONFIG_IDCTDSP) += x86/simple_idct.o -+endif - X86ASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o - X86ASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o - X86ASM-OBJS-$(CONFIG_VP8DSP) += x86/vp8dsp.o \ -@@ -157,6 +160,8 @@ X86ASM-OBJS-$(CONFIG_ALAC_DECODER) += x86/alacdsp.o +@@ -158,6 +158,8 @@ X86ASM-OBJS-$(CONFIG_ALAC_DECODER) += x86/alacdsp.o X86ASM-OBJS-$(CONFIG_APNG_DECODER) += x86/pngdsp.o X86ASM-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsidct.o +ifdef ARCH_X86_64 @@ -24,7 +10,7 @@ diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile X86ASM-OBJS-$(CONFIG_CFHD_DECODER) += x86/cfhddsp.o X86ASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o x86/synth_filter.o X86ASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp.o \ -@@ -175,15 +180,21 @@ x86/hevc_sao_10bit.o +@@ -175,15 +177,21 @@ x86/hevc_sao_10bit.o X86ASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o X86ASM-OBJS-$(CONFIG_LSCR_DECODER) += x86/pngdsp.o +ifdef ARCH_X86_64 diff --git a/ports/ffmpeg/0011-Fix-x265-detection.patch b/ports/ffmpeg/0011-Fix-x265-detection.patch index 13711bc2db0ed5..8c3e10d951ed2a 100644 --- a/ports/ffmpeg/0011-Fix-x265-detection.patch +++ b/ports/ffmpeg/0011-Fix-x265-detection.patch @@ -1,7 +1,7 @@ diff --git a/configure b/configure --- a/configure +++ b/configure -@@ -6671,7 +6671,10 @@ +@@ -6730,7 +6730,10 @@ [ "$toolchain" != "msvc" ] || require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && check_cpp_condition libx262 x264.h "X264_MPEG2" @@ -10,6 +10,6 @@ diff --git a/configure b/configure + { { check_lib libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" || + require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++"; } && + warn "using libx265 without pkg-config"; } } && - require_cpp_condition libx265 x265.h "X265_BUILD >= 70" + require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 30048c1155ed69..1754fcbff6887a 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -1,10 +1,9 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ffmpeg/ffmpeg REF n${VERSION} - SHA512 1b90c38b13149f2de7618ad419adc277afd5e65bbf52b849a7245aec0f92f73189c8547599dba8408b8828a767c1120f132727b57cd6231cd8b81de2471a4b8b + SHA512 da1b836c8f51cf69f95db750d5da5191a71d534fa7b0f019d6d6454f8dd6db5598789576b4fe5ad983dcd0197b9a7e8f9d43f10707b6d40ac31425da23da35b2 HEAD_REF master PATCHES 0001-create-lib-libraries.patch @@ -155,10 +154,18 @@ if(VCPKG_DETECTED_CMAKE_AR) list(APPEND prog_env "${AR_path}") endif() +if(VCPKG_DETECTED_CMAKE_RANLIB) + get_filename_component(RANLIB_path "${VCPKG_DETECTED_CMAKE_RANLIB}" DIRECTORY) + get_filename_component(RANLIB_filename "${VCPKG_DETECTED_CMAKE_RANLIB}" NAME) + set(ENV{RANLIB} "${RANLIB_filename}") + string(APPEND OPTIONS " --ranlib=${RANLIB_filename}") + list(APPEND prog_env "${RANLIB_path}") +endif() + list(REMOVE_DUPLICATES prog_env) vcpkg_add_to_path(PREPEND ${prog_env}) -# More? RANLIB OBJCC STRIP BIN2C +# More? OBJCC STRIP BIN2C file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 0723b4f4a89b56..756faa756d8060 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ffmpeg", - "version": "5.1.2", - "port-version": 7, + "version": "6.0", "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." @@ -634,6 +633,13 @@ "vpx": { "description": "VP8 and VP9 de/encoding via libvpx", "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec" + ] + }, "libvpx" ] }, diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake index 1b67cba6fa5520..d884b49c659de0 100644 --- a/ports/ffnvcodec/portfile.cmake +++ b/ports/ffnvcodec/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FFmpeg/nv-codec-headers - REF b641a195edbe3ac9788e681e22c2e2fad8aacddb # 11.1.5.0 - SHA512 e8b4c21ddc9c39dadd9b69ebdfcf38cf1e61f19ffb88d0a4d9086ddbf69285d2c8c946bb02bde3ee943accae559a72468f096718ad69ac03a43746c1eb0ed483 + REF n${VERSION} + SHA512 c08b7b3d08ef6e95819268067e09c588e5064d4c2320554f868579e96dc841e1eab217c03ef44e246aabdfa8b5e8e267cd5f0726f9c959f45fb27cb79af7c454 HEAD_REF master ) diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index 47418dc0ce0063..28a99a3b67dd9f 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ffnvcodec", - "version": "11.1.5.0", - "port-version": 1, + "version": "11.1.5.2", "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", "supports": "linux | (!osx & !uwp & !(arm64 & windows))" diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 71525003906417..c92ae9c728e4cd 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz REF "v${VERSION}" - SHA512 c7140b61529ee024e3c99e65d175acb8277fa7bc0090019188481b57c5253d8f5b96a01c28df4a1d00bae67e1f9079d409c2a7f526e933c7fe2f3c2a12fd92ac + SHA512 ff0dfe95640a24568a2950442576fbf4acd9a1dd354b7f7687cb1946cc2f896664e6e54b29ec051eccddb765bab276cb94c9920c724c4b4a5b1fc5f29c26e649 HEAD_REF master PATCHES 0001-fix-libsodium.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index be0f1d45fb26c8..f5f49a7c059a19 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2023.07.03.00", + "version-string": "2023.10.02.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 4d5d8dec3ba6bf..035dd3e118a9cd 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs REF "v${VERSION}" - SHA512 fd87868e75425749e42f615903a3084ee2cbc00f5e59b55cd8b3d11cdfcf0bb580deb12e2fec96f9519179a45523ebd28c804a8207251ba6535e3825d94f2049 + SHA512 d32628828eacc42646887de5a72a593ea42158d5f09e4ed789f86dff60f98f5be45c3a4a049c2b1173e2ab4da0313f544271eacd8f14a8c561815c51eebf8529 HEAD_REF master ) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index 503fb1c3dca9b0..aafd2b6ada46b0 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flecs", - "version": "3.2.4", + "version": "3.2.7", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/ports/flint/portfile.cmake b/ports/flint/portfile.cmake index f43f78e0ab0be4..90bc0233516b4d 100644 --- a/ports/flint/portfile.cmake +++ b/ports/flint/portfile.cmake @@ -1,10 +1,8 @@ -set(FLINT_VERSION 2.8.0) -set(FLINT_HASH "916285d13a55d12a041236195a9d7bbc5c1c3c30c3aa2f169efee6063b800d34f96ad3235f1c77285b04305ce685e5890169c984108d50d0c9ee7a77c3f6e73d") vcpkg_download_distfile(ARCHIVE - URLS "http://www.flintlib.org/flint-${FLINT_VERSION}.zip" - FILENAME "flint-${FLINT_VERSION}.zip" - SHA512 ${FLINT_HASH} + URLS "http://www.flintlib.org/flint-${VERSION}.zip" + FILENAME "flint-${VERSION}.zip" + SHA512 3dd9a4e79e08ab6bc434a786c8d4398eba6cb04e57bcb8d01677f4912cddf20ed3a971160a3e2d533d9a07b728678b0733cc8315bcb39a3f13475b6efa240062 ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/flint/vcpkg.json b/ports/flint/vcpkg.json index 82fd2fb5201224..bdf8ed6fa2a251 100644 --- a/ports/flint/vcpkg.json +++ b/ports/flint/vcpkg.json @@ -1,7 +1,6 @@ { "name": "flint", - "version-semver": "2.8.0", - "port-version": 2, + "version-semver": "2.9.0", "description": "Fast Library for Number Theory", "homepage": "https://www.flintlib.org/", "supports": "!uwp", diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index a768b1b66efe08..87c62c84807936 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth REF "v${VERSION}" - SHA512 "702b80ff9c8e2ba9fadd46a0377a295be78900c831ec4b6b75c2f5fee7e453b2e1f5511b076ccc044be7e6eb87086230c50c317dad3597a16d610e16032410fc" + SHA512 79891116d78b9be1c38bce9e5759b9bb732c3d8ee31c6e57d1a3e2b5548879b91d19582e73ee7fb0fd243beba3bf1bbc341a26aab0b6440eef36fc55dce3e8b0 HEAD_REF master PATCHES gentables.patch diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index efe02a7b567b9a..89412b18f9e45c 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fluidsynth", - "version": "2.3.3", + "version": "2.3.4", "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", "homepage": "https://github.com/FluidSynth/fluidsynth", "license": "LGPL-2.1-or-later", diff --git a/ports/flux/portfile.cmake b/ports/flux/portfile.cmake new file mode 100644 index 00000000000000..4b5d6c1176d770 --- /dev/null +++ b/ports/flux/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tcbrindle/flux + REF 1c128b50af95fc39b6683d437f9210239e219836 + SHA512 c07d3053227d6a62f5a7b0aba8535c0ed42195249d131a77989b3ee79a697f8d540b68639dcd9e89b5cdd76ee5d7f07db9b3be23bc325761c85af625f507e393 + HEAD_REF master + PATCHES + targets-fixup.patch +) + +set(VCPKG_BUILD_TYPE release) # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFLUX_BUILD_EXAMPLES=OFF + -DFLUX_BUILD_TESTS=OFF +) + + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/flux) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") diff --git a/ports/flux/targets-fixup.patch b/ports/flux/targets-fixup.patch new file mode 100644 index 00000000000000..3eba08b8c2299f --- /dev/null +++ b/ports/flux/targets-fixup.patch @@ -0,0 +1,33 @@ +diff --git i/CMakeLists.txt w/CMakeLists.txt +index e87b3c7..c6239f0 100644 +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -118,4 +118,27 @@ install( + DIRECTORY "${PROJECT_SOURCE_DIR}/include" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/.." + PATTERN "build2file" EXCLUDE +-) ++) ++ ++# ++# Removes the INTERFACE_SOURCES flux::flux property in the flux-targets.cmake ++# file that is there only because of the poor interaction of the ++# $ with the install(TARGETS...) command. The generator ++# creates an empty string instead of no string and the install(TARGETS...) ++# takes that empty string as a indication that the code should put the source ++# path in as a source file list (why?). ++# ++# The code here gets inserted into near the end of the cmake_install.cmake ++# file. It reads the flux-targets.cmake file into memory, clears the file, ++# then recreates the file skipping the line that contains the malformed ++# INTERFACE_SOURCES property value. ++# ++set(FLUX_TARGETS_FILE "${CMAKE_INSTALL_PREFIX}/lib/cmake/flux/flux-targets.cmake") ++install(CODE ++ "file (STRINGS \"${FLUX_TARGETS_FILE}\" FLUX_TARGETS_FILE_LINES) ++ file(WRITE \"${FLUX_TARGETS_FILE}\" \"\") ++ foreach(FLUX_TARGETS_FILE_LINE IN LISTS FLUX_TARGETS_FILE_LINES) ++ if (NOT FLUX_TARGETS_FILE_LINE MATCHES \"^[ \t]*INTERFACE_SOURCES[ \t].*$\") ++ file(APPEND \"${FLUX_TARGETS_FILE}\" \"\${FLUX_TARGETS_FILE_LINE}\\n\") ++ endif() ++ endforeach()") diff --git a/ports/flux/vcpkg.json b/ports/flux/vcpkg.json new file mode 100644 index 00000000000000..33f736af16ce91 --- /dev/null +++ b/ports/flux/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "flux", + "version-date": "2023-08-25", + "description": "Experimental C++20 library that provides a broadly equivalent feature set to C++20 Ranges, but uses a slightly different model based around cursors rather than iterators. Safer, easier, more efficient, compatible.", + "homepage": "https://github.com/tcbrindle/flux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index d5b73076657f83..db7a08bd14ad2e 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt REF "${VERSION}" - SHA512 6188508d74ca1ed75bf6441b152c07ca83971d3104b37f33784a7b55dfcc614d6243e77e0a14220018586fdb86207cc033eece834e7acd5e0907ed4c97403f3b + SHA512 288c349baac5f96f527d5b1bed0fa5f031aa509b4526560c684281388e91909a280c3262a2474d963b5d1bf7064b1c9930c6677fe54a0d8f86982d063296a54c HEAD_REF master PATCHES fix-write-batch.patch diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index 71db2116205851..acf9fd0885e22c 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fmt", - "version": "10.0.0", + "version": "10.1.1", "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "license": "MIT", diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 22462d0ff28da1..63f5c61733c7fd 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly REF "v${VERSION}" - SHA512 6e9433c65d91ff1af51b74e7153ce3d116484d6eb9cbe72747bad902bcb237fccffc35897c63ee3612fa633164b62884a94f511b7039112e2725851ad2719776 + SHA512 406dbbd5a61a5b0713e7e6c7677be76392c21a5d702b051e72158513436ea9605afe616c5bc1405cb9455be1d1993990c9f2608284204210f41ffc2055e7831b HEAD_REF main PATCHES reorder-glog-gflags.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index f93a7ac82f9f02..ea1d8b0df33fb2 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2023.07.03.00", + "version-string": "2023.10.02.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake index 21c1d2c031a414..c4a84b976369d4 100644 --- a/ports/font-util/portfile.cmake +++ b/ports/font-util/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH REPO font/util - REF d45011b8324fecebb4fc79e57491d341dd96e325 #1.3.2 - SHA512 d783cbb5b8b0975891a247f98b78c2afadfd33e1d26ee8bcf7ab7ccc11615b0150d07345c719182b0929afc3c54dc3288a01a789b5374e18aff883ac23d15b04 + REF "font-util-${VERSION}" + SHA512 93285c2e8c5c01f069a7621dba0bbb1175c0ebbea27d521395b40f036443c162fc1948c4d3cb34fe6c509d1818d95ed7e6d38919e3f7857dfa53e388aadb9128 HEAD_REF master PATCHES build.patch ) diff --git a/ports/font-util/vcpkg.json b/ports/font-util/vcpkg.json index 2e9f1996f3c4ca..0adc619d35d93e 100644 --- a/ports/font-util/vcpkg.json +++ b/ports/font-util/vcpkg.json @@ -1,7 +1,6 @@ { "name": "font-util", - "version": "1.3.2", - "port-version": 1, + "version": "1.4.1", "description": "X.Org font package creation/installation utilities", "homepage": "https://gitlab.freedesktop.org/xorg/font/util", "license": null, diff --git a/ports/foonathan-memory/portfile.cmake b/ports/foonathan-memory/portfile.cmake index 0a07586c1feb5c..492964ab354743 100644 --- a/ports/foonathan-memory/portfile.cmake +++ b/ports/foonathan-memory/portfile.cmake @@ -2,6 +2,13 @@ # unresolved external symbol "public: static unsigned int const foonathan::memory::detail::memory_block_stack::implementation_offset vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_download_distfile( + REMOVE_TOOL_STATIC_LINKING_CROSS_COMPILATION_PATCH + URLS https://github.com/foonathan/memory/commit/abb0bff7a232572b1fce304dd2e2a2d5c0a6806c.patch?full_index=1 + FILENAME foonathan-memory-abb0bff7a232572b1fce304dd2e2a2d5c0a6806c.patch + SHA512 9f16c9465a6475771241470925f34ead2281c5e2f7d9c4ddaceab77fa3775b8a63ccb6dde00061d74924f838a6d204ab70427f9ae5369245b5e9e971472e862f +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO foonathan/memory @@ -10,6 +17,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-foonathan-memory-include-install-dir.patch + "${REMOVE_TOOL_STATIC_LINKING_CROSS_COMPILATION_PATCH}" ) vcpkg_from_github( diff --git a/ports/foonathan-memory/vcpkg.json b/ports/foonathan-memory/vcpkg.json index 14815c5fe386ad..825c7b228bd157 100644 --- a/ports/foonathan-memory/vcpkg.json +++ b/ports/foonathan-memory/vcpkg.json @@ -1,6 +1,7 @@ { "name": "foonathan-memory", "version": "0.7.3", + "port-version": 1, "description": "STL compatible C++ memory allocator library", "homepage": "https://foonathan.net/doc/memory/", "license": "Zlib", diff --git a/ports/fplus/portfile.cmake b/ports/fplus/portfile.cmake index efe04fcdb8e23b..37ce83d1e5582a 100644 --- a/ports/fplus/portfile.cmake +++ b/ports/fplus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Dobiasd/FunctionalPlus - REF v0.2.18-p0 - SHA512 119aaef75020ef06818bf5d33db8bce272e89d69699df9be636bc6fdf06b584e1842440896a431ea2a75b88ce01472f3a9886b8dd781f5e5533315e9ad6860ac + REF "v${VERSION}" + SHA512 0e3478400c1acc2fc34642784f8bb3eb0f79bc4c157a38fb39c9f05d8e4c47cc6c9da765f76350fd593517c3a2db2515161f6f3d6ff770f2ace2da2a99bb493d HEAD_REF master ) diff --git a/ports/fplus/vcpkg.json b/ports/fplus/vcpkg.json index bdf521b1029bbf..f9150f2fa3d5dc 100644 --- a/ports/fplus/vcpkg.json +++ b/ports/fplus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fplus", - "version": "0.2.18-p0", + "version": "0.2.20-p0", "description": "Functional Programming Library for C++. Write concise and readable C++ code", "homepage": "https://github.com/Dobiasd/FunctionalPlus", "license": "BSL-1.0", diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index f7ed7697ab0bc0..0a6ef5311789e4 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP REF "${VERSION}" - SHA512 388c00d2f883b41d4ec127bcb871607429c136bfb99daf87f491e9f1e7d456e1fac403db9f9dec7611e729dfd2f913fa414ed3d0020d92c284c8f3ba1eeb80cb + SHA512 722d95d7591b5ce6a7e8a3b6ac8999df278dbcfc286a532f56bcbc4a3881e75b02c7e3cd4b296e67bc19d1165020acdcca198bf4bcc92aea5611760037fcc57f HEAD_REF master PATCHES DontInstallSystemRuntimeLibs.patch diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 2f93c8b286b383..3e225b8a07b8cc 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "freerdp", - "version": "2.10.0", + "version": "2.11.2", "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "license": "Apache-2.0", diff --git a/ports/freetype/brotli-static.patch b/ports/freetype/brotli-static.patch index 14a03f085a589f..d872e8dfecd537 100644 --- a/ports/freetype/brotli-static.patch +++ b/ports/freetype/brotli-static.patch @@ -2,7 +2,7 @@ diff --git a/builds/cmake/FindBrotliDec.cmake b/builds/cmake/FindBrotliDec.cmake index 46356b1fd..ed4cc2409 100644 --- a/builds/cmake/FindBrotliDec.cmake +++ b/builds/cmake/FindBrotliDec.cmake -@@ -35,10 +35,19 @@ find_path(BROTLIDEC_INCLUDE_DIRS +@@ -35,10 +35,15 @@ find_path(BROTLIDEC_INCLUDE_DIRS PATH_SUFFIXES brotli) find_library(BROTLIDEC_LIBRARIES @@ -11,15 +11,11 @@ index 46356b1fd..ed4cc2409 100644 HINTS ${PC_BROTLIDEC_LIBDIR} ${PC_BROTLIDEC_LIBRARY_DIRS}) -+get_filename_component(z_vcpkg_freetype_brotlidec_name "${BROTLIDEC_LIBRARIES}" NAME) -+if(z_vcpkg_freetype_brotlidec_name MATCHES "-static") + find_library(BROTLICOMMON_LIBRARIES -+ NAMES brotlicommon-static ++ NAMES brotlicommon-static brotlicommon NAMES_PER_DIR + HINTS ${PC_BROTLIDEC_LIBDIR} + ${PC_BROTLIDEC_LIBRARY_DIRS}) + set(BROTLIDEC_LIBRARIES "${BROTLIDEC_LIBRARIES};${BROTLICOMMON_LIBRARIES}") -+endif() -+unset(z_vcpkg_freetype_brotlidec_name) include(FindPackageHandleStandardArgs) find_package_handle_standard_args( diff --git a/ports/freetype/vcpkg.json b/ports/freetype/vcpkg.json index 42639756f95208..13e069c0bb3466 100644 --- a/ports/freetype/vcpkg.json +++ b/ports/freetype/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freetype", "version": "2.12.1", - "port-version": 3, + "port-version": 4, "description": "A library to render fonts.", "homepage": "https://www.freetype.org/", "license": "FTL OR GPL-2.0-or-later", diff --git a/ports/freexl/dependencies.patch b/ports/freexl/dependencies.patch new file mode 100644 index 00000000000000..e6c414753059e9 --- /dev/null +++ b/ports/freexl/dependencies.patch @@ -0,0 +1,47 @@ +diff --git a/configure.ac b/configure.ac +index d79099f..a820b17 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -66,10 +66,12 @@ AC_CONFIG_FILES([Makefile \ + AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])]) + # on some systems "iconv()" lives in libc. On others it lives in libiconv + # on older systems "libiconv()" lives in libiconv ++SAVED_LIBS="${LIBS}" + AC_SEARCH_LIBS(iconv,iconv,, + AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),)) + AC_SEARCH_LIBS(locale_charset,charset,, + AC_SEARCH_LIBS(nl_langinfo,c,,AC_MSG_ERROR(['libcharset' is required but it doesn't seem to be installed on this system.]),)) ++AC_SUBST(ICONV_LIBS, "${LIBS%${SAVED_LIBS}}") + + #----------------------------------------------------------------------- + # --enable-xmldocs +@@ -77,14 +79,14 @@ AC_SEARCH_LIBS(locale_charset,charset,, + AC_ARG_ENABLE(xmldocs, [AS_HELP_STRING( + [--enable-xmldocs], [enables XML documents support [default=yes]])], + [], [enable_xmldocs=yes]) ++PKG_PROG_PKG_CONFIG + if test x"$enable_xmldocs" != "xyes"; then + AC_DEFINE(OMIT_XMLDOC) + else +-AC_CHECK_HEADERS(minizip/unzip.h,, [AC_MSG_ERROR([cannot find minizip/unzip.h, bailing out])]) +-AC_SEARCH_LIBS(unzLocateFile, minizip,,AC_MSG_ERROR(['libminizip' is required but it doesn't seem to be installed on this system.])) +- +-AC_CHECK_HEADERS(expat.h,, [AC_MSG_ERROR([cannot find expat.h, bailing out])]) +-AC_CHECK_LIB(expat,XML_ParserCreate,,AC_MSG_ERROR(['expat' is required but it doesn't seem to be installed on this system.])) ++ PKG_CHECK_MODULES(MINIZIP, [minizip], [], [AC_MSG_ERROR([[minizip is required]])]) ++ PKG_CHECK_MODULES(EXPAT, [expat], [], [AC_MSG_ERROR([[expat is required]])]) ++ CFLAGS="${EXPAT_CFLAGS} ${MINIZIP_CFLAGS} ${CFLAGS}" ++ LIBS="${EXPAT_LIBS} ${MINIZIP_LIBS} ${LIBS}" + fi + #----------------------------------------------------------------------- + +diff --git a/freexl.pc.in b/freexl.pc.in +index 5813e68..4393590 100644 +--- a/freexl.pc.in ++++ b/freexl.pc.in +@@ -10,3 +10,5 @@ Description: a simple library extracting data from .xls (Excel BIFF) files + Version: @VERSION@ + Libs: -L${libdir} -lfreexl -lm + Cflags: -I${includedir} ++Libs.private: @ICONV_LIBS@ ++Requires.private: expat minizip diff --git a/ports/freexl/fix-makefiles.patch b/ports/freexl/fix-makefiles.patch deleted file mode 100644 index f6e8251c71d233..00000000000000 --- a/ports/freexl/fix-makefiles.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/makefile.vc b/makefile.vc -index cb8bd36..85c0352 100644 ---- a/makefile.vc -+++ b/makefile.vc -@@ -23,9 +23,9 @@ freexl.lib: $(LIBOBJ) - $(FREEXL_DLL): freexl_i.lib - - freexl_i.lib: $(LIBOBJ) -- link /debug /dll /out:$(FREEXL_DLL) \ -+ link $(LINK_FLAGS) /dll /out:$(FREEXL_DLL) \ - /implib:freexl_i.lib $(LIBOBJ) \ -- C:\OSGeo4w\lib\iconv.lib -+ $(LIBS_ALL) - if exist $(FREEXL_DLL).manifest mt -manifest \ - $(FREEXL_DLL).manifest -outputresource:$(FREEXL_DLL);2 - diff --git a/ports/freexl/fix-pc-file.patch b/ports/freexl/fix-pc-file.patch deleted file mode 100644 index 5a429026de0010..00000000000000 --- a/ports/freexl/fix-pc-file.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a44dbf4..55bd768 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,9 +64,11 @@ AC_CONFIG_FILES([Makefile \ - AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])]) - # on some systems "iconv()" lives in libc. On others it lives in libiconv - # on older systems "libiconv()" lives in libiconv -+SAVED_LIBS="${LIBS}" - AC_SEARCH_LIBS(iconv,iconv,, - AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),)) - AC_SEARCH_LIBS(locale_charset,charset,, - AC_SEARCH_LIBS(nl_langinfo,c,,AC_MSG_ERROR(['libcharset' is required but it doesn't seem to be installed on this system.]),)) -+AC_SUBST(ICONV_LIBS, "${LIBS%${SAVED_LIBS}}") - - AC_OUTPUT - -diff --git a/freexl.pc.in b/freexl.pc.in -index 5813e68..8fc671d 100644 ---- a/freexl.pc.in -+++ b/freexl.pc.in -@@ -10,3 +10,4 @@ Description: a simple library extracting data from .xls (Excel BIFF) files - Version: @VERSION@ - Libs: -L${libdir} -lfreexl -lm - Cflags: -I${includedir} -+Libs.private: @ICONV_LIBS@ diff --git a/ports/freexl/fix-sources.patch b/ports/freexl/fix-sources.patch deleted file mode 100644 index ffac02751a3168..00000000000000 --- a/ports/freexl/fix-sources.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/config-msvc.h b/config-msvc.h -index a39d4e7..37f1c0b 100644 ---- a/config-msvc.h -+++ b/config-msvc.h -@@ -66,7 +66,7 @@ - #define HAVE_SYS_TYPES_H 1 - - /* Define to 1 if you have the header file. */ --#define HAVE_UNISTD_H 1 -+#undef HAVE_UNISTD_H - - /* Define to 1 if `lstat' dereferences a symlink specified with a trailing - slash. */ diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake index 49c7d4c5cfaea0..285dd03c4a7e5b 100644 --- a/ports/freexl/portfile.cmake +++ b/ports/freexl/portfile.cmake @@ -1,18 +1,15 @@ -set(FREEXL_VERSION_STR "1.0.6") - vcpkg_download_distfile(ARCHIVE - URLS "https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-${FREEXL_VERSION_STR}.tar.gz" - FILENAME "freexl-${FREEXL_VERSION_STR}.tar.gz" - SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6 + URLS "https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-${VERSION}.tar.gz" + FILENAME "freexl-${VERSION}.tar.gz" + SHA512 663ccc321c2f0dcab8ad9255b2a77066c2046d531a0aa723fb114301fa27b53bf980787dd2548c46541036eceef988c5eedf2bec053adf628929470e67ddc17a ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES - fix-makefiles.patch - fix-sources.patch - fix-pc-file.patch + dependencies.patch + subdirs.patch ) vcpkg_configure_make( @@ -22,19 +19,13 @@ vcpkg_configure_make( vcpkg_install_make() if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(includedir [[${prefix}/include]]) - set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freexl.pc") - vcpkg_replace_string("${outfile}" " -lm" " -liconv -lcharset") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(includedir [[${prefix}/../include]]) - set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freexl.pc") - vcpkg_replace_string("${outfile}" " -lm" " -liconv -lcharset") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freexl.pc" " -lm" " -liconv -lcharset") + if(NOT DEFINED VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freexl.pc" " -lm" " -liconv -lcharset") endif() endif() - vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/freexl/subdirs.patch b/ports/freexl/subdirs.patch new file mode 100644 index 00000000000000..3beb115264021c --- /dev/null +++ b/ports/freexl/subdirs.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile.am b/Makefile.am +index 50dc7f6..cbc99ca 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = headers src tests examples ++SUBDIRS = headers src + + EXTRA_DIST = makefile.vc nmake.opt makefile64.vc nmake64.opt \ + images/piazza.jpg images/piazza.eps mainpage.doxy config-msvc.h diff --git a/ports/freexl/vcpkg.json b/ports/freexl/vcpkg.json index 557a9f5847c774..04cf20761d0696 100644 --- a/ports/freexl/vcpkg.json +++ b/ports/freexl/vcpkg.json @@ -1,10 +1,12 @@ { "name": "freexl", - "version": "1.0.6", - "port-version": 2, + "version": "2.0.0", "description": "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet", "homepage": "https://www.gaia-gis.it/gaia-sins/freexl-sources", + "license": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later", "dependencies": [ - "libiconv" + "expat", + "libiconv", + "minizip" ] } diff --git a/ports/frugally-deep/portfile.cmake b/ports/frugally-deep/portfile.cmake index 883883f4e659c0..8c2a81bbe6b61d 100644 --- a/ports/frugally-deep/portfile.cmake +++ b/ports/frugally-deep/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Dobiasd/frugally-deep - REF v0.15.19-p0 - SHA512 3721ab90fcae975497346c459ad5c75b7a39fc43caddd0251119888834e6ebcfa75048a4f95104c874f5397e0320e97c345f1ae8d6a730c4dc8e5429f8f46a49 + REF "v${VERSION}-p0" + SHA512 2b9a747420d20a380587ed787f6488c0cab2fadc72fdb25327a8afb95ad251d0fd332b3449b8bc1be8ca8a5eb9cccd4cce8ea92026422d7043f4a0484b734d27 HEAD_REF master ) diff --git a/ports/frugally-deep/vcpkg.json b/ports/frugally-deep/vcpkg.json index e41b9ad6a9fb08..82409a606631dd 100644 --- a/ports/frugally-deep/vcpkg.json +++ b/ports/frugally-deep/vcpkg.json @@ -1,6 +1,6 @@ { "name": "frugally-deep", - "version-semver": "0.15.19-p0", + "version-semver": "0.15.24", "description": "Header-only library for using Keras models in C++.", "homepage": "https://github.com/Dobiasd/frugally-deep", "license": "MIT", diff --git a/ports/fruit/portfile.cmake b/ports/fruit/portfile.cmake index c4bf8ed313e681..8bab51d71b4f3f 100644 --- a/ports/fruit/portfile.cmake +++ b/ports/fruit/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/fruit - REF v3.7.0 - SHA512 6a18f2740fc52672de49f082b5a21d0a236520da83e77806935baca5d5a0b41f75f1d1b6729cad13fc77b0f033d7d8d2158fd58b1e565a7662bd80dc7eb63ba1 + REF "v${VERSION}" + SHA512 82e86b939ce7d1c0f092255211cd0825e7cf96e56b4af44dcbb67c863c41cb398afbbf9098a934b7eea848acc0b48d3dee3a67cf907f9b9ef2a0d59d92507f30 HEAD_REF master ) diff --git a/ports/fruit/vcpkg.json b/ports/fruit/vcpkg.json index d72d26513f346e..5475689963c383 100644 --- a/ports/fruit/vcpkg.json +++ b/ports/fruit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fruit", - "version": "3.7.0", + "version": "3.7.1", "description": "Fruit, a dependency injection framework for C++ by Google", "homepage": "https://github.com/google/fruit", "license": "Apache-2.0", diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake index 264d280be0d5b0..e5dac575826c94 100644 --- a/ports/ftxui/portfile.cmake +++ b/ports/ftxui/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArthurSonzogni/FTXUI REF "v${VERSION}" - SHA512 14de98770e8a23707455f9197e9ef3b41effc1b5b8a594a7270b1378034720f58b5a81b99653d8b1f04e003565ae4778a1e5a3d756c8cbf297e2d09e327f608e + SHA512 be5ed7f2b3c90a7de874115a131c75c69ad9dd6db4c3bc0cfd7036cfe449b8d16af3df8f1aa1bcb057347bd726837e3f1c42e30a06cf3ad34b50e7bd26ba4883 HEAD_REF master ) @@ -21,9 +21,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ftxui.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ftxui.pc") -file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ftxui.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ftxui.pc") vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/ftxui/vcpkg.json b/ports/ftxui/vcpkg.json index b2043bb3c223ed..ebcc09be94ed82 100644 --- a/ports/ftxui/vcpkg.json +++ b/ports/ftxui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ftxui", - "version-semver": "4.1.1", + "version-semver": "5.0.0", "description": "C++ Functional Terminal User Interface", "homepage": "https://github.com/ArthurSonzogni/FTXUI", "license": "MIT", diff --git a/ports/function2/portfile.cmake b/ports/function2/portfile.cmake index 4f59aa93554b12..30d568d9c32ea4 100644 --- a/ports/function2/portfile.cmake +++ b/ports/function2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Naios/function2 - REF 2d3a878ef19dd5d2fb188898513610fac0a48621 # 4.2.2 - SHA512 e59c6fe7f4b68d4d70d1b0ccb3677ee5529e08431ee642933a4de1b217390d3a91f6501f06d0da080af85a5cb55da5b48c6de92818779ac25c6f56166a5b59fd + REF "${VERSION}" + SHA512 8e1a6f40f9bba647ec475845957287cc97aee67287ba1bd13dac453d25c76755bcc032e0439a953911cc2580aef5eefd77022b17ce6038eac90bc638655bb805 HEAD_REF master PATCHES disable-testing.patch diff --git a/ports/function2/vcpkg.json b/ports/function2/vcpkg.json index 859fa9b358242a..67262599a64200 100644 --- a/ports/function2/vcpkg.json +++ b/ports/function2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "function2", - "version-semver": "4.2.2", + "version-semver": "4.2.3", "description": "Improved drop-in replacement to std::function", "homepage": "https://github.com/Naios/function2", "license": "BSL-1.0", diff --git a/ports/functions-framework-cpp/fix-integral-include.patch b/ports/functions-framework-cpp/fix-integral-include.patch new file mode 100644 index 00000000000000..06358535683119 --- /dev/null +++ b/ports/functions-framework-cpp/fix-integral-include.patch @@ -0,0 +1,12 @@ +diff --git a/google/cloud/functions/internal/parse_options.cc b/google/cloud/functions/internal/parse_options.cc +index ba3a2b5..54daf29 100644 +--- a/google/cloud/functions/internal/parse_options.cc ++++ b/google/cloud/functions/internal/parse_options.cc +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + namespace google::cloud::functions_internal { + FUNCTIONS_FRAMEWORK_CPP_INLINE_NAMESPACE_BEGIN diff --git a/ports/functions-framework-cpp/portfile.cmake b/ports/functions-framework-cpp/portfile.cmake index 3752d5fc5ebca2..4567e13fb79b0f 100644 --- a/ports/functions-framework-cpp/portfile.cmake +++ b/ports/functions-framework-cpp/portfile.cmake @@ -4,9 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/functions-framework-cpp - REF v1.1.0 - SHA512 2dcedbded84fdd604724b4f2482ee531aaa640ebdbb69f77978e1af8943d9d7746152953953ebd89d8304ed3efbc334c620890142b0ba2e1239862e43a158364 + REF "v${VERSION}" + SHA512 3832e205a2505152ed6955d7cf5630b2045133221ddd96e2bef62e66cad58cea326f32428e2f494bbe1a10f5d66453d09ae46e6b972a7ed13f211efbb79527a8 HEAD_REF main + PATCHES fix-integral-include.patch ) vcpkg_cmake_configure( diff --git a/ports/functions-framework-cpp/vcpkg.json b/ports/functions-framework-cpp/vcpkg.json index 9056bd1641fc9b..007fbf2dd7ca68 100644 --- a/ports/functions-framework-cpp/vcpkg.json +++ b/ports/functions-framework-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "functions-framework-cpp", - "version": "1.1.0", - "port-version": 4, + "version": "1.2.0", "description": "Functions Framework for C++.", "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/", "license": "Apache-2.0", diff --git a/ports/gaussianlib/portfile.cmake b/ports/gaussianlib/portfile.cmake index 45f6b7ff4c1110..f8fdad1ff75629 100644 --- a/ports/gaussianlib/portfile.cmake +++ b/ports/gaussianlib/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LukasBanana/GaussianLib - REF 8630d4ac14a37f01c71bdf0c1c653e3746aa08da - SHA512 70de394496f20fe7037782d16cfa4bcd85beefdb25094247b8b572e6bb55866be6e2c82722d705141919b91f24428dde7b32f3d8a39670e7ef324c81b1ebe7e2 + REF 9b4a163a9a97c900b0febd93e22dc1be3faf6e20 + SHA512 f16c3cd699e30d3fbd3ef6e80f64716d72383a1f2dc073325f785b63c2ba6edc62e2a7d360eba6a92a42bf4a2ad32accd4ce3e249ee510ff5133745b897a4f55 HEAD_REF master ) diff --git a/ports/gaussianlib/vcpkg.json b/ports/gaussianlib/vcpkg.json index 8b666f5a51aa83..a117097421958a 100644 --- a/ports/gaussianlib/vcpkg.json +++ b/ports/gaussianlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gaussianlib", - "version-date": "2019-08-04", - "port-version": 2, + "version-date": "2023-02-17", "description": "Basic linear algebra C++ library for 2D and 3D applications", "homepage": "https://github.com/LukasBanana/GaussianLib" } diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake index bc85591128a089..c6322c64b9e295 100644 --- a/ports/gazebo/portfile.cmake +++ b/ports/gazebo/portfile.cmake @@ -1,5 +1,5 @@ vcpkg_download_distfile(gazebo3211 - URLS "https://patch-diff.githubusercontent.com/raw/osrf/gazebo/pull/3211.diff" + URLS "https://patch-diff.githubusercontent.com/raw/osrf/gazebo/pull/3211.diff?full_index=1" FILENAME "gazebo3211.diff" SHA512 761e254866d4705acc0b81479285f979c436b3b611739a207a575031d8a8daba48de4fc0c8de5edb9a9f89725586c5caeef9e6e1e3d63a2d961ca09df974f7de ) diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json index 6daf4a7a013441..44cb543488966e 100644 --- a/ports/gazebo/vcpkg.json +++ b/ports/gazebo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gazebo", "version-date": "2022-01-20", - "port-version": 4, + "port-version": 5, "description": "Open source robotics simulator.", "homepage": "http://gazebosim.org", "license": "Apache-2.0", diff --git a/ports/gcem/portfile.cmake b/ports/gcem/portfile.cmake index 79a4894bd7c8c1..944d36e049cb26 100644 --- a/ports/gcem/portfile.cmake +++ b/ports/gcem/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kthohr/gcem - REF v1.16.0 - SHA512 72b2c2022eabe30607533aee4cc7786646fad4d78733f34383dacf7da9298de40e77b3e3f62b5785fd3821387756858bddc94b16dc918fe5d4778e283ae635be + REF "v${VERSION}" + SHA512 ffd92b9a413ac248c02ae1c12ce5607cf5ad06920749668dc05d3f3f0beefc5c5827c9585674acd51738da2dd3c2042b8cc41ba6e29ce129edf6d895c5225d0b HEAD_REF master ) diff --git a/ports/gcem/vcpkg.json b/ports/gcem/vcpkg.json index f00e0c76dc6bd6..e7217d6a99f91b 100644 --- a/ports/gcem/vcpkg.json +++ b/ports/gcem/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gcem", - "version": "1.16.0", + "version": "1.17.0", "description": "A C++ compile-time math library using generalized constant expressions", "homepage": "https://www.kthohr.com/gcem.html", "license": "Apache-2.0", diff --git a/ports/gdal/fix-jpeg.patch b/ports/gdal/fix-jpeg.patch new file mode 100644 index 00000000000000..fb395373445a60 --- /dev/null +++ b/ports/gdal/fix-jpeg.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake +index 9568ef043e..94617e3ac9 100644 +--- a/cmake/helpers/CheckDependentLibraries.cmake ++++ b/cmake/helpers/CheckDependentLibraries.cmake +@@ -416,7 +416,7 @@ if (GDAL_USE_JPEG AND (JPEG_LIBRARY MATCHES ".*turbojpeg\.(so|lib)")) + "JPEG_LIBRARY should point to a library with libjpeg ABI, not TurboJPEG. See https://libjpeg-turbo.org/About/TurboJPEG for the difference" + ) + endif () +-if (TARGET JPEG::JPEG) ++if (GDAL_USE_JPEG AND TARGET JPEG::JPEG) + set(EXPECTED_JPEG_LIB_VERSION "" CACHE STRING "Expected libjpeg version number") + mark_as_advanced(GDAL_CHECK_PACKAGE_${name}_NAMES) + if (EXPECTED_JPEG_LIB_VERSION) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 3a485b66c49479..3ddf916eebfdd4 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -2,12 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 38d488a5c70f0f4b6a3b99a14c747760574680f1f7fc5c6e4c373e3599a03c3227bb1bdefc14c7770f15b5087ff706362ed5a0fc0f5623835f006561f5db9595 + SHA512 95b0dee07a616c8fb26ded2c538a6933ba070c0567e88af9356daea9b1df6c910edb4fcf55766839c1873829d20948b1714b3e2285e5ac57de8fcf0970ff53ff HEAD_REF master PATCHES find-link-libraries.patch fix-gdal-target-interfaces.patch libkml.patch + fix-jpeg.patch ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") @@ -81,6 +82,7 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Java=ON -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON -DCMAKE_DISABLE_FIND_PACKAGE_SWIG=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Arrow=ON -DGDAL_USE_INTERNAL_LIBS=OFF -DGDAL_USE_EXTERNAL_LIBS=OFF -DGDAL_BUILD_OPTIONAL_DRIVERS=ON @@ -166,4 +168,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDA file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT") diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 473678e4711f1b..e66cb60ca46e84 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdal", - "version-semver": "3.7.1", - "port-version": 1, + "version-semver": "3.7.2", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 5df66aaf53d912..91544e90fc2629 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -13,9 +13,6 @@ vcpkg_from_gitlab( ) if("introspection" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature introspection currently only supports dynamic build.") - endif() list(APPEND OPTIONS_DEBUG -Dintrospection=disabled) list(APPEND OPTIONS_RELEASE -Dintrospection=enabled) else() diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index 68cd59bd945956..9caa47cee92523 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdk-pixbuf", "version": "2.42.10", - "port-version": 1, + "port-version": 2, "description": "Image loading library.", "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", "license": "LGPL-2.1-or-later", @@ -28,14 +28,7 @@ "introspection": { "description": "build with introspection", "dependencies": [ - { - "name": "gobject-introspection", - "host": true - }, - { - "name": "gobject-introspection", - "platform": "windows & x86" - } + "gobject-introspection" ] } } diff --git a/ports/getopt-win32/getopt.h.patch b/ports/getopt-win32/getopt.h.patch deleted file mode 100644 index 58435f4817c8ef..00000000000000 --- a/ports/getopt-win32/getopt.h.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 81c35ed14e07138e44b5b30f52fbc2bb26ae1fed -Author: Max Khon -Date: Mon Jan 24 23:05:24 2022 +0700 - - Rename "extern C" macros as MS VC C++ headers use _END_EXTERN_C macro - -diff --git a/getopt.h b/getopt.h -index 5ed4a46..5e33682 100644 ---- a/getopt.h -+++ b/getopt.h -@@ -57,12 +57,12 @@ EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - // Change behavior for C\C++ - #ifdef __cplusplus -- #define _BEGIN_EXTERN_C extern "C" { -- #define _END_EXTERN_C } -+ #define _GETOPT_BEGIN_EXTERN_C extern "C" { -+ #define _GETOPT_END_EXTERN_C } - #define _GETOPT_THROW throw() - #else -- #define _BEGIN_EXTERN_C -- #define _END_EXTERN_C -+ #define _GETOPT_BEGIN_EXTERN_C -+ #define _GETOPT_END_EXTERN_C - #define _GETOPT_THROW - #endif - -@@ -81,7 +81,7 @@ EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - #include - #include - --_BEGIN_EXTERN_C -+_GETOPT_BEGIN_EXTERN_C - - extern _GETOPT_API int optind; - extern _GETOPT_API int opterr; -@@ -113,10 +113,10 @@ _BEGIN_EXTERN_C - extern _GETOPT_API int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW; - extern _GETOPT_API int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW; - --_END_EXTERN_C -+_GETOPT_END_EXTERN_C - -- #undef _BEGIN_EXTERN_C -- #undef _END_EXTERN_C -+ #undef _GETOPT_BEGIN_EXTERN_C -+ #undef _GETOPT_END_EXTERN_C - #undef _GETOPT_THROW - #undef _GETOPT_API - diff --git a/ports/getopt-win32/portfile.cmake b/ports/getopt-win32/portfile.cmake index e5cddc83dbf0e3..5b1eb8f6d480c1 100644 --- a/ports/getopt-win32/portfile.cmake +++ b/ports/getopt-win32/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO libimobiledevice-win32/getopt - REF 0.1 - SHA512 40e2a901241a5d751cec741e5de423c8f19b105572c7cae18adb6e69be0b408efc6c9a2ecaeb62f117745eac0d093f30d6b91d88c1a27e1f7be91f0e84fdf199 + REPO xiaozhuai/getopt-win32 + REF b69a586f0b1aa37b77c3cf0a9dedba1900007678 + SHA512 6e52b6f198073e85b3a29a2fe21435c591fce02c68cb8cf9b546791dd1197e9b91dd9104af449071b4a1d1485817a483f1989a2e585c2d0470cfd079290fe155 HEAD_REF master - PATCHES getopt.h.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") @@ -18,8 +17,8 @@ file(COPY "${SOURCE_PATH}/getopt.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/include/getopt.h" - " #define __GETOPT_H_" - " #define __GETOPT_H_\n #define STATIC_GETOPT" + "defined(STATIC_GETOPT)" + "1" ) endif() @@ -29,6 +28,7 @@ vcpkg_cmake_config_fixup( ) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS "enabled") diff --git a/ports/getopt-win32/vcpkg.json b/ports/getopt-win32/vcpkg.json index bda4d6696d495d..7429396920feab 100644 --- a/ports/getopt-win32/vcpkg.json +++ b/ports/getopt-win32/vcpkg.json @@ -1,9 +1,8 @@ { "name": "getopt-win32", - "version": "0.1", - "port-version": 7, + "version": "1.1.0.20220925", "description": "An implementation of getopt.", - "homepage": "https://github.com/libimobiledevice-win32/getopt", + "homepage": "https://www.codeproject.com/Articles/157001/Full-getopt-Port-for-Unicode-and-Multibyte-Microso/", "license": "LGPL-3.0-only", "supports": "windows & !mingw", "dependencies": [ diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index b40a2642b95e9d..fa30dde8f761ca 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -153,6 +153,13 @@ if(subdirs) vcpkg_install_make() vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(GLOB unix_runtime LIST_DIRECTORIES false + "${CURRENT_PACKAGES_DIR}/lib/libgettext*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}*" + "${CURRENT_PACKAGES_DIR}/lib/libtextstyle*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}*" + ) + if(unix_runtime) + file(INSTALL ${unix_runtime} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + endif() file(GLOB link_libs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/*" "${CURRENT_PACKAGES_DIR}/bin/*.dll") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include" ${link_libs}) endif() diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index e7a0f77bef926b..e3428cfaeb59c1 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gettext", "version": "0.21.1", - "port-version": 2, + "port-version": 3, "description": "A GNU framework to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", "license": "GPL-3.0-only", diff --git a/ports/ginkgo/portfile.cmake b/ports/ginkgo/portfile.cmake index 2faede6d561279..c8080e7670f224 100644 --- a/ports/ginkgo/portfile.cmake +++ b/ports/ginkgo/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(WINDOWS_SYMBOLS_PATCH - URLS https://github.com/ginkgo-project/ginkgo/commit/7481b2fffb51d73492ef9017045450b29b820f81.diff + URLS https://github.com/ginkgo-project/ginkgo/commit/7481b2fffb51d73492ef9017045450b29b820f81.diff?full_index=1 FILENAME 7481b2fffb51d73492ef9017045450b29b820f81.diff - SHA512 f81c57aacc30680383ccfb21ca08987d8ea19a23c0c7bbc5ae590c3c7eca4eed72cea84410357e080e5bb35f08f6b57834b3cdace6d91cc3fde0a1930aa4270a + SHA512 f2997dc1af55db2a152092b70097238af77d7345329b9033a19301cfc4d8d494c5c41fbbd9a63b3303697764fc5f799dfe93647bafbbefae8981a978ecaa6a68 ) vcpkg_from_github( diff --git a/ports/ginkgo/vcpkg.json b/ports/ginkgo/vcpkg.json index 426e388afe7336..76d755a4764834 100644 --- a/ports/ginkgo/vcpkg.json +++ b/ports/ginkgo/vcpkg.json @@ -1,8 +1,10 @@ { "name": "ginkgo", "version-semver": "1.4.0", - "port-version": 1, + "port-version": 2, "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems. Note that the OpenMP feature is not available on Windows.", + "homepage": "https://github.com/ginkgo-project/ginkgo", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 2076b27f74b84b..0dd851dc8372ef 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 d2adcc18cb5a06ee6ba96f9d905a7cebd7c566eae3d6b91111e3b71a2f121bd5bd1ce84892aefcc1df05569132bed69de097168e8dc33f5ab76aa8e0e8d9af74 + SHA512 f9730a9b572d50f4d7f50cb7d8584d3c1169ecf34e58017e96cc581de066e864fa5551f6a8d32aaf1a99ddbcebe3b3cbc2961b77a9b33dc83fb75f4558007531 ) vcpkg_cmake_configure( @@ -20,4 +20,4 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 50ca7e685a6fde..4cc1225c8df4c2 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glaze", - "version": "1.3.3", - "port-version": 1, + "version": "1.5.1", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index a8a5eee65e2d8f..c36828c4438f86 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -2,7 +2,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(GLIB_ARCHIVE URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz" FILENAME "glib-${VERSION}.tar.xz" - SHA512 291b8913918d411b679442b888f56893a857a77decfe428086c8bd1da1949498938ddb0bf254ed99d192e4a09b5e8cee1905fd6932ee642463fb229cac7c226e + SHA512 190a98e9a0ebb802a31b511e95725ed1fec9d750aed6bd87f14f3047d1f1d79458be3fa954fd6eb9af9f481a8deeaae73c95c990f5aa002a4b1166372ed4c4f1 ) vcpkg_extract_source_archive(SOURCE_PATH @@ -13,6 +13,10 @@ vcpkg_extract_source_archive(SOURCE_PATH fix-build-race-on-gio.patch # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3512 ) +if(APPLE) + list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_ENABLE_OBJC=1") +endif() + vcpkg_list(SET OPTIONS) if (selinux IN_LIST FEATURES) if(NOT EXISTS "/usr/include/selinux") @@ -38,6 +42,7 @@ endif() vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" + LANGUAGES C CXX OBJC OBJCXX ADDITIONAL_BINARIES ${ADDITIONAL_BINARIES} OPTIONS diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index f4f7d3aad5a6f7..01f38b57d3c5ee 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glib", - "version": "2.76.3", - "port-version": 2, + "version": "2.76.5", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index 133c81ec6e7ccf..a3e5e2e8c92184 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO g-truc/glm - REF bf71a834948186f4097caa076cd2663c69a10e1e #v0.9.9.8 - SHA512 226266c02af616a96fb19ee32cf3f98347daa43a4fde5d618d36b38709dce1280de126c542524d40725ecf70359edcc5b60660554c65ce246514501fb4c9c87c + REF 5c46b9c07008ae65cb81ab79cd677ecc1934b903 # commit on 2023-06-08 + SHA512 17315dd05059accf3d4084d35dd037d4001f88a1d91da9a6fd5cedecab652c8bef8efa89cd45e21cd227f964a03408401edc2384c22e50caa449abf71b23fd6a HEAD_REF master ) @@ -19,5 +19,5 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -# Put the license file where vcpkg expects it -file(INSTALL "${SOURCE_PATH}/copying.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/copying.txt") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/glm/usage b/ports/glm/usage new file mode 100644 index 00000000000000..95602ece2bad5c --- /dev/null +++ b/ports/glm/usage @@ -0,0 +1,4 @@ +glm provides CMake targets: + + find_package(glm CONFIG REQUIRED) + target_link_libraries(main PRIVATE glm::glm) diff --git a/ports/glm/vcpkg.json b/ports/glm/vcpkg.json index a81138c051cc8f..91bf95e6b0618b 100644 --- a/ports/glm/vcpkg.json +++ b/ports/glm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glm", - "version": "0.9.9.8", - "port-version": 2, + "version-date": "2023-06-08", "description": "OpenGL Mathematics (GLM)", "homepage": "https://glm.g-truc.net", "license": "MIT", diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 19ba383a682beb..7353c7d4afbfeb 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang REF "${VERSION}" - SHA512 999ee0a4324263f6c12126b76bb098fc7009ea444be5cb052bd3fd7109589b52180acd8e7a90735ef7dc4be1e29aab5d98845e1aeae874b7d2ccc9279063ab50 + SHA512 678df76a6f23b9da93f111fc7e6db57b7f6bf34661b077f9259a0a77d6c023b4d2e3c1cd60b3f9fc15fe69f25cdcb19877e88a50771d3d5275e32574eaefc056 HEAD_REF master ) diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index cce3d534c631ed..159c4240c61a63 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glslang", - "version": "12.2.0", - "port-version": 1, + "version": "13.0.0", "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.", "homepage": "https://github.com/KhronosGroup/glslang", "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later", diff --git a/ports/gmmlib/portfile.cmake b/ports/gmmlib/portfile.cmake index 4fb8c45208dffd..acfc3aade22824 100644 --- a/ports/gmmlib/portfile.cmake +++ b/ports/gmmlib/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/gmmlib - REF intel-gmmlib-21.3.2 - SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be + REF "intel-gmmlib-${VERSION}" + SHA512 afe64aaaddac9b72ff12aa41faeb668141999e1b9c644fa21ced8fd851cf698ec57bac1080c87c0fae5c464b47ea5b94e6290c0e4c0c24ec010071f535c60e42 HEAD_REF master ) diff --git a/ports/gmmlib/vcpkg.json b/ports/gmmlib/vcpkg.json index cd2ee1825b4aaa..4bb0a4064a646e 100644 --- a/ports/gmmlib/vcpkg.json +++ b/ports/gmmlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gmmlib", - "version": "21.3.2", - "port-version": 1, + "version": "22.3.12", "description": "Intel(R) Graphics Memory Management Library", "homepage": "https://github.com/intel/gmmlib", "license": "MIT", diff --git a/ports/gmsh/portfile.cmake b/ports/gmsh/portfile.cmake index 78f9194a191135..f42b94309ca6c0 100644 --- a/ports/gmsh/portfile.cmake +++ b/ports/gmsh/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.onelab.info OUT_SOURCE_PATH SOURCE_PATH REPO gmsh/gmsh - REF gmsh_4_9_0 - SHA512 e70a09741a86a9131094e77742078aec1cc94517e1d7c855c257bc93c21c057e25c7ac5168d31ec4d905d78f31d5704faf63bfd3a81b4b9e2ebbcfacf2fdaa8b + REF gmsh_4_11_1 + SHA512 4c10a41659ee4f70ba5091f9ae1c4c3ee285ccf217c3de1157a0d6d694e6f1df9a6b1329b2b24029dd52f945dd7605e477302bdb358106a8d97e903eaba425dc HEAD_REF master PATCHES fix-install.patch ) @@ -108,4 +108,4 @@ vcpkg_copy_tools(TOOL_NAMES gmsh AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/gmsh/vcpkg.json b/ports/gmsh/vcpkg.json index 70b1d266ec9cec..1caf380c550ecb 100644 --- a/ports/gmsh/vcpkg.json +++ b/ports/gmsh/vcpkg.json @@ -1,8 +1,9 @@ { "name": "gmsh", - "version": "4.9.0", + "version": "4.11.1", "description": "Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor.", "homepage": "https://gmsh.info", + "license": "LGPL-2.0-or-later", "supports": "!uwp", "dependencies": [ "blas", diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json index 783866dbd8eb58..25dc66d235dc7d 100644 --- a/ports/gobject-introspection/vcpkg.json +++ b/ports/gobject-introspection/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gobject-introspection", "version": "1.72.0", - "port-version": 4, + "port-version": 5, "description": "A middleware layer between C libraries (using GObject) and language bindings.", "homepage": "https://gi.readthedocs.io/en/latest/", "license": null, @@ -23,6 +23,7 @@ "name": "gobject-introspection", "host": true }, + "libffi", "python3", { "name": "vcpkg-tool-meson", diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index ce16a2a63c9a69..011d6b0e27cba4 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp REF "v${VERSION}" - SHA512 c7fd2445339fbb9f66d6863693feff456fa14381e83f3e28456aed2e8102c8d776868afa1a5020874672306f68e911f199b5ce667c61708166925c63877e8c5d + SHA512 225202a8e799f630f0b07c392bf305c28e21b99ef8dc5a670238a6d08e0e2816cd8ca1c43d7b252bcf5d289f875e64c16413085f63663265169807fd59977e43 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 69aa7ebf3e348a..8c5c49b540e3f4 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "2.14.0", - "port-version": 1, + "version": "2.15.1", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -441,6 +440,18 @@ } ] }, + "datastore": { + "description": "Cloud Datastore API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "datastream": { "description": "Datastream API C++ Client Library", "dependencies": [ @@ -501,6 +512,18 @@ } ] }, + "discoveryengine": { + "description": "Discovery Engine API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "dlp": { "description": "Cloud Data Loss Prevention (DLP) API C++ Client Library", "dependencies": [ @@ -903,6 +926,18 @@ } ] }, + "policysimulator": { + "description": "Policy Simulator API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "policytroubleshooter": { "description": "Policy Troubleshooter API C++ Client Library", "dependencies": [ diff --git a/ports/gperftools/vcpkg.json b/ports/gperftools/vcpkg.json index e84f2a39b22a83..6cc9b530cbf431 100644 --- a/ports/gperftools/vcpkg.json +++ b/ports/gperftools/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gperftools", "version": "2.10", + "port-version": 1, "description": "A set of tools for performance profiling and memory checking", "homepage": "https://github.com/gperftools/gperftools", "supports": "!(arm & windows) & !uwp & !android", @@ -14,7 +15,7 @@ "features": { "override": { "description": "Override allocators", - "supports": "windows" + "supports": "windows & staticcrt" }, "tools": { "description": "Build gperftools CLI tools", diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index 921e19fc48c68e..f63b32f9fa091e 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -1,11 +1,11 @@ -set(GM_VERSION 1.3.37) +set(GM_VERSION 1.3.41) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO graphicsmagick/graphicsmagick REF ${GM_VERSION} FILENAME "GraphicsMagick-${GM_VERSION}-windows.7z" - SHA512 2e465a290946d730c0da1b45602ebdebc256d9a0705d6d79784efcefb0760a923dd78c73f7a563ce6ec41e4199da66d3b31cc8c6b8f821ff993092d348aeaa2f + SHA512 4790081136af67bf406b94e3de88feff295cc98fd3b125776e014436b12dbb31331af4ee4f8497ccc39d4afda08145b5e4bfeb45b3210a50e17b14e4dc2a220d PATCHES # GM always requires a dynamic BZIP2. This patch makes this dependent if _DLL is defined dynamic_bzip2.patch diff --git a/ports/graphicsmagick/vcpkg.json b/ports/graphicsmagick/vcpkg.json index 90e01917de474b..6f3b879429446e 100644 --- a/ports/graphicsmagick/vcpkg.json +++ b/ports/graphicsmagick/vcpkg.json @@ -1,7 +1,6 @@ { "name": "graphicsmagick", - "version": "1.3.37", - "port-version": 3, + "version": "1.3.41", "description": "Image processing library", "homepage": "https://sourceforge.net/projects/graphicsmagick/", "dependencies": [ diff --git a/ports/graphviz/cmake-project-include.cmake b/ports/graphviz/cmake-project-include.cmake index b4f23054e424a0..81a50f91bfaeb4 100644 --- a/ports/graphviz/cmake-project-include.cmake +++ b/ports/graphviz/cmake-project-include.cmake @@ -3,3 +3,8 @@ if(MSVC) set(GETOPT_LIBRARY "unofficial::getopt-win32::getopt" CACHE INTERNAL "vcpkg") set(GETOPT_RUNTIME_LIBRARY "unused" CACHE INTERNAL "vcpkg") endif() + +if(MINGW AND BUILD_SHARED_LIBS AND NOT CMAKE_CROSSCOMPILING) + # Prevent running `configure_plugins.cmake`. + set(CMAKE_CROSSCOMPILING 1) +endif() diff --git a/ports/graphviz/disable-pragma-lib.patch b/ports/graphviz/disable-pragma-lib.patch new file mode 100644 index 00000000000000..c30c532cad2204 --- /dev/null +++ b/ports/graphviz/disable-pragma-lib.patch @@ -0,0 +1,36 @@ +diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp +index 98a2a4a..e810c36 100644 +--- a/cmd/gvedit/main.cpp ++++ b/cmd/gvedit/main.cpp +@@ -30,6 +30,7 @@ + + + #ifdef _MSC_VER ++#elif 0 + #pragma comment( lib, "cgraph.lib" ) + #pragma comment( lib, "gvc.lib" ) + #pragma comment( lib, "ingraphs.lib" ) +diff --git a/plugin/gdk/gvloadimage_gdk.c b/plugin/gdk/gvloadimage_gdk.c +index 84c6a6a..0d3ec64 100644 +--- a/plugin/gdk/gvloadimage_gdk.c ++++ b/plugin/gdk/gvloadimage_gdk.c +@@ -22,6 +22,7 @@ + #include + + #ifdef _MSC_VER //*dependencies ++#elif 0 + #pragma comment( lib, "gvc.lib" ) + #pragma comment( lib, "glib-2.0.lib" ) + #pragma comment( lib, "cairo.lib" ) +diff --git a/plugin/webp/gvloadimage_webp.c b/plugin/webp/gvloadimage_webp.c +index c983556..446d43f 100644 +--- a/plugin/webp/gvloadimage_webp.c ++++ b/plugin/webp/gvloadimage_webp.c +@@ -24,6 +24,7 @@ + #include + + #ifdef _MSC_VER //*dependencies ++#elif 0 + #pragma comment( lib, "gvc.lib" ) + #pragma comment( lib, "glib-2.0.lib" ) + #pragma comment( lib, "pango-1.0.lib" ) diff --git a/ports/graphviz/fix-dependencies.patch b/ports/graphviz/fix-dependencies.patch index 0e3832815d33b5..a08f785776f724 100644 --- a/ports/graphviz/fix-dependencies.patch +++ b/ports/graphviz/fix-dependencies.patch @@ -1,5 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 12fd424..11371df 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -126,9 +126,13 @@ endif() + find_package(PANGOCAIRO) + find_package(PkgConfig) + if(PkgConfig_FOUND) +- pkg_check_modules(POPPLER poppler-glib) +- pkg_check_modules(RSVG librsvg-2.0) +- pkg_check_modules(WEBP libwebp) ++ #pkg_check_modules(POPPLER poppler-glib IMPORTED_TARGET REQUIRED) ++ set(POPPLER_LIBRARIES PkgConfig::POPPLER) ++ set(POPPLER_FOUND 0) ++ pkg_check_modules(RSVG librsvg-2.0 IMPORTED_TARGET REQUIRED) ++ set(RSVG_LIBRARIES PkgConfig::RSVG) ++ pkg_check_modules(WEBP libwebp IMPORTED_TARGET REQUIRED) ++ set(WEBP_LIBRARIES PkgConfig::WEBP) + else() + set(POPPLER_FOUND 0) + set(RSVG_FOUND 0) diff --git a/cmake/FindCAIRO.cmake b/cmake/FindCAIRO.cmake -index a92916e..799fa68 100644 +index 65bb42f..47949f6 100644 --- a/cmake/FindCAIRO.cmake +++ b/cmake/FindCAIRO.cmake @@ -1,6 +1,6 @@ @@ -7,11 +28,22 @@ index a92916e..799fa68 100644 -if(WIN32) +if(0) - find_path(CAIRO_INCLUDE_DIR cairo/cairo.h) + find_path( + CAIRO_INCLUDE_DIR cairo.h + PATH_SUFFIXES cairo +@@ -39,7 +39,9 @@ if(WIN32) + ) + else() + find_package(PkgConfig) +- pkg_check_modules(CAIRO cairo) ++ pkg_check_modules(CAIRO cairo IMPORTED_TARGET) ++ set(CAIRO_LIBRARIES PkgConfig::CAIRO) ++ set(CAIRO_LINK_LIBRARIES PkgConfig::CAIRO) - find_library(CAIRO_LIBRARY NAMES cairo) + find_package_handle_standard_args(CAIRO DEFAULT_MSG + CAIRO_INCLUDE_DIRS diff --git a/cmake/FindGD.cmake b/cmake/FindGD.cmake -index d7e0cc9..2322fcd 100644 +index 0deb5e6..ef42889 100644 --- a/cmake/FindGD.cmake +++ b/cmake/FindGD.cmake @@ -1,3 +1,11 @@ @@ -26,19 +58,41 @@ index d7e0cc9..2322fcd 100644 find_path(GD_INCLUDE_DIR gd.h) find_library(GD_LIBRARY NAMES gd libgd) find_program(GD_RUNTIME_LIBRARY libgd.dll) +diff --git a/cmake/FindGTS.cmake b/cmake/FindGTS.cmake +index 8e544e9..88dd849 100644 +--- a/cmake/FindGTS.cmake ++++ b/cmake/FindGTS.cmake +@@ -1,5 +1,5 @@ + include(FindPackageHandleStandardArgs) +-if(WIN32) ++if(0) + find_path(GTS_INCLUDE_DIR gts.h) + find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0) + find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h +@@ -40,7 +40,8 @@ if(WIN32) + ) + else() + find_package(PkgConfig) +- pkg_check_modules(GTS gts) ++ pkg_check_modules(GTS gts IMPORTED_TARGET) ++ set(GTS_LINK_LIBRARIES PkgConfig::GTS) + + find_package_handle_standard_args(GTS DEFAULT_MSG + GTS_INCLUDE_DIRS diff --git a/cmake/FindLTDL.cmake b/cmake/FindLTDL.cmake -index a1ee8c2..08b7f50 100644 +index e955b74..046e9e8 100644 --- a/cmake/FindLTDL.cmake +++ b/cmake/FindLTDL.cmake -@@ -16,3 +16,6 @@ mark_as_advanced(LTDL_INCLUDE_DIR LTDL_LIBRARY) - +@@ -17,4 +17,7 @@ mark_as_advanced(LTDL_INCLUDE_DIR LTDL_LIBRARY) set(LTDL_INCLUDE_DIRS ${LTDL_INCLUDE_DIR}) - set(LTDL_LIBRARIES ${LTDL_LIBRARY}) -+if(CMAKE_DL_LIBS AND NOT BUILD_SHARED_LIBS) -+ set(LTDL_LIBRARIES "${LTDL_LIBRARIES};${CMAKE_DL_LIBS}") -+endif() + if(NOT WIN32 OR MINGW) + set(LTDL_LIBRARIES ${LTDL_LIBRARY}) ++ if(CMAKE_DL_LIBS AND NOT BUILD_SHARED_LIBS) ++ set(LTDL_LIBRARIES "${LTDL_LIBRARIES};${CMAKE_DL_LIBS}") ++ endif() + endif() diff --git a/cmake/FindPANGOCAIRO.cmake b/cmake/FindPANGOCAIRO.cmake -index b92e5be..225589e 100644 +index b92e5be..01c4cc7 100644 --- a/cmake/FindPANGOCAIRO.cmake +++ b/cmake/FindPANGOCAIRO.cmake @@ -1,6 +1,6 @@ @@ -49,13 +103,52 @@ index b92e5be..225589e 100644 find_path(PANGOCAIRO_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0) find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0) find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h -@@ -78,7 +78,8 @@ if(WIN32) +@@ -78,7 +78,9 @@ if(WIN32) ) else() find_package(PkgConfig) - pkg_check_modules(PANGOCAIRO pangocairo) + pkg_check_modules(PANGOCAIRO pangocairo IMPORTED_TARGET) ++ set(PANGOCAIRO_LIBRARIES PkgConfig::PANGOCAIRO) + set(PANGOCAIRO_LINK_LIBRARIES PkgConfig::PANGOCAIRO) # https://gitlab.kitware.com/cmake/cmake/-/issues/16154 find_package_handle_standard_args(PANGOCAIRO DEFAULT_MSG PANGOCAIRO_INCLUDE_DIRS +diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt +index d2ea435..3b068b0 100644 +--- a/cmd/dot/CMakeLists.txt ++++ b/cmd/dot/CMakeLists.txt +@@ -73,22 +73,20 @@ endif() + + find_package(PkgConfig) + if(PkgConfig_FOUND) +- pkg_check_modules(GTS gts) + if(GTS_FOUND) + target_include_directories(dot_builtins SYSTEM PRIVATE ${GTS_INCLUDE_DIRS}) + target_link_libraries(dot_builtins PRIVATE ${GTS_LINK_LIBRARIES}) + endif() + + pkg_check_modules(LASI lasi) +- if(LASI_FOUND) ++ if(TARGET gvplugin_lasi) + target_link_libraries(dot_builtins PRIVATE gvplugin_lasi) + endif() + endif() + + if(PANGOCAIRO_FOUND) + target_link_libraries(dot_builtins PRIVATE gvplugin_pango) +- if(PkgConfig_FOUND) +- pkg_check_modules(WEBP libwebp) ++ if(TARGET gvplugin_webp) + if(WEBP_FOUND) + target_link_libraries(dot_builtins PRIVATE gvplugin_webp) + endif() +@@ -96,7 +94,7 @@ if(PANGOCAIRO_FOUND) + endif() + + find_library(SOCKET socket) +-if(SOCKET) ++if(0) + target_link_libraries(dot_builtins PRIVATE ${SOCKET}) + endif() + diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake index 3a827fde3afde3..966004560681a4 100644 --- a/ports/graphviz/portfile.cmake +++ b/ports/graphviz/portfile.cmake @@ -1,13 +1,15 @@ set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) # for plugins +set(VCPKG_POLICY_DLLS_WITHOUT_EXPORTS enabled) # kitty and vt plugin not ready yet? vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO graphviz/graphviz REF "${VERSION}" - SHA512 5872db8aefb9bebf6fea91dbe96759c42fa82dbe811238c7d6de8db5a0c6af77749083af60fc21f8e42c4fc159a2cbfefcc304967edda3d2832ef396c457530a + SHA512 1edcf6aa232d38d1861a344c1a4a88aac51fd4656d667783ca1608ac694025199595a72a293c4eee2f7c7326ce54f22b787a5b7f4c44946f2de6096bd8f0e79d HEAD_REF main PATCHES + disable-pragma-lib.patch fix-dependencies.patch no-absolute-paths.patch select-plugins.patch @@ -45,7 +47,6 @@ vcpkg_find_acquire_program(PYTHON3) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS "-DVERSION=${VERSION}" "-DBISON_EXECUTABLE=${BISON}" @@ -56,6 +57,7 @@ vcpkg_cmake_configure( "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -Dinstall_win_dependency_dlls=OFF -Duse_win_pre_inst_libs=OFF + -Dwith_gvedit=OFF -Dwith_smyrna=OFF -DCMAKE_DISABLE_FIND_PACKAGE_ANN=ON -DCMAKE_REQUIRE_FIND_PACKAGE_CAIRO=ON @@ -84,7 +86,41 @@ foreach(script_or_link IN ITEMS "dot2gxl${VCPKG_TARGET_EXECUTABLE_SUFFIX}" gvmap endif() endforeach() vcpkg_copy_tools( - TOOL_NAMES acyclic bcomps ccomps circo diffimg dijkstra dot edgepaint fdp gc gml2gv graphml2gv gv2gml gvcolor gvgen gvmap gvpack gvpr gxl2gv mm2gv neato nop osage patchwork sccmap sfdp tred twopi unflatten + TOOL_NAMES + acyclic + bcomps + ccomps + circo + cluster + diffimg + dijkstra + dot + dot_builtins + edgepaint + fdp + gc + gml2gv + graphml2gv + gv2gml + gv2gxl + gvcolor + gvgen + gvmap + gvpack + gvpr + gxl2dot + gxl2gv + mm2gv + neato + nop + osage + patchwork + prune + sccmap + sfdp + tred + twopi + unflatten AUTO_CLEAN ) diff --git a/ports/graphviz/select-plugins.patch b/ports/graphviz/select-plugins.patch index 21539264c282ff..4a78ef8947d6d4 100644 --- a/ports/graphviz/select-plugins.patch +++ b/ports/graphviz/select-plugins.patch @@ -1,16 +1,21 @@ diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt -index 6f40f27..420ad0f 100644 +index 3956102..d14bf9c 100644 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt -@@ -1,4 +1,11 @@ +@@ -1,16 +1,10 @@ add_subdirectory(core) -+add_subdirectory(dot_layout) -+add_subdirectory(gdiplus) -+add_subdirectory(neato_layout) -+add_subdirectory(pango) -+add_subdirectory(quartz) -+add_subdirectory(gd) -+return() - add_subdirectory(devil) +-add_subdirectory(devil) add_subdirectory(dot_layout) add_subdirectory(gd) + add_subdirectory(gdiplus) +-add_subdirectory(gdk) +-add_subdirectory(gs) +-add_subdirectory(gtk) + add_subdirectory(kitty) +-add_subdirectory(lasi) + add_subdirectory(neato_layout) + add_subdirectory(pango) +-add_subdirectory(poppler) + add_subdirectory(quartz) + add_subdirectory(rsvg) + add_subdirectory(vt) diff --git a/ports/graphviz/static-linkage.patch b/ports/graphviz/static-linkage.patch index 49b03da54804ce..c815eff33a196d 100644 --- a/ports/graphviz/static-linkage.patch +++ b/ports/graphviz/static-linkage.patch @@ -1,8 +1,52 @@ +diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt +index 3b068b0..4e3758f 100644 +--- a/cmd/dot/CMakeLists.txt ++++ b/cmd/dot/CMakeLists.txt +@@ -58,6 +58,7 @@ target_link_libraries(dot_builtins PRIVATE + gvplugin_core + gvplugin_dot_layout + gvplugin_neato_layout ++ ${GTS_LINK_LIBRARIES} + pathplan + xdot + ) +diff --git a/cmd/gvmap/CMakeLists.txt b/cmd/gvmap/CMakeLists.txt +index d5b0d42..9263b19 100644 +--- a/cmd/gvmap/CMakeLists.txt ++++ b/cmd/gvmap/CMakeLists.txt +@@ -26,6 +26,7 @@ if(with_sfdp) + gvc + ingraphs + neatogen ++ ${GTS_LINK_LIBRARIES} + rbtree + sfdpgen + sparse +@@ -92,6 +93,7 @@ if(with_sfdp) + gvc + ingraphs + neatogen ++ ${GTS_LINK_LIBRARIES} + rbtree + sfdpgen + sparse +diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt +index 6928bf6..5a4c308 100644 +--- a/cmd/tools/CMakeLists.txt ++++ b/cmd/tools/CMakeLists.txt +@@ -320,6 +320,7 @@ target_link_libraries(gvpack + cgraph + gvc + gvplugin_neato_layout ++ ${GTS_LINK_LIBRARIES} + ingraphs + ) + diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c -index 960271c..2494e95 100644 +index 0085107..8879003 100644 --- a/plugin/gd/gvrender_gd.c +++ b/plugin/gd/gvrender_gd.c -@@ -259,7 +259,7 @@ static void gdgen_missingfont(char *fontreq) { +@@ -240,7 +240,7 @@ static void gdgen_end_page(GVJ_t * job) #else #define GD_IMPORT #endif @@ -12,7 +56,7 @@ index 960271c..2494e95 100644 void gdgen_text(gdImagePtr im, pointf spf, pointf epf, int fontcolor, double fontsize, int fontdpi, double fontangle, char *fontname, char *str) { diff --git a/plugin/pango/CMakeLists.txt b/plugin/pango/CMakeLists.txt -index 26749af..65d77e4 100644 +index aca7eec..901f118 100644 --- a/plugin/pango/CMakeLists.txt +++ b/plugin/pango/CMakeLists.txt @@ -58,6 +58,7 @@ if(CAIRO_FOUND AND PANGOCAIRO_FOUND) diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json index 3d37d87f147068..ad63d6c76850df 100644 --- a/ports/graphviz/vcpkg.json +++ b/ports/graphviz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphviz", - "version-semver": "7.0.0", - "port-version": 2, + "version-semver": "9.0.0", + "port-version": 1, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", "license": "EPL-1.0", @@ -12,6 +12,7 @@ "default-features": false }, "getopt", + "gts", { "name": "libgd", "default-features": false, @@ -23,6 +24,8 @@ "tiff" ] }, + "librsvg", + "libwebp", "pango", { "name": "pkgconf", diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 8fff07a24c778e..35dd585098821d 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "grpc", "version-semver": "1.51.1", + "port-version": 1, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", @@ -40,7 +41,8 @@ "description": "Deprecated." }, "codegen": { - "description": "Build code generator machinery" + "description": "Build code generator machinery", + "supports": "!uwp" } } } diff --git a/ports/gsoap/portfile.cmake b/ports/gsoap/portfile.cmake index d6073274697d13..04a482f5623439 100644 --- a/ports/gsoap/portfile.cmake +++ b/ports/gsoap/portfile.cmake @@ -11,50 +11,41 @@ vcpkg_from_sourceforge( set(BUILD_ARCH "Win32") -# Handle binary files and includes -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/gsoap ${CURRENT_PACKAGES_DIR}/debug/tools) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/gsoap" "${CURRENT_PACKAGES_DIR}/debug/tools") if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_build_msbuild( - USE_VCPKG_INTEGRATION - PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln + vcpkg_msbuild_install( + PROJECT_PATH "${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln" PLATFORM ${BUILD_ARCH} TARGET Build ) - vcpkg_build_msbuild( - USE_VCPKG_INTEGRATION - PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln + vcpkg_msbuild_install( + PROJECT_PATH "${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln" PLATFORM ${BUILD_ARCH} TARGET Build ) - - file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/release/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/) - file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/release/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/) - file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/debug/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/) - file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/debug/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/) else() message(FATAL_ERROR "Sorry but gsoap only can be build in Windows temporary") 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 ${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/${PORT}) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") -# Handle custom files -file(COPY ${SOURCE_PATH}/gsoap/custom DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +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 plugin files -file(COPY ${SOURCE_PATH}/gsoap/plugin DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${SOURCE_PATH}/gsoap/import" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/gsoap/custom" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/gsoap/plugin" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -# Cleanup surplus empty directory file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/gsoap/plugin/.deps") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/INSTALL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME install) -file(INSTALL ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme) - -vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +file(INSTALL "${SOURCE_PATH}/INSTALL.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME install) +file(INSTALL "${SOURCE_PATH}/README.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME readme) diff --git a/ports/gsoap/vcpkg.json b/ports/gsoap/vcpkg.json index 4fce1bad32208b..c7fa38a0334509 100644 --- a/ports/gsoap/vcpkg.json +++ b/ports/gsoap/vcpkg.json @@ -1,8 +1,15 @@ { "name": "gsoap", "version": "2.8.112", - "port-version": 1, + "port-version": 2, "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.", "homepage": "https://sourceforge.net/projects/gsoap2/", - "supports": "!(linux | osx | arm | uwp)" + "supports": "!(linux | osx | arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/gstreamer/fix-clang-cl-bad.patch b/ports/gstreamer/fix-clang-cl-bad.patch index 1cfab239f384d4..c3eeaf1e076c30 100644 --- a/ports/gstreamer/fix-clang-cl-bad.patch +++ b/ports/gstreamer/fix-clang-cl-bad.patch @@ -1,8 +1,8 @@ diff --git a/subprojects/gst-plugins-bad/ext/dts/meson.build b/subprojects/gst-plugins-bad/ext/dts/meson.build -index 8ab3fc917..c19aa2264 100644 +index c4868a4..6b34cb7 100644 --- a/subprojects/gst-plugins-bad/ext/dts/meson.build +++ b/subprojects/gst-plugins-bad/ext/dts/meson.build -@@ -15,7 +15,7 @@ if not dca_dep.found() +@@ -20,7 +20,7 @@ if not dca_dep.found() endif no_warn_c_args = [] @@ -12,10 +12,10 @@ index 8ab3fc917..c19aa2264 100644 # can point to a non-existing location (/usr/include/dca) no_warn_c_args = ['-Wno-missing-include-dirs'] diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build -index 4a844ef75..cd97e8f7a 100644 +index 160080a..6acf110 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build -@@ -174,7 +174,7 @@ endif +@@ -158,7 +158,7 @@ endif # MinGW 32bits compiler seems to be complaining about redundant-decls # when ComPtr is in use. Let's just disable the warning @@ -25,12 +25,13 @@ index 4a844ef75..cd97e8f7a 100644 '-Wno-redundant-decls', ]) diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build -index 7cab556e0..35531110b 100644 +index 84eeb17..1743f41 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build -@@ -45,7 +45,7 @@ endif - +@@ -54,7 +54,7 @@ endif + cdata = configuration_data() + cdata.set('ENABLE_NLS', 1) -if cc.get_id() == 'msvc' +if cc.get_argument_syntax() == 'msvc' @@ -38,7 +39,7 @@ index 7cab556e0..35531110b 100644 # Ignore several spurious warnings for things gstreamer does very commonly # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it diff --git a/subprojects/gst-plugins-bad/sys/asio/meson.build b/subprojects/gst-plugins-bad/sys/asio/meson.build -index 3006d26ce..1afbd0022 100644 +index c61ad4e..b30793c 100644 --- a/subprojects/gst-plugins-bad/sys/asio/meson.build +++ b/subprojects/gst-plugins-bad/sys/asio/meson.build @@ -15,7 +15,7 @@ endif @@ -51,10 +52,10 @@ index 3006d26ce..1afbd0022 100644 error('asio plugin can only be built with MSVC') else diff --git a/subprojects/gst-plugins-bad/sys/d3d11/meson.build b/subprojects/gst-plugins-bad/sys/d3d11/meson.build -index 43f213d9c..9c9e9b535 100644 +index 1368b79..8dd3b30 100644 --- a/subprojects/gst-plugins-bad/sys/d3d11/meson.build +++ b/subprojects/gst-plugins-bad/sys/d3d11/meson.build -@@ -102,7 +102,7 @@ endif +@@ -96,7 +96,7 @@ endif # MinGW 32bits compiler seems to be complaining about redundant-decls # when ComPtr is in use. Let's just disable the warning @@ -77,10 +78,10 @@ index d869e79a4..c7b37a7c6 100644 comutil_dep = cxx.find_library('comsuppw', required : get_option('decklink')) if comutil_dep.found() diff --git a/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build b/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build -index 828954909..af570f9ff 100644 +index 6b9a059..40713ce 100644 --- a/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build +++ b/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build -@@ -48,7 +48,7 @@ if host_system != 'windows' or mf_option.disabled() +@@ -54,7 +54,7 @@ if host_system != 'windows' or mf_option.disabled() subdir_done() endif @@ -90,10 +91,10 @@ index 828954909..af570f9ff 100644 error('mediafoundation plugin can only be built with MSVC') endif diff --git a/subprojects/gst-plugins-bad/sys/msdk/meson.build b/subprojects/gst-plugins-bad/sys/msdk/meson.build -index a77160049..7c834d8ed 100644 +index 659b96c..92e6bc4 100644 --- a/subprojects/gst-plugins-bad/sys/msdk/meson.build +++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build -@@ -139,13 +139,13 @@ if have_mfx_ver134 +@@ -176,12 +176,12 @@ if use_onevpl and have_mfx_ver205 endif if host_machine.system() == 'windows' @@ -102,10 +103,9 @@ index a77160049..7c834d8ed 100644 error('msdk plugin can only be built with MSVC') endif legacy_stdio_dep = cc.find_library('legacy_stdio_definitions', required: get_option('msdk')) - d3d11_dep = cc.find_library('d3d11', required: get_option('msdk')) - msdk_deps = declare_dependency(dependencies: [d3d11_dep, legacy_stdio_dep]) -- msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc' + msdk_deps = declare_dependency(dependencies: [gstd3d11_dep, legacy_stdio_dep]) +- msdk_deps_found = gstd3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc' + msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_argument_syntax() == 'msvc' else - libva_dep = dependency('libva', required: get_option('msdk')) - libva_drm_dep = dependency('libva-drm', required: get_option('msdk')) + libdl_dep = cc.find_library('dl', required: get_option('msdk')) + libgudev_dep = dependency('gudev-1.0', required: get_option('msdk')) diff --git a/ports/gstreamer/fix-clang-cl-base.patch b/ports/gstreamer/fix-clang-cl-base.patch index 99a4f7db86618c..227a7e05ba6594 100644 --- a/ports/gstreamer/fix-clang-cl-base.patch +++ b/ports/gstreamer/fix-clang-cl-base.patch @@ -1,8 +1,8 @@ diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build -index 495671ebb..fff3ea518 100644 +index c040bc9..ce9071c 100644 --- a/subprojects/gst-plugins-base/meson.build +++ b/subprojects/gst-plugins-base/meson.build -@@ -43,7 +43,7 @@ plugins = [] +@@ -51,7 +51,7 @@ gst_libraries = [] cc = meson.get_compiler('c') @@ -11,12 +11,3 @@ index 495671ebb..fff3ea518 100644 msvc_args = [ # Ignore several spurious warnings for things gstreamer does very commonly # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it -@@ -75,7 +75,7 @@ endif - core_conf = configuration_data() - - # Symbol visibility --if cc.get_id() == 'msvc' -+if cc.get_argument_syntax() == 'msvc' - export_define = '__declspec(dllexport) extern' - elif cc.has_argument('-fvisibility=hidden') - add_project_arguments('-fvisibility=hidden', language: 'c') diff --git a/ports/gstreamer/fix-clang-cl-gstreamer.patch b/ports/gstreamer/fix-clang-cl-gstreamer.patch index 19be6c1e5e51c0..a89167b303e9a5 100644 --- a/ports/gstreamer/fix-clang-cl-gstreamer.patch +++ b/ports/gstreamer/fix-clang-cl-gstreamer.patch @@ -1,5 +1,5 @@ diff --git a/subprojects/gstreamer/gst/parse/meson.build b/subprojects/gstreamer/gst/parse/meson.build -index 35ed6f2f4..5e38e49ea 100644 +index b79a07c..891f907 100644 --- a/subprojects/gstreamer/gst/parse/meson.build +++ b/subprojects/gstreamer/gst/parse/meson.build @@ -16,7 +16,7 @@ else @@ -12,10 +12,10 @@ index 35ed6f2f4..5e38e49ea 100644 else flex_cdata.set('FLEX_ARGS', '') diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build -index 772809e15..70b1eafc5 100644 +index 941bedc..cd37a40 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build -@@ -36,7 +36,7 @@ cc = meson.get_compiler('c') +@@ -47,7 +47,7 @@ endif cdata = configuration_data() @@ -24,16 +24,7 @@ index 772809e15..70b1eafc5 100644 msvc_args = [ # Ignore several spurious warnings for things gstreamer does very commonly # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it -@@ -61,7 +61,7 @@ endif - - # Symbol visibility - have_visibility_hidden = false --if cc.get_id() == 'msvc' -+if cc.get_argument_syntax() == 'msvc' - export_define = '__declspec(dllexport) extern' - elif cc.has_argument('-fvisibility=hidden') - add_project_arguments('-fvisibility=hidden', language: 'c') -@@ -313,8 +313,10 @@ static __uint128_t v2 = 10; +@@ -347,8 +347,10 @@ static __uint128_t v2 = 10; static __uint128_t u; u = v1 / v2; }''' @@ -46,12 +37,3 @@ index 772809e15..70b1eafc5 100644 endif # All supported platforms have long long now -@@ -322,7 +324,7 @@ cdata.set('HAVE_LONG_LONG', 1) - - # We only want to use the __declspec(dllexport/import) dance in GST_EXPORT when - # building with MSVC --if cc.get_id() == 'msvc' -+if cc.get_argument_syntax() == 'msvc' - cdata.set('GSTCONFIG_BUILT_WITH_MSVC', 1) - else - cdata.set('GSTCONFIG_BUILT_WITH_MSVC', 0) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index fda62d9e1f1458..053394f14a3393 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/ OUT_SOURCE_PATH SOURCE_PATH REPO gstreamer/gstreamer - REF 1.20.5 - SHA512 2a996d8ac0f70c34dbbc02c875026df6e89346f0844fbaa25475075bcb6e57c81ceb7d71e729c3259eace851e3d7222cb3fe395e375d93eb45b1262a6ede1fdb + REF ${VERSION} + SHA512 0d69896d0a83452320df0d0f56c710df1365a259cd3f48dc7cd4df18d45b27caea7174aafa15ae5eb8637ccdef192c1047185b369b7232db4eaacbc57ffaaa22 HEAD_REF master PATCHES fix-clang-cl.patch @@ -248,7 +248,7 @@ vcpkg_configure_meson( -Dgst-plugins-bad:msdk=disabled -Dgst-plugins-bad:musepack=disabled -Dgst-plugins-bad:neon=disabled - -Dgst-plugins-bad:nvcodec=enabled + -Dgst-plugins-bad:nvcodec=disabled -Dgst-plugins-bad:onnx=disabled # libonnxruntime not found -Dgst-plugins-bad:openaptx=disabled -Dgst-plugins-bad:opencv=disabled # opencv not found diff --git a/ports/gstreamer/srtp_fix.patch b/ports/gstreamer/srtp_fix.patch index cc73cd11b8a116..ed4601d458a951 100644 --- a/ports/gstreamer/srtp_fix.patch +++ b/ports/gstreamer/srtp_fix.patch @@ -1,8 +1,8 @@ diff --git a/subprojects/gst-plugins-bad/ext/srtp/meson.build b/subprojects/gst-plugins-bad/ext/srtp/meson.build -index 7f947191ae..b4a8e9c2a8 100644 +index 49eed5b..db5aed0 100644 --- a/subprojects/gst-plugins-bad/ext/srtp/meson.build +++ b/subprojects/gst-plugins-bad/ext/srtp/meson.build -@@ -6,12 +6,14 @@ srtp_sources = [ +@@ -6,13 +6,15 @@ srtp_sources = [ 'gstsrtpenc.c', ] @@ -10,6 +10,7 @@ index 7f947191ae..b4a8e9c2a8 100644 + srtp_cargs = [] if get_option('srtp').disabled() + srtp_dep = dependency('', required : false) subdir_done() endif @@ -18,12 +19,12 @@ index 7f947191ae..b4a8e9c2a8 100644 if srtp_dep.found() srtp_cargs += ['-DHAVE_SRTP2'] else -@@ -37,7 +39,7 @@ if srtp_dep.found() +@@ -38,7 +40,7 @@ if srtp_dep.found() include_directories : [configinc], dependencies : [gstrtp_dep, gstvideo_dep, srtp_dep], install : true, - install_dir : plugins_install_dir, + install_dir : gst_plugins_install_dir, ) - pkgconfig.generate(gstsrtp, install_dir : plugins_pkgconfig_install_dir) plugins += [gstsrtp] + endif diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 81d06295244e59..105d02517385e9 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", - "version": "1.20.5", - "port-version": 11, + "version": "1.22.5", + "port-version": 1, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", diff --git a/ports/gtest/001-fix-UWP-death-test.patch b/ports/gtest/001-fix-UWP-death-test.patch index 572b7c7a4d01f7..03484908f1b4e8 100644 --- a/ports/gtest/001-fix-UWP-death-test.patch +++ b/ports/gtest/001-fix-UWP-death-test.patch @@ -2,12 +2,12 @@ diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index a64e887c..45ff24c3 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc -@@ -5409,7 +5409,7 @@ int UnitTest::Run() { +@@ -5434,7 +5434,7 @@ int UnitTest::Run() { // used for the duration of the program. impl()->set_catch_exceptions(GTEST_FLAG_GET(catch_exceptions)); --#if GTEST_OS_WINDOWS -+#if GTEST_OS_WINDOWS && GTEST_HAS_DEATH_TEST +-#ifdef GTEST_OS_WINDOWS ++#if defined(GTEST_OS_WINDOWS) && defined(GTEST_HAS_DEATH_TEST) // Either the user wants Google Test to catch exceptions thrown by the // tests or this is executing in the context of death test child // process. In either case the user does not want to see pop-up dialogs diff --git a/ports/gtest/fix-main-lib-path.patch b/ports/gtest/fix-main-lib-path.patch index c2998f3e4479d9..2a7be9dce6fa6a 100644 --- a/ports/gtest/fix-main-lib-path.patch +++ b/ports/gtest/fix-main-lib-path.patch @@ -2,7 +2,7 @@ diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index e7df8ec..1ecd596 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt -@@ -120,7 +120,8 @@ endif() +@@ -112,7 +112,8 @@ endif() ######################################################################## # # Install rules @@ -16,7 +16,7 @@ diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index abdd98b..7d1c01d 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt -@@ -148,7 +148,8 @@ target_link_libraries(gtest_main PUBLIC gtest) +@@ -155,7 +155,8 @@ target_link_libraries(gtest_main PUBLIC gtest) ######################################################################## # # Install rules @@ -30,16 +30,17 @@ diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_u index 8d8d60a..b08ce28 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake -@@ -315,11 +315,15 @@ function(install_project) - install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/" +@@ -300,12 +300,16 @@ function(install_project) + COMPONENT "${PROJECT_NAME}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") # Install the project targets. + set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR}) + if (${ARGN} MATCHES "_main") + set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR}/manual-link) -+ endif() ++ endif() install(TARGETS ${ARGN} EXPORT ${targets_export_name} + COMPONENT "${PROJECT_NAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") @@ -48,10 +49,10 @@ index 8d8d60a..b08ce28 100644 if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") # Install PDBs foreach(t ${ARGN}) -@@ -328,7 +332,7 @@ function(install_project) - get_target_property(t_pdb_output_directory ${t} PDB_OUTPUT_DIRECTORY) +@@ -315,7 +319,7 @@ function(install_project) install(FILES "${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$:${t_pdb_name_debug}>$<$>:${t_pdb_name}>.pdb" + COMPONENT "${PROJECT_NAME}" - DESTINATION ${CMAKE_INSTALL_LIBDIR} + DESTINATION ${LIB_INSTALL_DST} OPTIONAL) diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index ff4a2b8589e6b1..6b20051e69480b 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/googletest - REF v1.13.0 - SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e + REF "v${VERSION}" + SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c HEAD_REF main PATCHES 001-fix-UWP-death-test.patch diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index 8f9d4ce0191609..406a2dff5aff44 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtest", - "version-semver": "1.13.0", + "version-semver": "1.14.0", "description": "GoogleTest and GoogleMock testing frameworks", "homepage": "https://github.com/google/googletest", "license": "BSD-3-Clause", diff --git a/ports/gtk/0001-build.patch b/ports/gtk/0001-build.patch index 2835f2b5baeb9b..40e3529f031d18 100644 --- a/ports/gtk/0001-build.patch +++ b/ports/gtk/0001-build.patch @@ -1,29 +1,13 @@ diff --git a/meson.build b/meson.build -index 13517714b7..2132611c88 100644 +index 5efd8a9..d51af19 100644 --- a/meson.build +++ b/meson.build -@@ -857,15 +857,15 @@ subdir('po') +@@ -857,7 +857,7 @@ subdir('po') subdir('docs/reference') -if not meson.is_cross_build() -- gnome.post_install( -- glib_compile_schemas: true, -- gio_querymodules: gio_module_dirs, -- gtk_update_icon_cache: get_option('demos'), -- ) --else -- message('Not executing post-install steps automatically when cross compiling') --endif -+#if not meson.is_cross_build() -+ gnome.post_install( -+ glib_compile_schemas: true, -+ gio_querymodules: gio_module_dirs, -+ gtk_update_icon_cache: get_option('demos'), -+ ) -+#else -+# message('Not executing post-install steps automatically when cross compiling') -+#endif - - if not meson.is_subproject() - meson.add_dist_script('build-aux/meson/dist-data.py') ++if false + gnome.post_install( + glib_compile_schemas: true, + gio_querymodules: gio_module_dirs, diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 7686e98720de94..9b1f9c9666c8fe 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/gtk - REF 55bc7808cc7796b06c27b1e64f608cd83b9b18ec #v4.10.4 - SHA512 70859173ffc52e4fad4997157c6eb59cdb4dd8395cad8fa24931f0bf5396a800c20de09be88355c2c5e7c055bddb54f6e7cb92cc1b9c77c2da0896f52a39dceb + REF ${VERSION} + SHA512 f219ddc6f46061f516f99a3845f344269d51d7fc2554773f7d4cee7833c5be26ce809262466d18c2804559834eb595f0d802b6fc80d77b7e8bf046e4c1293d64 HEAD_REF master # branch name PATCHES 0001-build.patch @@ -33,9 +33,6 @@ list(APPEND OPTIONS -Dwin32-backend=${win32}) #Enable the Windows gdk backend (o list(APPEND OPTIONS -Dmacos-backend=${osx}) #Enable the macOS gdk backend (only when building on macOS) if("introspection" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature introspection currently only supports dynamic build.") - endif() list(APPEND OPTIONS_DEBUG -Dintrospection=disabled) list(APPEND OPTIONS_RELEASE -Dintrospection=enabled) else() @@ -88,7 +85,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") set(TOOL_NAMES gtk4-builder-tool gtk4-encode-symbolic-svg diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 31e7f53a4d7bd3..b12107437c3db1 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtk", - "version": "4.10.4", + "version": "4.10.5", "port-version": 1, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", @@ -74,14 +74,6 @@ "introspection" ] }, - { - "name": "gobject-introspection", - "host": true - }, - { - "name": "gobject-introspection", - "platform": "windows & x86" - }, { "name": "graphene", "default-features": false, diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json index 72194a9c875aec..a7e4151488fe2a 100644 --- a/ports/gtk3/vcpkg.json +++ b/ports/gtk3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gtk3", "version": "3.24.38", + "port-version": 1, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": null, @@ -78,14 +79,6 @@ "introspection" ] }, - { - "name": "gobject-introspection", - "host": true - }, - { - "name": "gobject-introspection", - "platform": "windows & x86" - }, { "name": "pango", "default-features": false, diff --git a/ports/gz-common5/fix_dependencies.patch b/ports/gz-common5/fix_dependencies.patch new file mode 100644 index 00000000000000..493408a5ef62cc --- /dev/null +++ b/ports/gz-common5/fix_dependencies.patch @@ -0,0 +1,89 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73920fe..8bee7fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,7 @@ set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR}) + #-------------------------------------- + # Find Tinyxml2 + if(USE_EXTERNAL_TINYXML2) +- gz_find_package(TINYXML2 PRETTY tinyxml2 ++ gz_find_package(tinyxml2 EXTRA_ARGS CONFIG + REQUIRED_BY graphics + PRIVATE_FOR graphics) + else() +@@ -70,13 +70,13 @@ if(NOT MSVC) + + #------------------------------------ + # Find uuid +- gz_find_package(UUID REQUIRED PRETTY uuid) ++ gz_find_package(UUID REQUIRED PRETTY uuid REQUIRED_BY graphics) + + endif() + + #------------------------------------ + # Find Freeimage +-gz_find_package(FreeImage VERSION 3.9 ++gz_find_package(freeimage EXTRA_ARGS CONFIG + REQUIRED_BY graphics + PRIVATE_FOR graphics) + +@@ -84,6 +84,7 @@ ign_find_package(FreeImage VERSION 3.9 + # Find GNU Triangulation Surface Library + gz_find_package( + GTS PRETTY gts PURPOSE "GNU Triangulation Surface library" ++ BY_PKGCONFIG gts + REQUIRED_BY graphics + PRIVATE_FOR graphics) + +@@ -98,7 +98,7 @@ + #------------------------------------ + # Find GDAL +-gz_find_package(GDAL VERSION 3.0 ++gz_find_package(GDAL + PKGCONFIG gdal + PRIVATE_FOR geospatial + REQUIRED_BY geospatial) + +diff --git a/graphics/src/CMakeLists.txt b/graphics/src/CMakeLists.txt +index 000a0ce..f6e1831 100644 +--- a/graphics/src/CMakeLists.txt ++++ b/graphics/src/CMakeLists.txt +@@ -14,8 +14,10 @@ target_link_libraries(${graphics_target} + PUBLIC + gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER} + gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER} + PRIVATE + ${GzAssimp_LIBRARIES} + GTS::GTS +- FreeImage::FreeImage) ++ freeimage::FreeImage) ++ ++target_include_directories(${graphics_target} PRIVATE ${GTS_INCLUDE_DIRS}) + +@@ -42,14 +44,14 @@ if(USE_EXTERNAL_TINYXML2) + + # If we are using an external copy of tinyxml2, add its imported target + target_link_libraries(${graphics_target} + PRIVATE +- TINYXML2::TINYXML2) ++ tinyxml2::tinyxml2) + + # The collada exporter test uses tinyxml2, so we must link it if we're using + # an external copy. The graphics target considers tinyxml2 to be a private + # dependency, so it will not automatically get linked to this test. + if(TARGET UNIT_ColladaExporter_TEST) +- target_link_libraries(UNIT_ColladaExporter_TEST TINYXML2::TINYXML2) ++ target_link_libraries(UNIT_ColladaExporter_TEST tinyxml2::tinyxml2) + endif() + + else() +@@ -79,7 +81,7 @@ + # define of tinxml2 major version >= 6 + # https://github.com/gazebosim/gz-common/issues/28 +-if (NOT TINYXML2_VERSION VERSION_LESS "6.0.0") +- message(STATUS "TINYXML2_VERSION ${TINYXML2_VERSION} >= 6.0.0") ++if (NOT tinyxml2_VERSION VERSION_LESS "6.0.0") ++ message(STATUS "TINYXML2_VERSION ${tinyxml2_VERSION} >= 6.0.0") + target_compile_definitions(${graphics_target} + PRIVATE "TINYXML2_MAJOR_VERSION_GE_6") + endif() diff --git a/ports/gz-common5/gz_remotery_vis.patch b/ports/gz-common5/gz_remotery_vis.patch new file mode 100644 index 00000000000000..995338762229ca --- /dev/null +++ b/ports/gz-common5/gz_remotery_vis.patch @@ -0,0 +1,12 @@ +diff --git a/profiler/src/CMakeLists.txt b/profiler/src/CMakeLists.txt +--- a/profiler/src/CMakeLists.txt ++++ b/profiler/src/CMakeLists.txt +@@ -116,7 +116,7 @@ + install(PROGRAMS + ${CMAKE_CURRENT_BINARY_DIR}/gz_remotery_vis +- DESTINATION ${GZ_PROFILER_SCRIPT_PATH}) ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/gz-common${PROJECT_VERSION_MAJOR}) + + install(DIRECTORY Remotery/vis/ + DESTINATION ${GZ_PROFILER_VIS_PATH}) + endif() diff --git a/ports/gz-common5/portfile.cmake b/ports/gz-common5/portfile.cmake new file mode 100644 index 00000000000000..bcff46993b8b8a --- /dev/null +++ b/ports/gz-common5/portfile.cmake @@ -0,0 +1,14 @@ +set(PACKAGE_NAME common) + +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 40db4747db743005d7c43ca25cfe93cf68ee19201abcb165e72de37708b92fd88553b11520c420db33b37f4cab7e01e4d79c91c5dc0485146b7156284b8baaee + OPTIONS + -DUSE_EXTERNAL_TINYXML2=ON + PATCHES + fix_dependencies.patch + remove_tests.patch + gz_remotery_vis.patch +) diff --git a/ports/gz-common5/remove_tests.patch b/ports/gz-common5/remove_tests.patch new file mode 100644 index 00000000000000..b03a81be68bccb --- /dev/null +++ b/ports/gz-common5/remove_tests.patch @@ -0,0 +1,15 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -41,4 +41,5 @@ ++if(0) + # Build the unit tests + gz_build_tests( + TYPE UNIT + SOURCES ${gtest_sources} +@@ -77,4 +78,5 @@ + message(STATUS "") + target_compile_definitions(UNIT_Filesystem_TEST PRIVATE GZ_BUILD_SYMLINK_TESTS_ON_WINDOWS) + endif() + endif() ++endif(0) diff --git a/ports/gz-common5/vcpkg.json b/ports/gz-common5/vcpkg.json new file mode 100644 index 00000000000000..805464eda39e2b --- /dev/null +++ b/ports/gz-common5/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "gz-common5", + "version": "5.4.1", + "description": "Common libraries for robotics applications", + "homepage": "https://ignitionrobotics.org/libs/common", + "license": "Apache-2.0", + "dependencies": [ + "assimp", + { + "name": "dlfcn-win32", + "platform": "windows | uwp" + }, + "ffmpeg", + "freeimage", + "gdal", + "gts", + "gz-cmake3", + "gz-math7", + { + "name": "ignition-modularscripts", + "host": true + }, + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx" + }, + "tinyxml2" + ] +} diff --git a/ports/gz-fuel-tools8/portfile.cmake b/ports/gz-fuel-tools8/portfile.cmake new file mode 100644 index 00000000000000..cce4c10294bbe7 --- /dev/null +++ b/ports/gz-fuel-tools8/portfile.cmake @@ -0,0 +1,11 @@ +set(PACKAGE_NAME fuel-tools) + +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 6a31719441c7ea835007d82b6aea99b10fa124ebad71683b8c1c58c41b435d4801e016464dc30d760cc9464e642dab4ff910375f5244ebf7c565845174e65cbf + OPTIONS + PATCHES + remove_docs.patch +) diff --git a/ports/gz-fuel-tools8/remove_docs.patch b/ports/gz-fuel-tools8/remove_docs.patch new file mode 100644 index 00000000000000..b8c3293e11db36 --- /dev/null +++ b/ports/gz-fuel-tools8/remove_docs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,6 +79,8 @@ + ++if(0) + #============================================================================ + # gz command line support + #============================================================================ + add_subdirectory(conf) ++endif(0) + +@@ -95,7 +95,9 @@ + ++if(0) + gz_create_docs( + API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md" + TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md" + TAGFILES + "${GZ-COMMON_DOXYGEN_TAGFILE} = ${GZ-COMMON_API_URL}" + ) ++endif(0) diff --git a/ports/gz-fuel-tools8/vcpkg.json b/ports/gz-fuel-tools8/vcpkg.json new file mode 100644 index 00000000000000..f36144596da374 --- /dev/null +++ b/ports/gz-fuel-tools8/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "gz-fuel-tools8", + "version": "8.1.0", + "description": "Tools for using fuel API to download robot models", + "homepage": "https://gazebosim.org/libs/fuel_tools", + "license": null, + "dependencies": [ + "curl", + "gz-cmake3", + "gz-common5", + "gz-msgs9", + { + "name": "ignition-modularscripts", + "host": true + }, + "jsoncpp", + "libyaml", + "libzip", + "tinyxml2" + ] +} diff --git a/ports/gz-msgs9/portfile.cmake b/ports/gz-msgs9/portfile.cmake new file mode 100644 index 00000000000000..c01438d2475c49 --- /dev/null +++ b/ports/gz-msgs9/portfile.cmake @@ -0,0 +1,15 @@ +set(PACKAGE_NAME msgs) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 669e60fc35868e4d86695104a58aecaef9ad08861cba97ff91c7306caf66ec237da46c0a13f5f59907371fc7a4dd56d5506fabe4ba97c393889fc5a9c2a101ee + OPTIONS + PATCHES + remove_ruby.patch +) diff --git a/ports/gz-msgs9/remove_ruby.patch b/ports/gz-msgs9/remove_ruby.patch new file mode 100644 index 00000000000000..d6b7634123346e --- /dev/null +++ b/ports/gz-msgs9/remove_ruby.patch @@ -0,0 +1,17 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -102,5 +102,5 @@ +- if(gz_msgs_protoc_GENERATE_RUBY) ++ if(0) + file(MAKE_DIRECTORY ${gz_msgs_protoc_OUTPUT_RUBY_DIR}) + set(output_ruby "${gz_msgs_protoc_OUTPUT_RUBY_DIR}${proto_package_dir}/${FIL_WE}_pb.rb") + list(APPEND ${gz_msgs_protoc_OUTPUT_RUBY_VAR} ${output_ruby}) + list(APPEND output_files ${output_ruby}) +@@ -126,5 +126,5 @@ +- if(${gz_msgs_protoc_GENERATE_RUBY}) ++ if(0) + list(APPEND GENERATE_ARGS + --generate-ruby + --output-ruby-path "${gz_msgs_protoc_OUTPUT_RUBY_DIR}") + endif() diff --git a/ports/gz-msgs9/vcpkg.json b/ports/gz-msgs9/vcpkg.json new file mode 100644 index 00000000000000..d854172cdfc4d7 --- /dev/null +++ b/ports/gz-msgs9/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "gz-msgs9", + "version": "9.5.0", + "description": "Middleware protobuf messages for robotics", + "license": "Apache-2.0", + "supports": "!(android | arm | uwp)", + "dependencies": [ + "gz-cmake3", + "gz-math7", + { + "name": "ignition-modularscripts", + "host": true + }, + "protobuf", + "tinyxml2" + ] +} diff --git a/ports/gz-plugin2/portfile.cmake b/ports/gz-plugin2/portfile.cmake new file mode 100644 index 00000000000000..58d3f6950d3616 --- /dev/null +++ b/ports/gz-plugin2/portfile.cmake @@ -0,0 +1,10 @@ +set(PACKAGE_NAME plugin) + +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 4c497291f8e33aae3a5752607a7fd7b48912e209f0f424ea7b1e6d35f27d1e920d1dd97ee64b7b3846d7d433618742be5d19352cbce8f6f63eccc83a086520ea + OPTIONS + PATCHES +) diff --git a/ports/gz-plugin2/vcpkg.json b/ports/gz-plugin2/vcpkg.json new file mode 100644 index 00000000000000..cf363c0f10c72a --- /dev/null +++ b/ports/gz-plugin2/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "gz-plugin2", + "version": "2.0.1", + "description": "Library for registering plugin libraries and dynamically loading them at runtime", + "homepage": "https://ignitionrobotics.org/libs/plugin", + "license": null, + "supports": "!arm & !android", + "dependencies": [ + { + "name": "dlfcn-win32", + "platform": "windows | uwp" + }, + "gz-cmake3", + "gz-utils2", + { + "name": "ignition-modularscripts", + "host": true + } + ] +} diff --git a/ports/gz-transport12/portfile.cmake b/ports/gz-transport12/portfile.cmake new file mode 100644 index 00000000000000..0cc1e635bf639f --- /dev/null +++ b/ports/gz-transport12/portfile.cmake @@ -0,0 +1,11 @@ +set(PACKAGE_NAME transport) + +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 8f0c02b76579679d40b16bd19796e8ac84eaace6c70889fc703d4c234970be130ca1dd18f047c0b40acd46e8f9291f199b8558329a75a33fc61c235dfcb79f4d + OPTIONS + PATCHES + uuid-osx.patch +) diff --git a/ports/gz-transport12/uuid-osx.patch b/ports/gz-transport12/uuid-osx.patch new file mode 100644 index 00000000000000..97af930960c91d --- /dev/null +++ b/ports/gz-transport12/uuid-osx.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,8 +72,10 @@ + #-------------------------------------- + # Find uuid + if (MSVC) + message (STATUS "UUID: Using Windows RPC UuidCreate function\n") ++elseif (APPLE) ++ message (STATUS "Use system uuid header") + else() + gz_find_package(UUID REQUIRED) + endif() + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -20,9 +20,9 @@ + $ + $) + + # Windows system library provides UUID +-if (NOT MSVC) ++if (NOT MSVC AND NOT APPLE) + target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + PUBLIC + UUID::UUID + ) diff --git a/ports/gz-transport12/vcpkg.json b/ports/gz-transport12/vcpkg.json new file mode 100644 index 00000000000000..43e3a8e708c1cb --- /dev/null +++ b/ports/gz-transport12/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "gz-transport12", + "version": "12.2.0", + "description": "Transport middleware for robotics", + "license": null, + "dependencies": [ + "cppzmq", + "gz-cmake3", + "gz-msgs9", + { + "name": "ignition-modularscripts", + "host": true + }, + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx" + }, + "protobuf", + "sqlite3", + "zeromq" + ] +} diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 5545a94c0185fe..fbdbc608717321 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz REF ${VERSION} - SHA512 044f8ce9d195f83eb90412e76e9f381559ed6565f956a3cdf1da26b0540df85d1dc51b4a6bcca2f8fcb48a4a1f2e5535ef6d786dfaf63d68ce5fe70ea6f2f2f9 + SHA512 23d6abbd270885d7ae1ebb3c981f0c331a48d891e23caffe9e254f5e7e205bb0348add7b371526166a49b336f8076f92c11ef76ca81f48a6fd9f58812ec96d79 HEAD_REF master ) @@ -35,9 +35,6 @@ list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers #endif() if("introspection" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature introspection currently only supports dynamic build.") - endif() list(APPEND OPTIONS_DEBUG -Dgobject=enabled -Dintrospection=disabled) list(APPEND OPTIONS_RELEASE -Dgobject=enabled -Dintrospection=enabled) else() diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 255d281c605a5c..ffd73c02a54e26 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version": "8.1.1", + "version": "8.2.1", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", @@ -50,14 +50,7 @@ "description": "build with introspection", "dependencies": [ "glib", - { - "name": "gobject-introspection", - "host": true - }, - { - "name": "gobject-introspection", - "platform": "windows & x86" - } + "gobject-introspection" ] } } diff --git a/ports/hffix/portfile.cmake b/ports/hffix/portfile.cmake index 05a4a9a2448f72..a5d6353cb8e7f5 100644 --- a/ports/hffix/portfile.cmake +++ b/ports/hffix/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jamesdbrock/hffix - REF v1.2.1 - SHA512 81947d5b2fbc2818b6ae7274febece8a813a67afc4a605bd92a1d7cb5df4e19e5df73a1a597c27898134fab1a0cc7c672d2dcba7688bab24184469b0760be06f + REF "v${VERSION}" + SHA512 a04a22360074f383997756d36ddf520a565e5d200e32e8439ef92f33bcb30ab29e962fc4d85142c1da323ddf9fef2d8b6a023dcbeedf1a5c269889adfcd70fb8 HEAD_REF master ) diff --git a/ports/hffix/vcpkg.json b/ports/hffix/vcpkg.json index bc08b8e06616df..3560597046884a 100644 --- a/ports/hffix/vcpkg.json +++ b/ports/hffix/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hffix", - "version": "1.2.1", + "version": "1.3.0", "description": "Financial Information Exchange Protocol C++ Library", "homepage": "https://jamesdbrock.github.io/hffix", "license": "BSD-2-Clause", diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index 85b012a1216dff..f43cec6b25201d 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -1,19 +1,12 @@ -# Must be removed on next release -vcpkg_download_distfile(CATCH2_PATCH - URLS https://github.com/BlueBrain/HighFive/commit/be9285ee4661ff4154830989899a2a050d6fbc64.patch?full_index=1 - FILENAME ${PORT}-669-be9285ee.diff - SHA512 d4b085557fdcfaed195efaa25e02358714e6ccb00cc532594592183e934d99e3b80883991fcac1d073fbedb5773d76a5e9a58da4328b71215dd30b259df1eba3 -) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BlueBrain/HighFive - REF v2.6.2 - SHA512 80deb3d7f0b2e8e8c660ee37b189d1a4993e23b5ada30c72f3ef4fef80020f8564c8a5a507a34f891cec6c5db0d75d7c7de89040defaf91a3b1cec2018d1bf9e + REF "v${VERSION}" + SHA512 4fbbd3898791a67e44329a5d0e20e16454b9393510236563b12fe4346cd4f2785d43d915ea05239ac1568d00651e41d85d93590f01454ffc1b82e7bba28e780a HEAD_REF master PATCHES fix-error-C1128.patch - ${CATCH2_PATCH} ) vcpkg_check_features( diff --git a/ports/highfive/vcpkg.json b/ports/highfive/vcpkg.json index f2c1b3c9734050..d88bb0f980cb70 100644 --- a/ports/highfive/vcpkg.json +++ b/ports/highfive/vcpkg.json @@ -1,7 +1,6 @@ { "name": "highfive", - "version": "2.6.2", - "port-version": 2, + "version": "2.7.1", "description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5", "homepage": "https://github.com/BlueBrain/HighFive", "license": "BSL-1.0", diff --git a/ports/highs/fix-cmake-output.patch b/ports/highs/fix-cmake-output.patch index c8c373e11def33..9561f0cb442d28 100644 --- a/ports/highs/fix-cmake-output.patch +++ b/ports/highs/fix-cmake-output.patch @@ -1,24 +1,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6c0642877..30fb625a2 100644 +index 605a1e2..148c006 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -184,6 +184,7 @@ if(MSVC) +@@ -196,6 +196,7 @@ if(MSVC) unsigned long y; _BitScanReverse(&y, x); _BitScanReverse64(&x, y); + __popcnt64(x); return 0; }" - HIGHS_HAVE_BITSCAN_REVERSE) -@@ -548,9 +549,9 @@ if (PYTHON) - endif() + HIGHS_HAVE_BITSCAN_REVERSE) +@@ -568,9 +569,9 @@ else(FAST_BUILD) + endif() - # Add tests in examples/tests --add_subdirectory(examples) -+#add_subdirectory(examples) + # Add tests in examples/tests +- add_subdirectory(examples) ++ #add_subdirectory(examples) --add_subdirectory(app) -+#add_subdirectory(app) +- add_subdirectory(app) ++ #add_subdirectory(app) - if (EXP) + if(EXP) add_executable(doctest) diff --git a/ports/highs/fix-threads.patch b/ports/highs/fix-threads.patch index 37a7638ca188e9..611629d2b4a614 100644 --- a/ports/highs/fix-threads.patch +++ b/ports/highs/fix-threads.patch @@ -1,13 +1,13 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b92cb4c09..2ffeec1a9 100644 +index fc24e57..fe0edfe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -562,7 +562,7 @@ if (ZLIB AND ZLIB_FOUND) - $ +@@ -573,7 +573,7 @@ else() + $ ) target_link_libraries(highs ZLIB::ZLIB) - set(CONF_DEPENDENCIES "include(CMakeFindDependencyMacro)\nfind_dependency(ZLIB)") + set(CONF_DEPENDENCIES "include(CMakeFindDependencyMacro)\nfind_dependency(ZLIB)\nfind_dependency(Threads)") - endif() + endif() - # # on UNIX system the 'lib' prefix is automatically added + # # on UNIX system the 'lib' prefix is automatically added diff --git a/ports/highs/portfile.cmake b/ports/highs/portfile.cmake index 33fc5529623eba..4e96d0a52786ce 100644 --- a/ports/highs/portfile.cmake +++ b/ports/highs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ERGO-Code/HiGHS REF "v${VERSION}" - SHA512 ce2003f7328d49e2292135b740204eb485c8c6694fa017c6604e6d4057913d5d5eea517561ffe4b7251b0fbe230bc8288ab6d91dd9432ffc96e792a1ce866424 + SHA512 9229d2e960354b8b8fd45588cd4eec7e54826ee6f3939ac691d7b2b6eb0580a66a3a2649c940a3869f58dbbcf08fdd9641919fc92666948c62e70c4bce8ac130 HEAD_REF master PATCHES fix-hconfig-path.patch diff --git a/ports/highs/vcpkg.json b/ports/highs/vcpkg.json index a83715dd5cc7c6..bbf340a4dba13c 100644 --- a/ports/highs/vcpkg.json +++ b/ports/highs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "highs", - "version": "1.5.1", + "version": "1.6.0", "description": "High performance library to solve linear, mixed-integer, and convex quadratic optimization problems.", "homepage": "https://highs.dev", "license": "MIT", diff --git a/ports/highway/portfile.cmake b/ports/highway/portfile.cmake index 33f1d858a2845d..7f285c81f331d9 100644 --- a/ports/highway/portfile.cmake +++ b/ports/highway/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/highway REF "${VERSION}" - SHA512 9d42ebae81240f75a0cd15030875f8405875e4f31690a16ae039df0ead2f4f483f76d269fb6d74af57680ee4593cb2475c7adf5937ffe367d71d424b193dc4d4 + SHA512 6ee5007ec13ac20b5d816b38a1b31c31a06678ca6d2ea090dd75e364f04cb2cf7ad8a82d1bdfff51079efa54b9a95fb554d62e6cc1bbf7d7e794cb272032d8f5 HEAD_REF master ) diff --git a/ports/highway/vcpkg.json b/ports/highway/vcpkg.json index bdbfd2cc636bd5..011668dc4c0529 100644 --- a/ports/highway/vcpkg.json +++ b/ports/highway/vcpkg.json @@ -1,6 +1,6 @@ { "name": "highway", - "version": "1.0.6", + "version": "1.0.7", "description": "Performance-portable, length-agnostic SIMD with runtime dispatch", "homepage": "https://github.com/google/highway", "license": "Apache-2.0", diff --git a/ports/hikogui/portfile.cmake b/ports/hikogui/portfile.cmake index 7a37309f4e5a21..ad82c5ab39c107 100644 --- a/ports/hikogui/portfile.cmake +++ b/ports/hikogui/portfile.cmake @@ -1,25 +1,22 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hikogui/hikogui - REF v0.7.0 - SHA512 64555c67e5a44f336a3528d3a894d43e2751a1f4e4e4d9f6618c085ef0be4a502610a36625d95f79298080cb483f7361a758f7c43b4784999b0b5d839baacb28 + REF v0.8.1 + SHA512 1a711aeb83d4d84e89ba4895aea321b1e5120fc20e8124237ee575b14955edcfa991965cb80628e7c485a44ba13245ba76781582339f62939a8180a629de996a HEAD_REF main ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DHI_BUILD_TESTS=OFF - -DHI_BUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup() -vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/hikogui/vcpkg.json b/ports/hikogui/vcpkg.json index ab0dddefc7c53b..402a7003f71519 100644 --- a/ports/hikogui/vcpkg.json +++ b/ports/hikogui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hikogui", - "version": "0.7.0", + "version": "0.8.1", "maintainers": "@takev", "description": "A portable, low latency, retained-mode GUI framework written in C++.", "homepage": "https://github.com/hikogui/hikogui", diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 1d2d13a147f706..d2723a789f634c 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -6,8 +6,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" HPX_WITH_STATIC_LINKING vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF "${VERSION}" - SHA512 af2471a04dd0a3c414907ed06661ab1c6f6a49cc09d1ed3ae5d5587ca365270797a1d2ce9d0320dc7d7f9ff2c6d29037c7fbb84fa6d9c0033628ba7036f12986 + REF "v${VERSION}" + SHA512 a7972beada950cf6ef3b61f20496a08b220e4f48c28c11d57c20683906ca5124a9f36ac2552318883a5ab1db6efdbf63d1141b6e0c484c560a8c1311ae2d7090 HEAD_REF stable PATCHES fix-dependency-hwloc.patch @@ -90,9 +90,11 @@ vcpkg_fixup_pkgconfig() file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(RENAME "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py" "'${CURRENT_INSTALLED_DIR}/tools/openmpi/bin/mpiexec'" "'mpiexec'") +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py" "'${CURRENT_INSTALLED_DIR}/tools/openmpi/bin/mpiexec'" "'mpiexec'") +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json index 034a171c988a58..17eba54ff37aa1 100644 --- a/ports/hpx/vcpkg.json +++ b/ports/hpx/vcpkg.json @@ -1,12 +1,13 @@ { "name": "hpx", - "version": "1.8.1", + "version": "1.9.1", "description": [ "The C++ Standards Library for Concurrency and Parallelism", "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." ], "homepage": "https://github.com/STEllAR-GROUP/hpx", "license": "BSL-1.0", + "supports": "!(windows & x86)", "dependencies": [ "asio", "boost-accumulators", diff --git a/ports/hunspell/0001_fix_unistd.patch b/ports/hunspell/0001_fix_unistd.patch deleted file mode 100644 index 9ea198b951fb08..00000000000000 --- a/ports/hunspell/0001_fix_unistd.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/tools/hzip.cxx b/src/tools/hzip.cxx -index d7d2d2464..30bb5a32c 100644 ---- a/src/tools/hzip.cxx -+++ b/src/tools/hzip.cxx -@@ -38,10 +38,13 @@ - /* hzip: file compression for sorted dictionaries with optional encryption, - * algorithm: prefix-suffix encoding and 16-bit Huffman encoding */ - -+#include - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif /* HAVE_UNISTD_H */ - #include - #include - -diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx -index e33ac71e3..1e8342ff5 100644 ---- a/src/tools/munch.cxx -+++ b/src/tools/munch.cxx -@@ -40,7 +40,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/src/tools/unmunch.cxx b/src/tools/unmunch.cxx -index 5a73e6fe9..3d9e31832 100644 ---- a/src/tools/unmunch.cxx -+++ b/src/tools/unmunch.cxx -@@ -42,7 +42,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/ports/hunspell/portfile.cmake b/ports/hunspell/portfile.cmake index dd441f939f4d4c..0311f4be3c6ac9 100644 --- a/ports/hunspell/portfile.cmake +++ b/ports/hunspell/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hunspell/hunspell - REF v1.7.1 - SHA512 472249309aecbbc58a025445781268867173e0651a6147f29644975ad65af043a1e2fbe91f2094934526889c7f9944739dc0a5f0d25328a77d22db1fd8f055ec + REF "v${VERSION}" + SHA512 d007edc8cb7ff95048361418b088bb062962973247c940aa826c9859a5ef90a9734100bffe7c7ac9a774f2e233605e814efb9e7fd3fc8c4ef4b978e9ec990cba HEAD_REF master PATCHES - 0001_fix_unistd.patch # from https://github.com/hunspell/hunspell/commit/60980f2bfe6678cca98bea2bf37f0b11bb34f4c5 0005-autotools-subdirs.patch ) diff --git a/ports/hunspell/vcpkg.json b/ports/hunspell/vcpkg.json index 42c35b8e61bad4..a8399f4315b069 100644 --- a/ports/hunspell/vcpkg.json +++ b/ports/hunspell/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hunspell", - "version": "1.7.1", - "port-version": 4, + "version": "1.7.2", "description": "The most popular spellchecking library.", "homepage": "https://github.com/hunspell/hunspell", "license": "MPL-1.1 OR LGPL-2.1-or-later OR GPL-2.0-or-later", diff --git a/ports/hwloc/portfile.cmake b/ports/hwloc/portfile.cmake index b56addb68b4eea..f46d0d11c20781 100644 --- a/ports/hwloc/portfile.cmake +++ b/ports/hwloc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-mpi/hwloc - REF 42bebfa5e4b96c99c2482645c8eb86d4755ef23b - SHA512 87aff1e0eb7389a8d433f2936b6e23e8c37381d46fb7e60a205a97bc0f86f3c8926e3a6da6e54d4aeb89ef19abbe73a9d392f8c7871108b2a9fbf0b011de9f2c + REF "hwloc-${VERSION}" + SHA512 958f385d846ed1b6ab60725b7966374213eff3e304a77c5bc8a26f1900c04eb082119d5147f98b2c7f931f566e2d1b05a2a4e89bda220f45258e497b68735929 PATCHES fix_shared_win_build.patch stdout_fileno.patch diff --git a/ports/hwloc/vcpkg.json b/ports/hwloc/vcpkg.json index 5b1d852486a98f..49c5819b369ee2 100644 --- a/ports/hwloc/vcpkg.json +++ b/ports/hwloc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hwloc", - "version": "2.9.0", + "version": "2.9.3", "maintainers": "bgoglin", "description": [ "Portable Hardware Locality (hwloc)", diff --git a/ports/hypre/fix-dll-install-destination.patch b/ports/hypre/fix-dll-install-destination.patch deleted file mode 100644 index 68d335ccfd5f50..00000000000000 --- a/ports/hypre/fix-dll-install-destination.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -459,7 +459,7 @@ install(TARGETS ${PROJECT_NAME} - EXPORT HYPRETargets - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -- RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - install(FILES ${HYPRE_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - diff --git a/ports/hypre/portfile.cmake b/ports/hypre/portfile.cmake index 8645eaef1b8335..720a3e97fcad0b 100644 --- a/ports/hypre/portfile.cmake +++ b/ports/hypre/portfile.cmake @@ -5,11 +5,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hypre-space/hypre - REF v2.23.0 - SHA512 bed8426d093e2290ab443f49deffad96a64e1b3844a4236bc59af19523b16ea8bf2318db21e42ab2b8a4dd529246ba1d9a4eb0cb3bd943633569d03e6311f67f + REF "v${VERSION}" + SHA512 fe92d09b56107845e3a4b7f0e7bbba5f319a7ebdaaecab3e6b89fae1fe2a79a9dd712806823ea518f5960f0eaa1088f6b82ebac63d3940478d36690f3adec4f2 HEAD_REF master - PATCHES - fix-dll-install-destination.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" HYPRE_SHARED) diff --git a/ports/hypre/vcpkg.json b/ports/hypre/vcpkg.json index bcdb97323c23a8..42548e93a07f44 100644 --- a/ports/hypre/vcpkg.json +++ b/ports/hypre/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hypre", - "version": "2.23.0", + "version": "2.29.0", "description": "Parallel solvers for sparse linear systems featuring multigrid methods", "homepage": "https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods", "dependencies": [ diff --git a/ports/ideviceinstaller/001_fix_windows.patch b/ports/ideviceinstaller/001_fix_windows.patch new file mode 100644 index 00000000000000..16f1149ffd2206 --- /dev/null +++ b/ports/ideviceinstaller/001_fix_windows.patch @@ -0,0 +1,47 @@ +diff --git a/src/ideviceinstaller.c b/src/ideviceinstaller.c +index c50bacf..e4a8c3d 100644 +--- a/src/ideviceinstaller.c ++++ b/src/ideviceinstaller.c +@@ -32,7 +32,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + #include +@@ -87,6 +89,32 @@ static int asprintf(char **PTR, const char *TEMPLATE, ...) + } + #endif + ++#ifdef _MSC_VER ++#ifndef ISSLASH ++#define ISSLASH(C) ((C) == '/' || (C) == '\\') ++#endif ++char *basename(char const *name) { ++ char const *base = name; ++ char const *p; ++ for (p = base; *p; p++) { ++ if (ISSLASH(*p)) { ++ do p++; ++ while (ISSLASH(*p)); ++ ++ if (!*p) { ++ if (ISSLASH(*base)) ++ base = p - 1; ++ break; ++ } ++ ++ base = p; ++ } ++ } ++ ++ return (char *) base; ++} ++#endif ++ + #define ITUNES_METADATA_PLIST_FILENAME "iTunesMetadata.plist" + + const char PKG_PATH[] = "PublicStaging"; diff --git a/ports/ideviceinstaller/Add-missing-lib.patch b/ports/ideviceinstaller/Add-missing-lib.patch deleted file mode 100644 index 5e662951606b88..00000000000000 --- a/ports/ideviceinstaller/Add-missing-lib.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/ideviceinstaller.vcxproj b/ideviceinstaller.vcxproj -index dd8d483..4b15d7e 100644 ---- a/ideviceinstaller.vcxproj -+++ b/ideviceinstaller.vcxproj -@@ -112,7 +112,7 @@ - - Console - true -- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) -+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies) - - - -@@ -126,7 +126,7 @@ - - Console - true -- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) -+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies) - - - -@@ -144,7 +144,7 @@ - true - true - true -- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) -+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies) - - - -@@ -162,7 +162,7 @@ - true - true - true -- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) -+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies) - - - diff --git a/ports/ideviceinstaller/CMakeLists.txt b/ports/ideviceinstaller/CMakeLists.txt new file mode 100644 index 00000000000000..e1923497f6d7ec --- /dev/null +++ b/ports/ideviceinstaller/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 3.15) +project(ideviceinstaller C) + +include(GNUInstallDirs) + +file(GLOB_RECURSE IDEVICEINSTALLER_SOURCE src/*.c src/*.h) + +set(DEFINITIONS) + +list(APPEND DEFINITIONS -DPACKAGE_NAME="ideviceinstaller") +list(APPEND DEFINITIONS -DPACKAGE_VERSION="1.1.1") +list(APPEND DEFINITIONS -DPACKAGE_URL="https://github.com/libimobiledevice/ideviceinstaller") +list(APPEND DEFINITIONS -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/ideviceinstaller/issues") + +if(UNIX) + list(APPEND DEFINITIONS -DHAVE_VASPRINTF) + list(APPEND DEFINITIONS -DHAVE_ASPRINTF) + list(APPEND DEFINITIONS -DHAVE_UNISTD_H) +endif() + +if(WIN32) + list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS) + list(APPEND DEFINITIONS -DWIN32) +endif() + +find_package(unofficial-libimobiledevice CONFIG REQUIRED) +find_package(libzip CONFIG REQUIRED) +find_path(DIRENT_INCLUDE_DIR dirent.h REQUIRED) + +add_executable(ideviceinstaller ${IDEVICEINSTALLER_SOURCE}) +target_include_directories(ideviceinstaller PRIVATE + ${DIRENT_INCLUDE_DIR} +) +target_compile_definitions(ideviceinstaller PRIVATE ${DEFINITIONS}) +target_link_libraries(ideviceinstaller PRIVATE + unofficial::libimobiledevice::libimobiledevice + libzip::zip +) + +if(WIN32) + find_package(unofficial-getopt-win32 REQUIRED) + target_link_libraries(ideviceinstaller PRIVATE unofficial::getopt-win32::getopt) +endif() + +install(TARGETS ideviceinstaller + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") diff --git a/ports/ideviceinstaller/portfile.cmake b/ports/ideviceinstaller/portfile.cmake index 2d8caad8f197d4..6f96b2edff0fbb 100644 --- a/ports/ideviceinstaller/portfile.cmake +++ b/ports/ideviceinstaller/portfile.cmake @@ -1,19 +1,24 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO libimobiledevice-win32/ideviceinstaller - REF ${VERSION} - SHA512 d0801b3a38eb02206a6f06e05cc19b794c69a87c06895165f64522c61e07030046499c5f0e436981682f9e17f91eae87913cca091e2e039a74ee35a5136100d4 - HEAD_REF msvc-master - PATCHES Add-missing-lib.patch + REPO libimobiledevice/ideviceinstaller + REF b9cfe0b264f66eab9ad88e11eb6b0523cb1de911 # commits on 2023-07-21 + SHA512 a78418001109593f2d704d91aff8df009e15c504c2139ca606c9719b70868466ef73778d52670468a4b7bf758ec65435c1b981c27809a2e22737f7587ad51c7d + HEAD_REF master + PATCHES + 001_fix_windows.patch ) -vcpkg_install_msbuild( +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH ideviceinstaller.vcxproj - LICENSE_SUBPATH COPYING - USE_VCPKG_INTEGRATION ) +vcpkg_cmake_install() +vcpkg_copy_tools(TOOL_NAMES ideviceinstaller AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") + set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/ideviceinstaller/vcpkg.json b/ports/ideviceinstaller/vcpkg.json index ccfc1fd34ab737..0f4071af11ef9e 100644 --- a/ports/ideviceinstaller/vcpkg.json +++ b/ports/ideviceinstaller/vcpkg.json @@ -1,13 +1,18 @@ { "name": "ideviceinstaller", - "version": "1.1.2.23", - "port-version": 6, + "version-date": "2023-07-21", "description": "Manage apps of iOS devices", "homepage": "https://libimobiledevice.org/", - "license": "LGPL-2.1-only", - "supports": "windows & !arm64 & !xbox", + "license": "LGPL-2.0-or-later", + "supports": "!uwp & !android & !ios & !xbox", "dependencies": [ + "dirent", + "getopt", "libimobiledevice", - "libzip" + "libzip", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/idevicerestore/CMakeLists.txt b/ports/idevicerestore/CMakeLists.txt new file mode 100644 index 00000000000000..cff54d95665b46 --- /dev/null +++ b/ports/idevicerestore/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required(VERSION 3.15) +project(idevicerestore C) + +include(GNUInstallDirs) + +file(GLOB_RECURSE IDEVICERESTORE_SOURCE src/*.c src/*.h) +list(FILTER IDEVICERESTORE_SOURCE EXCLUDE REGEX "sha(1|512)\\.(c|h)$") + +set(DEFINITIONS) + +list(APPEND DEFINITIONS -DPACKAGE_NAME="idevicerestore") +list(APPEND DEFINITIONS -DPACKAGE_VERSION="1.0.0") +list(APPEND DEFINITIONS -DPACKAGE_URL="https://github.com/libimobiledevice/idevicerestore") +list(APPEND DEFINITIONS -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/idevicerestore/issues") + +list(APPEND DEFINITIONS -DHAVE_REVERSE_PROXY) + +list(APPEND DEFINITIONS -DHAVE_OPENSSL) + +if(UNIX) + list(APPEND DEFINITIONS -DHAVE_REALPATH) +endif() + +if(WIN32) + list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS) + list(APPEND DEFINITIONS -DWIN32) +endif() + +find_package(CURL CONFIG REQUIRED) +find_package(unofficial-libimobiledevice CONFIG REQUIRED) +find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED) +find_package(unofficial-libirecovery CONFIG REQUIRED) +find_package(libzip CONFIG REQUIRED) +find_package(OpenSSL REQUIRED) +find_package(ZLIB REQUIRED) +find_path(DIRENT_INCLUDE_DIR dirent.h REQUIRED) + +add_executable(idevicerestore ${IDEVICERESTORE_SOURCE}) +target_include_directories(idevicerestore PRIVATE + ${DIRENT_INCLUDE_DIR} +) +target_compile_definitions(idevicerestore PRIVATE ${DEFINITIONS}) +target_link_libraries(idevicerestore PRIVATE + CURL::libcurl + unofficial::libimobiledevice::libimobiledevice + unofficial::libimobiledevice-glue::libimobiledevice-glue + unofficial::libirecovery::libirecovery + libzip::zip + OpenSSL::SSL + OpenSSL::Crypto + ZLIB::ZLIB +) +if(WIN32) + find_package(unofficial-getopt-win32 REQUIRED) + target_link_libraries(idevicerestore PRIVATE unofficial::getopt-win32::getopt) +endif() + +install(TARGETS idevicerestore + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") diff --git a/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch b/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch deleted file mode 100644 index db7450eb23bcb5..00000000000000 --- a/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/common.c b/src/common.c -index afe1bc0..9219a8f 100644 ---- a/src/common.c -+++ b/src/common.c -@@ -29,7 +29,9 @@ - #include - #include - #include -+#ifndef _MSC_VER - #include -+#endif - #include - - #include "common.h" -diff --git a/src/idevicerestore.c b/src/idevicerestore.c -index efa13c3..c17a2ba 100644 ---- a/src/idevicerestore.c -+++ b/src/idevicerestore.c -@@ -38,12 +38,12 @@ - #include - #ifndef _MSC_VER - #include -+#include - #endif - #include - #include - #include - #include --#include - - #include - diff --git a/ports/idevicerestore/fix-vcxproj.patch b/ports/idevicerestore/fix-vcxproj.patch deleted file mode 100644 index 79ff322b30ad64..00000000000000 --- a/ports/idevicerestore/fix-vcxproj.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj -index fa209fa..6afa088 100644 ---- a/idevicerestore.vcxproj -+++ b/idevicerestore.vcxproj -@@ -92,9 +92,10 @@ - Disabled - true - _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS -+ 4996 - - -- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies) -+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies) - - - -@@ -103,9 +104,10 @@ - Disabled - true - _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS -+ 4996 - - -- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies) -+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies) - - - -@@ -116,6 +118,7 @@ - true - true - _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS -+ 4996 - - - true -@@ -131,6 +134,7 @@ - true - true - _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS -+ 4996 - - - true diff --git a/ports/idevicerestore/portfile.cmake b/ports/idevicerestore/portfile.cmake index 0bc503cea4629a..de3dfd2bd07693 100644 --- a/ports/idevicerestore/portfile.cmake +++ b/ports/idevicerestore/portfile.cmake @@ -1,19 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO libimobiledevice-win32/idevicerestore - REF 1.0.12 - SHA512 ba623be56c2f37853516d7d4c32e16f1ec72f33d512f18aa812ce6830af4b9e389f7af5321888dd0ddd168e282b652e379b60f90970680e213eabf489f406915 - HEAD_REF msvc-master - PATCHES - fix-vcxproj.patch - fix-libgen.h-cannot-be-found.patch + REPO libimobiledevice/idevicerestore + REF 609f7f058487596597e8e742088119fdd46729df # commits on 2023-05-23 + SHA512 9427c438d1967f1717424dd1d1b789d3d139b3fcacee15911e531d6377039927c147150dafacd251b92d57134e72c49de6e1a053fcd63f14c780e60dc5b13fc5 + HEAD_REF master ) -vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH idevicerestore.vcxproj - LICENSE_SUBPATH COPYING - USE_VCPKG_INTEGRATION +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) +vcpkg_cmake_install() +vcpkg_copy_tools(TOOL_NAMES idevicerestore AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") + set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/idevicerestore/vcpkg.json b/ports/idevicerestore/vcpkg.json index 056ccaf123a48a..674562d21944fa 100644 --- a/ports/idevicerestore/vcpkg.json +++ b/ports/idevicerestore/vcpkg.json @@ -1,13 +1,23 @@ { "name": "idevicerestore", - "version": "1.0.12", - "port-version": 7, + "version-date": "2023-05-23", "description": "Restore/upgrade firmware of iOS devices", - "supports": "windows", + "homepage": "https://libimobiledevice.org/", + "license": "LGPL-3.0-or-later", + "supports": "(!windows & !android & !ios) | mingw", "dependencies": [ "curl", + "dirent", + "getopt", "libimobiledevice", + "libimobiledevice-glue", "libirecovery", - "libzip" + "libzip", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" ] } diff --git a/ports/ignition-common3/portfile.cmake b/ports/ignition-common3/portfile.cmake index f8269c11fc4a90..7a659315f677ca 100644 --- a/ports/ignition-common3/portfile.cmake +++ b/ports/ignition-common3/portfile.cmake @@ -1,8 +1,16 @@ -ignition_modular_library(NAME common - VERSION "3.14.1" - SHA512 5f83685b67cb0b8e295136f74a681e2ca5f00a730b0a221f0c00cab5f9049c84692185fb5924ab29cd07cbdf85450e81dfcdc984fc8af4ed4cc549b2fe2f9a6e - OPTIONS -DUSE_EXTERNAL_TINYXML2=ON - PATCHES fix-dependencies.patch) +set(PACKAGE_NAME common) + +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 022f5f68cdc134fa84dc22b49dc43e5c62d6e987e7fd63630586716e43fb2aad57ab4fb470ea1c3884c79b910d403a94a4d47ac24ffbb6f3b89b36c5b0e708f8 + OPTIONS + -DUSE_EXTERNAL_TINYXML2=ON + PATCHES + fix-dependencies.patch +) + # Remove non-relocatable helper scripts (see https://github.com/ignitionrobotics/ign-common/issues/82) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ign_remotery_vis" "${CURRENT_PACKAGES_DIR}/debug/bin/ign_remotery_vis") diff --git a/ports/ignition-common3/vcpkg.json b/ports/ignition-common3/vcpkg.json index 29046dc3e3b89b..16b6c9ce1f2a13 100644 --- a/ports/ignition-common3/vcpkg.json +++ b/ports/ignition-common3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ignition-common3", - "version": "3.14.1", + "version": "3.16.0", "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", "license": null, diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index ae8a5ecd1d547a..ddc06fd5f329cb 100644 --- a/ports/igraph/portfile.cmake +++ b/ports/igraph/portfile.cmake @@ -4,9 +4,9 @@ # - The release tarball contains pre-generated parser sources, which eliminates the dependency on bison/flex. vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/igraph/igraph/releases/download/0.10.6/igraph-0.10.6.tar.gz" - FILENAME "igraph-0.10.6.tar.gz" - SHA512 e01d8bf2335b95a94a0abf095d2f43bc4397f028406389c4a0bddc038b117d7c5b6f02032d77c11c44ae51dbae10b92c677555d879dec6f028a5d8cb97c37029 + URLS "https://github.com/igraph/igraph/releases/download/0.10.7/igraph-0.10.7.tar.gz" + FILENAME "igraph-0.10.7.tar.gz" + SHA512 72187052de16c791176dce797addaa54c18f14f47b44983374e3d8bb94a664dc70d773fb9296aa4fb1c68dbf5fb3d61803f1c4b167388d9217ce80f38a90f522 ) vcpkg_extract_source_archive( diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index e69b00bbc0b636..1c1be413a821a8 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "igraph", - "version": "0.10.6", + "version": "0.10.7", "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "license": "GPL-2.0-or-later", diff --git a/ports/imath/portfile.cmake b/ports/imath/portfile.cmake index 0c60c9daa5f874..3f4f34ad58c7c6 100644 --- a/ports/imath/portfile.cmake +++ b/ports/imath/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_cmake_configure( OPTIONS -DIMATH_INSTALL_SYM_LINK=OFF -DBUILD_TESTING=OFF + -DIMATH_INSTALL_PKG_CONFIG=ON ) vcpkg_cmake_install() diff --git a/ports/imath/vcpkg.json b/ports/imath/vcpkg.json index 0973f840591bd2..85b1cb6915f3e7 100644 --- a/ports/imath/vcpkg.json +++ b/ports/imath/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imath", "version": "3.1.9", + "port-version": 1, "description": "Imath is a C++ and Python library of 2D and 3D vector, matrix, and math operations for computer graphics.", "homepage": "https://github.com/AcademySoftwareFoundation/Imath", "license": "BSD-3-Clause", diff --git a/ports/imgui-node-editor/CMakeLists.txt b/ports/imgui-node-editor/CMakeLists.txt new file mode 100644 index 00000000000000..852290e2931ba7 --- /dev/null +++ b/ports/imgui-node-editor/CMakeLists.txt @@ -0,0 +1,60 @@ +cmake_minimum_required(VERSION 3.8) +project(imgui-node-editor) + +set(CMAKE_CXX_STANDARD 14) + +find_package(imgui CONFIG REQUIRED) +get_target_property(IMGUI_INCLUDE_DIRS imgui::imgui + INTERFACE_INCLUDE_DIRECTORIES +) + +add_library(${PROJECT_NAME} "") + +target_include_directories( + ${PROJECT_NAME} + PUBLIC + $ + $ + PRIVATE + ${IMGUI_INCLUDE_DIRS} +) + +target_sources( + ${PROJECT_NAME} + PRIVATE + crude_json.cpp + imgui_canvas.cpp + imgui_node_editor.cpp + imgui_node_editor_api.cpp +) + +install( + TARGETS ${PROJECT_NAME} + EXPORT unofficial-${PROJECT_NAME}-target + ARCHIVE DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin +) + +if (NOT IMGUI_NODE_EDITOR_SKIP_HEADERS) + install( + FILES + crude_json.h + imgui_bezier_math.h + imgui_bezier_math.inl + imgui_canvas.h + imgui_extra_math.h + imgui_extra_math.inl + imgui_node_editor.h + imgui_node_editor_internal.h + imgui_node_editor_internal.inl + DESTINATION include/${PROJECT_NAME} + ) +endif() + +install( + EXPORT unofficial-${PROJECT_NAME}-target + NAMESPACE unofficial::${PROJECT_NAME}:: + FILE unofficial-${PROJECT_NAME}-config.cmake + DESTINATION share/unofficial-${PROJECT_NAME} +) diff --git a/ports/imgui-node-editor/portfile.cmake b/ports/imgui-node-editor/portfile.cmake new file mode 100644 index 00000000000000..031750bc8e214a --- /dev/null +++ b/ports/imgui-node-editor/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO thedmd/imgui-node-editor + REF v${VERSION} + SHA512 7dbc34a7af1554a7e683e0b55d18fc08cf5832bf5d6a57a30820e7ef98a6fbb5a65a7287f6250d3b6f47b89ac0499f51fbe19d9c11850e26f74e3b0e806abb1b + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DIMGUI_NODE_EDITOR_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/imgui-node-editor/vcpkg.json b/ports/imgui-node-editor/vcpkg.json new file mode 100644 index 00000000000000..b03295a303b02b --- /dev/null +++ b/ports/imgui-node-editor/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "imgui-node-editor", + "version": "0.9.2", + "description": "Node Editor built using Dear ImGui", + "homepage": "https://github.com/thedmd/imgui-node-editor", + "license": "MIT", + "dependencies": [ + "imgui", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/imgui-sfml/0001-fix_find_package.patch b/ports/imgui-sfml/0001-fix_find_package.patch index 1e558e621be534..ace8e9ee421f6a 100644 --- a/ports/imgui-sfml/0001-fix_find_package.patch +++ b/ports/imgui-sfml/0001-fix_find_package.patch @@ -1,48 +1,33 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a974c4..8a1c6cd 100644 +index 075d793..9bc635a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -38,37 +38,14 @@ set(IMGUI_SFML_CONFIG_INSTALL_DIR "" CACHE PATH "Path where user's config header - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") +@@ -41,13 +41,14 @@ if (IMGUI_SFML_FIND_SFML) + if (NOT BUILD_SHARED_LIBS) + set(SFML_STATIC_LIBRARIES ON) + endif() +- find_package(SFML 2.5 COMPONENTS graphics system window) ++ find_package(SFML COMPONENTS graphics system window) - if (IMGUI_SFML_FIND_SFML) -- if (NOT BUILD_SHARED_LIBS) -- set(SFML_STATIC_LIBRARIES ON) -- endif() -- find_package(SFML 2.5 COMPONENTS graphics system window) -+ find_package(SFML COMPONENTS graphics system window) - - if(NOT SFML_FOUND) - message(FATAL_ERROR "SFML 2 directory not found. Set SFML_DIR to directory where SFML was built (or one which ccontains SFMLConfig.cmake)") - endif() + if(NOT SFML_FOUND) + message(FATAL_ERROR "SFML 2 directory not found. Set SFML_DIR to directory where SFML was built (or one which contains SFMLConfig.cmake)") + endif() endif() --# ImGui does not provide native support for CMakeLists, workaround for now to have --# users specify IMGUI_DIR. Waiting for this PR to get merged... --# https://github.com/ocornut/imgui/pull/1713 --if(NOT IMGUI_DIR) -- set(IMGUI_DIR "" CACHE PATH "imgui top-level directory") -- message(FATAL_ERROR "ImGui directory not found. Set IMGUI_DIR to imgui's top-level path (containing 'imgui.h' and other files).\n") --endif() -- --# This uses FindImGui.cmake provided in ImGui-SFML repo for now --find_package(ImGui 1.80 REQUIRED) -- --# these headers will be installed alongside ImGui-SFML --set(IMGUI_PUBLIC_HEADERS -- ${IMGUI_INCLUDE_DIR}/imconfig.h -- ${IMGUI_INCLUDE_DIR}/imgui.h -- ${IMGUI_INCLUDE_DIR}/imgui_internal.h # not actually public, but users might need it -- ${IMGUI_INCLUDE_DIR}/imstb_rectpack.h -- ${IMGUI_INCLUDE_DIR}/imstb_textedit.h -- ${IMGUI_INCLUDE_DIR}/imstb_truetype.h -- ${IMGUI_INCLUDE_DIR}/misc/cpp/imgui_stdlib.h --) ++if(0) + # ImGui does not provide native support for CMakeLists, workaround for now to have + # users specify IMGUI_DIR. Waiting for this PR to get merged... + # https://github.com/ocornut/imgui/pull/1713 +@@ -69,6 +70,8 @@ set(IMGUI_PUBLIC_HEADERS + ${IMGUI_INCLUDE_DIR}/imstb_truetype.h + ${IMGUI_INCLUDE_DIR}/misc/cpp/imgui_stdlib.h + ) ++endif() +find_package(imgui CONFIG REQUIRED) if (IMGUI_SFML_IMGUI_DEMO) - list(APPEND IMGUI_SOURCES ${IMGUI_DEMO_SOURCES}) -@@ -93,6 +70,7 @@ add_library(ImGui-SFML + list(APPEND IMGUI_SOURCES ${IMGUI_DEMO_SOURCES}) +@@ -93,6 +96,7 @@ add_library(ImGui-SFML::ImGui-SFML ALIAS ImGui-SFML) target_link_libraries(ImGui-SFML PUBLIC diff --git a/ports/imgui-sfml/0002-fix-imgui-dependency.patch b/ports/imgui-sfml/0002-fix-imgui-dependency.patch deleted file mode 100644 index bb018cd42d8d94..00000000000000 --- a/ports/imgui-sfml/0002-fix-imgui-dependency.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/imgui-SFML.cpp b/imgui-SFML.cpp -index 6ca64ae..94af0c8 100644 ---- a/imgui-SFML.cpp -+++ b/imgui-SFML.cpp -@@ -128,7 +128,7 @@ void initDefaultJoystickMapping(); - // Returns first id of connected joystick - unsigned int getConnectedJoystickId(); - --void updateJoystickActionState(ImGuiIO& io, ImGuiNavInput_ action); -+void updateJoystickActionState(ImGuiIO& io, ImGuiNavInput action); - void updateJoystickDPadState(ImGuiIO& io); - void updateJoystickLStickState(ImGuiIO& io); - -@@ -1030,7 +1030,7 @@ void initDefaultJoystickMapping() { - ImGui::SFML::SetJoystickLStickThreshold(5.f); - } - --void updateJoystickActionState(ImGuiIO& io, ImGuiNavInput_ action) { -+void updateJoystickActionState(ImGuiIO& io, ImGuiNavInput action) { - bool isPressed = sf::Joystick::isButtonPressed(s_currWindowCtx->joystickId, - s_currWindowCtx->joystickMapping[action]); - io.NavInputs[action] = isPressed ? 1.0f : 0.0f; diff --git a/ports/imgui-sfml/portfile.cmake b/ports/imgui-sfml/portfile.cmake index 08df56083bd986..c8c9704ca96e7d 100644 --- a/ports/imgui-sfml/portfile.cmake +++ b/ports/imgui-sfml/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eliasdaler/imgui-sfml - REF 004efd85a590343e8c9d166dc9d2524c199c9450 #v2.5 - SHA512 feb11f0a52f89eedc5af4c686b71290a48d69e7bc371f29536eb51752d00b6879d642625f494035d2ccc0500878757709afa2a3810ac17496506db754a3a4ed6 + REF "v${VERSION}" + SHA512 c8f2ed21ad5dfac417474f0caed1c59105b7dd8bf2dcb1db3b1f46a4fb07cec3c199d6fda0ff05ec5040a18000a0168f1a8caa978dee356c2b6874b5b2e10ec4 HEAD_REF master PATCHES 0001-fix_find_package.patch - 0002-fix-imgui-dependency.patch ) vcpkg_cmake_configure( @@ -30,6 +29,6 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/share/imgui-sfml/ImGui-SFMLConfig.cmake" "${ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/imgui-sfml/vcpkg.json b/ports/imgui-sfml/vcpkg.json index 6815eeba207376..c24916590ca93e 100644 --- a/ports/imgui-sfml/vcpkg.json +++ b/ports/imgui-sfml/vcpkg.json @@ -1,7 +1,6 @@ { "name": "imgui-sfml", - "version": "2.5", - "port-version": 4, + "version": "2.6", "description": "ImGui binding for use with SFML", "homepage": "https://github.com/eliasdaler/imgui-sfml", "license": "MIT", diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 08508f314e53be..f447f5ebb2ef71 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -112,6 +112,12 @@ if(IMGUI_FREETYPE) target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_ENABLE_FREETYPE) endif() +if(IMGUI_FREETYPE_LUNASVG) + find_package(unofficial-lunasvg CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC unofficial::lunasvg::lunasvg) + target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_ENABLE_FREETYPE_LUNASVG) +endif() + if(IMGUI_USE_WCHAR32) target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_USE_WCHAR32) endif() diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in index 721bcf8845d0fd..2a2c494f24513f 100644 --- a/ports/imgui/imgui-config.cmake.in +++ b/ports/imgui/imgui-config.cmake.in @@ -26,6 +26,10 @@ if (@IMGUI_FREETYPE@) find_dependency(freetype CONFIG) endif() +if (@IMGUI_FREETYPE_LUNASVG@) + find_dependency(unofficial-lunasvg CONFIG) +endif() + if (@IMGUI_BUILD_ALLEGRO5_BINDING@) find_dependency(unofficial-allegro5 CONFIG) endif() diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 35ff5d9ef628fc..ad53a0bfe82101 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -4,8 +4,8 @@ if ("docking-experimental" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF dc3e531ff28450bff73fde0163b1d076b6bb5605 - SHA512 c716d90c57a036f0117eb02814c3ed164db31727f604fb7568e8413dfba73b678e09c6405a2af52e12522cb766fcf585a97a69b33097349b66755e5b9b04fd06 + REF a1b60fc1f5589d498ab1080c2572da725fcbd0e3 + SHA512 ac6117f6adf9418af3a2db5392f1316be50a94c38e78cd1eadc0e0a71dfbb5536507aaf4d9d3b3468b5a30ebf143b806e2774f274e2098e1217ed93080fe81c7 HEAD_REF docking ) else() @@ -13,7 +13,7 @@ else() OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui REF v${VERSION} - SHA512 69023cbff02287cb6409b08079d21469680222ca985fd1acd658dcf704c615cb2d74668821dc4830bef70be6033640b0528d3a103b70ebeb4b7563576305bf80 + SHA512 42021b06b611b58222b09fab8db2c34e992c3dc4fbaa175e09833c66c90d04b4a4e7def16a732535335c0ac5ff014d235835511a5d9a76d32b4395b302146919 HEAD_REF master ) endif() @@ -39,6 +39,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vulkan-binding IMGUI_BUILD_VULKAN_BINDING win32-binding IMGUI_BUILD_WIN32_BINDING freetype IMGUI_FREETYPE + freetype-lunasvg IMGUI_FREETYPE_LUNASVG wchar32 IMGUI_USE_WCHAR32 ) @@ -68,6 +69,9 @@ vcpkg_cmake_install() if ("freetype" IN_LIST FEATURES) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_ENABLE_FREETYPE" "#define IMGUI_ENABLE_FREETYPE") endif() +if ("freetype-lunasvg" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_ENABLE_FREETYPE_LUNASVG" "#define IMGUI_ENABLE_FREETYPE_LUNASVG") +endif() if ("wchar32" IN_LIST FEATURES) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_USE_WCHAR32" "#define IMGUI_USE_WCHAR32") endif() diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index 2a19feac922ee6..e6531b22799a47 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui", - "version": "1.89.7", + "version": "1.89.9", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", @@ -46,6 +46,18 @@ "freetype" ] }, + "freetype-lunasvg": { + "description": "Add support to render OpenType SVG fonts using LunaSVG", + "dependencies": [ + { + "name": "imgui", + "features": [ + "freetype" + ] + }, + "lunasvg" + ] + }, "glfw-binding": { "description": "Make available GLFW binding", "dependencies": [ @@ -69,7 +81,8 @@ "supports": "osx" }, "opengl2-binding": { - "description": "Make available OpenGL (legacy) binding" + "description": "Make available OpenGL (legacy) binding", + "supports": "!uwp" }, "opengl3-binding": { "description": "Make available OpenGL3/ES/ES2 (modern) binding" @@ -101,7 +114,7 @@ }, "win32-binding": { "description": "Make available Win32 binding", - "supports": "windows" + "supports": "windows & !uwp" } } } diff --git a/ports/implot/portfile.cmake b/ports/implot/portfile.cmake index 7b8de74eb2a645..7bda01747db2fb 100644 --- a/ports/implot/portfile.cmake +++ b/ports/implot/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO epezent/implot REF v${VERSION} - SHA512 07e45da79db20f12cd17e3510e0b67085f16865ec27e119cb9faa8037a815c1bc246a9dec11805e031f00a131afbacb6c9ca8a28d1115c4e1365dd941987fc80 + SHA512 117cb08122d900e7db857897bfec4c9ac3300a1d429c8f0303415bc693840baa9bbbb91ca3f13853d8efd3a6ebf538b7114401d4fbfe0d067256e58cbdbd4919 HEAD_REF master ) diff --git a/ports/implot/vcpkg.json b/ports/implot/vcpkg.json index 57b8c0bec855d5..70c71fb076ebf2 100644 --- a/ports/implot/vcpkg.json +++ b/ports/implot/vcpkg.json @@ -1,7 +1,6 @@ { "name": "implot", - "version": "0.15", - "port-version": 1, + "version": "0.16", "description": "Advanced 2D Plotting for Dear ImGui", "homepage": "https://github.com/epezent/implot", "license": "MIT", diff --git a/ports/influxdb-cxx/vcpkg.json b/ports/influxdb-cxx/vcpkg.json index 0227bc6617cf87..6d421a3914e308 100644 --- a/ports/influxdb-cxx/vcpkg.json +++ b/ports/influxdb-cxx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "influxdb-cxx", "version": "0.7.1", + "port-version": 1, "description": "InfluxDB C++ client library", "homepage": "https://github.com/offa/influxdb-cxx", "license": "MIT", @@ -18,6 +19,7 @@ "features": { "boost": { "description": "Enables UDP and Unix sockets as Transport Layer", + "supports": "!uwp", "dependencies": [ "boost-asio", "boost-conversion", diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake index 5642ceeaeea56f..e02c279575c648 100644 --- a/ports/intel-mkl/portfile.cmake +++ b/ports/intel-mkl/portfile.cmake @@ -236,7 +236,7 @@ endif() file(COPY "${mkl_dir}/lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}" "bin") #TODO: Hardcode settings from portfile in config.cmake #TODO: Give lapack/blas information about the correct BLA_VENDOR depending on settings. diff --git a/ports/intel-mkl/vcpkg.json b/ports/intel-mkl/vcpkg.json index 381933937ad174..e68c3865114b51 100644 --- a/ports/intel-mkl/vcpkg.json +++ b/ports/intel-mkl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "intel-mkl", "version": "2023.0.0", - "port-version": 2, + "port-version": 3, "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors.", "homepage": "https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html", "license": null, diff --git a/ports/ismrmrd/vcpkg.json b/ports/ismrmrd/vcpkg.json index 90612fef154a66..f560844d7195b3 100644 --- a/ports/ismrmrd/vcpkg.json +++ b/ports/ismrmrd/vcpkg.json @@ -1,13 +1,12 @@ { "name": "ismrmrd", "version": "1.13.2", + "port-version": 1, "description": "ISMRM Raw Data Format", "homepage": "https://github.com/ismrmrd/ismrmrd", "license": "BSD-3-Clause", "supports": "!(x86 | arm | wasm32)", "dependencies": [ - "boost", - "fftw3", "hdf5", "pugixml", { diff --git a/ports/ixwebsocket/portfile.cmake b/ports/ixwebsocket/portfile.cmake index b9e45518794bf4..d0d88fff609232 100644 --- a/ports/ixwebsocket/portfile.cmake +++ b/ports/ixwebsocket/portfile.cmake @@ -16,17 +16,23 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS sectransp USE_SECURE_TRANSPORT ) -if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") +string(COMPARE NOTEQUAL "${FEATURES}" "core" USE_TLS) + +list(REMOVE_ITEM FEATURES "ssl") +list(LENGTH FEATURES num_features) +if(num_features GREATER "2") + message(FATAL_ERROR "Can not select multiple ssl backends at the same time. Disable default features to disable the default ssl backend.") endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DUSE_TLS=1 + -DUSE_TLS=${USE_TLS} MAYBE_UNUSED_VARIABLES USE_SECURE_TRANSPORT + USE_MBED_TLS + USE_OPEN_SSL ) vcpkg_cmake_install() diff --git a/ports/ixwebsocket/vcpkg.json b/ports/ixwebsocket/vcpkg.json index 8eee6a764c0d98..678eb3fc7f59b9 100644 --- a/ports/ixwebsocket/vcpkg.json +++ b/ports/ixwebsocket/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ixwebsocket", "version-semver": "11.4.4", + "port-version": 2, "description": "Lightweight WebSocket Client and Server + HTTP Client and Server", "homepage": "https://github.com/machinezone/IXWebSocket", "license": "BSD-3-Clause", @@ -27,12 +28,14 @@ }, "openssl": { "description": "SSL support (OpenSSL)", + "supports": "!uwp", "dependencies": [ "openssl" ] }, "sectransp": { - "description": "SSL support (sectransp)" + "description": "SSL support (sectransp)", + "supports": "osx | ios" }, "ssl": { "description": "Default SSL backend", @@ -40,16 +43,16 @@ { "name": "ixwebsocket", "features": [ - "sectransp" + "mbedtls" ], - "platform": "osx" + "platform": "windows" }, { "name": "ixwebsocket", "features": [ - "mbedtls" + "sectransp" ], - "platform": "windows" + "platform": "osx | ios" }, { "name": "ixwebsocket", @@ -63,7 +66,7 @@ "features": [ "openssl" ], - "platform": "!uwp & !windows & !osx" + "platform": "!uwp & !windows & !osx & !ios" } ] } diff --git a/ports/jack2/jack.def b/ports/jack2/jack.def index c542e5337f851b..5c2d48e5696e1e 100644 --- a/ports/jack2/jack.def +++ b/ports/jack2/jack.def @@ -94,3 +94,11 @@ jack_get_time jack_set_error_function jack_set_info_function jack_free +jack_midi_get_event_count +jack_midi_event_get +jack_midi_clear_buffer +jack_midi_max_event_size +jack_midi_event_reserve +jack_midi_event_write +jack_midi_get_lost_event_count + diff --git a/ports/jack2/portfile.cmake b/ports/jack2/portfile.cmake index 3ab7e180e06384..cc2541654f2389 100644 --- a/ports/jack2/portfile.cmake +++ b/ports/jack2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jackaudio/jack2 - REF v1.9.21 - SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557 + REF "v${VERSION}" + SHA512 d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4 HEAD_REF master ) @@ -22,4 +22,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/jack2/vcpkg.json b/ports/jack2/vcpkg.json index 356579f3a8728a..443204d5bc6f00 100644 --- a/ports/jack2/vcpkg.json +++ b/ports/jack2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jack2", - "version-semver": "1.9.21", + "version-semver": "1.9.22", "description": "Cross-platform API that enables device sharing and inter-application audio routing", "homepage": "https://jackaudio.org/", "license": "GPL-2.0", diff --git a/ports/jbig2dec/portfile.cmake b/ports/jbig2dec/portfile.cmake index 463c3920811232..8ef7ff37f0f08a 100644 --- a/ports/jbig2dec/portfile.cmake +++ b/ports/jbig2dec/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArtifexSoftware/jbig2dec - REF 1c336b8ab44524dc56ea837e2211ff4207704cdd # 0.19 - SHA512 e189a80cc8da18813cf6c8edc6f1a799793adcba7ea6f302a8cced349bffac68869af338d9723ee1efdc07115ae554cd5757bfda7d7ac41324fde1f9c3a8343c + REF "${VERSION}" + SHA512 8b8a28b93b23e4284ca229e6c8935fd161ce5c597f7470a46ec06a3241d0ac23cf921aecdd4e0c1bd3c904591409054236f2ce25b6d8ae40db742559c7f4dbe9 HEAD_REF master ) diff --git a/ports/jbig2dec/vcpkg.json b/ports/jbig2dec/vcpkg.json index 824b6a3698df37..d9137fb3492b38 100644 --- a/ports/jbig2dec/vcpkg.json +++ b/ports/jbig2dec/vcpkg.json @@ -1,7 +1,6 @@ { "name": "jbig2dec", - "version": "0.19", - "port-version": 3, + "version": "0.20", "description": "a decoder library and example utility implementing the JBIG2 bi-level image compression spec. Also known as ITU T.88 and ISO IEC 14492, and included by reference in Adobe's PDF version 1.4 and later.", "homepage": "https://github.com/ArtifexSoftware/jbig2dec", "dependencies": [ diff --git a/ports/joltphysics/fix-export.diff b/ports/joltphysics/fix-export.diff new file mode 100644 index 00000000000000..2dc7e3ec859e0e --- /dev/null +++ b/ports/joltphysics/fix-export.diff @@ -0,0 +1,77 @@ +diff --git a/Build/CMakeLists.txt b/Build/CMakeLists.txt +index e4fddc50..655cdc80 100644 +--- a/Build/CMakeLists.txt ++++ b/Build/CMakeLists.txt +@@ -91,8 +91,8 @@ if (("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUA + endif() + + # Set compiler flags for various configurations +- set(CMAKE_CXX_FLAGS_DEBUG "/GS /Od /Ob0 /RTC1") +- set(CMAKE_CXX_FLAGS_RELEASE "/GS- /Gy /O2 /Oi /Ot") ++ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /GS /Od /Ob0 /RTC1") ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GS- /Gy /O2 /Oi /Ot") + set(CMAKE_CXX_FLAGS_DISTRIBUTION "/GS- /Gy /O2 /Oi /Ot") + set(CMAKE_CXX_FLAGS_RELEASEASAN "-fsanitize=address /Od") + set(CMAKE_CXX_FLAGS_RELEASEUBSAN "-fsanitize=undefined,implicit-conversion,float-divide-by-zero,local-bounds -fno-sanitize-recover=all") +@@ -148,8 +148,8 @@ elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQU + endif() + + # Set compiler flags for various configurations +- set(CMAKE_CXX_FLAGS_DEBUG "") +- set(CMAKE_CXX_FLAGS_RELEASE "-O3") ++ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") + set(CMAKE_CXX_FLAGS_DISTRIBUTION "-O3") + set(CMAKE_CXX_FLAGS_RELEASEASAN "-fsanitize=address") + set(CMAKE_CXX_FLAGS_RELEASEUBSAN "-fsanitize=undefined,implicit-conversion,float-divide-by-zero,local-bounds -fno-sanitize-recover=all") +@@ -193,7 +193,11 @@ if (IOS) + endif() + + # Install Jolt library and includes +-install(TARGETS Jolt DESTINATION lib) ++install(TARGETS Jolt ++ EXPORT unofficial-joltphysics-targets ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin) + foreach(SRC_FILE ${JOLT_PHYSICS_SRC_FILES}) + string(REPLACE ${PHYSICS_REPO_ROOT} "" RELATIVE_SRC_FILE ${SRC_FILE}) + get_filename_component(DESTINATION_PATH ${RELATIVE_SRC_FILE} DIRECTORY) +@@ -202,6 +206,17 @@ foreach(SRC_FILE ${JOLT_PHYSICS_SRC_FILES}) + endif() + endforeach() + ++install(EXPORT unofficial-joltphysics-targets ++ NAMESPACE unofficial::joltphysics:: ++ FILE unofficial-joltphysics-targets.cmake ++ DESTINATION share/unofficial-joltphysics ++) ++ ++install(FILES ++ unofficial-joltphysics-config.cmake ++ DESTINATION share/unofficial-joltphysics ++) ++ + # Check if we're the root CMakeLists.txt, if not we are included by another CMake file and we should disable everything except for the main library + if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) + # Ability to turn ON/OFF individual applications +diff --git a/Jolt/Jolt.cmake b/Jolt/Jolt.cmake +index 176a7578..b31b2417 100644 +--- a/Jolt/Jolt.cmake ++++ b/Jolt/Jolt.cmake +@@ -431,10 +431,13 @@ source_group(TREE ${JOLT_PHYSICS_ROOT} FILES ${JOLT_PHYSICS_SRC_FILES}) + + # Create Jolt lib + add_library(Jolt STATIC ${JOLT_PHYSICS_SRC_FILES}) +-target_include_directories(Jolt PUBLIC ${PHYSICS_REPO_ROOT}) ++target_include_directories(Jolt PUBLIC ++ $ ++ $ ++) + target_precompile_headers(Jolt PRIVATE ${JOLT_PHYSICS_ROOT}/Jolt.h) + target_compile_definitions(Jolt PUBLIC "$<$:_DEBUG;JPH_PROFILE_ENABLED;JPH_DEBUG_RENDERER>") +-target_compile_definitions(Jolt PUBLIC "$<$:NDEBUG;JPH_PROFILE_ENABLED;JPH_DEBUG_RENDERER>") ++target_compile_definitions(Jolt PUBLIC "$<$:NDEBUG>") + target_compile_definitions(Jolt PUBLIC "$<$:NDEBUG>") + target_compile_definitions(Jolt PUBLIC "$<$:NDEBUG;JPH_PROFILE_ENABLED;JPH_DISABLE_TEMP_ALLOCATOR;JPH_DISABLE_CUSTOM_ALLOCATOR;JPH_DEBUG_RENDERER>") + target_compile_definitions(Jolt PUBLIC "$<$:NDEBUG;JPH_PROFILE_ENABLED;JPH_DEBUG_RENDERER>") diff --git a/ports/joltphysics/portfile.cmake b/ports/joltphysics/portfile.cmake index cb51f23fd956b8..068b6f0b2550c3 100644 --- a/ports/joltphysics/portfile.cmake +++ b/ports/joltphysics/portfile.cmake @@ -6,8 +6,14 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 367e5b945e8f91a0c0c9eb699db6f49351aa39b0af9b8fd0be5f474d65b28a7244880eedad10cbd2db0e031daa28bbabb5f9fb8bf9af653dd1f86904bfde44a2 HEAD_REF master + PATCHES + fix-export.diff ) +# Need to provide this library a config +# The fix-export.diff should install this +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-joltphysics-config.cmake" DESTINATION "${SOURCE_PATH}/Build") + string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_CRT) vcpkg_cmake_configure( @@ -19,29 +25,20 @@ vcpkg_cmake_configure( -DTARGET_SAMPLES=OFF -DTARGET_VIEWER=OFF -DCROSS_PLATFORM_DETERMINISTIC=OFF + -DINTERPROCEDURAL_OPTIMIZATION=OFF -DUSE_STATIC_MSVC_RUNTIME_LIBRARY=${USE_STATIC_CRT} -DENABLE_ALL_WARNINGS=OFF OPTIONS_RELEASE - -DCMAKE_BUILD_TYPE=Distribution + -DGENERATE_DEBUG_SYMBOLS=OFF ) -vcpkg_cmake_build() - -file( - INSTALL "${SOURCE_PATH}/Jolt" - DESTINATION "${CURRENT_PACKAGES_DIR}/include" - FILES_MATCHING - PATTERN "*.h" - PATTERN "*.inl" -) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -if(VCPKG_TARGET_IS_WINDOWS) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Jolt.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Jolt.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -else() - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libJolt.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libJolt.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-${PORT} PACKAGE_NAME unofficial-${PORT}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/joltphysics/unofficial-joltphysics-config.cmake b/ports/joltphysics/unofficial-joltphysics-config.cmake new file mode 100644 index 00000000000000..00f9617280035b --- /dev/null +++ b/ports/joltphysics/unofficial-joltphysics-config.cmake @@ -0,0 +1,3 @@ +include(CMakeFindDependencyMacro) +# find_dependency(xx 2.0) +include(${CMAKE_CURRENT_LIST_DIR}/unofficial-joltphysics-targets.cmake) \ No newline at end of file diff --git a/ports/joltphysics/usage b/ports/joltphysics/usage index c6835e754c6758..342bb11a430e0d 100644 --- a/ports/joltphysics/usage +++ b/ports/joltphysics/usage @@ -1,4 +1,4 @@ -The package joltphysics can be used from CMake via: + joltphysics provides CMake targets: - find_path(JOLTPHYSICS_INCLUDE_DIRS "Jolt/Jolt.h") - target_include_directories(main PRIVATE ${JOLTPHYSICS_INCLUDE_DIRS}) + find_package(unofficial-joltphysics CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::joltphysics::Jolt) \ No newline at end of file diff --git a/ports/joltphysics/vcpkg.json b/ports/joltphysics/vcpkg.json index 786bd7f667880a..1c8fc998af1bdb 100644 --- a/ports/joltphysics/vcpkg.json +++ b/ports/joltphysics/vcpkg.json @@ -1,6 +1,7 @@ { "name": "joltphysics", "version": "3.0.1", + "port-version": 1, "description": "A multi core friendly rigid body physics and collision detection library suitable for games and VR applications", "homepage": "https://github.com/jrouwe/JoltPhysics", "license": "MIT", diff --git a/ports/json-rpc-cxx/fix-config.patch b/ports/json-rpc-cxx/fix-config.patch new file mode 100644 index 00000000000000..197527eb1aa3b2 --- /dev/null +++ b/ports/json-rpc-cxx/fix-config.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a362ea4..9c23acf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,8 +10,16 @@ option(CODE_COVERAGE "Enable coverage reporting" OFF) + include(GNUInstallDirs) + + add_library(json-rpc-cxx INTERFACE) +-target_include_directories(json-rpc-cxx INTERFACE include) ++target_include_directories(json-rpc-cxx INTERFACE ++ $ ++ $ ++ ) + install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install (TARGETS json-rpc-cxx EXPORT unofficial-json-rpc-cxx-config) ++install (EXPORT unofficial-json-rpc-cxx-config ++ NAMESPACE unofficial::json-rpc-cxx:: ++ DESTINATION share/unofficial-json-rpc-cxx ++ ) + + add_library(coverage_config INTERFACE) + diff --git a/ports/json-rpc-cxx/portfile.cmake b/ports/json-rpc-cxx/portfile.cmake new file mode 100644 index 00000000000000..cd1b8f21f2127d --- /dev/null +++ b/ports/json-rpc-cxx/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jsonrpcx/json-rpc-cxx + REF "v${VERSION}" + SHA512 0b8f2b1c8ff95bee14585f6b363f6aa4bf046e3905f7a65cf2e562e5c9181a3ba882baded36fab4d3ff9ac5b2f3245eeb54260f2163491af7fba264ff547f6d8 + HEAD_REF master + PATCHES + fix-config.patch +) + +set(VCPKG_BUILD_TYPE release) # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCOMPILE_TESTS=OFF + -DCOMPILE_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) +file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" JSON_RPC_CXX_CONFIG) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" " +include(CMakeFindDependencyMacro) +find_dependency(nlohmann_json) +${JSON_RPC_CXX_CONFIG} +") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/json-rpc-cxx/usage b/ports/json-rpc-cxx/usage new file mode 100644 index 00000000000000..0e1009eb6c7872 --- /dev/null +++ b/ports/json-rpc-cxx/usage @@ -0,0 +1,4 @@ +json-rpc-cxx provides CMake targets: + + find_package(unofficial-json-rpc-cxx CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::json-rpc-cxx::json-rpc-cxx) diff --git a/ports/json-rpc-cxx/vcpkg.json b/ports/json-rpc-cxx/vcpkg.json new file mode 100644 index 00000000000000..2030a0e2f6135c --- /dev/null +++ b/ports/json-rpc-cxx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "json-rpc-cxx", + "version": "0.3.1", + "description": "A JSON-RPC 2.0 framework implemented in C++17 using the nlohmann's json for modern C++.", + "homepage": "https://github.com/jsonrpcx/json-rpc-cxx", + "license": "MIT", + "dependencies": [ + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake index 811fddc0e4fa09..50c086c279ca97 100644 --- a/ports/jsoncons/portfile.cmake +++ b/ports/jsoncons/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons REF v${VERSION} - SHA512 0166b6dbfeb427a07afd74807bc48a0853f3a2f52f9e9415dd7e392cafeed8047f274295663e799ba4808e8c6ea4d79278cce6a5948034009858ed16e63bd27d + SHA512 6cfe09f0464f3212017fa96e25772397cd849e91b7d08ff0b685bbee1884003d974ebc244b0cbc5f643215b0168c2e9d93496790a38fb9496b1c1ae86c610522 HEAD_REF master ) diff --git a/ports/jsoncons/vcpkg.json b/ports/jsoncons/vcpkg.json index cefc84b4ff261c..dbc95568f5b63d 100644 --- a/ports/jsoncons/vcpkg.json +++ b/ports/jsoncons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsoncons", - "version": "0.170.2", + "version": "0.171.0", "description": "A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSON Schema, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON", "homepage": "https://github.com/danielaparker/jsoncons", "license": "BSL-1.0", diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index 8f0bd8a92dba22..cd1f9563ea302c 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - SHA512 d06000ed5c9311e840fee37a85085d9f8712fc65d83f6e52ae08f31bdcba80309064ccb1978e5ca8d76e2c848f7506e5a1830e2536ba38955f5bb45866664cab + SHA512 6cc28660c8dd9a5e299d8ebcc2c26d1859925b00e58db96351a17a12934df78b1e1a2d3b26fccdee0e2bbb46a13e26dbae7149a80611b02bc69aad6874c11df2 HEAD_REF main ) diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index dde930911891af..130ad4cb40a649 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsonifier", - "version": "0.9.5", + "version": "0.9.8", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", diff --git a/ports/jsonnet/0006-use-cxx17.patch b/ports/jsonnet/0006-use-cxx17.patch new file mode 100644 index 00000000000000..31174021a9ed10 --- /dev/null +++ b/ports/jsonnet/0006-use-cxx17.patch @@ -0,0 +1,20 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index e8a0efa..5dfd2e4 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -34,6 +34,7 @@ if (BUILD_SHARED_BINARIES) + add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet stdlib) + target_link_libraries(libjsonnet nlohmann_json::nlohmann_json ryml) ++target_compile_features(libjsonnet PRIVATE cxx_std_17) + + file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF + REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+") +@@ -60,6 +61,7 @@ if (BUILD_STATIC_LIBS) + add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet_static stdlib) + target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json ryml) ++ target_compile_features(libjsonnet_static PRIVATE cxx_std_17) + set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet) + install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") + target_include_directories(libjsonnet_static INTERFACE diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index d6b69831dd8c88..bab4155d962442 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/jsonnet - REF v0.18.0 - SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1 + REF "v${VERSION}" + SHA512 d46d2521d4389d05f91a16ecd9f181be1853f674a9264e9fac23e413f1084dee947e80682af59603e15e443061a0beb50a30c14c858853e10ed1ae7187d09730 HEAD_REF master PATCHES 001-enable-msvc.patch @@ -14,6 +14,7 @@ vcpkg_from_github( 0003-use-upstream-nlohmann-json.patch 0004-incorporate-md5.patch 0005-use-upstream-rapidyaml.patch + 0006-use-cxx17.patch ) # see https://github.com/google/jsonnet/blob/v0.18.0/Makefile#L220 diff --git a/ports/jsonnet/vcpkg.json b/ports/jsonnet/vcpkg.json index d223594965bfab..9ef7a123b4b638 100644 --- a/ports/jsonnet/vcpkg.json +++ b/ports/jsonnet/vcpkg.json @@ -1,7 +1,6 @@ { "name": "jsonnet", - "version": "0.18.0", - "port-version": 1, + "version": "0.20.0", "description": "Jsonnet - The data templating language", "homepage": "https://github.com/google/jsonnet", "license": "Apache-2.0", diff --git a/ports/kdbindings/portfile.cmake b/ports/kdbindings/portfile.cmake index 736e8efbed177d..4591e66d5cd048 100644 --- a/ports/kdbindings/portfile.cmake +++ b/ports/kdbindings/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDAB/KDBindings - REF bbf790fc94f3018781f32be53c6086aedc0f74ec - SHA512 4303f8e73b376e851d40cab99b848788ae2aff00e0e4ec0006655d8ef9373eebe5e04f734e78037e257d7a5101739b912da9dab15bf1985f204b31224d9c53c5 + REF "v${VERSION}" + SHA512 b66403ad4eecc5e8216600d67f29260eb9981f0b93517fa1a85106a52be4b3ffcd482d1dda6cdc5993f46ffa6cd0e10513cd7ce1fec3dee72ec9d50fc5887a46 HEAD_REF main ) diff --git a/ports/kdbindings/vcpkg.json b/ports/kdbindings/vcpkg.json index 0797c2cb15b0aa..c9ebdf9f0dfd7e 100644 --- a/ports/kdbindings/vcpkg.json +++ b/ports/kdbindings/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kdbindings", - "version": "1.0.0", + "version": "1.0.3", "description": "Reactive programming & data binding in C++", "homepage": "https://github.com/KDAB/KDBindings", "license": "MIT OR BSD-3-Clause", diff --git a/ports/kf5solid/fix-libmount.patch b/ports/kf5solid/001_fix_libmount.patch similarity index 100% rename from ports/kf5solid/fix-libmount.patch rename to ports/kf5solid/001_fix_libmount.patch diff --git a/ports/kf5solid/002_fix_imobile.patch b/ports/kf5solid/002_fix_imobile.patch new file mode 100644 index 00000000000000..4089fd3ba8fea5 --- /dev/null +++ b/ports/kf5solid/002_fix_imobile.patch @@ -0,0 +1,61 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60172b0d..1dfe6e8a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,13 +55,25 @@ set_package_properties(BISON PROPERTIES + PURPOSE "Required for the Predicate parser" + ) + +-find_package(IMobileDevice) ++find_package(IMobileDevice NAMES unofficial-libimobiledevice) + set_package_properties(IMobileDevice PROPERTIES + TYPE OPTIONAL + PURPOSE "Needed to build the iOS device support backend" + ) ++if(TARGET unofficial::libimobiledevice::libimobiledevice) ++ set(IMobileDevice_VERSION "1.3.0") ++ set(_imobile_version "0x00000") ++ if (IMobileDevice_VERSION VERSION_GREATER_EQUAL 1.3.0) ++ set(_imobile_version "0x10300") ++ elseif(IMobileDevice_VERSION VERSION_GREATER_EQUAL 1.2.0) ++ set(_imobile_version "0x10200") ++ endif() ++ set_target_properties(unofficial::libimobiledevice::libimobiledevice PROPERTIES ++ INTERFACE_COMPILE_DEFINITIONS "IMOBILEDEVICE_API=${_imobile_version}" ++ ) ++endif() + +-find_package(PList) ++find_package(PList NAMES unofficial-libplist CONFIG) + set_package_properties(PList PROPERTIES + TYPE OPTIONAL + PURPOSE "Needed to build the iOS device support backend" +diff --git a/KF5SolidConfig.cmake.in b/KF5SolidConfig.cmake.in +index 6fc15eeb..a6250ce6 100644 +--- a/KF5SolidConfig.cmake.in ++++ b/KF5SolidConfig.cmake.in +@@ -27,6 +27,11 @@ if (NOT @BUILD_SHARED_LIBS@) + find_dependency(LibMount) + endif() + ++ if ("@IMobileDevice_FOUND@" AND "@PList_FOUND@") ++ find_dependency(unofficial-libimobiledevice) ++ find_dependency(unofficial-libplist) ++ endif() ++ + if ("@Qt5DBus_FOUND@" OR "@Qt6DBus_FOUND@") + find_dependency(Qt@QT_MAJOR_VERSION@DBus @REQUIRED_QT_VERSION@) + endif() +diff --git a/src/solid/devices/backends/imobile/CMakeLists.txt b/src/solid/devices/backends/imobile/CMakeLists.txt +index e1666447..3f8b982e 100644 +--- a/src/solid/devices/backends/imobile/CMakeLists.txt ++++ b/src/solid/devices/backends/imobile/CMakeLists.txt +@@ -5,7 +5,7 @@ set(backend_sources + imobiledeviceinterface.cpp + imobileportablemediaplayer.cpp + ) +-set(backend_libs IMobileDevice::IMobileDevice PList::PList) ++set(backend_libs unofficial::libimobiledevice::libimobiledevice unofficial::libplist::libplist) + + ecm_qt_declare_logging_category(backend_sources + HEADER imobile_debug.h diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index 334ef08fd878b9..d58a920d6fea51 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -5,14 +5,17 @@ vcpkg_from_github( SHA512 9f0aed7f8ea29a6132ca9c99c4c744ca5580bb3f7be1712e27d1fc3ae47b2edac26a5ce20abddef4d9998612f2386e1cc6915504c02897f2b3ebcec01cd26208 HEAD_REF master PATCHES - fix-libmount.patch + 001_fix_libmount.patch + 002_fix_imobile.patch ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") if(VCPKG_TARGET_IS_OSX) # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0). vcpkg_find_acquire_program(BISON) execute_process( - COMMAND ${BISON} --version + COMMAND "${BISON}" --version OUTPUT_VARIABLE BISON_OUTPUT ) string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") @@ -27,30 +30,33 @@ endif() vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(FLEX) -get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) -get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY) vcpkg_add_to_path(PREPEND "${FLEX_DIR}") vcpkg_add_to_path(PREPEND "${BISON_DIR}") -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - "libmount" CMAKE_DISABLE_FIND_PACKAGE_LibMount + FEATURES + libmount CMAKE_REQUIRE_FIND_PACKAGE_LibMount + imobile CMAKE_REQUIRE_FIND_PACKAGE_IMobileDevice + imobile CMAKE_REQUIRE_FIND_PACKAGE_PList + INVERTED_FEATURES + libmount CMAKE_DISABLE_FIND_PACKAGE_LibMount + imobile CMAKE_DISABLE_FIND_PACKAGE_IMobileDevice + imobile CMAKE_DISABLE_FIND_PACKAGE_PList ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_DEVICE_BACKEND_imobile=OFF + ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF -DKDE_INSTALL_QMLDIR=qml ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Solid CONFIG_PATH lib/cmake/KF5Solid) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Solid) vcpkg_copy_pdbs() vcpkg_copy_tools( @@ -58,13 +64,12 @@ vcpkg_copy_tools( AUTO_CLEAN ) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Until https://github.com/microsoft/vcpkg/pull/34091 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}/debug/share") - file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) - diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json index 6d72112f04ff8e..51a5e4530b11df 100644 --- a/ports/kf5solid/vcpkg.json +++ b/ports/kf5solid/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5solid", "version": "5.98.0", - "port-version": 1, + "port-version": 3, "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ @@ -18,27 +18,25 @@ } ], "default-features": [ - "platform-default-features" + { + "name": "libmount", + "platform": "linux" + } ], "features": { + "imobile": { + "description": "Used by the imobile backend", + "dependencies": [ + "libimobiledevice", + "libplist" + ] + }, "libmount": { "description": "Used by the UDisks backend on Linux", "supports": "linux", "dependencies": [ "libmount" ] - }, - "platform-default-features": { - "description": "Enable platform-dependent default features", - "dependencies": [ - { - "name": "kf5solid", - "features": [ - "libmount" - ], - "platform": "linux" - } - ] } } } diff --git a/ports/kinectsdk1/vcpkg.json b/ports/kinectsdk1/vcpkg.json index e13a4e8f086f7e..c2bba67270f596 100644 --- a/ports/kinectsdk1/vcpkg.json +++ b/ports/kinectsdk1/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kinectsdk1", "version": "1.8", - "port-version": 7, + "port-version": 8, "description": "Kinect for Windows SDK for Kinect v1 sensor.", "license": null, "supports": "!arm & windows & !uwp & !xbox", @@ -9,7 +9,7 @@ { "name": "vcpkg-tool-lessmsi", "host": true, - "version>=": "1.10#1" + "version>=": "1.10.0#1" } ] } diff --git a/ports/kinectsdk2/vcpkg.json b/ports/kinectsdk2/vcpkg.json index 6bfde2f6a33aae..4fa73a4d9eaaa0 100644 --- a/ports/kinectsdk2/vcpkg.json +++ b/ports/kinectsdk2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kinectsdk2", "version": "2.0", - "port-version": 6, + "port-version": 7, "description": "Kinect for Windows SDK for Kinect v2 sensor.", "license": null, "supports": "!arm & windows & !uwp & !xbox", @@ -9,7 +9,7 @@ { "name": "vcpkg-tool-lessmsi", "host": true, - "version>=": "1.10#1" + "version>=": "1.10.0#1" } ] } diff --git a/ports/krabsetw/portfile.cmake b/ports/krabsetw/portfile.cmake index ee321fc61cdd20..d90e50b8278f10 100644 --- a/ports/krabsetw/portfile.cmake +++ b/ports/krabsetw/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/krabsetw - REF 31679cf84bc85360158672699f2f68a821e8a6d0 - SHA512 4fcc4ee1c41c6d40770a5b57111e6fd29eedf1f4a29038ab1dfb8bffb3ad0464c4ec06b90b65fabadcd419564d55172d4d9fdc3750c1898545f7c6e00fbe99c8 + REF 3bc145fb55212aaf121be88c3a2f25afa2e07b42 + SHA512 e25e6525a61df367ba782701cb5f22d8262b6451368dbead2ea901f59eb1479a1364d58da20e47e2413db3cb45c6b46a992a1aeb9bff60ad137ffdb91b4aba60 HEAD_REF master ) diff --git a/ports/krabsetw/vcpkg.json b/ports/krabsetw/vcpkg.json index 9027ddacb83c03..6428581a1949d9 100644 --- a/ports/krabsetw/vcpkg.json +++ b/ports/krabsetw/vcpkg.json @@ -1,7 +1,6 @@ { "name": "krabsetw", - "version": "4.1.18", - "port-version": 1, + "version": "4.3.1", "description": "krabsetw is a header-only C++ library that simplifies interacting with ETW.", "homepage": "https://github.com/microsoft/krabsetw", "supports": "windows & !uwp" diff --git a/ports/launch-darkly-server/portfile.cmake b/ports/launch-darkly-server/portfile.cmake index 0bc1a9ec152ea5..e0cf49badb7c40 100644 --- a/ports/launch-darkly-server/portfile.cmake +++ b/ports/launch-darkly-server/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES findPCRE.patch FixStrictPrototypes.patch # required with clang-15 + removeWarningAsError.patch ) diff --git a/ports/launch-darkly-server/removeWarningAsError.patch b/ports/launch-darkly-server/removeWarningAsError.patch new file mode 100644 index 00000000000000..8174ed47a6a671 --- /dev/null +++ b/ports/launch-darkly-server/removeWarningAsError.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9acff7d..12904e6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,7 +184,6 @@ else() + -pedantic + -Wall + -Wextra +- -Werror + -Wstrict-prototypes + -Wmissing-prototypes + -Wmissing-declarations +diff --git a/c-sdk-common/CMakeLists.txt b/c-sdk-common/CMakeLists.txt +index 15340f7..091e46d 100644 +--- a/c-sdk-common/CMakeLists.txt ++++ b/c-sdk-common/CMakeLists.txt +@@ -87,7 +87,6 @@ else() + -pedantic + -Wall + -Wextra +- -Werror + -Wstrict-prototypes + -Wmissing-prototypes + -Wmissing-declarations +@@ -123,7 +122,6 @@ else() + PRIVATE -fno-omit-frame-pointer + -Wall + -Wextra +- -Werror + -Wstrict-prototypes + -Wmissing-prototypes + -Wmissing-declarations diff --git a/ports/launch-darkly-server/vcpkg.json b/ports/launch-darkly-server/vcpkg.json index 9f08c2e88e7626..fa420d6c3d2577 100644 --- a/ports/launch-darkly-server/vcpkg.json +++ b/ports/launch-darkly-server/vcpkg.json @@ -1,10 +1,11 @@ { "name": "launch-darkly-server", "version": "2.8.6", + "port-version": 1, "description": "LaunchDarkly server-side SDK for C/C++", "homepage": "https://github.com/launchdarkly/c-server-sdk", "license": "Apache-2.0", - "supports": "!uwp & !arm", + "supports": "!uwp", "dependencies": [ "curl", "pcre", diff --git a/ports/lazy-importer/portfile.cmake b/ports/lazy-importer/portfile.cmake index 80845209975e94..a735967e4ea823 100644 --- a/ports/lazy-importer/portfile.cmake +++ b/ports/lazy-importer/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustasMasiulis/lazy_importer - REF edac6afddb9e0df2e3affa8b2d631caafcba69ed - SHA512 45f024c34fa1c8854b8b77706934ce95449b2416a5c1dcab970d0df068c9b5bf0de12994c13ac215e629f8ae21fdab75b4ce6535f56ca7508f490a4c664e5b1a + REF 4810f51d63438865e508c2784ea00811d9beb2ea + SHA512 1b2f330586cb80d8ecf13dd27c5a407c778c3a12aeffa493d31b75fa9c3186ed9f67838164c48c64e2bb4a9fe804a77625dd1cd996d661545580e29d57c3494b HEAD_REF master ) file(COPY "${SOURCE_PATH}/include/lazy_importer.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Handle copyright -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/lazy-importer/vcpkg.json b/ports/lazy-importer/vcpkg.json index 7f3073487aa9ec..51aa00e9680a97 100644 --- a/ports/lazy-importer/vcpkg.json +++ b/ports/lazy-importer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lazy-importer", - "version-date": "2022-02-09", + "version-date": "2023-08-03", "description": "Library for importing functions from dlls in a hidden, reverse engineer unfriendly way", "homepage": "https://github.com/JustasMasiulis/lazy_importer" } diff --git a/ports/leveldb/fix-dependencies.patch b/ports/leveldb/fix-dependencies.patch index a0fe68651f94e3..5efc6385f0a3f7 100644 --- a/ports/leveldb/fix-dependencies.patch +++ b/ports/leveldb/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 98b87dc..76d2e9b 100644 +index f8285b8..39536fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -35,8 +35,14 @@ include(CheckIncludeFile) +@@ -38,8 +38,14 @@ include(CheckIncludeFile) check_include_file("unistd.h" HAVE_UNISTD_H) include(CheckLibraryExists) @@ -19,7 +19,7 @@ index 98b87dc..76d2e9b 100644 check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC) include(CheckCXXSymbolExists) -@@ -246,10 +252,10 @@ if(HAVE_CLANG_THREAD_SAFETY) +@@ -268,10 +274,10 @@ if(HAVE_CLANG_THREAD_SAFETY) endif(HAVE_CLANG_THREAD_SAFETY) if(HAVE_CRC32C) diff --git a/ports/leveldb/fix-util-install.patch b/ports/leveldb/fix-util-install.patch new file mode 100644 index 00000000000000..fb65023177cdb2 --- /dev/null +++ b/ports/leveldb/fix-util-install.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39536fc..648de6d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -477,6 +477,11 @@ if(LEVELDB_INSTALL) + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/leveldb" + ) + ++ file(GLOB HEADER_UTIL "${PROJECT_SOURCE_DIR}/util/*.h" ) ++ file(GLOB HEADER_TABLE "${PROJECT_SOURCE_DIR}/table/*.h" ) ++ install(FILES ${HEADER_UTIL} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/leveldb/util) ++ install(FILES ${HEADER_TABLE} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/leveldb/table) ++ + include(CMakePackageConfigHelpers) + configure_package_config_file( + "cmake/${PROJECT_NAME}Config.cmake.in" diff --git a/ports/leveldb/fix_config.patch b/ports/leveldb/fix_config.patch deleted file mode 100644 index c5a83296b14f58..00000000000000 --- a/ports/leveldb/fix_config.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1409c06..98b87dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -437,6 +437,12 @@ if(LEVELDB_INSTALL) - "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake" - COMPATIBILITY SameMajorVersion - ) -+ configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/leveldbConfig.cmake.in -+ leveldbConfig.cmake -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/leveldb -+ NO_CHECK_REQUIRED_COMPONENTS_MACRO -+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR -+ ) - install( - EXPORT leveldbTargets - NAMESPACE leveldb:: -@@ -444,7 +450,7 @@ if(LEVELDB_INSTALL) - ) - install( - FILES -- "${PROJECT_SOURCE_DIR}/cmake/leveldbConfig.cmake" -+ "${PROJECT_BINARY_DIR}/leveldbConfig.cmake" - "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake" - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/leveldb" - ) diff --git a/ports/leveldb/leveldbConfig.cmake.in b/ports/leveldb/leveldbConfig.cmake.in index 65b9bac51cdb83..4097fac7eef0c4 100644 --- a/ports/leveldb/leveldbConfig.cmake.in +++ b/ports/leveldb/leveldbConfig.cmake.in @@ -1,7 +1,6 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -set_and_check(leveldb_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") find_dependency(Threads) if (@WITH_CRC32C@) diff --git a/ports/leveldb/portfile.cmake b/ports/leveldb/portfile.cmake index 2a01cbe8ed1e43..92c283b5055723 100644 --- a/ports/leveldb/portfile.cmake +++ b/ports/leveldb/portfile.cmake @@ -3,12 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/leveldb - REF 1.22 - SHA512 f9bbf5f466e7f707b94e19261762319ea9f65d41911690e84f59098551e2e69beccf756a414d705ade74ee96fd979bdb8b94c171c6f2cc83873cbd4a9380dbab + REF "${VERSION}" + SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84 HEAD_REF master PATCHES - fix_config.patch fix-dependencies.patch + fix-util-install.patch ) file(COPY "${CURRENT_PORT_DIR}/leveldbConfig.cmake.in" DESTINATION "${SOURCE_PATH}/cmake") @@ -37,4 +37,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") 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/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/leveldb/vcpkg.json b/ports/leveldb/vcpkg.json index 050746db763b4c..f33c459d1c2c62 100644 --- a/ports/leveldb/vcpkg.json +++ b/ports/leveldb/vcpkg.json @@ -1,7 +1,6 @@ { "name": "leveldb", - "version": "1.22", - "port-version": 6, + "version": "1.23", "description": "LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.", "homepage": "https://github.com/google/leveldb", "license": "BSD-3-Clause", diff --git a/ports/libavif/portfile.cmake b/ports/libavif/portfile.cmake index 6617340bb3cc5a..b03550cd832b99 100644 --- a/ports/libavif/portfile.cmake +++ b/ports/libavif/portfile.cmake @@ -10,12 +10,17 @@ vcpkg_from_github( find-dependency.patch # from https://github.com/AOMediaCodec/libavif/pull/1339 ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + aom AVIF_CODEC_AOM +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DAVIF_CODEC_AOM=ON -DAVIF_BUILD_APPS=OFF -DCMAKE_REQUIRE_FIND_PACKAGE_libyuv=ON + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/libavif/vcpkg.json b/ports/libavif/vcpkg.json index 3b0d1d49aa82d9..4b1a5a7825b8b9 100644 --- a/ports/libavif/vcpkg.json +++ b/ports/libavif/vcpkg.json @@ -1,12 +1,11 @@ { "name": "libavif", "version-semver": "0.11.1", - "port-version": 1, + "port-version": 2, "description": "Library for encoding and decoding AVIF files", "homepage": "https://github.com/AOMediaCodec/libavif", "license": "BSD-2-Clause AND Apache-2.0", "dependencies": [ - "aom", "libyuv", { "name": "vcpkg-cmake", @@ -16,5 +15,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "aom": { + "description": "AV1 codec library", + "dependencies": [ + "aom" + ] + } + } } diff --git a/ports/libbson/disable-dynamic-when-static.patch b/ports/libbson/disable-dynamic-when-static.patch index 58942b05d62d2c..4bf375b05c17e7 100644 --- a/ports/libbson/disable-dynamic-when-static.patch +++ b/ports/libbson/disable-dynamic-when-static.patch @@ -1,36 +1,36 @@ diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index d6df66f..88de79a 100644 +index 61e926747..6b4c5a911 100644 --- a/src/libbson/CMakeLists.txt +++ b/src/libbson/CMakeLists.txt -@@ -209,6 +209,7 @@ set (HEADERS_FORWARDING +@@ -205,6 +205,7 @@ set (HEADERS_FORWARDING ${PROJECT_SOURCE_DIR}/src/bson/forwarding/bson.h ) - + +if(NOT MONGOC_ENABLE_STATIC_BUILD) add_library (bson_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - set (CMAKE_CXX_VISIBILITY_PRESET hidden) - target_compile_definitions (bson_shared -@@ -275,6 +276,7 @@ if (WIN32) + if (MSVC AND MSVC_VERSION VERSION_LESS 1900) + message (STATUS "Disabling warning C4756 for VS 2013 and older") +@@ -282,6 +283,7 @@ if (WIN32) # must be handled specially since we can't resolve them set (BSON_SYSTEM_LIBRARIES ${BSON_SYSTEM_LIBRARIES} ws2_32) endif () +endif() - + if (MONGOC_ENABLE_STATIC_BUILD) add_library (bson_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) -@@ -349,7 +351,7 @@ set (BSON_HEADER_INSTALL_DIR +@@ -367,7 +369,7 @@ set (BSON_HEADER_INSTALL_DIR ) - + if (MONGOC_ENABLE_STATIC_INSTALL) - set (TARGETS_TO_INSTALL bson_shared bson_static) + set (TARGETS_TO_INSTALL bson_static) else () set (TARGETS_TO_INSTALL bson_shared) endif () -@@ -400,12 +402,14 @@ configure_file ( +@@ -418,12 +420,14 @@ configure_file ( ${CMAKE_CURRENT_BINARY_DIR}/src/libbson-1.0.pc @ONLY) - + +if(NOT MONGOC_ENABLE_STATIC_INSTALL) install ( FILES @@ -39,6 +39,6 @@ index d6df66f..88de79a 100644 ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) +endif() - + if (MONGOC_ENABLE_STATIC_INSTALL) configure_file ( diff --git a/ports/libbson/fix-missing-header.patch b/ports/libbson/fix-missing-header.patch new file mode 100644 index 00000000000000..eee0e1907bb244 --- /dev/null +++ b/ports/libbson/fix-missing-header.patch @@ -0,0 +1,12 @@ +diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt +index 61e926747..715b304c0 100644 +--- a/src/libbson/CMakeLists.txt ++++ b/src/libbson/CMakeLists.txt +@@ -181,6 +181,7 @@ set (HEADERS + ${PROJECT_SOURCE_DIR}/src/bson/bson-compat.h + ${PROJECT_SOURCE_DIR}/src/bson/bson-context.h + ${PROJECT_SOURCE_DIR}/src/bson/bson-decimal128.h ++ ${PROJECT_SOURCE_DIR}/src/bson/bson-dsl.h # mongo-c-driver build time only + ${PROJECT_SOURCE_DIR}/src/bson/bson-endian.h + ${PROJECT_SOURCE_DIR}/src/bson/bson-error.h + ${PROJECT_SOURCE_DIR}/src/bson/bson.h diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index e83f51079efba7..38341d152ec0a6 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -6,11 +6,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 36cd8844b1cc9a935c50afc240523f9aaac7cffa58a5d0f9850848f22ab0f1f5a7202ec9b56b0a7d15f075f665bcecbec63b28d2074d35a7cf25065f9075c15e + SHA512 242416638bf6722ccda67ecc15cf78f8531f1a4ae0e89fd66cde74221d7b98b859442f5b70628802972961e69156fd7afcc916d7a83cc134d5723eb0b6e15cc9 HEAD_REF master PATCHES disable-dynamic-when-static.patch fix-include-directory.patch # vcpkg legacy decision + fix-missing-header.patch # for building mongo-c-driver ) file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}") diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index d83d179c065645..ba4d23c8a9676c 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libbson", - "version": "1.22.2", + "version": "1.24.3", "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson", "license": null, diff --git a/ports/libcap/configure b/ports/libcap/configure new file mode 100755 index 00000000000000..4e7cfe6daab593 --- /dev/null +++ b/ports/libcap/configure @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +linkage=shared +prefix= +for OPTION; do + case "${OPTION}" in + --prefix=*) + prefix="${OPTION#--prefix=}" + ;; + --enable-static) + linkage=static + ;; + esac +done + +cat > Makefile.vcpkg < git config --local core.hooksPath .githooks") +-execute_process( +- COMMAND git config --local core.hooksPath .githooks +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +-) ++#message("${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} -> git config --local core.hooksPath .githooks") ++#execute_process( ++# COMMAND git config --local core.hooksPath .githooks ++# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++#) + + option(LIBCORO_EXTERNAL_DEPENDENCIES "Use Cmake find_package to resolve dependencies instead of embedded libraries, Default=OFF." OFF) diff --git a/ports/libcoro/portfile.cmake b/ports/libcoro/portfile.cmake new file mode 100644 index 00000000000000..e48f240e97b6b0 --- /dev/null +++ b/ports/libcoro/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jbaldwin/libcoro + REF "v${VERSION}" + SHA512 9554fcaf721188e2475933fb8fe6b35f879479af9acb8b011545d66e588a98811f69100a4392e62c3c8bf05e8177760778c44ed4357d40d0a6349833a93fb8e8 + HEAD_REF master + PATCHES + 0001-allow-shared-lib.patch + 0002-disable-git-config.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + networking LIBCORO_FEATURE_NETWORKING + ssl LIBCORO_FEATURE_SSL + threading LIBCORO_FEATURE_THREADING +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBCORO_EXTERNAL_DEPENDENCIES=ON + -DLIBCORO_BUILD_TESTS=OFF + -DLIBCORO_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +vcpkg_fixup_pkgconfig() diff --git a/ports/libcoro/vcpkg.json b/ports/libcoro/vcpkg.json new file mode 100644 index 00000000000000..e6a9891b064e4d --- /dev/null +++ b/ports/libcoro/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "libcoro", + "version": "0.9", + "description": "C++20 coroutine library", + "homepage": "https://github.com/jbaldwin/libcoro", + "license": "Apache-2.0", + "supports": "!windows", + "dependencies": [ + "tl-expected", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "networking", + "ssl", + "threading" + ], + "features": { + "networking": { + "description": "Include networking features.", + "dependencies": [ + "c-ares" + ] + }, + "ssl": { + "description": "Include SSL features.", + "dependencies": [ + { + "name": "libcoro", + "default-features": false, + "features": [ + "networking" + ] + }, + "openssl" + ] + }, + "threading": { + "description": "Include multithreading features." + } + } +} diff --git a/ports/libcroco/CMakeLists.txt b/ports/libcroco/CMakeLists.txt index 9e05f376dc6706..20d7872683ac33 100644 --- a/ports/libcroco/CMakeLists.txt +++ b/ports/libcroco/CMakeLists.txt @@ -1,15 +1,9 @@ cmake_minimum_required(VERSION 3.11) project(libcroco C) -find_package(Iconv REQUIRED) -find_package(Intl REQUIRED) find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) -find_package(LibXml2 REQUIRED) -if(NOT WIN32) - find_package(Threads REQUIRED) -endif() -find_path(GLIB_INCLUDE_DIR glib.h) +set(libcroco_pc_requires glib-2.0 libxml-2.0) +pkg_check_modules(LIBCROCO_LINK_PUBLIC ${libcroco_pc_requires} IMPORTED_TARGET REQUIRED) file(GLOB SOURCES src/cr-utils.c @@ -67,18 +61,10 @@ file(GLOB SOURCES src/libcroco.def ) -set(CMAKE_DEBUG_POSTFIX "d") - add_library(croco-0.6 ${SOURCES}) - -target_include_directories(croco-0.6 PRIVATE ${GLIB_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) -target_link_libraries(croco-0.6 PRIVATE - PkgConfig::GLIB2 - ${LIBXML2_LIBRARIES} ${Intl_LIBRARIES} Iconv::Iconv -) +target_link_libraries(croco-0.6 PRIVATE PkgConfig::LIBCROCO_LINK_PUBLIC) install(TARGETS croco-0.6 - EXPORT libcroco-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib @@ -113,26 +99,20 @@ install(FILES src/cr-parsing-location.h src/cr-string.h src/libcroco-config.h - DESTINATION include/libcroco + DESTINATION include/libcroco-0.6/libcroco ) -install( - EXPORT libcroco-targets - NAMESPACE unofficial::libcroco:: - FILE unofficial-libcroco-targets.cmake - DESTINATION share/unofficial-libcroco -) +string(REGEX MATCH "^([0-9]*)[.]([0-9]*)[.].*" unused "${VERSION}" ) +set(LIBCROCO_MAJOR_VERSION "${CMAKE_MATCH_1}") +set(LIBCROCO_MINOR_VERSION "${CMAKE_MATCH_2}") + +set(prefix "${CMAKE_INSTALL_PREFIX}") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake " -include(CMakeFindDependencyMacro) -find_dependency(Intl) -find_dependency(Iconv) -find_dependency(PkgConfig) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) -find_dependency(LibXml2) -if(NOT WIN32) - find_dependency(Threads) -endif() -include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-libcroco-targets.cmake) -") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake DESTINATION share/unofficial-libcroco) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libcroco.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libcroco.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libcroco.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + RENAME "libcroco-${LIBCROCO_MAJOR_VERSION}.${LIBCROCO_MINOR_VERSION}.pc" +) diff --git a/ports/libcroco/portfile.cmake b/ports/libcroco/portfile.cmake index aa144cc688cd19..170201b129b499 100644 --- a/ports/libcroco/portfile.cmake +++ b/ports/libcroco/portfile.cmake @@ -19,15 +19,15 @@ vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + "-DVERSION=${VERSION}" + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ) - vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libcroco) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright +file(COPY "${CURRENT_PORT_DIR}/unofficial-libcroco-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libcroco") +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") - -vcpkg_copy_pdbs() diff --git a/ports/libcroco/unofficial-libcroco-config.cmake b/ports/libcroco/unofficial-libcroco-config.cmake new file mode 100644 index 00000000000000..a116ae8d8ac2e9 --- /dev/null +++ b/ports/libcroco/unofficial-libcroco-config.cmake @@ -0,0 +1,14 @@ +file(READ "${CMAKE_CURRENT_LIST_DIR}/../libcroco/usage" usage) +message(WARNING "find_package(unofficial-libcroco) is deprecated.\n${usage}") + +include(CMakeFindDependencyMacro) +find_dependency(PkgConfig) +pkg_check_modules(VCPKG_LIBCROCO libcroco-0.6 IMPORTED_TARGET) +if(NOT VCPKG_LIBCROCO_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND 0) +elseif(NOT TARGET unofficial::libcroco::croco-0.6) + add_library(unofficial::libcroco::croco-0.6 INTERFACE IMPORTED) + set_target_properties(unofficial::libcroco::croco-0.6 PROPERTIES + INTERFACE_LINK_LIBRARIES PkgConfig::VCPKG_LIBCROCO + ) +endif() diff --git a/ports/libcroco/usage b/ports/libcroco/usage new file mode 100644 index 00000000000000..cee11583dfcc61 --- /dev/null +++ b/ports/libcroco/usage @@ -0,0 +1,5 @@ +libcroco can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig REQUIRED) + pkg_check_modules(LIBCROCO libcroco-0.6 IMPORTED_TARGET REQUIRED) + target_link_libraries(main PRIVATE PkgConfig::LIBCROCO) diff --git a/ports/libcroco/vcpkg.json b/ports/libcroco/vcpkg.json index 88b8d2dae0d2e1..a92872f944978b 100644 --- a/ports/libcroco/vcpkg.json +++ b/ports/libcroco/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcroco", "version": "0.6.13", - "port-version": 5, + "port-version": 6, "description": "A standalone css2 parsing and manipulation library", "license": "LGPL-2.0-only", "dependencies": [ @@ -10,10 +10,6 @@ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 2e0b4892952614..13c9603031052c 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel REF "v${VERSION}" - SHA512 ede45221b8fb4ebc2a812f187372bc65da2a495311058e3b486ba7a2a584817ecdef286d956386a8635752786aebd5d0507bd84a84e484b9bf73ecd2dd92f918 + SHA512 bcf58026612e2ae670911945f9f74660b513cbd38c9bae13e7b8acd41e545b5760ab4713c67b956e0bb8c0449491a5ab8e3f8d05e2468ff6540fc99e2540a105 HEAD_REF master PATCHES ${PATCHES} diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 3d200e5fd2b5d7..12f67a87d1ea3a 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.18.2", + "version-semver": "0.18.6", "port-version": 2, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", diff --git a/ports/libdeflate/portfile.cmake b/ports/libdeflate/portfile.cmake index 7d852a8de47d48..db7e8ca8ca33c0 100644 --- a/ports/libdeflate/portfile.cmake +++ b/ports/libdeflate/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ebiggers/libdeflate REF "v${VERSION}" - SHA512 4e2c0f78e55befc8cbc390722ee5e9e7662315eaafe1979e300972990acf4afffc32a1220cca7a6e944d551a430dd13d36b40066dfe8141789de1a5418ac620f + SHA512 fe57542a0d28ad61d70bef9b544bb6805f9f30930b16432712b3b1caab041f1f4e64315a4306a0635b96c2632239c5af0e45a3915581d0b89975729fc2e95613 HEAD_REF master PATCHES remove_wrong_c_flags_modification.diff @@ -12,8 +12,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES compression LIBDEFLATE_COMPRESSION_SUPPORT decompression LIBDEFLATE_DECOMPRESSION_SUPPORT - gzip LIBDEFLATE_ZLIB_SUPPORT - zlib LIBDEFLATE_GZIP_SUPPORT + gzip LIBDEFLATE_GZIP_SUPPORT + zlib LIBDEFLATE_ZLIB_SUPPORT ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBDEFLATE_BUILD_STATIC) diff --git a/ports/libdeflate/vcpkg.json b/ports/libdeflate/vcpkg.json index 4c0483d83908f2..60f273db36aacb 100644 --- a/ports/libdeflate/vcpkg.json +++ b/ports/libdeflate/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdeflate", - "version": "1.17", + "version": "1.19", "description": "libdeflate is a library for fast, whole-buffer DEFLATE-based compression and decompression.", "homepage": "https://github.com/ebiggers/libdeflate", "license": "MIT", diff --git a/ports/libdjinterop/portfile.cmake b/ports/libdjinterop/portfile.cmake index cae89d762f972f..dbc6e9a70ebc0e 100644 --- a/ports/libdjinterop/portfile.cmake +++ b/ports/libdjinterop/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xsco/libdjinterop REF "${VERSION}" - SHA512 1fec3ef48bc20f1a6087553ba9b2332cfb30cab10ddd57307ce982be77daa0a24e53d53fb5e6e3c2d8a6552fdf6b437ab8787f4a46f893394b48eda113d3c1ff + SHA512 2f75a57326cc958bce6634aba407707313cec646d1713c80d9286d9d2448a68dd304eacd02b38c237a6bb869f07b9b3d3b1cc7fcb7c3a9cdf6ba7515166be6cf HEAD_REF master ) diff --git a/ports/libdjinterop/vcpkg.json b/ports/libdjinterop/vcpkg.json index 40f54bdacff60f..c168b36709c6b6 100644 --- a/ports/libdjinterop/vcpkg.json +++ b/ports/libdjinterop/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdjinterop", - "version": "0.19.2", + "version": "0.20.1", "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases", "homepage": "https://github.com/xsco/libdjinterop", "license": "LGPL-3.0-or-later", diff --git a/ports/libfabric/portfile.cmake b/ports/libfabric/portfile.cmake index 03b2ec3fa83db7..b87a10ba75405d 100644 --- a/ports/libfabric/portfile.cmake +++ b/ports/libfabric/portfile.cmake @@ -13,24 +13,16 @@ vcpkg_from_github( set(LIBFABRIC_RELEASE_CONFIGURATION "Release-v142") set(LIBFABRIC_DEBUG_CONFIGURATION "Debug-v142") -vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH libfabric.vcxproj - INCLUDES_SUBPATH include - LICENSE_SUBPATH COPYING PLATFORM "x64" RELEASE_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION} - DEBUG_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION} - USE_VCPKG_INTEGRATION - ALLOW_ROOT_INCLUDES + DEBUG_CONFIGURATION ${LIBFABRIC_DEBUG_CONFIGURATION} OPTIONS /p:SolutionDir=${SOURCE_PATH} - /p:AdditionalIncludeDirectories="${CURRENT_INSTALLED_DIR}/include" ) -#Move includes under subdirectory to avoid colisions with other libraries -file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/includetemp") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") -file(RENAME "${CURRENT_PACKAGES_DIR}/includetemp" "${CURRENT_PACKAGES_DIR}/include/libfabric") +file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/libfabric") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libfabric/vcpkg.json b/ports/libfabric/vcpkg.json index 547c77e3c26ac7..3478c994c60d8e 100644 --- a/ports/libfabric/vcpkg.json +++ b/ports/libfabric/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libfabric", "version-semver": "1.13.2", - "port-version": 1, + "port-version": 2, "description": "The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release.", "homepage": "https://github.com/ofiwg/libfabric", "supports": "windows & !uwp & x64 & !static", @@ -9,6 +9,11 @@ { "name": "networkdirect-sdk", "platform": "windows" + }, + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" } ] } diff --git a/ports/libffi/CMakeLists.txt b/ports/libffi/CMakeLists.txt deleted file mode 100644 index 146b0329148e89..00000000000000 --- a/ports/libffi/CMakeLists.txt +++ /dev/null @@ -1,243 +0,0 @@ -cmake_minimum_required(VERSION 3.9) -project(libffi C ASM) - -set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 i686 armv7l armv7-a aarch64 mips64el riscv32 riscv64) - -string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" lower_system_processor) - -if(NOT lower_system_processor IN_LIST KNOWN_PROCESSORS) - message(FATAL_ERROR "Unknown processor: ${CMAKE_SYSTEM_PROCESSOR}") -endif() - -if(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(TARGET ARM_WIN32) -elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(TARGET ARM_WIN64) -elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(TARGET X86_WIN32) -elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(TARGET X86_WIN64) -elseif(lower_system_processor MATCHES "arm64|aarch64") - set(TARGET ARM64) -elseif(lower_system_processor MATCHES "mips64") - set(TARGET MIPS64) -elseif(lower_system_processor MATCHES "arm") - set(TARGET ARM) -elseif(lower_system_processor MATCHES "riscv") - set(TARGET RISCV) -elseif(CMAKE_SYSTEM_NAME MATCHES "BSD" AND CMAKE_SIZEOF_VOID_P EQUAL 4) - set(TARGET X86_FREEBSD) -elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND CMAKE_SIZEOF_VOID_P EQUAL 4) - set(TARGET X86_DARWIN) -elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(TARGET X86_64) -elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(TARGET X86) -else() - message(FATAL_ERROR "Cannot determine target. Please consult ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac and add your platform to this CMake file.") -endif() - -if("${TARGET}" STREQUAL "X86_64" OR "${TARGET}" STREQUAL "MIPS64") - set(HAVE_LONG_DOUBLE 1) -else() - set(HAVE_LONG_DOUBLE 0) -endif() -set(FFI_EXEC_TRAMPOLINE_TABLE 0) - -# mimic layout of original buildsystem -configure_file(include/ffi.h.in ${CMAKE_BINARY_DIR}/include/ffi.h) -file(COPY ${FFI_CONFIG_FILE} DESTINATION ${CMAKE_BINARY_DIR}) - -if ("${TARGET}" STREQUAL "ARM_WIN64" OR "${TARGET}" STREQUAL "ARM64") - file(COPY src/aarch64/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) -elseif ("${TARGET}" STREQUAL "ARM_WIN32" OR "${TARGET}" STREQUAL "ARM") - file(COPY src/arm/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) -elseif ("${TARGET}" MATCHES "MIPS") - file(COPY src/mips/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) -elseif ("${TARGET}" STREQUAL "RISCV") - file(COPY src/riscv/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) -else() - file(COPY src/x86/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) -endif() - -include_directories(${CMAKE_BINARY_DIR}/include) -include_directories(${CMAKE_BINARY_DIR}) -include_directories(include) - -add_definitions(-DFFI_BUILDING) -if(BUILD_SHARED_LIBS AND WIN32) - add_definitions(-DFFI_BUILDING_DLL) -endif() - -set(FFI_SOURCES - src/closures.c - src/prep_cif.c - src/types.c - src/tramp.c) - -if ("${TARGET}" STREQUAL "ARM_WIN64" OR "${TARGET}" STREQUAL "ARM64") - set(FFI_SOURCES - ${FFI_SOURCES} - src/aarch64/ffi.c) -elseif("${TARGET}" STREQUAL "ARM_WIN32" OR "${TARGET}" STREQUAL "ARM") - set(FFI_SOURCES - ${FFI_SOURCES} - src/arm/ffi.c) -elseif("${TARGET}" MATCHES "MIPS") - set(FFI_SOURCES - ${FFI_SOURCES} - src/mips/ffi.c) -elseif("${TARGET}" STREQUAL "RISCV") - set(FFI_SOURCES - ${FFI_SOURCES} - src/riscv/ffi.c) -else() - set(FFI_SOURCES - ${FFI_SOURCES} - src/java_raw_api.c - src/raw_api.c) - if("${TARGET}" STREQUAL "X86_WIN32" OR "${TARGET}" STREQUAL "X86_DARWIN" OR "${TARGET}" STREQUAL "X86") - set(FFI_SOURCES - ${FFI_SOURCES} - src/x86/ffi.c) - elseif("${TARGET}" STREQUAL "X86_WIN64") - set(FFI_SOURCES - ${FFI_SOURCES} - src/x86/ffiw64.c) - elseif("${TARGET}" STREQUAL "X86_64") - set(FFI_SOURCES - ${FFI_SOURCES} - src/x86/ffi64.c - src/x86/ffiw64.c) - endif() -endif() - -macro(add_assembly ASMFILE) - get_filename_component(ASMFILE_FULL "${ASMFILE}" ABSOLUTE) - if(MSVC) - if ("${TARGET}" STREQUAL "ARM_WIN64") - set(ARCH_ASSEMBLER armasm64) - elseif ("${TARGET}" STREQUAL "ARM_WIN32") - set(ARCH_ASSEMBLER armasm) - elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(ARCH_ASSEMBLER ml /safeseh /c /Zi) - else() - set(ARCH_ASSEMBLER ml64 /c /Zi) - endif() - - get_filename_component(ARCH_ASM_NAME "${ASMFILE_FULL}" NAME_WE) - - execute_process( - COMMAND ${CMAKE_C_COMPILER} /nologo /EP /I. /Iinclude /I${CMAKE_CURRENT_SOURCE_DIR}/include "${ASMFILE_FULL}" - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - OUTPUT_FILE ${ARCH_ASM_NAME}.asm - RESULT_VARIABLE retcode - ) - - if(NOT ${retcode} STREQUAL "0") - message(FATAL_ERROR "Unable to assemble, exit code: '${retcode}'.") - endif() - - # Produced *.asm file could be just added to sources. - # It works in x64 mode, but for some strange reason MASM returns error code when in x86, - # (even though it didn't report any errors and correctly generated object file) - # which in turn causes MSBUILD to stop. - execute_process( - COMMAND ${ARCH_ASSEMBLER} ${ARCH_ASM_NAME}.asm - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE retcode - ) - - if(NOT ${retcode} STREQUAL "0") - message(FATAL_ERROR "Unable to compile assembly, exit code: '${retcode}'.") - endif() - - list(APPEND FFI_SOURCES ${CMAKE_BINARY_DIR}/${ARCH_ASM_NAME}.obj) - else() - list(APPEND FFI_SOURCES ${ASMFILE}) - endif() -endmacro() - -if("${TARGET}" STREQUAL "X86") - set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -m32") -endif() - -if("${TARGET}" STREQUAL "X86" OR "${TARGET}" STREQUAL "X86_DARWIN") - add_assembly(src/x86/sysv.S) -elseif("${TARGET}" STREQUAL "X86_64") - add_assembly(src/x86/unix64.S) - add_assembly(src/x86/win64.S) -elseif("${TARGET}" STREQUAL "X86_WIN32") - if(MSVC) - add_assembly(src/x86/sysv_intel.S) - else() - add_assembly(src/x86/sysv.S) - endif() -elseif("${TARGET}" STREQUAL "X86_WIN64") - if(MSVC) - add_assembly(src/x86/win64_intel.S) - else() - add_assembly(src/x86/win64.S) - endif() -elseif("${TARGET}" STREQUAL "ARM_WIN32") - if(MSVC) - add_assembly(src/arm/sysv_msvc_arm32.S) - else() - add_assembly(src/arm/sysv.S) - endif() -elseif("${TARGET}" STREQUAL "ARM") - add_assembly(src/arm/sysv.S) -elseif("${TARGET}" STREQUAL "ARM_WIN64") - if(MSVC) - add_assembly(src/aarch64/win64_armasm.S) - else() - add_assembly(src/aarch64/sysv.S) - endif() -elseif("${TARGET}" STREQUAL "ARM64") - add_assembly(src/aarch64/sysv.S) -elseif("${TARGET}" MATCHES "MIPS") - add_assembly(src/mips/n32.S) -elseif("${TARGET}" MATCHES "RISCV") - add_assembly(src/riscv/sysv.S) -else() - message(FATAL_ERROR "Target not implemented") -endif() - -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND FFI_SOURCES src/debug.c) - add_definitions(-DFFI_DEBUG) -endif() - -add_library(libffi ${FFI_SOURCES}) - -if(CMAKE_STATIC_LIBRARY_PREFIX STREQUAL "lib") - set_target_properties(libffi PROPERTIES OUTPUT_NAME ffi) -endif() - -install(TARGETS libffi - EXPORT ${PROJECT_NAME}Targets - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -include(CMakePackageConfigHelpers) - -configure_package_config_file(${PROJECT_NAME}Config.cmake.in - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" - INSTALL_DESTINATION share/${PROJECT_NAME}) -write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake - VERSION ${VERSION} - COMPATIBILITY AnyNewerVersion) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" - DESTINATION share/${PROJECT_NAME}) -install(EXPORT ${PROJECT_NAME}Targets - DESTINATION share/${PROJECT_NAME}) - -if(NOT FFI_SKIP_HEADERS) - install(FILES - ${CMAKE_BINARY_DIR}/include/ffi.h - ${CMAKE_BINARY_DIR}/include/ffitarget.h - DESTINATION include) -endif() diff --git a/ports/libffi/dll-bindir.diff b/ports/libffi/dll-bindir.diff new file mode 100644 index 00000000000000..51e15413dffaa0 --- /dev/null +++ b/ports/libffi/dll-bindir.diff @@ -0,0 +1,12 @@ +diff --git a/configure.host b/configure.host +index f23716f..78d317b 100644 +--- a/configure.host ++++ b/configure.host +@@ -103,6 +103,7 @@ case "${host}" in + else + AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"'; + fi ++ AM_LTLDFLAGS='-no-undefined'; + ;; + + i?86-*-darwin* | x86_64-*-darwin* | i?86-*-ios | x86_64-*-ios) diff --git a/ports/libffi/fficonfig.h b/ports/libffi/fficonfig.h deleted file mode 100644 index 7d9a45c63d7ed9..00000000000000 --- a/ports/libffi/fficonfig.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifdef __linux__ -#define EH_FRAME_FLAGS "a" -#endif -#define HAVE_ALLOCA 1 -#ifndef _WIN64 -#define HAVE_AS_ASCII_PSEUDO_OP 1 -#endif -#ifndef _WIN64 -#define HAVE_AS_STRING_PSEUDO_OP 1 -#endif -#ifndef _WIN64 -#define HAVE_AS_X86_PCREL 1 -#endif -#ifdef __linux__ -#define HAVE_HIDDEN_VISIBILITY_ATTRIBUTE 1 -#endif -#define HAVE_INTTYPES_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TYPES_H 1 -#define LT_OBJDIR ".libs/" -#define PACKAGE "libffi" -#define PACKAGE_BUGREPORT "http://github.com/libffi/libffi/issues" -#define PACKAGE_NAME "libffi" -#define PACKAGE_STRING "libffi 3.4.4" -#define PACKAGE_TARNAME "libffi" -#define PACKAGE_URL "" -#define PACKAGE_VERSION "3.4.4" -#define SIZEOF_DOUBLE 8 -#define SIZEOF_LONG_DOUBLE 8 -#ifndef _WIN64 -#define SIZEOF_SIZE_T 4 -#else -#define SIZEOF_SIZE_T 8 -#endif -#define STDC_HEADERS 1 -#ifndef __linux__ -#ifndef _WIN64 -#define SYMBOL_UNDERSCORE 1 -#endif -#endif -#define VERSION "3.4.4" -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#endif - -#ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE -#ifdef LIBFFI_ASM -#define FFI_HIDDEN(name) .hidden name -#else -#define FFI_HIDDEN __attribute__ ((visibility ("hidden"))) -#endif -#else -#ifdef LIBFFI_ASM -#define FFI_HIDDEN(name) -#else -#define FFI_HIDDEN -#endif -#endif - diff --git a/ports/libffi/libffiConfig.cmake b/ports/libffi/libffiConfig.cmake new file mode 100644 index 00000000000000..a510862e10dcc2 --- /dev/null +++ b/ports/libffi/libffiConfig.cmake @@ -0,0 +1,7 @@ +file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage) +message(WARNING "find_package(libffi) is deprecated.\n${usage}") +include(CMakeFindDependencyMacro) +find_dependency(unofficial-libffi CONFIG REQUIRED) +if(NOT TARGET libffi) + add_library(libffi ALIAS unofficial::libffi::libffi) +endif() diff --git a/ports/libffi/libffiConfig.cmake.in b/ports/libffi/libffiConfig.cmake.in deleted file mode 100644 index d25083ef5e59e6..00000000000000 --- a/ports/libffi/libffiConfig.cmake.in +++ /dev/null @@ -1,5 +0,0 @@ -@PACKAGE_INIT@ - -if(NOT TARGET libffi) - include("${CMAKE_CURRENT_LIST_DIR}/libffiTargets.cmake") -endif() diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index 0b118c3c1ad033..40d936b35b84b9 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -1,52 +1,72 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO libffi/libffi - REF "v${VERSION}" - SHA512 e3b261a7900cec61225c768ebd443884465669e0904db3f523aaaeeed74b4c03dbe23d74ff8bb69554791a798e25894a5fcbe2b13b883d3ee38aeff4c1e16a49 - HEAD_REF master +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/libffi/libffi/releases/download/v${VERSION}/libffi-${VERSION}.tar.gz" + FILENAME "libffi-${VERSION}.tar.gz" + SHA512 88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889 ) +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + dll-bindir.diff +) + +vcpkg_list(SET options) +if(VCPKG_TARGET_IS_WINDOWS) + set(extra_cflags "-DFFI_BUILDING") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + string(APPEND extra_cflags " -DFFI_BUILDING_DLL") + endif() + vcpkg_list(APPEND options "CFLAGS=\${CFLAGS} ${extra_cflags}") +endif() -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in" DESTINATION "${SOURCE_PATH}") +set(ccas_options "") +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") +if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") + set(ccas "${SOURCE_PATH}/msvcc.sh") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + string(APPEND ccas_options " -m32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND ccas_options " -m64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + string(APPEND ccas_options " -marm") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + string(APPEND ccas_options " -marm64") + endif() +else() + set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") +endif() +cmake_path(GET ccas PARENT_PATH ccas_dir) +vcpkg_add_to_path("${ccas_dir}") +cmake_path(GET ccas FILENAME ccas_command) +vcpkg_list(APPEND options "CCAS=${ccas_command}${ccas_options}") -vcpkg_cmake_configure( +vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS OPTIONS - "-DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h" - "-DVERSION=${VERSION}" - OPTIONS_DEBUG - -DFFI_SKIP_HEADERS=ON + --enable-portable-binary + --disable-docs + --disable-multi-os-directory + ${options} ) -vcpkg_cmake_install() +vcpkg_install_make() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() - -set(PACKAGE_VERSION ${VERSION}) -set(prefix "${CURRENT_INSTALLED_DIR}") -set(exec_prefix "\${prefix}") -set(libdir "\${prefix}/lib") -set(toolexeclibdir "\${libdir}") -set(includedir "\${prefix}/include") -configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY) -if (NOT VCPKG_BUILD_TYPE) - set(prefix "${CURRENT_INSTALLED_DIR}/debug") - set(exec_prefix "\${prefix}") - set(libdir "\${prefix}/lib") - set(toolexeclibdir "\${libdir}") - set(includedir "\${prefix}/../include") - configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" @ONLY) -endif() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" " -lffi" " -llibffi") - if(NOT DEFINED VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" " -lffi" " -llibffi") - endif() -endif() vcpkg_fixup_pkgconfig() if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ffi.h" "!defined FFI_BUILDING" "0") endif() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libffi-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libffi") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man3" +) + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libffi/unofficial-libffi-config.cmake b/ports/libffi/unofficial-libffi-config.cmake new file mode 100644 index 00000000000000..453f6347eecdd8 --- /dev/null +++ b/ports/libffi/unofficial-libffi-config.cmake @@ -0,0 +1,20 @@ +if(NOT TARGET unofficial::libffi::libffi) + get_filename_component(VCPKG_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) + find_library(VCPKG_LIBFFI_LIBRARY_RELEASE NAMES ffi PATHS "${VCPKG_IMPORT_PREFIX}/lib" REQUIRED) + find_library(VCPKG_LIBFFI_LIBRARY_DEBUG NAMES ffi PATHS "${VCPKG_IMPORT_PREFIX}/debug/lib") + mark_as_advanced(VCPKG_LIBFFI_LIBRARY_RELEASE VCPKG_LIBFFI_LIBRARY_DEBUG) + add_library(unofficial::libffi::libffi UNKNOWN IMPORTED) + set_target_properties(unofficial::libffi::libffi PROPERTIES + IMPORTED_CONFIGURATIONS "Release" + INTERFACE_INCLUDE_DIRECTORIES "${VCPKG_IMPORT_PREFIX}/include" + IMPORTED_LOCATION_RELEASE "${VCPKG_LIBFFI_LIBRARY_RELEASE}" + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C" + ) + if(VCPKG_LIBFFI_LIBRARY_DEBUG) + set_property(TARGET unofficial::libffi::libffi APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(unofficial::libffi::libffi PROPERTIES + IMPORTED_LOCATION_DEBUG "${VCPKG_LIBFFI_LIBRARY_DEBUG}" + IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C" + ) + endif() +endif() diff --git a/ports/libffi/usage b/ports/libffi/usage new file mode 100644 index 00000000000000..3c5ecab10bd0a1 --- /dev/null +++ b/ports/libffi/usage @@ -0,0 +1,10 @@ +libffi can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(LIBFFI REQUIRED IMPORTED_TARGET libffi) + target_link_libraries(main PRIVATE PkgConfig::LIBFFI) + +vcpkg provides proprietary CMake targets: + + find_package(unofficial-libffi CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::libffi::libffi) diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index 21868bd9eba2ce..ba0a6bdca2e03b 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,17 +1,13 @@ { "name": "libffi", "version": "3.4.4", - "port-version": 2, + "port-version": 5, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi", "license": "MIT", "dependencies": [ { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", + "name": "vcpkg-cmake-get-vars", "host": true } ] diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake index 20fc109d217600..c8c788c4020dd5 100644 --- a/ports/libflac/portfile.cmake +++ b/ports/libflac/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/flac REF "${VERSION}" - SHA512 1b4992024dffe83916f0da8726f73bf932a52d8c3346c35ab1ee81b82d68ff01faa8c477aa29d7099a09611664dee723db5be3087f709218c33e564f77810013 + SHA512 3571467a1d557bc03eade2ae9bb1a72fd94a89222e6ad9563078d646aac0b65ed1c3d829fb45dd3a6cdca806f7ba3b6393f0ce6571b43651959acaa1c2106396 HEAD_REF master PATCHES - uwp-library-console.patch fix-compile-options.patch ) diff --git a/ports/libflac/uwp-library-console.patch b/ports/libflac/uwp-library-console.patch deleted file mode 100644 index bf65642d238732..00000000000000 --- a/ports/libflac/uwp-library-console.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/share/win_utf8_io/win_utf8_io.c b/src/share/win_utf8_io/win_utf8_io.c -index bbb6a74a..8b20bbb7 100644 ---- a/src/share/win_utf8_io/win_utf8_io.c -+++ b/src/share/win_utf8_io/win_utf8_io.c -@@ -110,7 +110,11 @@ int get_utf8_argv(int *argc, char ***argv) - char **utf8argv; - int ret, i; - -+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) -+ if ((handle = LoadPackagedLibrary("msvcrt.dll", 0)) == NULL) return 1; -+#else - if ((handle = LoadLibraryW(L"msvcrt.dll")) == NULL) return 1; -+#endif - if ((wgetmainargs = (wgetmainargs_t)GetProcAddress(handle, "__wgetmainargs")) == NULL) { - FreeLibrary(handle); - return 1; diff --git a/ports/libflac/vcpkg.json b/ports/libflac/vcpkg.json index 9bd32667fb7ccd..31c3d8301ae1ea 100644 --- a/ports/libflac/vcpkg.json +++ b/ports/libflac/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libflac", - "version": "1.4.2", + "version": "1.4.3", "description": "Library for manipulating FLAC files", "homepage": "https://xiph.org/flac/", "license": "BSD-3-Clause", diff --git a/ports/libgnutls/portfile.cmake b/ports/libgnutls/portfile.cmake index 784a813030b749..94302863e72764 100644 --- a/ports/libgnutls/portfile.cmake +++ b/ports/libgnutls/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_download_distfile(tarball "https://mirrors.dotsrc.org/gcrypt/gnutls/v${GNUTLS_BRANCH}/gnutls-${VERSION}.tar.xz" "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnutls/v${GNUTLS_BRANCH}/gnutls-${VERSION}.tar.xz" FILENAME "gnutls-${VERSION}.tar.xz" - SHA512 4199bcf7c9e3aab2f52266aadceefc563dfe2d938d0ea1f3ec3be95d66f4a8c8e5494d3a800c03dd02ad386dec1738bd63e1fe0d8b394a2ccfc7d6c6a0cc9359 + SHA512 22e78db86b835843df897d14ad633d8a553c0f9b1389daa0c2f864869c6b9ca889028d434f9552237dc4f1b37c978fbe0cce166e3768e5d4e8850ff69a6fc872 ) vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${tarball}" diff --git a/ports/libgnutls/vcpkg.json b/ports/libgnutls/vcpkg.json index 55cc7234461aeb..227c79a8f41663 100644 --- a/ports/libgnutls/vcpkg.json +++ b/ports/libgnutls/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libgnutls", - "version": "3.7.8", + "version": "3.8.1", "description": "A secure communications library implementing the SSL, TLS and DTLS protocols.", "homepage": "https://www.gnutls.org/", "license": null, diff --git a/ports/libideviceactivation/001_fix_static_build.patch b/ports/libideviceactivation/001_fix_static_build.patch new file mode 100644 index 00000000000000..be47327f08a9bc --- /dev/null +++ b/ports/libideviceactivation/001_fix_static_build.patch @@ -0,0 +1,21 @@ +diff --git a/src/activation.c b/src/activation.c +index 4260c20..29bb2e8 100644 +--- a/src/activation.c ++++ b/src/activation.c +@@ -90,6 +90,7 @@ struct idevice_activation_response_private { + int has_errors; + }; + ++#ifndef LIBIDEVICEACTIVATION_STATIC // disable dll constructor + + static void internal_libideviceactivation_init(void) + { +@@ -162,6 +163,8 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) + #warning No compiler support for constructor/destructor attributes, some features might not be available. + #endif + ++#endif // disable dll constructor ++ + static int debug_level = 0; + + IDEVICE_ACTIVATION_API void idevice_activation_set_debug_level(int level) { diff --git a/ports/libideviceactivation/002_fix_api.patch b/ports/libideviceactivation/002_fix_api.patch new file mode 100644 index 00000000000000..8aea70d50ab02a --- /dev/null +++ b/ports/libideviceactivation/002_fix_api.patch @@ -0,0 +1,21 @@ +diff --git a/src/activation.c b/src/activation.c +index 29bb2e8..69ec7b4 100644 +--- a/src/activation.c ++++ b/src/activation.c +@@ -32,15 +32,11 @@ + #include + #include + +-#ifdef WIN32 +-#define IDEVICE_ACTIVATION_API __declspec( dllexport ) +-#else +-#ifdef HAVE_FVISIBILITY ++#if !defined(_WIN32) && !defined(LIBIDEVICEACTIVATION_STATIC) + #define IDEVICE_ACTIVATION_API __attribute__((visibility("default"))) + #else + #define IDEVICE_ACTIVATION_API + #endif +-#endif + + #ifdef WIN32 + #include diff --git a/ports/libideviceactivation/003_fix_tools_msvc.patch b/ports/libideviceactivation/003_fix_tools_msvc.patch new file mode 100644 index 00000000000000..e89ae7fee721aa --- /dev/null +++ b/ports/libideviceactivation/003_fix_tools_msvc.patch @@ -0,0 +1,14 @@ +diff --git a/tools/ideviceactivation.c b/tools/ideviceactivation.c +index 757c54e..e75e9e9 100644 +--- a/tools/ideviceactivation.c ++++ b/tools/ideviceactivation.c +@@ -28,7 +28,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #ifndef WIN32 + #include diff --git a/ports/libideviceactivation/CMakeLists.txt b/ports/libideviceactivation/CMakeLists.txt index 05ab295e6906c0..833545eb7aedbe 100644 --- a/ports/libideviceactivation/CMakeLists.txt +++ b/ports/libideviceactivation/CMakeLists.txt @@ -1,39 +1,103 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.15) project(libideviceactivation C) -# find dependencies -find_library(libplist NAMES plist plist-2.0 libplist libplist-2.0 REQUIRED) -find_path(libimobiledevice_INCLUDES endianness.h) -find_library(libimobiledevice NAMES imobiledevice imobiledevice-1.0 libimobiledevice libimobiledevice-1.0 REQUIRED) -find_package(LibXml2 REQUIRED) -find_package(CURL REQUIRED) +option(BUILD_TOOLS "Build tools." OFF) -# ready to create library -file(GLOB_RECURSE IDVCACTV_TOOLS_SRC common/*.c) +include(GNUInstallDirs) -file(GLOB_RECURSE IDVCACTV_PUBLIC_HDR include/*.h) -file(GLOB_RECURSE IDVCACTV_SRC src/*.c) +file(GLOB_RECURSE LIBIDEVICEACTIVATION_HEADER include/*.h) +file(GLOB_RECURSE LIBIDEVICEACTIVATION_SOURCE src/*.c) -add_library(libideviceactivation ${IDVCACTV_TOOLS_SRC} ${IDVCACTV_SRC} ${IDVCACTV_PUBLIC_HDR}) -target_include_directories(libideviceactivation PRIVATE ${libimobiledevice_INCLUDES} ${LIBXML2_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} include) -target_compile_definitions(libideviceactivation PRIVATE -DHAVE_OPENSSL) -target_link_libraries(libideviceactivation PRIVATE ${libplist} ${libimobiledevice} ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES}) +set(DEFINITIONS) + +if(BUILD_SHARED_LIBS) + if(WIN32) + list(APPEND LIBIDEVICEACTIVATION_SOURCE exports.def) + endif() +else() + list(APPEND DEFINITIONS -DLIBIDEVICEACTIVATION_STATIC) +endif() + +if(WIN32) + list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS) + list(APPEND DEFINITIONS -DWIN32_LEAN_AND_MEAN) + list(APPEND DEFINITIONS -DWIN32) +endif() + +find_package(unofficial-libplist CONFIG REQUIRED) +find_package(unofficial-libimobiledevice CONFIG REQUIRED) +find_package(CURL CONFIG REQUIRED) +find_package(LibXml2 CONFIG REQUIRED) + +add_library(libideviceactivation ${LIBIDEVICEACTIVATION_SOURCE}) +target_include_directories(libideviceactivation PUBLIC + "$" + "$" +) +target_compile_definitions(libideviceactivation PRIVATE ${DEFINITIONS}) +target_link_libraries(libideviceactivation + PRIVATE + CURL::libcurl + LibXml2::LibXml2 + PUBLIC + unofficial::libplist::libplist + unofficial::libimobiledevice::libimobiledevice +) +set_target_properties(libideviceactivation PROPERTIES OUTPUT_NAME ideviceactivation-1.0) + +install(TARGETS libideviceactivation EXPORT unofficial-libideviceactivation) -# install install( - TARGETS libideviceactivation - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib + EXPORT unofficial-libideviceactivation + FILE unofficial-libideviceactivation-config.cmake + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libideviceactivation" + NAMESPACE unofficial::libideviceactivation:: ) + +install( + FILES ${LIBIDEVICEACTIVATION_HEADER} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +set(LIBPLIST_VERSION 2.0) +set(LIBIMOBILEDEVICE_VERSION 1.0) +set(LIBCURL_VERSION 7.0) +set(LIBXML2_VERSION 2.0) +set(PACKAGE_NAME libideviceactivation) +set(PACKAGE_VERSION 1.0) +set(prefix "") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") + configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/src/libideviceactivation-1.0.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc + "${CMAKE_CURRENT_SOURCE_DIR}/src/libideviceactivation-1.0.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc" @ONLY ) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc - DESTINATION lib/pkgconfig + FILES "${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" ) -install(FILES ${IDVCACTV_PUBLIC_HDR} DESTINATION include) \ No newline at end of file +if(BUILD_TOOLS) + add_executable(ideviceactivation "tools/ideviceactivation.c") + target_compile_definitions(ideviceactivation PRIVATE + -DPACKAGE_VERSION="1.1.1" + -DPACKAGE_URL="https://github.com/libimobiledevice/libideviceactivation" + -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/libideviceactivation/issues" + ) + if(WIN32) + target_compile_definitions(ideviceactivation PRIVATE + -D_CRT_SECURE_NO_WARNINGS + -DWIN32_LEAN_AND_MEAN + -DWIN32 + ) + endif() + target_link_libraries(ideviceactivation PRIVATE libideviceactivation) + + install( + TARGETS ideviceactivation + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) +endif() diff --git a/ports/libideviceactivation/exports.def b/ports/libideviceactivation/exports.def new file mode 100644 index 00000000000000..346b0c83b1216d --- /dev/null +++ b/ports/libideviceactivation/exports.def @@ -0,0 +1,31 @@ +EXPORTS + idevice_activation_set_debug_level + idevice_activation_request_new + idevice_activation_request_new_from_lockdownd + idevice_activation_drm_handshake_request_new + idevice_activation_request_free + idevice_activation_request_get_fields + idevice_activation_request_set_fields + idevice_activation_request_set_fields_from_response + idevice_activation_request_set_field + idevice_activation_request_get_field + idevice_activation_request_get_url + idevice_activation_request_set_url + idevice_activation_response_new + idevice_activation_response_new_from_html + idevice_activation_response_to_buffer + idevice_activation_response_free + idevice_activation_response_get_field + idevice_activation_response_get_fields + idevice_activation_response_get_label + idevice_activation_response_get_placeholder + idevice_activation_response_get_title + idevice_activation_response_get_description + idevice_activation_response_get_activation_record + idevice_activation_response_get_headers + idevice_activation_response_is_activation_acknowledged + idevice_activation_response_is_authentication_required + idevice_activation_response_field_requires_input + idevice_activation_response_field_secure_input + idevice_activation_response_has_errors + idevice_activation_send_request diff --git a/ports/libideviceactivation/portfile.cmake b/ports/libideviceactivation/portfile.cmake index e438cba37ed8f1..db91abae0bf8a6 100644 --- a/ports/libideviceactivation/portfile.cmake +++ b/ports/libideviceactivation/portfile.cmake @@ -1,21 +1,47 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO libimobiledevice-win32/libideviceactivation - REF fbe0476cfeddc2fc317ceb900eec12302c1d4c11 # v1.3.17 - SHA512 18fdf1b42744da33e0f0f037e83a72b76cc0b63a0b712e78d9736adcde113582327f3712bc2bfa7b6fdb692465700a9106286f383fd7d11f9351ca7939b20e24 - HEAD_REF msvc-master + REPO libimobiledevice/libideviceactivation + REF 067c439e0b18d6f1c8a37dde791f9d91191a922e # commits on 2023-05-01 + SHA512 0afd74720abc6a1e47e035243879d291444b27667ce0a1908a4e66fea92185ff002e5390a1911ae95dc05d0bb0518a0043c77b531edcc5ac8b59c913aea9d487 + HEAD_REF master + PATCHES + 001_fix_static_build.patch + 002_fix_api.patch + 003_fix_tools_msvc.patch ) -configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() -vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) +vcpkg_fixup_pkgconfig() +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ideviceactivation AUTO_CLEAN) +endif() + +file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" cmake_config) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" +"include(CMakeFindDependencyMacro) +find_dependency(unofficial-libplist CONFIG) +find_dependency(unofficial-libimobiledevice CONFIG) +find_dependency(CURL CONFIG) +find_dependency(LibXml2 CONFIG) +${cmake_config} +") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libideviceactivation/usage b/ports/libideviceactivation/usage new file mode 100644 index 00000000000000..7ba822f370d8be --- /dev/null +++ b/ports/libideviceactivation/usage @@ -0,0 +1,4 @@ +libideviceactivation provides CMake targets: + + find_package(unofficial-libideviceactivation CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::libideviceactivation::libideviceactivation) diff --git a/ports/libideviceactivation/vcpkg.json b/ports/libideviceactivation/vcpkg.json index 7eadb89a3f17cb..855b589ca76c26 100644 --- a/ports/libideviceactivation/vcpkg.json +++ b/ports/libideviceactivation/vcpkg.json @@ -1,7 +1,11 @@ { "name": "libideviceactivation", - "version": "1.3.17", + "version-date": "2023-05-01", + "port-version": 1, "description": "A library to handle the activation process of iOS devices", + "homepage": "https://libimobiledevice.org/", + "license": "LGPL-2.1-or-later", + "supports": "!uwp", "dependencies": [ "curl", "libimobiledevice", @@ -10,6 +14,16 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "build command line tool", + "supports": "!android & !ios & !xbox" } - ] + } } diff --git a/ports/libimobiledevice-glue/001_fix_win32_defs.patch b/ports/libimobiledevice-glue/001_fix_win32_defs.patch new file mode 100644 index 00000000000000..f0dd322de698a0 --- /dev/null +++ b/ports/libimobiledevice-glue/001_fix_win32_defs.patch @@ -0,0 +1,57 @@ +diff --git a/include/libimobiledevice-glue/socket.h b/include/libimobiledevice-glue/socket.h +index 53f58b8..f3cc6c6 100644 +--- a/include/libimobiledevice-glue/socket.h ++++ b/include/libimobiledevice-glue/socket.h +@@ -32,7 +32,7 @@ enum fd_mode { + }; + typedef enum fd_mode fd_mode; + +-#ifdef WIN32 ++#ifdef _WIN32 + #include + #define SHUT_RD SD_READ + #define SHUT_WR SD_WRITE +@@ -41,7 +41,7 @@ typedef enum fd_mode fd_mode; + #include + #endif + +-#ifndef WIN32 ++#ifndef _WIN32 + int socket_create_unix(const char *filename); + int socket_connect_unix(const char *filename); + #endif +diff --git a/include/libimobiledevice-glue/thread.h b/include/libimobiledevice-glue/thread.h +index 2aadc6e..b5c2ac1 100644 +--- a/include/libimobiledevice-glue/thread.h ++++ b/include/libimobiledevice-glue/thread.h +@@ -24,7 +24,7 @@ + + #include + +-#ifdef WIN32 ++#ifdef _WIN32 + #include + typedef HANDLE THREAD_T; + typedef CRITICAL_SECTION mutex_t; +@@ -61,7 +61,7 @@ int thread_alive(THREAD_T thread); + + int thread_cancel(THREAD_T thread); + +-#ifdef WIN32 ++#ifdef _WIN32 + #undef HAVE_THREAD_CLEANUP + #else + #ifdef HAVE_PTHREAD_CANCEL +diff --git a/include/libimobiledevice-glue/utils.h b/include/libimobiledevice-glue/utils.h +index 1a21871..2421270 100644 +--- a/include/libimobiledevice-glue/utils.h ++++ b/include/libimobiledevice-glue/utils.h +@@ -29,7 +29,7 @@ + #include + #endif + +-#ifdef WIN32 ++#ifdef _WIN32 + #include + #endif + diff --git a/ports/libimobiledevice-glue/002_fix_msvc.patch b/ports/libimobiledevice-glue/002_fix_msvc.patch new file mode 100644 index 00000000000000..d8a8c987176b42 --- /dev/null +++ b/ports/libimobiledevice-glue/002_fix_msvc.patch @@ -0,0 +1,47 @@ +diff --git a/src/socket.c b/src/socket.c +index 4b8b857..4cf8a92 100644 +--- a/src/socket.c ++++ b/src/socket.c +@@ -26,10 +26,12 @@ + #include + #include + #include +-#include + #include +-#include + #include ++#ifndef _MSC_VER ++#include ++#include ++#endif + #ifdef WIN32 + #include + #include +diff --git a/src/termcolors.c b/src/termcolors.c +index 5c436f2..9a84ff2 100644 +--- a/src/termcolors.c ++++ b/src/termcolors.c +@@ -28,7 +28,9 @@ + + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + +diff --git a/src/utils.c b/src/utils.c +index ad8e9c4..b9803ac 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -30,7 +30,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + #include diff --git a/ports/libimobiledevice-glue/003_fix_static_build.patch b/ports/libimobiledevice-glue/003_fix_static_build.patch new file mode 100644 index 00000000000000..4e587cfd4fff9f --- /dev/null +++ b/ports/libimobiledevice-glue/003_fix_static_build.patch @@ -0,0 +1,19 @@ +diff --git a/src/glue.c b/src/glue.c +index 7970679..bad3269 100644 +--- a/src/glue.c ++++ b/src/glue.c +@@ -29,6 +29,8 @@ + #include "common.h" + #include "libimobiledevice-glue/thread.h" + ++#ifndef LIBIMOBILEDEVICEGLUE_STATIC // disable dll constructor ++ + extern void term_colors_init(); + + static void internal_glue_init(void) +@@ -78,3 +80,5 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) + #else + #warning No compiler support for constructor/destructor attributes, some features might not be available. + #endif ++ ++#endif // disable dll constructor diff --git a/ports/libimobiledevice-glue/004_fix_api.patch b/ports/libimobiledevice-glue/004_fix_api.patch new file mode 100644 index 00000000000000..9eea9589c8e040 --- /dev/null +++ b/ports/libimobiledevice-glue/004_fix_api.patch @@ -0,0 +1,20 @@ +diff --git a/src/common.h b/src/common.h +index bd22e3d..144a799 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -25,14 +25,10 @@ + #include + #endif + +-#ifdef WIN32 +-#define LIBIMOBILEDEVICE_GLUE_API __declspec( dllexport ) +-#else +-#ifdef HAVE_FVISIBILITY ++#if !defined(_WIN32) && !defined(LIBIMOBILEDEVICEGLUE_STATIC) + #define LIBIMOBILEDEVICE_GLUE_API __attribute__((visibility("default"))) + #else + #define LIBIMOBILEDEVICE_GLUE_API + #endif +-#endif + + #endif diff --git a/ports/libimobiledevice-glue/CMakeLists.txt b/ports/libimobiledevice-glue/CMakeLists.txt new file mode 100644 index 00000000000000..56bbaab60e1320 --- /dev/null +++ b/ports/libimobiledevice-glue/CMakeLists.txt @@ -0,0 +1,77 @@ +cmake_minimum_required(VERSION 3.15) +project(libimobiledevice-glue C CXX) + +include(GNUInstallDirs) + +file(GLOB_RECURSE LIBIMOBILEDEVICEGLUE_SOURCE src/*.c) + +set(DEFINITIONS) + +if(BUILD_SHARED_LIBS) + if(WIN32) + list(APPEND LIBIMOBILEDEVICEGLUE_SOURCE exports.def) + endif() +else() + list(APPEND DEFINITIONS -DLIBIMOBILEDEVICEGLUE_STATIC) +endif() + +if(UNIX) + list(APPEND DEFINITIONS -DHAVE_GETIFADDRS) +endif() + +if(WIN32) + list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS) + list(APPEND DEFINITIONS -DWIN32) +endif() + +find_package(unofficial-libplist CONFIG REQUIRED) + +add_library(libimobiledevice-glue ${LIBIMOBILEDEVICEGLUE_SOURCE}) +target_include_directories(libimobiledevice-glue + PRIVATE + "$" + PUBLIC + "$" +) +target_compile_definitions(libimobiledevice-glue PRIVATE ${DEFINITIONS}) +target_link_libraries(libimobiledevice-glue + PUBLIC + unofficial::libplist::libplist +) +set_target_properties(libimobiledevice-glue PROPERTIES OUTPUT_NAME imobiledevice-glue-1.0) + +if(WIN32) + target_link_libraries(libimobiledevice-glue PRIVATE Ws2_32 Iphlpapi) +endif() + +install(TARGETS libimobiledevice-glue EXPORT unofficial-libimobiledevice-glue) + +install( + EXPORT unofficial-libimobiledevice-glue + FILE unofficial-libimobiledevice-glue-config.cmake + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libimobiledevice-glue" + NAMESPACE unofficial::libimobiledevice-glue:: +) + +install( + DIRECTORY "${CMAKE_SOURCE_DIR}/include/libimobiledevice-glue" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +set(LIBPLIST_VERSION 2.0) +set(PACKAGE_NAME libimobiledevice-glue) +set(PACKAGE_VERSION 1.0) +set(prefix "") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") + +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/src/libimobiledevice-glue-1.0.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-glue-1.0.pc" + @ONLY +) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-glue-1.0.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" +) diff --git a/ports/libimobiledevice-glue/exports.def b/ports/libimobiledevice-glue/exports.def new file mode 100644 index 00000000000000..03aca563a49f81 --- /dev/null +++ b/ports/libimobiledevice-glue/exports.def @@ -0,0 +1,81 @@ +EXPORTS + + ; src/cbuf.c + char_buf_new + char_buf_free + char_buf_append + + ; src/collention.c + collection_init + collection_free + collection_add + collection_remove + collection_count + collection_copy + + ; opack.c + opack_encode_from_plist + opack_decode_to_plist + + ; src/socket.c + socket_set_verbose + socket_addr_to_string + ;socket_create_unix + ;socket_connect_unix + socket_create + get_primary_mac_address + socket_connect_addr + socket_connect + socket_check_fd + socket_accept + socket_shutdown + socket_close + socket_receive + socket_peek + socket_receive_timeout + socket_send + socket_get_socket_port + + ; src/termcolors.c + term_colors_init + term_colors_set_enabled + cvfprintf + cfprintf + cprintf + + ; src/thread.c + thread_new + thread_detach + thread_free + thread_join + thread_alive + thread_cancel + mutex_init + mutex_destroy + mutex_lock + mutex_unlock + thread_once + cond_init + cond_destroy + cond_signal + cond_wait + cond_wait_timeout + + ; src/tlv.c + tlv_buf_new + tlv_buf_free + tlv_buf_append + tlv_get_data_ptr + tlv_data_get_uint + tlv_data_get_uint8 + tlv_data_copy_data + + ; src/utils.c + string_concat + string_append + string_build_path + string_format_size + string_toupper + generate_uuid + buffer_read_from_filename + buffer_write_to_filename diff --git a/ports/libimobiledevice-glue/portfile.cmake b/ports/libimobiledevice-glue/portfile.cmake new file mode 100644 index 00000000000000..7daca5189ad48b --- /dev/null +++ b/ports/libimobiledevice-glue/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libimobiledevice/libimobiledevice-glue + REF 214bafdde6a1434ead87357afe6cb41b32318495 # commits on 2023-05-13 + SHA512 a12ace7690ebab0ac6372f61e1a6722d506bc20a89130f39441af4da74e8fe9cdae45d947eb3e864a5f043b621432b59418f8e4660857e25b648a9476c552ac6 + HEAD_REF master + PATCHES + 001_fix_win32_defs.patch + 002_fix_msvc.patch + 003_fix_static_build.patch + 004_fix_api.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) +vcpkg_fixup_pkgconfig() + +file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" cmake_config) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" +"include(CMakeFindDependencyMacro) +find_dependency(unofficial-libplist CONFIG) +${cmake_config} +") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libimobiledevice-glue/usage b/ports/libimobiledevice-glue/usage new file mode 100644 index 00000000000000..c4868a6be10c49 --- /dev/null +++ b/ports/libimobiledevice-glue/usage @@ -0,0 +1,4 @@ +libimobiledevice-glue provides CMake targets: + + find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::libimobiledevice-glue::libimobiledevice-glue) diff --git a/ports/libimobiledevice-glue/vcpkg.json b/ports/libimobiledevice-glue/vcpkg.json new file mode 100644 index 00000000000000..79b8ab580f32e8 --- /dev/null +++ b/ports/libimobiledevice-glue/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libimobiledevice-glue", + "version-date": "2023-05-13", + "description": "Library with common code used by the libraries and tools around the libimobiledevice project.", + "homepage": "https://libimobiledevice.org/", + "license": "LGPL-2.1-or-later", + "dependencies": [ + "libplist", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libimobiledevice/001_fix_msvc.patch b/ports/libimobiledevice/001_fix_msvc.patch new file mode 100644 index 00000000000000..bea25f00efe801 --- /dev/null +++ b/ports/libimobiledevice/001_fix_msvc.patch @@ -0,0 +1,166 @@ +diff --git a/common/userpref.c b/common/userpref.c +index b64c703..7ff325c 100644 +--- a/common/userpref.c ++++ b/common/userpref.c +@@ -35,7 +35,9 @@ + #ifndef WIN32 + #include + #endif ++#ifndef _MSC_VER + #include ++#endif + #include + #if defined(HAVE_OPENSSL) + #include +@@ -65,7 +67,9 @@ + #endif + + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + +diff --git a/include/libimobiledevice/libimobiledevice.h b/include/libimobiledevice/libimobiledevice.h +index 6851145..55ef753 100644 +--- a/include/libimobiledevice/libimobiledevice.h ++++ b/include/libimobiledevice/libimobiledevice.h +@@ -30,6 +30,11 @@ + extern "C" { + #endif + ++#if defined(_MSC_VER) ++#include ++typedef SSIZE_T ssize_t; ++#endif ++ + #include + #include + #include +diff --git a/src/afc.c b/src/afc.c +index d8c3db0..ab2c4ff 100644 +--- a/src/afc.c ++++ b/src/afc.c +@@ -26,7 +26,9 @@ + #endif + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #include "afc.h" +diff --git a/src/house_arrest.c b/src/house_arrest.c +index ac92130..e12bde5 100644 +--- a/src/house_arrest.c ++++ b/src/house_arrest.c +@@ -24,7 +24,9 @@ + #endif + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #include "house_arrest.h" +diff --git a/src/installation_proxy.c b/src/installation_proxy.c +index 9602876..2f02514 100644 +--- a/src/installation_proxy.c ++++ b/src/installation_proxy.c +@@ -26,7 +26,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #include "installation_proxy.h" +diff --git a/src/lockdown-cu.c b/src/lockdown-cu.c +index d8d7f42..eb11afa 100644 +--- a/src/lockdown-cu.c ++++ b/src/lockdown-cu.c +@@ -29,7 +29,9 @@ + #define __USE_GNU 1 + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #include "idevice.h" +diff --git a/src/lockdown.c b/src/lockdown.c +index 92af186..a9b9b88 100644 +--- a/src/lockdown.c ++++ b/src/lockdown.c +@@ -32,7 +32,9 @@ + #define __USE_GNU 1 + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + +diff --git a/src/misagent.c b/src/misagent.c +index af925f9..5fe618e 100644 +--- a/src/misagent.c ++++ b/src/misagent.c +@@ -24,7 +24,9 @@ + #endif + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + +diff --git a/src/mobile_image_mounter.c b/src/mobile_image_mounter.c +index 9ccfd85..c4f540c 100644 +--- a/src/mobile_image_mounter.c ++++ b/src/mobile_image_mounter.c +@@ -24,7 +24,9 @@ + #endif + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #include "mobile_image_mounter.h" +diff --git a/src/notification_proxy.c b/src/notification_proxy.c +index e17e2fe..679739c 100644 +--- a/src/notification_proxy.c ++++ b/src/notification_proxy.c +@@ -24,7 +24,9 @@ + #endif + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #include "notification_proxy.h" +diff --git a/src/sbservices.c b/src/sbservices.c +index ccb7c4b..f0b832e 100644 +--- a/src/sbservices.c ++++ b/src/sbservices.c +@@ -24,7 +24,9 @@ + #endif + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #include "sbservices.h" diff --git a/ports/libimobiledevice/002_fix_static_build.patch b/ports/libimobiledevice/002_fix_static_build.patch new file mode 100644 index 00000000000000..3ea317b16fe38a --- /dev/null +++ b/ports/libimobiledevice/002_fix_static_build.patch @@ -0,0 +1,22 @@ +diff --git a/src/idevice.c b/src/idevice.c +index 719cd28..0ae8a1c 100644 +--- a/src/idevice.c ++++ b/src/idevice.c +@@ -124,6 +124,8 @@ static void id_function(CRYPTO_THREADID *thread) + #endif + #endif /* HAVE_OPENSSL */ + ++#ifndef LIBIMOBILEDEVICE_STATIC // disable dll constructor ++ + static void internal_idevice_init(void) + { + #if defined(HAVE_OPENSSL) +@@ -219,6 +221,8 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) + #warning No compiler support for constructor/destructor attributes, some features might not be available. + #endif + ++#endif // disable dll constructor ++ + struct idevice_subscription_context { + idevice_event_cb_t callback; + void *user_data; diff --git a/ports/libimobiledevice/003_fix_api.patch b/ports/libimobiledevice/003_fix_api.patch new file mode 100644 index 00000000000000..1558ab61f15e79 --- /dev/null +++ b/ports/libimobiledevice/003_fix_api.patch @@ -0,0 +1,21 @@ +diff --git a/src/idevice.h b/src/idevice.h +index 2509e48..384f178 100644 +--- a/src/idevice.h ++++ b/src/idevice.h +@@ -37,15 +37,11 @@ + #include + #endif + +-#ifdef WIN32 +-#define LIBIMOBILEDEVICE_API __declspec( dllexport ) +-#else +-#ifdef HAVE_FVISIBILITY ++#if !defined(_WIN32) && !defined(LIBIMOBILEDEVICEGLUE_STATIC) + #define LIBIMOBILEDEVICE_API __attribute__((visibility("default"))) + #else + #define LIBIMOBILEDEVICE_API + #endif +-#endif + + #include "common/userpref.h" + #include "libimobiledevice/libimobiledevice.h" diff --git a/ports/libimobiledevice/004_fix_tools_msvc.patch b/ports/libimobiledevice/004_fix_tools_msvc.patch new file mode 100644 index 00000000000000..395eb1d6dc7717 --- /dev/null +++ b/ports/libimobiledevice/004_fix_tools_msvc.patch @@ -0,0 +1,273 @@ +diff --git a/tools/idevicebackup.c b/tools/idevicebackup.c +index 5694c12..77fd81f 100644 +--- a/tools/idevicebackup.c ++++ b/tools/idevicebackup.c +@@ -50,7 +50,9 @@ + #else + #error No supported crypto library enabled + #endif ++#ifndef _MSC_VER + #include ++#endif + #include + #include + +@@ -68,6 +70,18 @@ + #define LOCK_ATTEMPTS 50 + #define LOCK_WAIT 200000 + ++#ifdef _MSC_VER ++static void usleep(__int64 usec) { ++ HANDLE timer; ++ LARGE_INTEGER ft; ++ ft.QuadPart = -(10*usec); ++ timer = CreateWaitableTimer(NULL, TRUE, NULL); ++ SetWaitableTimer(timer, &ft, 0, NULL, NULL, 0); ++ WaitForSingleObject(timer, INFINITE); ++ CloseHandle(timer); ++} ++#endif ++ + #ifdef WIN32 + #include + #define sleep(x) Sleep(x*1000) +diff --git a/tools/idevicebackup2.c b/tools/idevicebackup2.c +index c73b269..33157c9 100644 +--- a/tools/idevicebackup2.c ++++ b/tools/idevicebackup2.c +@@ -31,9 +31,13 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + #include +@@ -54,6 +58,62 @@ + #define LOCK_ATTEMPTS 50 + #define LOCK_WAIT 200000 + ++#ifdef _MSC_VER ++static void usleep(__int64 usec) { ++ HANDLE timer; ++ LARGE_INTEGER ft; ++ ft.QuadPart = -(10*usec); ++ timer = CreateWaitableTimer(NULL, TRUE, NULL); ++ SetWaitableTimer(timer, &ft, 0, NULL, NULL, 0); ++ WaitForSingleObject(timer, INFINITE); ++ CloseHandle(timer); ++} ++#ifndef ISSLASH ++#define ISSLASH(C) ((C) == '/' || (C) == '\\') ++#endif ++#ifndef FILESYSTEM_PREFIX_LEN ++#define FILESYSTEM_PREFIX_LEN(Filename) 0 ++#endif ++static char *basename(char const *name) { ++ char const *base = name + FILESYSTEM_PREFIX_LEN(name); ++ char const *p; ++ ++ for (p = base; *p; p++) { ++ if (ISSLASH(*p)) { ++ do p++; ++ while (ISSLASH(*p)); ++ ++ if (!*p) { ++ if (ISSLASH(*base)) ++ base = p - 1; ++ break; ++ } ++ base = p; ++ } ++ } ++ ++ return (char *) base; ++} ++static size_t dirlen(char const *path) { ++ size_t prefix_length = FILESYSTEM_PREFIX_LEN(path); ++ size_t length; ++ for (length = basename(path) - path; prefix_length < length; length--) ++ if (!ISSLASH(path[length - 1])) ++ return length; ++ return prefix_length + ISSLASH(path[prefix_length]); ++} ++static char *dirname(char const *path) { ++ size_t length = dirlen(path); ++ int append_dot = (length == FILESYSTEM_PREFIX_LEN(path)); ++ char *newpath = (char *) malloc(length + append_dot + 1); ++ memcpy(newpath, path, length); ++ if (append_dot) ++ newpath[length++] = '.'; ++ newpath[length] = 0; ++ return newpath; ++} ++#endif ++ + #ifdef WIN32 + #include + #include +diff --git a/tools/idevicebtlogger.c b/tools/idevicebtlogger.c +index 8de6b22..8fbf40d 100644 +--- a/tools/idevicebtlogger.c ++++ b/tools/idevicebtlogger.c +@@ -31,7 +31,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + #include +diff --git a/tools/idevicecrashreport.c b/tools/idevicecrashreport.c +index 09bd537..9f53b30 100644 +--- a/tools/idevicecrashreport.c ++++ b/tools/idevicecrashreport.c +@@ -29,7 +29,14 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#else ++#define S_IFIFO _S_IFIFO ++#define S_IFBLK 0x3000 ++#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) ++#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) ++#endif + #include + #ifndef WIN32 + #include +diff --git a/tools/idevicedebug.c b/tools/idevicedebug.c +index 36c594e..9c11781 100644 +--- a/tools/idevicedebug.c ++++ b/tools/idevicedebug.c +@@ -30,8 +30,12 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif ++#ifndef _MSC_VER + #include ++#endif + #include + + #ifdef WIN32 +diff --git a/tools/idevicedevmodectl.c b/tools/idevicedevmodectl.c +index ba9b935..8e28e4b 100644 +--- a/tools/idevicedevmodectl.c ++++ b/tools/idevicedevmodectl.c +@@ -30,7 +30,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #ifndef WIN32 + #include +diff --git a/tools/ideviceimagemounter.c b/tools/ideviceimagemounter.c +index f551b6c..26bb80c 100644 +--- a/tools/ideviceimagemounter.c ++++ b/tools/ideviceimagemounter.c +@@ -32,9 +32,13 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #ifndef WIN32 + #include +diff --git a/tools/idevicename.c b/tools/idevicename.c +index 69b76f6..cb8c9a6 100644 +--- a/tools/idevicename.c ++++ b/tools/idevicename.c +@@ -27,7 +27,9 @@ + + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + #ifndef WIN32 +diff --git a/tools/idevicepair.c b/tools/idevicepair.c +index 94d3f04..129c409 100644 +--- a/tools/idevicepair.c ++++ b/tools/idevicepair.c +@@ -31,7 +31,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #ifdef WIN32 + #include + #include +diff --git a/tools/ideviceprovision.c b/tools/ideviceprovision.c +index 4080a28..f64e2c4 100644 +--- a/tools/ideviceprovision.c ++++ b/tools/ideviceprovision.c +@@ -42,6 +42,14 @@ + #include + #endif + ++#ifdef _MSC_VER ++#include ++#ifndef _S_ISTYPE ++#define _S_ISTYPE(mode, mask) (((mode) & _S_IFMT) == (mask)) ++#define S_ISDIR(mode) _S_ISTYPE((mode), _S_IFDIR) ++#endif ++#endif ++ + #include + #include + #include +diff --git a/tools/idevicescreenshot.c b/tools/idevicescreenshot.c +index 0e694c7..6f4b1c5 100644 +--- a/tools/idevicescreenshot.c ++++ b/tools/idevicescreenshot.c +@@ -31,7 +31,11 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#else ++#define F_OK 0 ++#endif + #ifndef WIN32 + #include + #endif +diff --git a/tools/idevicesyslog.c b/tools/idevicesyslog.c +index 5600be2..69b7b03 100644 +--- a/tools/idevicesyslog.c ++++ b/tools/idevicesyslog.c +@@ -31,7 +31,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #ifdef WIN32 diff --git a/ports/libimobiledevice/CMakeLists.txt b/ports/libimobiledevice/CMakeLists.txt index ab9866a4a0174c..e8980cfcdbe35d 100644 --- a/ports/libimobiledevice/CMakeLists.txt +++ b/ports/libimobiledevice/CMakeLists.txt @@ -1,61 +1,183 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.15) project(libimobiledevice C) -# find dependencies -find_library(libplist NAMES plist plist-2.0 libplist libplist-2.0 REQUIRED) -find_library(libusbmuxd NAMES usbmuxd libusbmuxd REQUIRED) -find_package(OpenSSL REQUIRED) -find_path(dirent_INCLUDE_DIR dirent.h) -if (WIN32) - find_library(getopt getopt REQUIRED) +option(BUILD_TOOLS "Build tools." OFF) + +include(GNUInstallDirs) + +file(GLOB_RECURSE LIBIMOBILEDEVICE_SOURCE src/*.c src/*.h) +file(GLOB_RECURSE LIBIMOBILEDEVICE_COMMON_SOURCE common/*.c common/*.h) + +set(DEFINITIONS) + +list(APPEND DEFINITIONS -DHAVE_OPENSSL) + +if(BUILD_SHARED_LIBS) + if(WIN32) + list(APPEND LIBIMOBILEDEVICE_SOURCE exports.def) + endif() +else() + list(APPEND DEFINITIONS -DLIBIMOBILEDEVICE_STATIC) endif() -# ready to create library -file(GLOB_RECURSE IMOBDEV_COMMON_HDR common/*.h) -file(GLOB_RECURSE IMOBDEV_COMMON_SRC common/*.c) +if(UNIX) + list(APPEND DEFINITIONS -DHAVE_STPCPY) + list(APPEND DEFINITIONS -DHAVE_VASPRINTF) + list(APPEND DEFINITIONS -DHAVE_ASPRINTF) + list(APPEND DEFINITIONS -DHAVE_GETIFADDRS) +endif() -file(GLOB IMOBDEV_PUBLIC_HDR include/*.h) -file(GLOB IMOBDEV_PUBLIC_SUB_HDR include/libimobiledevice/*.h) -file(GLOB_RECURSE IMOBDEV_PRIVATE_HDR src/*.h) -file(GLOB_RECURSE IMOBDEV_SRC src/*.c) +if(WIN32) + list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS) + list(APPEND DEFINITIONS -DWIN32_LEAN_AND_MEAN) + list(APPEND DEFINITIONS -DWIN32) +endif() + +find_package(unofficial-libplist CONFIG REQUIRED) +find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED) +find_package(unofficial-libusbmuxd CONFIG REQUIRED) +find_package(OpenSSL REQUIRED) -add_library(libimobiledevice ${IMOBDEV_SRC} ${IMOBDEV_PUBLIC_HDR} ${IMOBDEV_PUBLIC_SUB_HDR} ${IMOBDEV_PRIVATE_HDR} ${IMOBDEV_COMMON_HDR} ${IMOBDEV_COMMON_SRC}) +add_library(libimobiledevice ${LIBIMOBILEDEVICE_SOURCE} ${LIBIMOBILEDEVICE_COMMON_SOURCE}) +target_include_directories(libimobiledevice PUBLIC + "$" + "$" + "$" +) +target_compile_definitions(libimobiledevice PRIVATE ${DEFINITIONS}) +target_link_libraries(libimobiledevice + PRIVATE + unofficial::libimobiledevice-glue::libimobiledevice-glue + unofficial::libusbmuxd::libusbmuxd + OpenSSL::SSL + OpenSSL::Crypto + PUBLIC + unofficial::libplist::libplist +) set_target_properties(libimobiledevice PROPERTIES OUTPUT_NAME imobiledevice-1.0) -target_include_directories(libimobiledevice PRIVATE ${dirent_INCLUDE_DIR} include .) -target_compile_definitions(libimobiledevice PRIVATE -DHAVE_OPENSSL) -target_link_libraries(libimobiledevice PRIVATE ${libplist} ${libusbmuxd} ${getopt} OpenSSL::SSL OpenSSL::Crypto) -if (WIN32) + +if(WIN32) target_link_libraries(libimobiledevice PRIVATE Ws2_32) endif() -if (UNIX) - target_compile_definitions(libimobiledevice PRIVATE -DHAVE_STPCPY -DHAVE_VASPRINTF -DHAVE_ASPRINTF -DHAVE_GETIFADDRS) -endif() -# install +install(TARGETS libimobiledevice EXPORT unofficial-libimobiledevice) + install( - TARGETS libimobiledevice - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib + EXPORT unofficial-libimobiledevice + FILE unofficial-libimobiledevice-config.cmake + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libimobiledevice" + NAMESPACE unofficial::libimobiledevice:: +) + +install( + DIRECTORY "${CMAKE_SOURCE_DIR}/include/libimobiledevice" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +install( + FILES "${CMAKE_SOURCE_DIR}/include/endianness.h" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) set(LIBPLIST_VERSION 2.0) +set(LIMD_GLUE_VERSION 1.0) set(LIBUSBMUXD_VERSION 2.0) set(PACKAGE_NAME libimobiledevice) set(PACKAGE_VERSION 1.0) -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix \${prefix}) -set(libdir \${prefix}/lib) -set(includedir \${prefix}/../include) +set(prefix "") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") + configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/src/libimobiledevice-1.0.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc + "${CMAKE_CURRENT_SOURCE_DIR}/src/libimobiledevice-1.0.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc" @ONLY ) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc - DESTINATION lib/pkgconfig + FILES "${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" ) -install(FILES ${IMOBDEV_PUBLIC_HDR} DESTINATION include) -install(FILES ${IMOBDEV_PUBLIC_SUB_HDR} DESTINATION include/libimobiledevice) \ No newline at end of file +if(BUILD_TOOLS) + if(WIN32) + find_package(unofficial-getopt-win32 REQUIRED) + endif() + + function(add_tool name source) + add_executable("${name}" "${source}" ${LIBIMOBILEDEVICE_COMMON_SOURCE}) + target_compile_definitions("${name}" PRIVATE + -DPACKAGE_VERSION="2.0.2" + -DPACKAGE_URL="https://github.com/libimobiledevice/libusbmuxd" + -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/libusbmuxd/issues" + -DHAVE_OPENSSL + ) + target_link_libraries("${name}" PRIVATE + libimobiledevice + unofficial::libimobiledevice-glue::libimobiledevice-glue + unofficial::libusbmuxd::libusbmuxd + OpenSSL::SSL + OpenSSL::Crypto + ) + if(WIN32) + target_compile_definitions("${name}" PRIVATE + -D_CRT_SECURE_NO_WARNINGS + -DWIN32_LEAN_AND_MEAN + -DWIN32 + ) + target_link_libraries("${name}" PRIVATE unofficial::getopt-win32::getopt Ws2_32) + endif() + if(UNIX) + target_compile_definitions("${name}" PRIVATE + -DHAVE_VASPRINTF + -DHAVE_ASPRINTF + ) + endif() + endfunction(add_tool) + + add_tool(idevice_id "tools/idevice_id.c") + add_tool(idevicebackup "tools/idevicebackup.c") + add_tool(idevicebackup2 "tools/idevicebackup2.c") + add_tool(idevicebtlogger "tools/idevicebtlogger.c") + add_tool(idevicecrashreport "tools/idevicecrashreport.c") + add_tool(idevicedate "tools/idevicedate.c") + add_tool(idevicedebug "tools/idevicedebug.c") + add_tool(idevicedebugserverproxy "tools/idevicedebugserverproxy.c") + add_tool(idevicedevmodectl "tools/idevicedevmodectl.c") + add_tool(idevicediagnostics "tools/idevicediagnostics.c") + add_tool(ideviceenterrecovery "tools/ideviceenterrecovery.c") + add_tool(ideviceimagemounter "tools/ideviceimagemounter.c") + add_tool(ideviceinfo "tools/ideviceinfo.c") + add_tool(idevicename "tools/idevicename.c") + add_tool(idevicenotificationproxy "tools/idevicenotificationproxy.c") + add_tool(idevicepair "tools/idevicepair.c") + add_tool(ideviceprovision "tools/ideviceprovision.c") + add_tool(idevicescreenshot "tools/idevicescreenshot.c") + add_tool(idevicesetlocation "tools/idevicesetlocation.c") + add_tool(idevicesyslog "tools/idevicesyslog.c") + + install( + TARGETS + idevice_id + idevicebackup + idevicebackup2 + idevicebtlogger + idevicecrashreport + idevicedate + idevicedebug + idevicedebugserverproxy + idevicedevmodectl + idevicediagnostics + ideviceenterrecovery + ideviceimagemounter + ideviceinfo + idevicename + idevicenotificationproxy + idevicepair + ideviceprovision + idevicescreenshot + idevicesetlocation + idevicesyslog + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) +endif() diff --git a/ports/libimobiledevice/exports.def b/ports/libimobiledevice/exports.def new file mode 100644 index 00000000000000..a9f63d084fd12e --- /dev/null +++ b/ports/libimobiledevice/exports.def @@ -0,0 +1,369 @@ +EXPORTS + + ; src/mobilebackup2.c + mobilebackup2_client_new + mobilebackup2_client_start_service + mobilebackup2_client_free + mobilebackup2_send_message + mobilebackup2_receive_message + mobilebackup2_send_raw + mobilebackup2_receive_raw + mobilebackup2_version_exchange + mobilebackup2_send_request + mobilebackup2_send_status_response + + ; src/misagent.c + misagent_client_new + misagent_client_start_service + misagent_client_free + misagent_install + misagent_copy + misagent_copy_all + misagent_remove + misagent_get_status_code + + ; src/mobileactivation.c + mobileactivation_client_new + mobileactivation_client_start_service + mobileactivation_client_free + mobileactivation_get_activation_state + mobileactivation_create_activation_session_info + mobileactivation_create_activation_info + mobileactivation_create_activation_info_with_session + mobileactivation_activate + mobileactivation_activate_with_session + mobileactivation_deactivate + + ; src/heartbeat.c + heartbeat_client_new + heartbeat_client_start_service + heartbeat_client_free + heartbeat_send + heartbeat_receive + heartbeat_receive_with_timeout + + ; src/lockdown-cu.c + lockdownd_cu_pairing_create + lockdownd_cu_send_request_and_get_reply + lockdownd_get_value_cu + lockdownd_pair_cu + + ; src/preboard.c + preboard_client_new + preboard_client_start_service + preboard_client_free + preboard_send + preboard_receive_with_timeout + preboard_receive + preboard_create_stashbag + preboard_commit_stashbag + + ; src/screenshotr.c + screenshotr_client_new + screenshotr_client_start_service + screenshotr_client_free + screenshotr_take_screenshot + + ; src/property_list_service.c + property_list_service_client_new + property_list_service_client_free + property_list_service_send_xml_plist + property_list_service_send_binary_plist + property_list_service_receive_plist_with_timeout + property_list_service_receive_plist + property_list_service_enable_ssl + property_list_service_disable_ssl + property_list_service_get_service_client + + ; src/file_relay.c + file_relay_client_new + file_relay_client_start_service + file_relay_client_free + file_relay_request_sources_timeout + file_relay_request_sources + + ; src/reverse_proxy.c + reverse_proxy_client_start_proxy + reverse_proxy_client_create_with_service + reverse_proxy_client_create_with_port + reverse_proxy_client_free + reverse_proxy_get_type + reverse_proxy_client_set_status_callback + reverse_proxy_client_set_log_callback + reverse_proxy_client_set_data_callback + + ; src/service.c + service_client_new + service_client_factory_start_service + service_client_free + service_send + service_receive_with_timeout + service_receive + service_enable_ssl + service_disable_ssl + service_disable_bypass_ssl + service_get_connection + + ; src/installation_proxy.c + instproxy_client_new + instproxy_client_start_service + instproxy_client_free + instproxy_browse_with_callback + instproxy_browse + instproxy_lookup + instproxy_install + instproxy_upgrade + instproxy_uninstall + instproxy_lookup_archives + instproxy_archive + instproxy_restore + instproxy_remove_archive + instproxy_check_capabilities_match + instproxy_status_get_error + instproxy_status_get_name + instproxy_status_get_percent_complete + instproxy_status_get_current_list + instproxy_command_get_name + instproxy_client_options_new + instproxy_client_options_add + instproxy_client_options_set_return_attributes + instproxy_client_options_free + instproxy_client_get_path_for_bundle_identifier + + ; src/companion_proxy.c + companion_proxy_client_new + companion_proxy_client_start_service + companion_proxy_client_free + companion_proxy_send + companion_proxy_receive + companion_proxy_get_device_registry + companion_proxy_start_listening_for_devices + companion_proxy_stop_listening_for_devices + companion_proxy_get_value_from_registry + companion_proxy_start_forwarding_service_port + companion_proxy_stop_forwarding_service_port + + ; src/restore.c + restored_client_free + restored_client_set_label + restored_receive + restored_send + restored_query_type + restored_query_value + restored_get_value + restored_client_new + restored_goodbye + restored_start_restore + restored_reboot + + ; src/notification_proxy.c + np_client_new + np_client_start_service + np_client_free + np_post_notification + np_observe_notification + np_observe_notifications + np_set_notify_callback + + ; src/house_arrest.c + house_arrest_client_new + house_arrest_client_start_service + house_arrest_client_free + house_arrest_send_request + house_arrest_send_command + house_arrest_get_result + afc_client_new_from_house_arrest_client + + ; src/mobilesync.c + mobilesync_client_new + mobilesync_client_start_service + mobilesync_client_free + mobilesync_receive + mobilesync_send + mobilesync_start + mobilesync_finish + mobilesync_get_all_records_from_device + mobilesync_get_changes_from_device + mobilesync_receive_changes + mobilesync_clear_all_records_on_device + mobilesync_acknowledge_changes_from_device + mobilesync_ready_to_send_changes_from_computer + mobilesync_send_changes + mobilesync_remap_identifiers + mobilesync_cancel + mobilesync_anchors_new + mobilesync_anchors_free + mobilesync_actions_new + mobilesync_actions_add + mobilesync_actions_free + + ; src/idevice.c + idevice_events_subscribe + idevice_events_unsubscribe + idevice_event_subscribe + idevice_event_unsubscribe + idevice_get_device_list_extended + idevice_device_list_extended_free + idevice_get_device_list + idevice_device_list_free + idevice_set_debug_level + idevice_new_with_options + idevice_new + idevice_free + idevice_connect + idevice_disconnect + idevice_connection_send + idevice_connection_receive_timeout + idevice_connection_receive + idevice_connection_get_fd + idevice_get_handle + idevice_get_udid + idevice_connection_enable_ssl + idevice_connection_disable_ssl + idevice_connection_disable_bypass_ssl + + ; src/mobilebackup.c + mobilebackup_client_new + mobilebackup_client_start_service + mobilebackup_client_free + mobilebackup_receive + mobilebackup_send + mobilebackup_request_backup + mobilebackup_send_backup_file_received + mobilebackup_request_restore + mobilebackup_receive_restore_file_received + mobilebackup_receive_restore_application_received + mobilebackup_send_restore_complete + mobilebackup_send_error + + ; src/diagnostics_relay.c + diagnostics_relay_client_new + diagnostics_relay_client_start_service + diagnostics_relay_client_free + diagnostics_relay_goodbye + diagnostics_relay_sleep + diagnostics_relay_restart + diagnostics_relay_shutdown + diagnostics_relay_request_diagnostics + diagnostics_relay_query_mobilegestalt + diagnostics_relay_query_ioregistry_entry + diagnostics_relay_query_ioregistry_plane + + ; src/webinspector.c + webinspector_client_new + webinspector_client_start_service + webinspector_client_free + webinspector_send + webinspector_receive + webinspector_receive_with_timeout + + ; src/afc.c + afc_client_new_with_service_client + afc_client_new + afc_client_start_service + afc_client_free + afc_read_directory + afc_get_device_info + afc_get_device_info_key + afc_remove_path + afc_rename_path + afc_make_directory + afc_get_file_info + afc_file_open + afc_file_read + afc_file_write + afc_file_close + afc_file_lock + afc_file_seek + afc_file_tell + afc_file_truncate + afc_truncate + afc_make_link + afc_set_file_time + afc_remove_path_and_contents + afc_dictionary_free + + ; src/debugserver.c + debugserver_client_new + debugserver_client_start_service + debugserver_client_free + debugserver_client_send + debugserver_client_receive_with_timeout + debugserver_client_receive + debugserver_command_new + debugserver_command_free + debugserver_encode_string + debugserver_decode_string + debugserver_client_set_ack_mode + debugserver_client_set_receive_params + debugserver_client_receive_response + debugserver_client_send_command + debugserver_client_set_environment_hex_encoded + debugserver_client_set_argv + + ; src/sbservices.c + sbservices_client_new + sbservices_client_start_service + sbservices_client_free + sbservices_get_icon_state + sbservices_set_icon_state + sbservices_get_icon_pngdata + sbservices_get_interface_orientation + sbservices_get_home_screen_wallpaper_pngdata + + ; src/bt_packet_logger.c + bt_packet_logger_client_new + bt_packet_logger_client_start_service + bt_packet_logger_client_free + bt_packet_logger_receive_with_timeout + bt_packet_logger_start_capture + bt_packet_logger_stop_capture + + ; src/mobile_image_mounter.c + mobile_image_mounter_new + mobile_image_mounter_start_service + mobile_image_mounter_free + mobile_image_mounter_lookup_image + mobile_image_mounter_upload_image + mobile_image_mounter_mount_image + mobile_image_mounter_hangup + + ; src/lockdown.c + lockdownd_stop_session + lockdownd_client_free + lockdownd_client_set_label + lockdownd_receive + lockdownd_send + lockdownd_query_type + lockdownd_get_value + lockdownd_set_value + lockdownd_remove_value + lockdownd_get_device_udid + lockdownd_get_device_name + lockdownd_client_new + lockdownd_client_new_with_handshake + lockdownd_pair + lockdownd_pair_with_options + lockdownd_validate_pair + lockdownd_unpair + lockdownd_enter_recovery + lockdownd_goodbye + lockdownd_start_session + lockdownd_start_service + lockdownd_start_service_with_escrow_bag + lockdownd_activate + lockdownd_deactivate + lockdownd_get_sync_data_classes + lockdownd_data_classes_free + lockdownd_service_descriptor_free + lockdownd_strerror + + ; src/syslog_relay.c + syslog_relay_client_new + syslog_relay_client_start_service + syslog_relay_client_free + syslog_relay_receive + syslog_relay_receive_with_timeout + syslog_relay_start_capture + syslog_relay_start_capture_raw + syslog_relay_stop_capture diff --git a/ports/libimobiledevice/portfile.cmake b/ports/libimobiledevice/portfile.cmake index 47d530b4eb653d..81a788ff758bc8 100644 --- a/ports/libimobiledevice/portfile.cmake +++ b/ports/libimobiledevice/portfile.cmake @@ -1,23 +1,71 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO libimobiledevice-win32/libimobiledevice - REF 0d4a7e905baeadafa098e629a5241fac6fbf7d24 # v1.3.17 - SHA512 db6369b2fa8e7b659948602ac8c4cd568bf37c0f73e58150f61f1af7000de95aa1a6a9ae546d6a37de4cb08a8059127fe5ed067351c4092c01a45350586f755a - HEAD_REF msvc-master + REPO libimobiledevice/libimobiledevice + REF 6fc41f57fc607df9b07446ca45bdf754225c9bd9 # commits on 2023-07-05 + SHA512 0ceae43eb5c193c173536a20a6efde44b0ff4b5e6029342f59cb6b0dcad2fd629713db922f17b331b5f359a649b5402c18637e636bcdb5eb5c53bec12ff94903 + HEAD_REF master + PATCHES + 001_fix_msvc.patch + 002_fix_static_build.patch + 003_fix_api.patch + 004_fix_tools_msvc.patch ) -configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() -vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) vcpkg_fixup_pkgconfig() +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES + idevice_id + idevicebackup + idevicebackup2 + idevicebtlogger + idevicecrashreport + idevicedate + idevicedebug + idevicedebugserverproxy + idevicedevmodectl + idevicediagnostics + ideviceenterrecovery + ideviceimagemounter + ideviceinfo + idevicename + idevicenotificationproxy + idevicepair + ideviceprovision + idevicescreenshot + idevicesetlocation + idevicesyslog + AUTO_CLEAN + ) +endif() + +file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" cmake_config) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" +"include(CMakeFindDependencyMacro) +find_dependency(unofficial-libplist CONFIG) +find_dependency(unofficial-libimobiledevice-glue CONFIG) +find_dependency(unofficial-libusbmuxd CONFIG) +find_dependency(OpenSSL) +${cmake_config} +") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libimobiledevice/usage b/ports/libimobiledevice/usage index 922db8f3e6431b..566ef2ba481154 100644 --- a/ports/libimobiledevice/usage +++ b/ports/libimobiledevice/usage @@ -1,5 +1,4 @@ -libimobiledevice provides usage: - - find_package(PkgConfig REQUIRED) - pkg_check_modules(LIBIMOBILEDEVICE REQUIRED IMPORTED_TARGET libimobiledevice-1.0) - target_link_libraries(main PRIVATE PkgConfig::LIBIMOBILEDEVICE) +libimobiledevice provides CMake targets: + + find_package(unofficial-libimobiledevice CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::libimobiledevice::libimobiledevice) diff --git a/ports/libimobiledevice/vcpkg.json b/ports/libimobiledevice/vcpkg.json index 36d16b9b1d1c32..a288fe627a92f2 100644 --- a/ports/libimobiledevice/vcpkg.json +++ b/ports/libimobiledevice/vcpkg.json @@ -1,24 +1,33 @@ { "name": "libimobiledevice", - "version": "1.3.17", - "port-version": 4, + "version-date": "2023-07-05", + "port-version": 1, "description": "A cross-platform protocol library to communicate with iOS devices", "homepage": "http://www.libimobiledevice.org", - "license": "LGPL-2.1-only", - "supports": "!xbox", + "license": "LGPL-2.1-or-later", + "supports": "!uwp", "dependencies": [ "dirent", - "getopt", + "libimobiledevice-glue", "libplist", "libusbmuxd", "openssl", { - "name": "pkgconf", + "name": "vcpkg-cmake", "host": true }, { - "name": "vcpkg-cmake", + "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tools": { + "description": "build command line tool", + "supports": "!android & !ios & !xbox", + "dependencies": [ + "getopt" + ] + } + } } diff --git a/ports/libirecovery/001_fix_static_build.patch b/ports/libirecovery/001_fix_static_build.patch new file mode 100644 index 00000000000000..795bd076b2801d --- /dev/null +++ b/ports/libirecovery/001_fix_static_build.patch @@ -0,0 +1,22 @@ +diff --git a/src/libirecovery.c b/src/libirecovery.c +index 6e7647b..45ff6f2 100644 +--- a/src/libirecovery.c ++++ b/src/libirecovery.c +@@ -470,6 +470,8 @@ static void _irecv_deinit(void) + static thread_once_t init_once = THREAD_ONCE_INIT; + static thread_once_t deinit_once = THREAD_ONCE_INIT; + ++#ifndef IRECV_STATIC // disable dll constructor ++ + #ifndef HAVE_ATTRIBUTE_CONSTRUCTOR + #if defined(__llvm__) || defined(__GNUC__) + #define HAVE_ATTRIBUTE_CONSTRUCTOR +@@ -505,6 +507,8 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) + #warning No compiler support for constructor/destructor attributes, some features might not be available. + #endif + ++#endif // disable dll constructor ++ + #ifdef HAVE_IOKIT + static int iokit_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc_index, unsigned char * buffer, int size) + { diff --git a/ports/libirecovery/002_fix_api.patch b/ports/libirecovery/002_fix_api.patch new file mode 100644 index 00000000000000..ae02df6b5d58e1 --- /dev/null +++ b/ports/libirecovery/002_fix_api.patch @@ -0,0 +1,24 @@ +diff --git a/include/libirecovery.h b/include/libirecovery.h +index 33879a4..41fc8bb 100644 +--- a/include/libirecovery.h ++++ b/include/libirecovery.h +@@ -30,17 +30,13 @@ extern "C" { + #ifdef IRECV_STATIC + #define IRECV_API + #elif defined(_WIN32) +- #ifdef DLL_EXPORT ++ #ifdef IRECV_EXPORT + #define IRECV_API __declspec(dllexport) + #else + #define IRECV_API __declspec(dllimport) + #endif + #else +- #if __GNUC__ >= 4 +- #define IRECV_API __attribute__((visibility("default"))) +- #else +- #define IRECV_API +- #endif ++ #define IRECV_API __attribute__((visibility("default"))) + #endif + + enum irecv_mode { diff --git a/ports/libirecovery/003_fix_msvc.patch b/ports/libirecovery/003_fix_msvc.patch new file mode 100644 index 00000000000000..66852ec4250f27 --- /dev/null +++ b/ports/libirecovery/003_fix_msvc.patch @@ -0,0 +1,25 @@ +diff --git a/src/libirecovery.c b/src/libirecovery.c +index 45ff6f2..d9ff1e6 100644 +--- a/src/libirecovery.c ++++ b/src/libirecovery.c +@@ -29,7 +29,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #include +@@ -59,6 +61,10 @@ + + #include "libirecovery.h" + ++#ifdef _MSC_VER ++#define strcasecmp _stricmp ++#endif ++ + struct irecv_client_private { + int debug; + int usb_config; diff --git a/ports/libirecovery/004_fix_tools_msvc.patch b/ports/libirecovery/004_fix_tools_msvc.patch new file mode 100644 index 00000000000000..b29d98f2ea02b7 --- /dev/null +++ b/ports/libirecovery/004_fix_tools_msvc.patch @@ -0,0 +1,14 @@ +diff --git a/tools/irecovery.c b/tools/irecovery.c +index 34e80bf..deffe89 100644 +--- a/tools/irecovery.c ++++ b/tools/irecovery.c +@@ -27,7 +27,9 @@ + + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + #include diff --git a/ports/libirecovery/CMakeLists.txt b/ports/libirecovery/CMakeLists.txt new file mode 100644 index 00000000000000..7e8a728ac3100c --- /dev/null +++ b/ports/libirecovery/CMakeLists.txt @@ -0,0 +1,125 @@ +cmake_minimum_required(VERSION 3.15) +project(libirecovery C) + +option(BUILD_TOOLS "Build tools." OFF) + +include(GNUInstallDirs) + +file(GLOB_RECURSE LIBIRECOVERY_HEADER include/*.h) +file(GLOB_RECURSE LIBIRECOVERY_SOURCE src/*.c) + +set(DEFINITIONS) + +if(BUILD_SHARED_LIBS) + if(WIN32) + list(APPEND DEFINITIONS -DIRECV_EXPORT) + endif() +else() + list(APPEND DEFINITIONS -DIRECV_STATIC) +endif() + +if(APPLE) + list(APPEND DEFINITIONS -DHAVE_IOKIT) +endif() + +if(WIN32) + list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS) + list(APPEND DEFINITIONS -DWIN32_LEAN_AND_MEAN) + list(APPEND DEFINITIONS -DWIN32) +endif() + +find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED) + +add_library(libirecovery ${LIBIRECOVERY_SOURCE}) +target_include_directories(libirecovery PUBLIC + "$" + "$" +) +target_compile_definitions(libirecovery PRIVATE ${DEFINITIONS}) +target_link_libraries(libirecovery + PRIVATE + unofficial::libimobiledevice-glue::libimobiledevice-glue +) +if(NOT WIN32 AND NOT APPLE) + find_package(libusb CONFIG REQUIRED) + target_include_directories(libirecovery PRIVATE ${LIBUSB_INCLUDE_DIRS}) + target_link_libraries(libirecovery PRIVATE ${LIBUSB_LIBRARIES}) +endif() +set_target_properties(libirecovery PROPERTIES OUTPUT_NAME irecovery-1.0) + +if(WIN32) + target_link_libraries(libirecovery PRIVATE Setupapi) +endif() + +if(APPLE) + target_link_libraries(libirecovery PRIVATE "-framework IOKit" "-framework CoreFoundation") +endif() + +install(TARGETS libirecovery EXPORT unofficial-libirecovery) + +install( + EXPORT unofficial-libirecovery + FILE unofficial-libirecovery-config.cmake + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libirecovery" + NAMESPACE unofficial::libirecovery:: +) + +install( + FILES ${LIBIRECOVERY_HEADER} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +set(LIMD_GLUE_VERSION 1.0) +set(PACKAGE_NAME libirecovery) +set(PACKAGE_VERSION 1.0) +set(prefix "") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") + +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/src/libirecovery-1.0.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/libirecovery-1.0.pc" + @ONLY +) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/libirecovery-1.0.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" +) + +if(BUILD_TOOLS) + add_executable(irecovery "tools/irecovery.c") + target_compile_definitions(irecovery PRIVATE + -DPACKAGE_VERSION="1.1.0" + -DPACKAGE_URL="https://github.com/libimobiledevice/libirecovery" + -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/libirecovery/issues" + ) + if(NOT BUILD_SHARED_LIBS) + target_compile_definitions(irecovery PRIVATE -DIRECV_STATIC) + endif() + if(WIN32) + target_compile_definitions(irecovery PRIVATE + -D_CRT_SECURE_NO_WARNINGS + -DWIN32_LEAN_AND_MEAN + -DWIN32 + ) + find_package(unofficial-getopt-win32 REQUIRED) + target_link_libraries(irecovery PRIVATE unofficial::getopt-win32::getopt Ws2_32) + endif() + if(APPLE) + target_compile_definitions(irecovery PRIVATE -DHAVE_IOKIT) + target_link_libraries(irecovery PRIVATE "-framework IOKit" "-framework CoreFoundation") + endif() + if(NOT WIN32 AND NOT APPLE) + find_package(libusb CONFIG REQUIRED) + target_include_directories(irecovery PRIVATE ${LIBUSB_INCLUDE_DIRS}) + target_link_libraries(irecovery PRIVATE ${LIBUSB_LIBRARIES}) + endif() + find_package(PkgConfig REQUIRED) + pkg_check_modules(readline REQUIRED IMPORTED_TARGET readline) + target_link_libraries(irecovery PRIVATE libirecovery PkgConfig::readline) + install( + TARGETS irecovery + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) +endif() diff --git a/ports/libirecovery/portfile.cmake b/ports/libirecovery/portfile.cmake index 5fd9c0ee89b0f2..0f7e0f238b8782 100644 --- a/ports/libirecovery/portfile.cmake +++ b/ports/libirecovery/portfile.cmake @@ -1,20 +1,59 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO libimobiledevice-win32/libirecovery - REF 1.0.25 - SHA512 0dd91d4fe3ded2bc1bbd91aea964e31e7f59bce18be01aa096e974f37dc1be281644d6c44e3f9b49470dd961e3df2e3ff8a09bcc6b803a959073e7d7d9a8d3e7 - HEAD_REF msvc-master + REPO libimobiledevice/libirecovery + REF c7b488fbf2a9ab95e451df1319e68662fff7b9b7 # commits on 2023-05-13 + SHA512 a8638b71789c0cedf5913a877ca42fef079c968592b6149dfa578d2dc7840f63c1d1fadd934d7cfbd5139cea2b3a4249886a88b69c3edb19dbd3f893c266f665 + HEAD_REF master + PATCHES + 001_fix_static_build.patch + 002_fix_api.patch + 003_fix_msvc.patch + 004_fix_tools_msvc.patch ) -vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH libirecovery.sln - INCLUDES_SUBPATH include - LICENSE_SUBPATH COPYING - USE_VCPKG_INTEGRATION - ALLOW_ROOT_INCLUDES +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +if("tools" IN_LIST FEATURES) + vcpkg_find_acquire_program(PKGCONFIG) + list(APPEND FEATURE_OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) +vcpkg_fixup_pkgconfig() +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES irecovery AUTO_CLEAN) +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libirecovery.h" + "#ifdef IRECV_STATIC" "#if 1" + ) +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libirecovery.h" + "#ifdef IRECV_STATIC" "#if 0" + ) +endif() + +file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" cmake_config) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" +"include(CMakeFindDependencyMacro) +find_dependency(unofficial-libimobiledevice-glue CONFIG) +${cmake_config} +") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libirecovery/usage b/ports/libirecovery/usage new file mode 100644 index 00000000000000..fbb5c015267f05 --- /dev/null +++ b/ports/libirecovery/usage @@ -0,0 +1,4 @@ +libirecovery provides CMake targets: + + find_package(unofficial-libirecovery CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::libirecovery::libirecovery) diff --git a/ports/libirecovery/vcpkg.json b/ports/libirecovery/vcpkg.json index 711c65caee6cca..21265f5f162c07 100644 --- a/ports/libirecovery/vcpkg.json +++ b/ports/libirecovery/vcpkg.json @@ -1,13 +1,34 @@ { "name": "libirecovery", - "version": "1.0.25", - "port-version": 7, + "version-date": "2023-05-13", + "port-version": 1, "description": "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux", - "license": "LGPL-2.1-only", - "supports": "windows & !arm64 & !static & !staticcrt & !xbox", + "homepage": "https://libimobiledevice.org/", + "license": "LGPL-2.1-or-later", + "supports": "!uwp", "dependencies": [ - "getopt", - "libusbmuxd", - "readline" - ] + "libimobiledevice-glue", + { + "name": "libusb", + "platform": "!windows & !osx" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "build command line tool", + "supports": "!android & !ios & !xbox", + "dependencies": [ + "getopt", + "readline" + ] + } + } } diff --git a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch index 9c4efd37ed9774..8d7aeca0eea01e 100644 --- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch +++ b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c384aae..c9a15a0 100644 +index efd101a..9c1c69f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -194,6 +194,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE) +@@ -222,6 +222,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE) boolean_number(ENABLE_SHARED) option(ENABLE_STATIC "Build static libraries" TRUE) boolean_number(ENABLE_STATIC) @@ -14,8 +14,8 @@ index c384aae..c9a15a0 100644 +boolean_number(INSTALL_HEADERS) option(REQUIRE_SIMD "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" FALSE) boolean_number(REQUIRE_SIMD) - option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_ARITH_DEC=0 WITH_ARITH_ENC=0 WITH_JAVA=0 WITH_SIMD=0 WITH_TURBOJPEG=0 )" FALSE) -@@ -662,6 +668,7 @@ if(WITH_TURBOJPEG) + option(WITH_ARITH_DEC "Include arithmetic decoding support when emulating the libjpeg v6b API/ABI" TRUE) +@@ -690,6 +696,7 @@ if(WITH_TURBOJPEG) LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}") endif() @@ -23,7 +23,7 @@ index c384aae..c9a15a0 100644 add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c) target_link_libraries(tjunittest turbojpeg) -@@ -673,6 +680,7 @@ if(WITH_TURBOJPEG) +@@ -701,6 +708,7 @@ if(WITH_TURBOJPEG) add_executable(tjexample tjexample.c) target_link_libraries(tjexample turbojpeg) @@ -31,7 +31,7 @@ index c384aae..c9a15a0 100644 endif() if(ENABLE_STATIC) -@@ -685,6 +693,7 @@ if(WITH_TURBOJPEG) +@@ -721,6 +729,7 @@ if(WITH_TURBOJPEG) set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) endif() @@ -39,7 +39,7 @@ index c384aae..c9a15a0 100644 add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c md5/md5hl.c) target_link_libraries(tjunittest-static turbojpeg-static) -@@ -694,6 +703,7 @@ if(WITH_TURBOJPEG) +@@ -730,6 +739,7 @@ if(WITH_TURBOJPEG) if(UNIX) target_link_libraries(tjbench-static m) endif() @@ -47,17 +47,36 @@ index c384aae..c9a15a0 100644 endif() endif() -@@ -708,7 +718,7 @@ else() - set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c) - endif() - --if(ENABLE_STATIC) -+if(ENABLE_STATIC AND ENABLE_EXECUTABLES) - add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c - ${CJPEG_BMP_SOURCES}) - set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS}) -@@ -724,9 +734,11 @@ if(ENABLE_STATIC) - set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}") +@@ -748,13 +758,15 @@ if(ENABLE_STATIC) + add_library(cjpeg16-static OBJECT rdgif.c rdppm.c) + set_property(TARGET cjpeg16-static PROPERTY COMPILE_FLAGS + "-DBITS_IN_JSAMPLE=16 -DGIF_SUPPORTED -DPPM_SUPPORTED") ++ if(ENABLE_EXECUTABLES) + add_executable(cjpeg-static cjpeg.c cdjpeg.c rdbmp.c rdgif.c rdppm.c + rdswitch.c rdtarga.c $ + $) + set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS + ${CDJPEG_COMPILE_FLAGS}) + target_link_libraries(cjpeg-static jpeg-static) +- ++ endif() ++ + # Compile a separate version of these source files with 12-bit and 16-bit + # data precision. + add_library(djpeg12-static OBJECT rdcolmap.c wrgif.c wrppm.c) +@@ -763,6 +775,7 @@ if(ENABLE_STATIC) + add_library(djpeg16-static OBJECT wrppm.c) + set_property(TARGET djpeg16-static PROPERTY COMPILE_FLAGS + "-DBITS_IN_JSAMPLE=16 -DPPM_SUPPORTED") ++ if(ENABLE_EXECUTABLES) + add_executable(djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrbmp.c + wrgif.c wrppm.c wrtarga.c $ + $) +@@ -776,11 +789,14 @@ if(ENABLE_STATIC) + + add_executable(example-static example.c) + target_link_libraries(example-static jpeg-static) ++ endif() endif() +if(ENABLE_EXECUTABLES) @@ -68,7 +87,7 @@ index c384aae..c9a15a0 100644 ############################################################################### -@@ -1464,8 +1476,10 @@ if(WITH_TURBOJPEG) +@@ -1687,8 +1703,10 @@ if(WITH_TURBOJPEG) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -79,7 +98,7 @@ index c384aae..c9a15a0 100644 if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND CMAKE_C_LINKER_SUPPORTS_PDB) install(FILES "$" -@@ -1476,7 +1490,7 @@ if(WITH_TURBOJPEG) +@@ -1699,7 +1717,7 @@ if(WITH_TURBOJPEG) install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -88,7 +107,7 @@ index c384aae..c9a15a0 100644 if(GENERATOR_IS_MULTI_CONFIG) set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") else() -@@ -1486,15 +1500,17 @@ if(WITH_TURBOJPEG) +@@ -1709,15 +1727,17 @@ if(WITH_TURBOJPEG) DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE}) endif() endif() @@ -107,7 +126,7 @@ index c384aae..c9a15a0 100644 if(GENERATOR_IS_MULTI_CONFIG) set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") else() -@@ -1509,8 +1525,11 @@ if(ENABLE_STATIC) +@@ -1732,8 +1752,11 @@ if(ENABLE_STATIC) endif() endif() @@ -117,9 +136,9 @@ index c384aae..c9a15a0 100644 +if(INSTALL_DOCS) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg - ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt + ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.c ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c -@@ -1522,8 +1541,9 @@ if(WITH_JAVA) +@@ -1745,8 +1768,9 @@ if(WITH_JAVA) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() @@ -130,7 +149,7 @@ index c384aae..c9a15a0 100644 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1 ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1 -@@ -1544,10 +1564,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets +@@ -1767,11 +1791,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets NAMESPACE ${CMAKE_PROJECT_NAME}:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME}) @@ -139,30 +158,30 @@ index c384aae..c9a15a0 100644 ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +- +endif() - include(cmakescripts/BuildPackages.cmake) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in" diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt -index aea0b9d..069dbe2 100644 +index 8e94256..8a16497 100644 --- a/sharedlib/CMakeLists.txt +++ b/sharedlib/CMakeLists.txt -@@ -76,6 +76,7 @@ else() - set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c) - endif() - +@@ -76,11 +76,13 @@ set_property(TARGET cjpeg12 PROPERTY COMPILE_FLAGS + add_library(cjpeg16 OBJECT ../rdgif.c ../rdppm.c) + set_property(TARGET cjpeg16 PROPERTY COMPILE_FLAGS + "-DBITS_IN_JSAMPLE=16 -DGIF_SUPPORTED -DPPM_SUPPORTED") +if(ENABLE_EXECUTABLES) - add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c - ../rdswitch.c ${CJPEG_BMP_SOURCES}) - set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS}) -@@ -92,14 +93,17 @@ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}") - - add_executable(jcstest ../jcstest.c) - target_link_libraries(jcstest jpeg) + add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdbmp.c ../rdgif.c ../rdppm.c + ../rdswitch.c ../rdtarga.c $ + $) + set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${CDJPEG_COMPILE_FLAGS}) + target_link_libraries(cjpeg jpeg) +endif() - install(TARGETS jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + # Compile a separate version of these source files with 12-bit and 16-bit data + # precision. +@@ -111,8 +113,10 @@ install(TARGETS jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 0ce6aadfefcea9..325c790c766dc3 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo REF "${VERSION}" - SHA512 bcd946eed0fb3712eae2485d300d5e2b84596b1c8cfd4e944902bb141125d411b727024f054e2ad6c23855d06a02dcb926696f05cb107869a7b81814d4cfcaeb + SHA512 0efb7ce16333f4f3556b889bdd83b0f91697ce1645cbfb13db0c8a93ef47dd9cb0805c7160edaf946d4d54faf30a33bae90800c189e8b4bd44fcf3ce98179115 HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch @@ -14,7 +14,9 @@ vcpkg_from_github( workaround_cmake_system_processor.patch ) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + set(LIBJPEGTURBO_SIMD -DWITH_SIMD=OFF) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")) set(LIBJPEGTURBO_SIMD -DWITH_SIMD=ON -DNEON_INTRINSICS=ON) else() set(LIBJPEGTURBO_SIMD -DWITH_SIMD=ON) diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 0e44e1f8fadafc..f084727b5cb661 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjpeg-turbo", - "version": "2.1.5.1", + "version": "3.0.0", "port-version": 2, "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", diff --git a/ports/libjxl/fix-dependencies.patch b/ports/libjxl/fix-dependencies.patch index 6ec3b52bb78b1f..eeca99927e94d2 100644 --- a/ports/libjxl/fix-dependencies.patch +++ b/ports/libjxl/fix-dependencies.patch @@ -2,20 +2,15 @@ diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 8ee9864..b8a22a5 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt -@@ -47,7 +47,16 @@ endif() +@@ -47,7 +47,11 @@ endif() # brotli if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR JPEGXL_FORCE_SYSTEM_BROTLI) - find_package(Brotli) + find_package(Brotli NAMES unofficial-brotli REQUIRED) + foreach(brlib IN ITEMS brotlienc brotlidec brotlicommon) -+ if(TARGET unofficial::brotli::${brlib}) + add_library(${brlib} ALIAS unofficial::brotli::${brlib}) + add_library(${brlib}-static ALIAS unofficial::brotli::${brlib}) -+ else() -+ add_library(${brlib} ALIAS unofficial::brotli::${brlib}-static) -+ add_library(${brlib}-static ALIAS unofficial::brotli::${brlib}-static) -+ endif() + endforeach() if (NOT Brotli_FOUND) message(FATAL_ERROR diff --git a/ports/libjxl/vcpkg.json b/ports/libjxl/vcpkg.json index 55b1ade18bb7d1..4ce6ff6d42b453 100644 --- a/ports/libjxl/vcpkg.json +++ b/ports/libjxl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libjxl", "version-semver": "0.8.2", + "port-version": 1, "description": "JPEG XL image format reference implementation", "homepage": "https://github.com/libjxl/libjxl", "license": "BSD-3-Clause", diff --git a/ports/libkml/fix-minizip.patch b/ports/libkml/fix-minizip.patch index 358f664a3974e7..ccf7b43bdb66f6 100644 --- a/ports/libkml/fix-minizip.patch +++ b/ports/libkml/fix-minizip.patch @@ -7,10 +7,10 @@ index 9728ead..028f50a 100644 endif() -find_package(MiniZip) -+find_package(MINIZIP NAMES minizip REQUIRED) ++find_package(MINIZIP NAMES unofficial-minizip REQUIRED) if(MINIZIP_FOUND) - include_directories(${MINIZIP_INCLUDE_DIR}) -+ set(MINIZIP_LIBRARY minizip::minizip) ++ set(MINIZIP_LIBRARY unofficial::minizip::minizip) else() include(External_minizip) list(APPEND KMLBASE_DEPENDS MINIZIP) @@ -20,7 +20,7 @@ index 3e295f4..97826df 100644 +++ b/cmake/LibKMLConfig.cmake.in @@ -1,3 +1,6 @@ +include(CMakeFindDependencyMacro) -+find_dependency(minizip CONFIG) ++find_dependency(unofficial-minizip CONFIG) + # Compute paths get_filename_component(LIBKML_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) diff --git a/ports/libkml/vcpkg.json b/ports/libkml/vcpkg.json index f0ffc0b296ecad..9ab9bdaea4512e 100644 --- a/ports/libkml/vcpkg.json +++ b/ports/libkml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libkml", "version": "1.3.0", - "port-version": 12, + "port-version": 13, "description": "Reference implementation of OGC KML 2.2", "homepage": "https://github.com/libkml/libkml", "license": "BSD-3-Clause", diff --git a/ports/libmad/CMakeLists.txt b/ports/libmad/CMakeLists.txt index 2a692a41316467..cc7fe273f8c0f8 100644 --- a/ports/libmad/CMakeLists.txt +++ b/ports/libmad/CMakeLists.txt @@ -41,10 +41,38 @@ add_library( ) target_compile_definitions(mad - PRIVATE _LIB _MBCS ASO_ZEROCHECK HAVE_CONFIG_H FPM_DEFAULT + PRIVATE _LIB _MBCS ASO_ZEROCHECK HAVE_CONFIG_H PRIVATE _CRT_SECURE_NO_WARNINGS ) +if(CMAKE_SYSTEM_PROCESSOR MATCHES "(^i.86$)") + target_compile_definitions(mad + PRIVATE FPM_INTEL + ) +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|^(aarch64|arm64)") + target_compile_definitions(mad + PRIVATE FPM_64BIT + ) +# This fails with "error: invalid instruction" on armv7-a +#elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm") +# target_compile_definitions(mad +# PRIVATE FPM_ARM +# ) +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") + target_compile_definitions(mad + PRIVATE FPM_MIPS + ) +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") + target_compile_definitions(mad + PRIVATE FPM_PPC + ) +else() + target_compile_definitions(mad + PRIVATE FPM_DEFAULT + ) + message(WARNING "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR} unknown. Fall back to FPM_DEFAULT, loosing significant accuracy") +endif() + install( TARGETS mad RUNTIME DESTINATION bin diff --git a/ports/libmad/vcpkg.json b/ports/libmad/vcpkg.json index 5595b6a687d495..6cef437d79dcdd 100644 --- a/ports/libmad/vcpkg.json +++ b/ports/libmad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmad", "version": "0.15.1", - "port-version": 12, + "port-version": 13, "description": "high-quality MPEG audio decoder", "homepage": "http://www.mars.org/home/rob/proj/mpeg/", "dependencies": [ diff --git a/ports/libmesh/portfile.cmake b/ports/libmesh/portfile.cmake index c4810b560cd63d..b0cf639b42e598 100644 --- a/ports/libmesh/portfile.cmake +++ b/ports/libmesh/portfile.cmake @@ -16,7 +16,7 @@ endif() # but there are a lot more which need to be checked/fixed # So this port can only be considered a Work In Progress vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} OPTIONS_DEBUG --with-methods=dbg OPTIONS_RELEASE --with-methods=opt @@ -24,30 +24,24 @@ vcpkg_configure_make( vcpkg_install_make() -if (EXISTS ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool) - file(COPY ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool) -endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/contrib) - -file(GLOB LIBMESH_EXAMPLES ${CURRENT_PACKAGES_DIR}/examples/*) -foreach (LIBMESH_EXAMPLE ${LIBMESH_EXAMPLES}) - file(COPY ${LIBMESH_EXAMPLE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -endforeach() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/examples) +file(RENAME "${CURRENT_PACKAGES_DIR}/examples" "${CURRENT_PACKAGES_DIR}/share/${PORT}/examples") if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # Remove tools and debug include directories -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/contrib ${CURRENT_PACKAGES_DIR}/debug/etc - ${CURRENT_PACKAGES_DIR}/debug/examples ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/tools/libmesh/debug - ${CURRENT_PACKAGES_DIR}/Make.common ${CURRENT_PACKAGES_DIR}/debug/Make.common) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/contrib" "${CURRENT_PACKAGES_DIR}/debug/contrib" + "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/debug/etc" + "${CURRENT_PACKAGES_DIR}/debug/examples" "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/tools/libmesh/debug" + "${CURRENT_PACKAGES_DIR}/Make.common" "${CURRENT_PACKAGES_DIR}/debug/Make.common") + +file(GLOB config_files "${CURRENT_PACKAGES_DIR}/bin/*-config" "${CURRENT_PACKAGES_DIR}/debug/bin/*-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/*-config") +file(REMOVE_RECURSE ${config_files}) vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libmesh/libmesh_config.h" "${CURRENT_INSTALLED_DIR}" "") -file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - +vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright") diff --git a/ports/libmesh/vcpkg.json b/ports/libmesh/vcpkg.json index 8981af66f30885..3127369e02d6eb 100644 --- a/ports/libmesh/vcpkg.json +++ b/ports/libmesh/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libmesh", "version": "1.5.0", - "port-version": 5, + "port-version": 6, "description": "The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.", "homepage": "https://github.com/libMesh/libmesh", "license": "LGPL-2.1-only", - "supports": "!xbox" + "supports": "linux" } diff --git a/ports/libmicrodns/vcpkg.json b/ports/libmicrodns/vcpkg.json index dca30505f91dc2..82095357cb0085 100644 --- a/ports/libmicrodns/vcpkg.json +++ b/ports/libmicrodns/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libmicrodns", "version": "0.2.0", - "port-version": 1, + "port-version": 2, "description": "Minimal mDNS resolver (and announcer) library", "homepage": "https://github.com/videolabs/libmicrodns", "license": "LGPL-2.1-or-later", - "supports": "!xbox", + "supports": "!xbox & !uwp", "dependencies": [ { "name": "vcpkg-tool-meson", diff --git a/ports/libmicrohttpd/portfile.cmake b/ports/libmicrohttpd/portfile.cmake index 1a1e991d555e42..f689d7ccfb5386 100644 --- a/ports/libmicrohttpd/portfile.cmake +++ b/ports/libmicrohttpd/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES remove_pdb_install.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -18,7 +19,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(CFG_SUFFIX "static") endif() - vcpkg_install_msbuild( + vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH w32/VS-Any-Version/libmicrohttpd.vcxproj RELEASE_CONFIGURATION "Release-${CFG_SUFFIX}" diff --git a/ports/libmicrohttpd/remove_pdb_install.patch b/ports/libmicrohttpd/remove_pdb_install.patch new file mode 100644 index 00000000000000..9b5e4eba9e9978 --- /dev/null +++ b/ports/libmicrohttpd/remove_pdb_install.patch @@ -0,0 +1,15 @@ +diff --git a/w32/common/libmicrohttpd-build-settings.props b/w32/common/libmicrohttpd-build-settings.props +index 97d84a87f..8ffcb19c4 100644 +--- a/w32/common/libmicrohttpd-build-settings.props ++++ b/w32/common/libmicrohttpd-build-settings.props +@@ -37,10 +37,6 @@ + + Ws2_32.lib + +- +- xcopy /F /I /Y "$(IntermediateOutputPath)$(TargetName).pdb" "$(OutputPath)" +- Copy .pdb to output directory +- + + + diff --git a/ports/libmicrohttpd/vcpkg.json b/ports/libmicrohttpd/vcpkg.json index 2698b692ed55fe..c47efff7bb8786 100644 --- a/ports/libmicrohttpd/vcpkg.json +++ b/ports/libmicrohttpd/vcpkg.json @@ -1,10 +1,22 @@ { "name": "libmicrohttpd", "version": "0.9.77", + "port-version": 2, "description": "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application", "homepage": "https://www.gnu.org/software/libmicrohttpd/", "license": "LGPL-2.1-or-later", - "supports": "!uwp & !(windows & !mingw & ((static & !staticcrt) | (!static & staticcrt)))", + "supports": "!((arm & windows) | uwp)", + "dependencies": [ + { + "name": "gettext", + "platform": "!windows" + }, + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ], "features": { "https": { "description": "Enable HTTPS protocol support", diff --git a/ports/libmodbus/portfile.cmake b/ports/libmodbus/portfile.cmake index 59487c1ebe6d1b..3e16315905f566 100644 --- a/ports/libmodbus/portfile.cmake +++ b/ports/libmodbus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephane/libmodbus - REF v3.1.6 - SHA512 9eaa395c75e1170e703e01f8c52c6e6e87efe4eaa22adfc3b51153fd5535d545aea35cf68e1aba29720a6c1dd13d9c60b6b08a5c8098dccd13ccfdc6944420a9 + REF "v${VERSION}" + SHA512 6a01da1f8b486e356ff44874f1479d9d121463958a5ed06e60d910328ccc9b2d431b4a1fd72861c5c645c97b5887a076b763ad6a9ae6b18402dd043ec525b1e2 HEAD_REF master PATCHES fix-static-linkage.patch ) @@ -26,6 +26,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LESSER") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libmodbus/vcpkg.json b/ports/libmodbus/vcpkg.json index 34778e6160265c..1f383188a339e1 100644 --- a/ports/libmodbus/vcpkg.json +++ b/ports/libmodbus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmodbus", - "version": "3.1.6", - "port-version": 5, + "version": "3.1.10", "description": "libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol", "homepage": "https://github.com/stephane/libmodbus", "license": "LGPL-2.1-or-later", diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake index 10793e44c2bf9d..977e0c2f8e42e2 100644 --- a/ports/libosip2/portfile.cmake +++ b/ports/libosip2/portfile.cmake @@ -29,18 +29,16 @@ if(VCPKG_TARGET_IS_WINDOWS) ) endforeach() - vcpkg_install_msbuild( + vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "platform/vsnet/osip2.vcxproj" - INCLUDES_SUBPATH include - USE_VCPKG_INTEGRATION - REMOVE_ROOT_INCLUDES ) - vcpkg_install_msbuild( + file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + + vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "platform/vsnet/osipparser2.vcxproj" - USE_VCPKG_INTEGRATION ) elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) @@ -50,8 +48,6 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - endif() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libosip2/vcpkg.json b/ports/libosip2/vcpkg.json index cf631f8a008b60..cf25d2463804b7 100644 --- a/ports/libosip2/vcpkg.json +++ b/ports/libosip2/vcpkg.json @@ -1,11 +1,16 @@ { "name": "libosip2", "version": "5.2.0", - "port-version": 3, + "port-version": 4, "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.", "homepage": "https://www.gnu.org/software/osip/", - "supports": "!(windows & arm)", + "supports": "!(windows & arm) & !uwp", "dependencies": [ - "pthread" + "pthread", + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } ] } diff --git a/ports/libosmium/portfile.cmake b/ports/libosmium/portfile.cmake index 06744f501ee817..804c84ac6f94da 100644 --- a/ports/libosmium/portfile.cmake +++ b/ports/libosmium/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osmcode/libosmium REF "v${VERSION}" - SHA512 dca79a6771be759b8f1c2167d8b5981a3b5d4c6a4d6a0df5ae438c63de3f25120abfabd20a88385eeda28e287d63f2b27f2ac87301d475f3ab46111809c4b2e3 + SHA512 72e881e221dc3e62d7459b5cd84bf65de4fc0149bed66fe0534107d0d4dc30e5d474df685b44af07e6065a690dd7b31b877b5b040b8e0b4b0b971738175c34a3 ) set(BOOST_ROOT "${CURRENT_INSTALLED_DIR}") diff --git a/ports/libosmium/vcpkg.json b/ports/libosmium/vcpkg.json index e9c7a7be7d522f..f73188c81ad538 100644 --- a/ports/libosmium/vcpkg.json +++ b/ports/libosmium/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libosmium", - "version-semver": "2.19.0", + "version-semver": "2.20.0", "description": "A fast and flexible C++ library for working with OpenStreetMap data", "homepage": "https://osmcode.org/libosmium/", "license": "BSL-1.0", diff --git a/ports/libplist/001_fix_static_build.patch b/ports/libplist/001_fix_static_build.patch new file mode 100644 index 00000000000000..f346423b60a083 --- /dev/null +++ b/ports/libplist/001_fix_static_build.patch @@ -0,0 +1,22 @@ +diff --git a/src/plist.c b/src/plist.c +index 19279edb..a62687eb 100644 +--- a/src/plist.c ++++ b/src/plist.c +@@ -51,6 +51,8 @@ + typedef SSIZE_T ssize_t; + #endif + ++#ifndef LIBPLIST_STATIC // disable dll constructor ++ + extern void plist_xml_init(void); + extern void plist_xml_deinit(void); + extern void plist_bin_init(void); +@@ -137,6 +139,8 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) + #warning No compiler support for constructor/destructor attributes, some features might not be available. + #endif + ++#endif // disable dll constructor ++ + #ifndef HAVE_MEMMEM + // see https://sourceware.org/legacy-ml/libc-alpha/2007-12/msg00000.html + diff --git a/ports/libplist/002_fix_api.patch b/ports/libplist/002_fix_api.patch new file mode 100644 index 00000000000000..71cedee15f7281 --- /dev/null +++ b/ports/libplist/002_fix_api.patch @@ -0,0 +1,24 @@ +diff --git a/include/plist/plist.h b/include/plist/plist.h +index 47eda513..9df379ab 100644 +--- a/include/plist/plist.h ++++ b/include/plist/plist.h +@@ -78,17 +78,13 @@ extern "C" + #ifdef LIBPLIST_STATIC + #define PLIST_API + #elif defined(_WIN32) +- #ifdef DLL_EXPORT ++ #ifdef PLIST_EXPORT + #define PLIST_API __declspec(dllexport) + #else + #define PLIST_API __declspec(dllimport) + #endif + #else +- #if __GNUC__ >= 4 +- #define PLIST_API __attribute__((visibility("default"))) +- #else +- #define PLIST_API +- #endif ++ #define PLIST_API __attribute__((visibility("default"))) + #endif + + #include diff --git a/ports/libplist/003_fix_msvc.patch b/ports/libplist/003_fix_msvc.patch new file mode 100644 index 00000000000000..083e5f4e975fe2 --- /dev/null +++ b/ports/libplist/003_fix_msvc.patch @@ -0,0 +1,106 @@ +diff --git a/src/bplist.c b/src/bplist.c +index 953c2c77..d7b4777a 100644 +--- a/src/bplist.c ++++ b/src/bplist.c +@@ -87,6 +87,28 @@ union plist_uint_ptr + uint64_t *u64ptr; + }; + ++#ifdef _MSC_VER ++uint64_t get_unaligned_64(uint64_t *ptr) ++{ ++ uint64_t temp; ++ memcpy(&temp, ptr, sizeof(temp)); ++ return temp; ++} ++ ++uint32_t get_unaligned_32(uint32_t *ptr) ++{ ++ uint32_t temp; ++ memcpy(&temp, ptr, sizeof(temp)); ++ return temp; ++} ++ ++uint16_t get_unaligned_16(uint16_t *ptr) ++{ ++ uint16_t temp; ++ memcpy(&temp, ptr, sizeof(temp)); ++ return temp; ++} ++#else + #define get_unaligned(ptr) \ + ({ \ + struct __attribute__((packed)) { \ +@@ -94,6 +116,7 @@ union plist_uint_ptr + } *__p = (void *) (ptr); \ + __p->__v; \ + }) ++#endif + + + #ifndef bswap16 +@@ -148,10 +171,23 @@ union plist_uint_ptr + #define beNtoh(x,n) be64toh((x) << ((8-(n)) << 3)) + #endif + ++#ifdef _MSC_VER ++uint64_t UINT_TO_HOST(void* x, uint8_t n) ++{ ++ union plist_uint_ptr __up; ++ __up.src = (n > 8) ? (char *)x + (n - 8) : x; ++ return (n >= 8 ? be64toh( get_unaligned_64(__up.u64ptr) ) : ++ (n == 4 ? be32toh( get_unaligned_32(__up.u32ptr) ) : ++ (n == 2 ? be16toh( get_unaligned_16(__up.u16ptr) ) : ++ (n == 1 ? *__up.u8ptr : ++ beNtoh( get_unaligned_64(__up.u64ptr), n) ++ )))); ++} ++#else + #define UINT_TO_HOST(x, n) \ + ({ \ + union plist_uint_ptr __up; \ +- __up.src = ((n) > 8) ? (x) + ((n) - 8) : (x); \ ++ __up.src = ((n) > 8) ? ((char *)x) + ((n) - 8) : (x); \ + ((n) >= 8 ? be64toh( get_unaligned(__up.u64ptr) ) : \ + ((n) == 4 ? be32toh( get_unaligned(__up.u32ptr) ) : \ + ((n) == 2 ? be16toh( get_unaligned(__up.u16ptr) ) : \ +@@ -159,6 +195,7 @@ union plist_uint_ptr + beNtoh( get_unaligned(__up.u64ptr), n) \ + )))); \ + }) ++#endif + + #define get_needed_bytes(x) \ + ( ((uint64_t)(x)) < (1ULL << 8) ? 1 : \ +@@ -277,11 +314,19 @@ static plist_t parse_real_node(const char **bnode, uint8_t size) + switch (size) + { + case sizeof(uint32_t): ++#ifdef _MSC_VER ++ *(uint32_t*)buf = float_bswap32(get_unaligned_32((uint32_t*)*bnode)); ++#else + *(uint32_t*)buf = float_bswap32(get_unaligned((uint32_t*)*bnode)); ++#endif + data->realval = *(float *) buf; + break; + case sizeof(uint64_t): ++#ifdef _MSC_VER ++ *(uint64_t*)buf = float_bswap64(get_unaligned_64((uint64_t*)*bnode)); ++#else + *(uint64_t*)buf = float_bswap64(get_unaligned((uint64_t*)*bnode)); ++#endif + data->realval = *(double *) buf; + break; + default: +@@ -343,7 +388,11 @@ static char *plist_utf16be_to_utf8(uint16_t *unistr, long len, long *items_read, + } + + while (i < len) { ++#if _MSC_VER ++ wc = be16toh(get_unaligned_16(unistr + i)); ++#else + wc = be16toh(get_unaligned(unistr + i)); ++#endif + i++; + if (wc >= 0xD800 && wc <= 0xDBFF) { + if (!read_lead_surrogate) { diff --git a/ports/libplist/004_fix_tools_msvc.patch b/ports/libplist/004_fix_tools_msvc.patch new file mode 100644 index 00000000000000..38910012c3406b --- /dev/null +++ b/ports/libplist/004_fix_tools_msvc.patch @@ -0,0 +1,18 @@ +diff --git a/tools/plistutil.c b/tools/plistutil.c +index 8121a7d..98b440e 100644 +--- a/tools/plistutil.c ++++ b/tools/plistutil.c +@@ -32,10 +32,13 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + + #ifdef _MSC_VER + #pragma warning(disable:4996) ++#define STDIN_FILENO _fileno(stdin) + #endif + + typedef struct _options diff --git a/ports/libplist/CMakeLists.txt b/ports/libplist/CMakeLists.txt index 800f46283be756..970334396833f6 100644 --- a/ports/libplist/CMakeLists.txt +++ b/ports/libplist/CMakeLists.txt @@ -1,79 +1,103 @@ -cmake_minimum_required(VERSION 3.8) -project(plist C CXX) - -file(GLOB_RECURSE PLIST_HEADER include/plist/*.h) - -set(PLIST_SRC - src/base64.c - src/bytearray.c - src/hashtable.c - src/ptrarray.c - src/time64.c - src/xplist.c - src/bplist.c - src/plist.c -) - -set(PLISTPP_SRC - src/Node.cpp - src/Structure.cpp - src/Array.cpp - src/Boolean.cpp - src/Data.cpp - src/Date.cpp - src/Dictionary.cpp - src/Integer.cpp - src/Key.cpp - src/Real.cpp - src/String.cpp - src/Uid.cpp -) - -file(GLOB_RECURSE LIBCNARY_HEADER libcnary/include/*.h) -file(GLOB_RECURSE LIBCNARY_SRC libcnary/*c) - -add_library(plist ${PLIST_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER}) -target_include_directories(plist PRIVATE src include libcnary/include) -set_target_properties(plist PROPERTIES OUTPUT_NAME plist-2.0) - -add_library(plist++ STATIC ${PLISTPP_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER}) -set_target_properties(plist++ PROPERTIES OUTPUT_NAME plist++-2.0) -target_include_directories(plist++ PRIVATE src include libcnary/include) - -if(WIN32 AND BUILD_SHARED_LIBS) - target_compile_options(plist PRIVATE -W3 -WX- -sdl-) - target_compile_definitions(plist PRIVATE -DLIBPLIST_EXPORTS) - target_compile_options(plist++ PRIVATE -W3 -WX- -sdl-) - target_compile_definitions(plist++ PRIVATE -DLIBPLIST_EXPORTS) -endif() -if(NOT BUILD_SHARED_LIBS) - target_compile_definitions(plist PRIVATE -DLIBPLIST_STATIC_LIBRARY) -endif() - -target_link_libraries(plist++ PRIVATE plist) - -install( - TARGETS plist plist++ - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -set(PACKAGE_NAME libplist) -set(PACKAGE_VERSION 2.0) -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix \${prefix}) -set(libdir \${prefix}/lib) -set(includedir \${prefix}/../include) -foreach (PLIST_PKGCONFIG libplist-2.0.pc libplist++-2.0.pc) -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/src/${PLIST_PKGCONFIG}.in - ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG} - @ONLY -) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG} - DESTINATION lib/pkgconfig) -endforeach() - -install(FILES ${PLIST_HEADER} DESTINATION include/plist) +cmake_minimum_required(VERSION 3.15) +project(libplist C CXX) + +option(BUILD_TOOLS "Build tools." OFF) + +include(GNUInstallDirs) + +file(GLOB_RECURSE LIBCNARY_SOURCE libcnary/node.c libcnary/node_list.c) +file(GLOB_RECURSE LIBPLIST_SOURCE src/*.c) +file(GLOB_RECURSE LIBPLISTPP_SOURCE src/*.cpp) + +set(DEFINITIONS) + +if(BUILD_SHARED_LIBS) + if(WIN32) + list(APPEND DEFINITIONS -DLIBPLIST_EXPORT) + endif() +else() + list(APPEND DEFINITIONS -DLIBPLIST_STATIC) +endif() + +if(UNIX) + list(APPEND DEFINITIONS -DHAVE_STRNDUP) +endif() + +if(WIN32) + list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS) +endif() + +add_library(libplist ${LIBPLIST_SOURCE} ${LIBCNARY_SOURCE}) +target_include_directories(libplist PUBLIC + "$" + "$" + "$" + "$" +) +target_compile_definitions(libplist PRIVATE ${DEFINITIONS}) +set_target_properties(libplist PROPERTIES OUTPUT_NAME plist-2.0) +if(UNIX AND NOT APPLE) + target_link_libraries(libplist PRIVATE m) +endif() + +add_library(libplist++ STATIC ${LIBPLISTPP_SOURCE} ${LIBCNARY_SOURCE}) +target_include_directories(libplist++ PUBLIC + "$" + "$" + "$" + "$" +) +target_compile_definitions(libplist++ PRIVATE ${DEFINITIONS}) +target_link_libraries(libplist++ PUBLIC libplist) +set_target_properties(libplist++ PROPERTIES OUTPUT_NAME plist++-2.0) + +install(TARGETS libplist libplist++ EXPORT unofficial-libplist) + +install( + EXPORT unofficial-libplist + FILE unofficial-libplist-config.cmake + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libplist" + NAMESPACE unofficial::libplist:: +) + +install( + DIRECTORY "${CMAKE_SOURCE_DIR}/include/plist" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +set(PACKAGE_NAME libplist) +set(PACKAGE_VERSION 2.0) +set(prefix "") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") + +foreach(PLIST_PKGCONFIG libplist-2.0.pc libplist++-2.0.pc) + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/src/${PLIST_PKGCONFIG}.in" + "${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG}" + @ONLY + ) + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG}" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + ) +endforeach() + +if(BUILD_TOOLS) + add_executable(plistutil "tools/plistutil.c") + target_compile_definitions(plistutil PRIVATE + -DPACKAGE_VERSION="2.3.0" + -DPACKAGE_URL="https://github.com/libimobiledevice/libplist" + -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/libplist/issues" + ) + if(NOT BUILD_SHARED_LIBS) + target_compile_definitions(plistutil PRIVATE -DLIBPLIST_STATIC) + endif() + target_link_libraries(plistutil PRIVATE libplist) + + install( + TARGETS plistutil + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) +endif() diff --git a/ports/libplist/dllexport.patch b/ports/libplist/dllexport.patch deleted file mode 100644 index f5e0062104bfb0..00000000000000 --- a/ports/libplist/dllexport.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/include/plist/plist.h b/include/plist/plist.h -index 2863c74..9cdb219 100644 ---- a/include/plist/plist.h -+++ b/include/plist/plist.h -@@ -42,7 +42,7 @@ extern "C" - #include - #endif - --#ifdef _MSC_VER -+#if defined(_MSC_VER) && defined(LIBPLIST_EXPORTS) - #define PLIST_API_MSC __declspec( dllexport ) - #else - #define PLIST_API_MSC -diff --git a/src/plist.h b/src/plist.h -index 1e5d0d1..6690343 100644 ---- a/src/plist.h -+++ b/src/plist.h -@@ -39,10 +39,7 @@ - #include - #endif - --#ifdef _MSC_VER -- #define PLIST_API __declspec( dllexport ) --#else --#ifdef WIN32 -+#if (defined(_MSC_VER) || defined(WIN32)) && defined(LIBPLIST_EXPORTS) - #define PLIST_API __declspec( dllexport ) - #else - #ifdef HAVE_FVISIBILITY -@@ -51,7 +48,6 @@ - #define PLIST_API - #endif - #endif --#endif - - struct plist_data_s - { diff --git a/ports/libplist/fix_static_build.patch b/ports/libplist/fix_static_build.patch deleted file mode 100644 index eeedef8cab3ea2..00000000000000 --- a/ports/libplist/fix_static_build.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/plist.c b/src/plist.c -index 57f0be4..cbe10ad 100644 ---- a/src/plist.c -+++ b/src/plist.c -@@ -62,6 +62,8 @@ static void internal_plist_deinit(void) - plist_xml_deinit(); - } - -+#ifndef LIBPLIST_STATIC_LIBRARY -+ - #ifdef WIN32 - - typedef volatile struct { -@@ -116,6 +118,8 @@ static void __attribute__((destructor)) libplist_deinitialize(void) - - #endif - -+#endif -+ - #ifndef HAVE_MEMMEM - // see https://sourceware.org/legacy-ml/libc-alpha/2007-12/msg00000.html - diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake index c057cc218b9854..d29483de63365d 100644 --- a/ports/libplist/portfile.cmake +++ b/ports/libplist/portfile.cmake @@ -1,46 +1,47 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO libimobiledevice-win32/libplist - REF bbba7cabb78aad180a7a982ada5e1f21ff0ba873 # v1.3.6 - SHA512 4cd59ed87c647259d0da99a20a05e01aa880f01f6b5cecd29e4247029a3d29f0f68b4552571eb3fd3c5549b4cb357801ffe43338b8ff34d44d6be5393d2e6b9d - HEAD_REF msvc-master + REPO libimobiledevice/libplist + REF 2d8d7ef272db06783989f77ba1ed80aa0f4d2dfd # commits on 2023-06-15 + SHA512 ec7c723ffb0492fe9901ee3854df16465e1b5b051cc8a716d89ff8fbf8f782134b7dda4d3a9656016fcf15c7cdf0eef7c80551b38a62317a11f056500e5c9ef4 + HEAD_REF master PATCHES - dllexport.patch - fix_static_build.patch + 001_fix_static_build.patch + 002_fix_api.patch + 003_fix_msvc.patch + 004_fix_tools_msvc.patch ) -configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() -vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -set(pcfile "libplist-2.0.pc") -set(pcfiletarget "libplist.pc") -set(basepath "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") -if(EXISTS "${basepath}${pcfile}") - file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) -endif() -set(basepath "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/") -if(EXISTS "${basepath}${pcfile}") - file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES plistutil AUTO_CLEAN) endif() -set(pcfile "libplist++-2.0.pc") -set(pcfiletarget "libplist++.pc") -set(basepath "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") -if(EXISTS "${basepath}${pcfile}") - file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) -endif() -set(basepath "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/") -if(EXISTS "${basepath}${pcfile}") - file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/plist/plist.h" + "#ifdef LIBPLIST_STATIC" "#if 1" + ) +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/plist/plist.h" + "#ifdef LIBPLIST_STATIC" "#if 0" + ) endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libplist/usage b/ports/libplist/usage new file mode 100644 index 00000000000000..81c34ead07b56d --- /dev/null +++ b/ports/libplist/usage @@ -0,0 +1,4 @@ +libplist provides CMake targets: + + find_package(unofficial-libplist CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::libplist::libplist unofficial::libplist::libplist++) diff --git a/ports/libplist/vcpkg.json b/ports/libplist/vcpkg.json index 459a3df20a8543..f7dec85483505c 100644 --- a/ports/libplist/vcpkg.json +++ b/ports/libplist/vcpkg.json @@ -1,14 +1,24 @@ { "name": "libplist", - "version": "1.3.6", - "port-version": 2, + "version-date": "2023-06-15", + "port-version": 1, "description": "A library to handle Apple Property List format in binary or XML", "homepage": "https://libimobiledevice.org/", - "license": "LGPL-2.1-only", + "license": "LGPL-2.1-or-later", "dependencies": [ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "build command line tool", + "supports": "!android & !ios & !xbox" } - ] + } } diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 5593f7702363fd..406372d31578e8 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES + unix/installdirs.patch unix/fix-configure.patch unix/single-linkage.patch unix/no-server-tools.patch diff --git a/ports/libpq/unix/installdirs.patch b/ports/libpq/unix/installdirs.patch new file mode 100644 index 00000000000000..ae6653f904df7e --- /dev/null +++ b/ports/libpq/unix/installdirs.patch @@ -0,0 +1,48 @@ +diff --git a/src/Makefile.global.in b/src/Makefile.global.in +index 5dacc4d..a9a797e 100644 +--- a/src/Makefile.global.in ++++ b/src/Makefile.global.in +@@ -100,14 +100,14 @@ datarootdir := @datarootdir@ + + bindir := @bindir@ + +-datadir := @datadir@ ++datadir := @datadir@/postgresql + ifeq "$(findstring pgsql, $(datadir))" "" + ifeq "$(findstring postgres, $(datadir))" "" + override datadir := $(datadir)/postgresql + endif + endif + +-sysconfdir := @sysconfdir@ ++sysconfdir := @sysconfdir@/postgresql + ifeq "$(findstring pgsql, $(sysconfdir))" "" + ifeq "$(findstring postgres, $(sysconfdir))" "" + override sysconfdir := $(sysconfdir)/postgresql +@@ -116,7 +116,7 @@ endif + + libdir := @libdir@ + +-pkglibdir = $(libdir) ++pkglibdir = $(libdir)/postgresql + ifeq "$(findstring pgsql, $(pkglibdir))" "" + ifeq "$(findstring postgres, $(pkglibdir))" "" + override pkglibdir := $(pkglibdir)/postgresql +@@ -125,7 +125,7 @@ endif + + includedir := @includedir@ + +-pkgincludedir = $(includedir) ++pkgincludedir = $(includedir)/postgresql + ifeq "$(findstring pgsql, $(pkgincludedir))" "" + ifeq "$(findstring postgres, $(pkgincludedir))" "" + override pkgincludedir := $(pkgincludedir)/postgresql +@@ -134,7 +134,7 @@ endif + + mandir := @mandir@ + +-docdir := @docdir@ ++docdir := @docdir@/postgresql + ifeq "$(findstring pgsql, $(docdir))" "" + ifeq "$(findstring postgres, $(docdir))" "" + override docdir := $(docdir)/postgresql diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 3dfcd11b0b3ba5..2574d459e77639 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", "version": "15.3", - "port-version": 1, + "port-version": 2, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", diff --git a/ports/libremidi/portfile.cmake b/ports/libremidi/portfile.cmake new file mode 100644 index 00000000000000..edff0a344b7f36 --- /dev/null +++ b/ports/libremidi/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jcelerier/libremidi + REF "v${VERSION}" + + SHA512 7b73d5e1a565e9f85ac28fba041c66a151537a9205b4f3605fa70e18d5e651fa0562329853c7e08bf8e620f9d83d08d167b746d30c39bffcd325fbd6338d0538 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libremidi PACKAGE_NAME libremidi) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") + diff --git a/ports/libremidi/vcpkg.json b/ports/libremidi/vcpkg.json new file mode 100644 index 00000000000000..a5496a058112f3 --- /dev/null +++ b/ports/libremidi/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libremidi", + "version": "4.1.0", + "description": "A modern C++ MIDI real-time & file I/O library", + "homepage": "https://github.com/jcelerier/libremidi", + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/librsvg/CMakeLists.txt b/ports/librsvg/CMakeLists.txt index edd85518981eeb..36efa65bcac8dd 100644 --- a/ports/librsvg/CMakeLists.txt +++ b/ports/librsvg/CMakeLists.txt @@ -4,29 +4,35 @@ project(librsvg C) set(RSVG_API_MAJOR_VERSION 2) set(RSVG_API_VERSION "2.0") Set(VERSION "2.40.20") -set(targets "rsvg-${RSVG_API_MAJOR_VERSION}") +set(LIBRSVG_TARGET "rsvg-${RSVG_API_MAJOR_VERSION}") Set(prefix "${CMAKE_INSTALL_PREFIX}") Set(exec_prefix "\${prefix}") Set(libdir "\${prefix}/lib") Set(includedir "\${prefix}/include") -find_package(unofficial-libcroco CONFIG REQUIRED) -find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2 IMPORTED_TARGET) -pkg_check_modules(CAIRO cairo IMPORTED_TARGET) -pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0 IMPORTED_TARGET) -pkg_check_modules(PANGO pango pangocairo IMPORTED_TARGET) -find_package(LibXml2 REQUIRED) -if(CMAKE_SYSTEM_NAME MATCHES "Windows") -elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") -else() - pkg_check_modules(PANGO2 pangoft2 pangofc IMPORTED_TARGET) - set(PANGO_FT2_LIB PkgConfig::PANGO2) +# Public required modules (cf. headers and librsvg.pc) +set(librsvg_pc_requires glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo) +# Other required modules from configure.ac +set(librsvg_pc_requires_private + libxml-2.0 + pangocairo + pangoft2 + cairo-png + libcroco-0.6 + gthread-2.0 + gmodule-2.0 + gobject-2.0 + gio-unix-2.0 + fontconfig +) +if(WIN32) + string(REPLACE "gio-unix" "gio-windows" librsvg_pc_requires_private "${librsvg_pc_requires_private}") endif() -# Add include directories -include_directories(${CAIRO_INCLUDE_DIRS} ${GDK_PIXBUF_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} ${PANGO2_INCLUDE_DIRS}) +find_package(PkgConfig REQUIRED) +pkg_check_modules(LIBRSVG_LINK_PUBLIC ${librsvg_pc_requires} IMPORTED_TARGET REQUIRED) +pkg_check_modules(LIBRSVG_LINK_PRIVATE ${librsvg_pc_requires_private} IMPORTED_TARGET REQUIRED) set(LIBRSVG_SOURCES librsvg-features.c @@ -81,82 +87,87 @@ set(LIBRSVG_SOURCES librsvg-enum-types.h ) -set(PIXBUFLOADERSVG_SOURCES - gdk-pixbuf-loader/io-svg.c -) - if(WIN32) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.win32 ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY) - add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.def - COMMAND echo "EXPORTS" > ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.def - COMMAND ${CMAKE_C_COMPILER} /EP ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.symbols >> ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.def) - list(APPEND LIBRSVG_SOURCES rsvg.def) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.win32" "${CMAKE_CURRENT_BINARY_DIR}/config.h" COPYONLY) + file(READ "${CMAKE_CURRENT_SOURCE_DIR}/rsvg.symbols" rsvg_symbols) + string(REGEX REPLACE "/[*][^*]*[*]/" "" rsvg_symbols "${rsvg_symbols}") + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/rsvg.def" "EXPORTS\n${rsvg_symbols}") + list(APPEND LIBRSVG_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/rsvg.def") else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.linux ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.linux" "${CMAKE_CURRENT_BINARY_DIR}/config.h" COPYONLY) list(APPEND LIBRSVG_SOURCES rsvg.symbols) endif() -add_library(${targets} ${LIBRSVG_SOURCES}) -add_library(pixbufloader-svg ${PIXBUFLOADERSVG_SOURCES}) - -target_compile_definitions(${targets} PRIVATE -DRSVG_COMPILATION -D_CRT_SECURE_NO_WARNINGS -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}") - -target_include_directories(pixbufloader-svg PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_compile_definitions(pixbufloader-svg PRIVATE - -DRSVG_COMPILATION +add_library(${LIBRSVG_TARGET} ${LIBRSVG_SOURCES}) +target_compile_definitions(${LIBRSVG_TARGET} PRIVATE + -DRSVG_COMPILATION -D_CRT_SECURE_NO_WARNINGS - -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" - -DGDK_PIXBUF_ENABLE_BACKEND - -DG_LOG_DOMAIN="libpixbufloader-svg") - -target_link_libraries(${targets} PRIVATE - PkgConfig::GLIB2 - ${LIBXML2_LIBRARIES} - PkgConfig::PANGO - PkgConfig::GDK_PIXBUF - ${PANGO_FT2_LIB} - unofficial::libcroco::croco-0.6 + -DSRCDIR="" + $<$:HAVE_STRTOK_R> ) -target_link_libraries(pixbufloader-svg PRIVATE - ${targets} - PkgConfig::GLIB2 - PkgConfig::GDK_PIXBUF +target_include_directories(${LIBRSVG_TARGET} + PRIVATE + "${CMAKE_CURRENT_BINARY_DIR}" + PUBLIC + "$" + "$" ) - -install(TARGETS ${targets} pixbufloader-svg - EXPORT librsvg-targets +target_link_libraries(${LIBRSVG_TARGET} + PUBLIC + PkgConfig::LIBRSVG_LINK_PUBLIC + PRIVATE + PkgConfig::LIBRSVG_LINK_PRIVATE +) +install(TARGETS ${LIBRSVG_TARGET} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) - install( - EXPORT librsvg-targets - NAMESPACE unofficial::librsvg:: - FILE unofficial-librsvg-targets.cmake - DESTINATION share/unofficial-librsvg + FILES + rsvg.h + rsvg-cairo.h + librsvg-features.h + librsvg-enum-types.h + DESTINATION include/librsvg-${RSVG_API_VERSION}/librsvg ) -install(FILES - rsvg.h - rsvg-cairo.h - librsvg-features.h - librsvg-enum-types.h - DESTINATION include/librsvg-${RSVG_API_VERSION} + +set(gdk_pixbuf_pc_requires_private gdk-pixbuf-2.0) +pkg_check_modules(GDK_PIXBUF ${gdk_pixbuf_pc_requires_private} IMPORTED_TARGET REQUIRED) +pkg_get_variable(GDK_PIXBUF_MODULEDIR ${gdk_pixbuf_pc_requires_private} gdk_pixbuf_moduledir) + +set(PIXBUFLOADERSVG_SOURCES + gdk-pixbuf-loader/io-svg.c ) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-librsvg-config.cmake " -include(CMakeFindDependencyMacro) -find_dependency(PkgConfig) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2 IMPORTED_TARGET) -pkg_check_modules(CAIRO cairo IMPORTED_TARGET) -pkg_check_modules(GDK_PIXBUF gdk-pixbuf IMPORTED_TARGET) -pkg_check_modules(PANGO pango pangocairo IMPORTED_TARGET) -find_dependency(unofficial-libcroco CONFIG) +add_library(pixbufloader-svg MODULE ${PIXBUFLOADERSVG_SOURCES}) +target_include_directories(pixbufloader-svg + PRIVATE + "${CMAKE_CURRENT_BINARY_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}" +) +target_compile_definitions(pixbufloader-svg PRIVATE + -DRSVG_COMPILATION + -D_CRT_SECURE_NO_WARNINGS + -DSRCDIR="" + -DGDK_PIXBUF_ENABLE_BACKEND + -DG_LOG_DOMAIN="libpixbufloader-svg" +) +target_link_libraries(pixbufloader-svg + PRIVATE + ${LIBRSVG_TARGET} + PkgConfig::GDK_PIXBUF +) +install(TARGETS pixbufloader-svg + RUNTIME DESTINATION "${GDK_PIXBUF_MODULEDIR}" + LIBRARY DESTINATION "${GDK_PIXBUF_MODULEDIR}" +) -include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-librsvg-targets.cmake) -") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-librsvg-config.cmake DESTINATION share/unofficial-librsvg) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/librsvg.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +file(READ "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" librsvg_pc) +list(JOIN librsvg_pc_requires_private " " requires_private) +string(REPLACE "Requires.private:" "Requires.private: ${requires_private}" librsvg_pc "${librsvg_pc}") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" "${librsvg_pc}") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" RENAME "librsvg-${RSVG_API_VERSION}.pc") diff --git a/ports/librsvg/portfile.cmake b/ports/librsvg/portfile.cmake index 1d1c51cf1e760e..5252b6547f6cc8 100644 --- a/ports/librsvg/portfile.cmake +++ b/ports/librsvg/portfile.cmake @@ -1,44 +1,40 @@ # port update requires rust/cargo +string(REGEX REPLACE "^([0-9]*[.][0-9]*)[.].*" "\\1" MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.20.tar.xz" - FILENAME "librsvg-2.40.20.tar.xz" + URLS "https://download.gnome.org/sources/librsvg/${MAJOR_MINOR}/librsvg-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/librsvg/${MAJOR_MINOR}/librsvg-${VERSION}.tar.xz" + FILENAME "librsvg-${VERSION}.tar.xz" SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f ) vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h.linux" "${SOURCE_PATH}/config.h.linux" COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${CMAKE_CURRENT_LIST_DIR}/config.h.linux" DESTINATION "${SOURCE_PATH}") vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ) vcpkg_cmake_install() - vcpkg_copy_pdbs() - -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-librsvg CONFIG_PATH share/unofficial-librsvg) - vcpkg_fixup_pkgconfig() -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) file(GLOB_RECURSE pc_files "${CURRENT_PACKAGES_DIR}/*.pc") - foreach(pc_file ${pc_files}) + foreach(pc_file IN LISTS pc_files) vcpkg_replace_string("${pc_file}" " -lm" "") endforeach() endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(COPY "${CURRENT_PORT_DIR}/unofficial-librsvg-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-librsvg") +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/librsvg/unofficial-librsvg-config.cmake b/ports/librsvg/unofficial-librsvg-config.cmake new file mode 100644 index 00000000000000..6bff45d87b188c --- /dev/null +++ b/ports/librsvg/unofficial-librsvg-config.cmake @@ -0,0 +1,14 @@ +file(READ "${CMAKE_CURRENT_LIST_DIR}/../librsvg/usage" usage) +message(WARNING "find_package(unofficial-librsvg) is deprecated.\n${usage}") + +include(CMakeFindDependencyMacro) +find_dependency(PkgConfig) +pkg_check_modules(VCPKG_LIBRSVG librsvg-2.0 IMPORTED_TARGET) +if(NOT VCPKG_LIBRSVG_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND 0) +elseif(NOT TARGET unofficial::librsvg::rsvg-2) + add_library(unofficial::librsvg::rsvg-2 INTERFACE IMPORTED) + set_target_properties(unofficial::librsvg::rsvg-2 PROPERTIES + INTERFACE_LINK_LIBRARIES PkgConfig::VCPKG_LIBRSVG + ) +endif() diff --git a/ports/librsvg/usage b/ports/librsvg/usage index 03080aea1ed4f7..22bfe67e7fcf31 100644 --- a/ports/librsvg/usage +++ b/ports/librsvg/usage @@ -1,10 +1,5 @@ librsvg can be imported via CMake FindPkgConfig module: find_package(PkgConfig REQUIRED) - pkg_check_modules(librsvg REQUIRED IMPORTED_TARGET librsvg) - target_link_libraries(main PkgConfig::librsvg) - -vcpkg provides proprietary CMake targets: - - find_package(unofficial-librsvg CONFIG REQUIRED) - target_link_libraries(main PRIVATE unofficial::librsvg::rsvg-2 unofficial::librsvg::pixbufloader-svg) + pkg_check_modules(LIBRSVG librsvg-2.0 IMPORTED_TARGET REQUIRED) + target_link_libraries(main PRIVATE PkgConfig::LIBRSVG) diff --git a/ports/librsvg/vcpkg.json b/ports/librsvg/vcpkg.json index 48cbad5076272a..86fdf2cadcd290 100644 --- a/ports/librsvg/vcpkg.json +++ b/ports/librsvg/vcpkg.json @@ -1,21 +1,23 @@ { "name": "librsvg", "version": "2.40.20", - "port-version": 9, + "port-version": 10, "description": "A small library to render Scalable Vector Graphics (SVG)", "homepage": "https://gitlab.gnome.org/GNOME/librsvg", "license": "LGPL-2.0-or-later", "dependencies": [ "cairo", + "fontconfig", "gdk-pixbuf", + "glib", "libcroco", - "pango", { - "name": "vcpkg-cmake", - "host": true + "name": "libxml2", + "default-features": false }, + "pango", { - "name": "vcpkg-cmake-config", + "name": "vcpkg-cmake", "host": true } ] diff --git a/ports/libspatialite/fix-mingw.patch b/ports/libspatialite/fix-mingw.patch index c29b034498223f..abbe3520a4dccd 100644 --- a/ports/libspatialite/fix-mingw.patch +++ b/ports/libspatialite/fix-mingw.patch @@ -1,23 +1,10 @@ -diff --git a/src/gaiageo/gg_shape.c b/src/gaiageo/gg_shape.c -index ee2f1cf..01f2571 100644 ---- a/src/gaiageo/gg_shape.c -+++ b/src/gaiageo/gg_shape.c -@@ -58,7 +58,7 @@ the terms of any one of the MPL, the GPL or the LGPL. - #endif - - #ifdef _WIN32 --#include -+#include - #endif - - #if OMIT_ICONV == 0 /* if ICONV is disabled no SHP support is available */ diff --color -ur a/configure.ac b/configure.ac --- a/configure.ac 2022-07-21 17:23:50.490298108 +0200 +++ b/configure.ac 2022-07-21 17:25:45.671489524 +0200 @@ -116,7 +116,6 @@ # Checks for installed libraries - AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is required but it doesn't seem to be installed on this system.]),-lm) + # AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is required but it doesn't seem to be installed on this system.]),-lm) -AC_CHECK_LIB(z,inflateInit_,,AC_MSG_ERROR(['libz' is required but it doesn't seem to be installed on this system.]),-lm) AC_CONFIG_FILES([Makefile \ diff --git a/ports/libspatialite/fix-utf8-source.patch b/ports/libspatialite/fix-utf8-source.patch new file mode 100644 index 00000000000000..76dcf77a5bbee5 --- /dev/null +++ b/ports/libspatialite/fix-utf8-source.patch @@ -0,0 +1,32 @@ +diff --git a/src/srsinit/epsg_inlined_21.c b/src/srsinit/epsg_inlined_21.c +index 94aa9d4..457b38a 100644 +--- a/src/srsinit/epsg_inlined_21.c ++++ b/src/srsinit/epsg_inlined_21.c +@@ -619,9 +619,9 @@ initialize_epsg_21 (int filter, struct epsg_defs **first, struct epsg_defs **las + add_srs_wkt (p, 27, + "lic, Chad, Chile, China, Christmas Island, Cocos (Keelin"); + add_srs_wkt (p, 28, +- "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, C"); ++ "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, Cô"); + add_srs_wkt (p, 29, +- "te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr"); ++ "te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr"); + add_srs_wkt (p, 30, + "us, Czechia, Denmark, Djibouti, Dominica, Dominican Repu"); + add_srs_wkt (p, 31, +diff --git a/src/srsinit/epsg_inlined_25.c b/src/srsinit/epsg_inlined_25.c +index 1071eb1..a09cb8c 100644 +--- a/src/srsinit/epsg_inlined_25.c ++++ b/src/srsinit/epsg_inlined_25.c +@@ -3180,9 +3180,9 @@ initialize_epsg_25 (int filter, struct epsg_defs **first, struct epsg_defs **las + add_srs_wkt (p, 26, + "lic, Chad, Chile, China, Christmas Island, Cocos (Keelin"); + add_srs_wkt (p, 27, +- "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, C"); ++ "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, Cô"); + add_srs_wkt (p, 28, +- "te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr"); ++ "te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr"); + add_srs_wkt (p, 29, + "us, Czechia, Denmark, Djibouti, Dominica, Dominican Repu"); + add_srs_wkt (p, 30, diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index a1fbed5faf4f8d..05dbe871a303aa 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -1,8 +1,7 @@ -set(LIBSPATIALITE_VERSION_STR "5.0.1") vcpkg_download_distfile(ARCHIVE - URLS "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz" - FILENAME "libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz" - SHA512 c2552994bc30d69d1e80aa274760f048cd384f71e8350a1e48a47cb8222ba71a1554a69c6534eedde9a09dc582c39c089967bcc1c57bf158cc91a3e7b1840ddf + URLS "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${VERSION}.tar.gz" + FILENAME "libspatialite-${VERSION}.tar.gz" + SHA512 2745b373e31cea58623224def6090c491b58409803bb71231450dfa2cfdf3aafc3fc6f680585d55d085008f8cf362c3062ae67ffc7d80257775a22eb81ef1e57 ) vcpkg_extract_source_archive( @@ -13,6 +12,7 @@ vcpkg_extract_source_archive( fix-linux-configure.patch gaiaconfig-msvc.patch fix-mingw.patch + fix-utf8-source.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS unused @@ -116,7 +116,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() set(infile "${SOURCE_PATH}/spatialite.pc.in") - set(VERSION "${LIBSPATIALITE_VERSION_STR}") set(libdir [[${prefix}/lib]]) set(exec_prefix [[${prefix}]]) list(JOIN pkg_config_modules " " requires_private) diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index 447ffe9934e49e..448e5c7bf39c23 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libspatialite", - "version": "5.0.1", - "port-version": 12, + "version": "5.1.0", "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", "license": null, diff --git a/ports/libsrtp/portfile.cmake b/ports/libsrtp/portfile.cmake index 10d0fe706d7563..29a04371e6c24b 100644 --- a/ports/libsrtp/portfile.cmake +++ b/ports/libsrtp/portfile.cmake @@ -1,16 +1,9 @@ -vcpkg_download_distfile(CMAKE_PR_PATCH - URLS https://patch-diff.githubusercontent.com/raw/cisco/libsrtp/pull/573.diff - FILENAME libsrtp-pr-573.patch - SHA512 58c07977ccbd3dce114f59583a5e10813bbee907af5ef23ec1961b4cfd0791c14326845a376470430978e878c78fb1f598851898a9e9031225628739fb248176 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cisco/libsrtp - REF v2.4.2 - SHA512 6E4805E6D34B2050A6F68F629B0B42356B1D27F2CBAA6CC6166E56957609C3D9AA6B723DCC674E5C74180D122D27BADD2F9496639CCB1E0C210B9E1F7949D0E2 - PATCHES - ${CMAKE_PR_PATCH} + REF "v${VERSION}" + SHA512 bd679ab65ccf22ca30fe867b9649a0b84cfa6fad6e22eb10f081141632f6dd56479a04d525b865f11fd46007303ca211065d9c170e4820d6ea7055403702340a + PATCHES fix-runtime-destination.patch ) @@ -18,14 +11,13 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + -DTEST_APPS=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup( - CONFIG_PATH lib/cmake/libSRTP -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libSRTP) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libsrtp" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libsrtp/vcpkg.json b/ports/libsrtp/vcpkg.json index be97d2e985acc8..bcb60dc36f00f1 100644 --- a/ports/libsrtp/vcpkg.json +++ b/ports/libsrtp/vcpkg.json @@ -1,10 +1,9 @@ { "name": "libsrtp", - "version": "2.4.2", - "port-version": 3, + "version": "2.5.0", "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel.", "homepage": "https://github.com/cisco/libsrtp/", - "license": null, + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libsvm/vcpkg.json b/ports/libsvm/vcpkg.json index d99a9112d899bc..a1ac6c75e94dee 100644 --- a/ports/libsvm/vcpkg.json +++ b/ports/libsvm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsvm", "version": "3.25", + "port-version": 1, "description": "A library for Support Vector Machines.", "homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/", "dependencies": [ @@ -15,7 +16,8 @@ ], "features": { "tools": { - "description": "build libsvm CLI tools." + "description": "build libsvm CLI tools.", + "supports": "!uwp" } } } diff --git a/ports/libsystemd/pkgconfig.patch b/ports/libsystemd/pkgconfig.patch new file mode 100644 index 00000000000000..1c6f5dee355924 --- /dev/null +++ b/ports/libsystemd/pkgconfig.patch @@ -0,0 +1,11 @@ +diff --git a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in +index da6e4e667e..3786238ccb 100644 +--- a/src/libsystemd/libsystemd.pc.in ++++ b/src/libsystemd/libsystemd.pc.in +@@ -17,4 +17,6 @@ Description: systemd Library + URL: {{PROJECT_URL}} + Version: {{PROJECT_VERSION}} + Libs: -L${libdir} -lsystemd ++Libs.private: -lrt ++Requires.private: libcap libcrypt liblz4 liblzma libzstd mount + Cflags: -I${includedir} diff --git a/ports/libsystemd/portfile.cmake b/ports/libsystemd/portfile.cmake new file mode 100644 index 00000000000000..7d154b8a3689c1 --- /dev/null +++ b/ports/libsystemd/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO systemd/systemd + REF "v${VERSION}" + SHA512 84b4d16980fe2e64d5c3c95b9b4fbaad1076f368f493fdd745cbafbe7ce825293384f5fa0b6360ba8188da23c4575e87402fb666a3b71f84ff8b323aba0c07ff + PATCHES + pkgconfig.patch +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dstatic-libsystemd=true + -Daudit=false + -Dgcrypt=false + OPTIONS_DEBUG + -Drootprefix=${CURRENT_PACKAGES_DIR}/debug + -Dpkgconfiglibdir={CURRENT_PACKAGES_DIR}/debug + OPTIONS_RELEASE + -Drootprefix=${CURRENT_PACKAGES_DIR} + -Dpkgconfiglibdir={CURRENT_PACKAGES_DIR} +) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_build_ninja( + TARGETS libsystemd.a devel + ) +else() + vcpkg_build_ninja( + TARGETS libsystemd devel + ) +endif() + +file(INSTALL "${SOURCE_PATH}/src/systemd" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") + +set(BUILD_DIR_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(INSTALL "${BUILD_DIR_RELEASE}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +else() + file(INSTALL "${BUILD_DIR_RELEASE}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FOLLOW_SYMLINK_CHAIN) +endif() + +set(BUILD_DIR_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +else() + file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FOLLOW_SYMLINK_CHAIN) +endif() + +file(INSTALL "${BUILD_DIR_RELEASE}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(INSTALL "${BUILD_DIR_DEBUG}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + +vcpkg_fixup_pkgconfig() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.LGPL2.1") diff --git a/ports/libsystemd/vcpkg.json b/ports/libsystemd/vcpkg.json new file mode 100644 index 00000000000000..57b3119759268c --- /dev/null +++ b/ports/libsystemd/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libsystemd", + "version": "254", + "description": "Libsystemd", + "homepage": "https://github.com/systemd/systemd", + "license": "LGPL-2.1+", + "supports": "linux", + "dependencies": [ + "libcap", + "liblzma", + "libmount", + "libxcrypt", + "lz4", + { + "name": "vcpkg-tool-meson", + "host": true + }, + "zstd" + ] +} diff --git a/ports/libunwind/portfile.cmake b/ports/libunwind/portfile.cmake new file mode 100644 index 00000000000000..b495342665a3d0 --- /dev/null +++ b/ports/libunwind/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "libunwind/libunwind" + REF "v${VERSION}" + HEAD_REF "v1.7-stable" + SHA512 b560f45cfa8ca3a60b41779afbcd862860c0f7af4014298c0b22eaec8b39740349c2077a940fb0d235c8f7d6a567e00c5cb0a04c251053f90c51320616784fd2 +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libunwind/usage b/ports/libunwind/usage new file mode 100644 index 00000000000000..0152567b30e8f4 --- /dev/null +++ b/ports/libunwind/usage @@ -0,0 +1,6 @@ +The package libunwind can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(libunwind REQUIRED IMPORTED_TARGET GLOBAL libunwind) + + target_link_libraries(main PRIVATE PkgConfig::libunwind) diff --git a/ports/libunwind/vcpkg.json b/ports/libunwind/vcpkg.json new file mode 100644 index 00000000000000..e1a1cf06e8616b --- /dev/null +++ b/ports/libunwind/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libunwind", + "version": "1.7.2", + "description": "Unix libray for portable stack unwinding", + "homepage": "https://www.nongnu.org/libunwind", + "license": "MIT", + "supports": "linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/liburing/fix-configure.patch b/ports/liburing/fix-configure.patch index b0b911bdb297cd..6eac3f0eaba55f 100644 --- a/ports/liburing/fix-configure.patch +++ b/ports/liburing/fix-configure.patch @@ -1,19 +1,19 @@ diff --git a/configure b/configure -index 2c2441b..620c443 100644 +index 28f3eb0..b3ac6bc 100755 --- a/configure +++ b/configure -@@ -20,7 +20,7 @@ for opt do - ;; - --mandir=*) mandir="$optarg" - ;; +@@ -36,7 +36,7 @@ for opt do + ;; + --mandir=*) mandir="$optarg" + ;; - --datadir=*) datadir="$optarg" + --datarootdir=*) datadir="$optarg" - ;; - --cc=*) cc="$optarg" - ;; -@@ -28,10 +28,12 @@ for opt do ;; - --nolibc) liburing_nolibc="yes" + --cc=*) cc="$optarg" + ;; +@@ -44,10 +44,12 @@ for opt do + ;; + --nolibc) nolibc_deprecated ;; + --enable-shared) ENABLE_SHARED=1 + ;; @@ -27,7 +27,7 @@ index 2c2441b..620c443 100644 ;; esac done -@@ -130,6 +132,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak +@@ -146,6 +148,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak printf "# Configured with:" >> $config_host_mak printf " '%s'" "$0" "$@" >> $config_host_mak echo >> $config_host_mak diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 96c3d67267f880..68e0161339e6fb 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing REF "liburing-${VERSION}" - SHA512 0eda230e527e696189aa04c63f8c444bbfc2e5d2f6b1f2ac9454accdd0aa435979017b803d869c25c29a8575237bec25a8414940a09b6e1e971d84f7e8797506 + SHA512 8033f813262472b695d15ce20cc6cbe76a5577f16bfa7e8bc2f21c7925ec831b0f2eaf135af721e80cccce9ebe7f4431148dba2e66fa5f0278be457d9aca6535 HEAD_REF master PATCHES fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index 39351df0da43d1..d6a1ba2a54c692 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,7 +1,6 @@ { "name": "liburing", - "version": "2.3", - "port-version": 1, + "version": "2.4", "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", "license": "MIT OR LGPL-2.1 OR GPL-2.0", diff --git a/ports/libusbmuxd/001_fix_win32_defs.patch b/ports/libusbmuxd/001_fix_win32_defs.patch new file mode 100644 index 00000000000000..952a9dc2f3e1df --- /dev/null +++ b/ports/libusbmuxd/001_fix_win32_defs.patch @@ -0,0 +1,13 @@ +diff --git a/include/usbmuxd-proto.h b/include/usbmuxd-proto.h +index a2a731e..38473f5 100644 +--- a/include/usbmuxd-proto.h ++++ b/include/usbmuxd-proto.h +@@ -26,7 +26,7 @@ + #include + #define USBMUXD_PROTOCOL_VERSION 0 + +-#if defined(WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__CYGWIN__) + #define USBMUXD_SOCKET_PORT 27015 + #else + #define USBMUXD_SOCKET_FILE "/var/run/usbmuxd" diff --git a/ports/libusbmuxd/002_fix_struct_pack.patch b/ports/libusbmuxd/002_fix_struct_pack.patch new file mode 100644 index 00000000000000..0dfd27f98e93c2 --- /dev/null +++ b/ports/libusbmuxd/002_fix_struct_pack.patch @@ -0,0 +1,50 @@ +diff --git a/include/usbmuxd-proto.h b/include/usbmuxd-proto.h +index 38473f5..d004232 100644 +--- a/include/usbmuxd-proto.h ++++ b/include/usbmuxd-proto.h +@@ -57,28 +57,30 @@ enum usbmuxd_msgtype { + MESSAGE_PLIST = 8, + }; + ++#pragma pack(push, 1) ++ + struct usbmuxd_header { + uint32_t length; // length of message, including header + uint32_t version; // protocol version + uint32_t message; // message type + uint32_t tag; // responses to this query will echo back this tag +-} __attribute__((__packed__)); ++}; + + struct usbmuxd_result_msg { + struct usbmuxd_header header; + uint32_t result; +-} __attribute__((__packed__)); ++}; + + struct usbmuxd_connect_request { + struct usbmuxd_header header; + uint32_t device_id; + uint16_t port; // TCP port number + uint16_t reserved; // set to zero +-} __attribute__((__packed__)); ++}; + + struct usbmuxd_listen_request { + struct usbmuxd_header header; +-} __attribute__((__packed__)); ++}; + + struct usbmuxd_device_record { + uint32_t device_id; +@@ -86,7 +88,9 @@ struct usbmuxd_device_record { + char serial_number[256]; + uint16_t padding; + uint32_t location; +-} __attribute__((__packed__)); ++}; ++ ++#pragma pack(pop) + + #ifdef __cplusplus + } diff --git a/ports/libusbmuxd/003_fix_msvc.patch b/ports/libusbmuxd/003_fix_msvc.patch new file mode 100644 index 00000000000000..e285d2268851b7 --- /dev/null +++ b/ports/libusbmuxd/003_fix_msvc.patch @@ -0,0 +1,37 @@ +diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c +index 95e322f..c5c8f09 100644 +--- a/src/libusbmuxd.c ++++ b/src/libusbmuxd.c +@@ -49,7 +49,9 @@ + #define ECONNREFUSED 107 + #endif + ++#ifndef _MSC_VER + #include ++#endif + #include + + #ifdef WIN32 +@@ -91,6 +93,10 @@ static char* stpncpy(char *dst, const char *src, size_t len) + } + #endif + ++#ifdef _MSC_VER ++#define strcasecmp _stricmp ++#endif ++ + #include + #define PLIST_CLIENT_VERSION_STRING PACKAGE_STRING + #define PLIST_LIBUSBMUX_VERSION 3 +@@ -1590,7 +1596,11 @@ USBMUXD_API int usbmuxd_send(int sfd, const char *data, uint32_t len, uint32_t * + num_sent = socket_send(sfd, (void*)data, len); + if (num_sent < 0) { + *sent_bytes = 0; ++#ifdef WIN32 ++ num_sent = WSAGetLastError(); ++#else + num_sent = errno; ++#endif + LIBUSBMUXD_DEBUG(1, "%s: Error %d when sending: %s\n", __func__, num_sent, strerror(num_sent)); + return -num_sent; + } diff --git a/ports/libusbmuxd/004_fix_api.patch b/ports/libusbmuxd/004_fix_api.patch new file mode 100644 index 00000000000000..c06e19d030d554 --- /dev/null +++ b/ports/libusbmuxd/004_fix_api.patch @@ -0,0 +1,22 @@ +diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c +index c5c8f09..edab706 100644 +--- a/src/libusbmuxd.c ++++ b/src/libusbmuxd.c +@@ -29,14 +29,10 @@ + #include + #include + +-#ifdef WIN32 +- #define USBMUXD_API __declspec( dllexport ) ++#if !defined(_WIN32) && !defined(LIBUSBMUXD_STATIC) ++#define USBMUXD_API __attribute__((visibility("default"))) + #else +- #ifdef HAVE_FVISIBILITY +- #define USBMUXD_API __attribute__((visibility("default"))) +- #else +- #define USBMUXD_API +- #endif ++#define USBMUXD_API + #endif + + #ifndef EPROTO diff --git a/ports/libusbmuxd/005_fix_tools_msvc.patch b/ports/libusbmuxd/005_fix_tools_msvc.patch new file mode 100644 index 00000000000000..2804e61058f5e8 --- /dev/null +++ b/ports/libusbmuxd/005_fix_tools_msvc.patch @@ -0,0 +1,42 @@ +diff --git a/tools/inetcat.c b/tools/inetcat.c +index f70215b..748db15 100644 +--- a/tools/inetcat.c ++++ b/tools/inetcat.c +@@ -33,7 +33,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + #ifdef WIN32 +@@ -50,6 +52,13 @@ + #include "usbmuxd.h" + #include + ++#ifdef _MSC_VER ++#include ++typedef SSIZE_T ssize_t; ++#define STDIN_FILENO _fileno(stdin) ++#define STDOUT_FILENO _fileno(stdout) ++#endif ++ + static int debug_level = 0; + + static size_t read_data_socket(int fd, uint8_t* buf, size_t bufsize) +diff --git a/tools/iproxy.c b/tools/iproxy.c +index d5f66b6..6510cb8 100644 +--- a/tools/iproxy.c ++++ b/tools/iproxy.c +@@ -34,7 +34,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + #ifdef WIN32 diff --git a/ports/libusbmuxd/CMakeLists.txt b/ports/libusbmuxd/CMakeLists.txt index b075a8a7d70a11..cfe8eae8a076ca 100644 --- a/ports/libusbmuxd/CMakeLists.txt +++ b/ports/libusbmuxd/CMakeLists.txt @@ -1,54 +1,117 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.15) project(libusbmuxd C) -# find dependencies -find_path(libplist_INCLUDES plist.h PATH_SUFFIXES plist) -set(libplist_INCLUDES ${libplist_INCLUDES}/../) -find_library(libplist NAMES plist libplist plist-2.0 libplist-2.0 REQUIRED) +option(BUILD_TOOLS "Build tools." OFF) -# ready to create library -file(GLOB_RECURSE IDVCACTV_TOOLS_HDR common/*.h) -file(GLOB_RECURSE IDVCACTV_TOOLS_SRC common/*.c) +include(GNUInstallDirs) -file(GLOB_RECURSE IDVCACTV_PUBLIC_HDR include/*.h) -file(GLOB_RECURSE IDVCACTV_SRC src/*.c) +file(GLOB_RECURSE LIBUSBMUXD_HEADER include/*.h) +file(GLOB_RECURSE LIBUSBMUXD_SOURCE src/*.c) -add_library(libusbmuxd ${IDVCACTV_TOOLS_HDR} ${IDVCACTV_TOOLS_SRC} ${IDVCACTV_SRC} ${IDVCACTV_PUBLIC_HDR}) -set_target_properties(libusbmuxd PROPERTIES OUTPUT_NAME usbmuxd) -target_include_directories(libusbmuxd PRIVATE ${libplist_INCLUDES} include common) -target_compile_definitions(libusbmuxd PRIVATE -DPACKAGE_STRING="1.2.77") -if (WIN32) - target_compile_definitions(libusbmuxd PRIVATE -DWIN32) - target_link_libraries(libusbmuxd PRIVATE Ws2_32) +set(DEFINITIONS) + +list(APPEND DEFINITIONS -DPACKAGE_STRING="2.0.2") + +if(BUILD_SHARED_LIBS) + if(WIN32) + list(APPEND LIBUSBMUXD_SOURCE exports.def) + endif() +else() + list(APPEND DEFINITIONS -DLIBUSBMUXD_STATIC) endif() -if (UNIX) - target_compile_definitions(libusbmuxd PRIVATE -DHAVE_STPNCPY) + +if(UNIX) + list(APPEND DEFINITIONS -DHAVE_GETIFADDRS) + list(APPEND DEFINITIONS -DHAVE_STPNCPY) +endif() + +if(WIN32) + list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS) + list(APPEND DEFINITIONS -DWIN32_LEAN_AND_MEAN) + list(APPEND DEFINITIONS -DWIN32) +endif() + +find_package(unofficial-libplist CONFIG REQUIRED) +find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED) + +add_library(libusbmuxd ${LIBUSBMUXD_SOURCE}) +target_include_directories(libusbmuxd PUBLIC + "$" + "$" +) +target_compile_definitions(libusbmuxd PRIVATE ${DEFINITIONS}) +target_link_libraries(libusbmuxd + PRIVATE + unofficial::libplist::libplist + unofficial::libimobiledevice-glue::libimobiledevice-glue +) +set_target_properties(libusbmuxd PROPERTIES OUTPUT_NAME usbmuxd-2.0) + +if(WIN32) + target_link_libraries(libusbmuxd PRIVATE Ws2_32) endif() -target_link_libraries(libusbmuxd PRIVATE ${libplist}) -# install +install(TARGETS libusbmuxd EXPORT unofficial-libusbmuxd) + +install( + EXPORT unofficial-libusbmuxd + FILE unofficial-libusbmuxd-config.cmake + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libusbmuxd" + NAMESPACE unofficial::libusbmuxd:: +) + install( - TARGETS libusbmuxd - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib + FILES ${LIBUSBMUXD_HEADER} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) set(LIBPLIST_VERSION 2.0) +set(LIMD_GLUE_VERSION 1.0) set(PACKAGE_NAME libusbmuxd) set(PACKAGE_VERSION 2.0) -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix \${prefix}) -set(libdir \${prefix}/lib) -set(includedir \${prefix}/../include) +set(prefix "") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") + configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/src/libusbmuxd-2.0.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc + "${CMAKE_CURRENT_SOURCE_DIR}/src/libusbmuxd-2.0.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc" @ONLY ) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc - DESTINATION lib/pkgconfig + FILES "${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" ) -install(FILES ${IDVCACTV_PUBLIC_HDR} DESTINATION include) \ No newline at end of file +if(BUILD_TOOLS) + if(WIN32) + find_package(unofficial-getopt-win32 REQUIRED) + endif() + + function(add_tool name source) + add_executable("${name}" "${source}") + target_compile_definitions("${name}" PRIVATE + -DPACKAGE_VERSION="2.0.2" + -DPACKAGE_URL="https://github.com/libimobiledevice/libusbmuxd" + -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/libusbmuxd/issues" + ) + target_link_libraries("${name}" PRIVATE libusbmuxd unofficial::libimobiledevice-glue::libimobiledevice-glue) + if(WIN32) + target_compile_definitions("${name}" PRIVATE + -D_CRT_SECURE_NO_WARNINGS + -DWIN32_LEAN_AND_MEAN + -DWIN32 + ) + target_link_libraries("${name}" PRIVATE unofficial::getopt-win32::getopt Ws2_32) + endif() + endfunction(add_tool) + + add_tool(inetcat "tools/inetcat.c") + add_tool(iproxy "tools/iproxy.c") + + install( + TARGETS inetcat iproxy + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) +endif() diff --git a/ports/libusbmuxd/exports.def b/ports/libusbmuxd/exports.def new file mode 100644 index 00000000000000..a89e7e7fe2bb0d --- /dev/null +++ b/ports/libusbmuxd/exports.def @@ -0,0 +1,21 @@ +EXPORTS + usbmuxd_events_subscribe + usbmuxd_events_unsubscribe + usbmuxd_subscribe + usbmuxd_unsubscribe + usbmuxd_get_device_list + usbmuxd_device_list_free + usbmuxd_get_device_by_udid + usbmuxd_get_device + usbmuxd_connect + usbmuxd_disconnect + usbmuxd_send + usbmuxd_recv_timeout + usbmuxd_recv + usbmuxd_read_buid + usbmuxd_read_pair_record + usbmuxd_save_pair_record_with_device_id + usbmuxd_save_pair_record + usbmuxd_delete_pair_record + libusbmuxd_set_use_inotify + libusbmuxd_set_debug_level diff --git a/ports/libusbmuxd/fix-win-build.patch b/ports/libusbmuxd/fix-win-build.patch deleted file mode 100644 index a1b7f2ef23faec..00000000000000 --- a/ports/libusbmuxd/fix-win-build.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c -index e85cf4a..35ed1b5 100644 ---- a/src/libusbmuxd.c -+++ b/src/libusbmuxd.c -@@ -86,6 +86,15 @@ static char* stpncpy(char *dst, const char *src, size_t len) - } - #endif - -+#ifdef WIN32 -+int strcasecmp(char *s1, char *s2) -+{ -+ while (toupper((unsigned char)*s1) == toupper((unsigned char)*s2++)) -+ if (*s1++ == '\0') return 0; -+ return(toupper((unsigned char)*s1) - toupper((unsigned char)*--s2)); -+} -+#endif -+ - #include - #define PLIST_CLIENT_VERSION_STRING PACKAGE_STRING - #define PLIST_LIBUSBMUX_VERSION 3 diff --git a/ports/libusbmuxd/portfile.cmake b/ports/libusbmuxd/portfile.cmake index 38fbca4f9e10d1..3bd300e452858a 100644 --- a/ports/libusbmuxd/portfile.cmake +++ b/ports/libusbmuxd/portfile.cmake @@ -1,23 +1,47 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO libimobiledevice-win32/libusbmuxd - REF ac86b23f57879b8b702f3712ba66729008d059a3 # v1.2.219 - SHA512 ced85088bc6ebb416ccb635d6b4e79662fb34f427d869b64b61847e5fde7b4ae094cebb1f7916d9387c314aeb84106a618fbd7497dc4b36151b236dcb55bd0e4 - HEAD_REF msvc-master - PATCHES fix-win-build.patch + REPO libimobiledevice/libusbmuxd + REF 8d30a559cf0585625d9d05dc8ce0dd495b1de4f4 # commits on 2023-06-21 + SHA512 ace920d13908c12afcc9182776a668f6876b2f037b21a151c1dca897aa24bc24cb41898471cd258487963772963753457be5efba2657571cf2c07c8225b68a5f + HEAD_REF master + PATCHES + 001_fix_win32_defs.patch + 002_fix_struct_pack.patch + 003_fix_msvc.patch + 004_fix_api.patch + 005_fix_tools_msvc.patch ) -configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() -vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) vcpkg_fixup_pkgconfig() +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES inetcat iproxy AUTO_CLEAN) +endif() + +file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" cmake_config) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" +"include(CMakeFindDependencyMacro) +find_dependency(unofficial-libplist CONFIG) +find_dependency(unofficial-libimobiledevice-glue CONFIG) +${cmake_config} +") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libusbmuxd/usage b/ports/libusbmuxd/usage new file mode 100644 index 00000000000000..2f98e1d330d868 --- /dev/null +++ b/ports/libusbmuxd/usage @@ -0,0 +1,4 @@ +libusbmuxd provides CMake targets: + + find_package(unofficial-libusbmuxd CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::libusbmuxd::libusbmuxd) diff --git a/ports/libusbmuxd/vcpkg.json b/ports/libusbmuxd/vcpkg.json index 5ad272b736a1ad..78a75a3743715e 100644 --- a/ports/libusbmuxd/vcpkg.json +++ b/ports/libusbmuxd/vcpkg.json @@ -1,15 +1,30 @@ { "name": "libusbmuxd", - "version": "1.2.219", - "port-version": 3, + "version-date": "2023-06-21", + "port-version": 1, "description": "A client library to multiplex connections from and to iOS devices", - "license": "LGPL-2.1-only", + "homepage": "https://libimobiledevice.org/", + "license": "LGPL-2.1-or-later", "supports": "!uwp", "dependencies": [ + "libimobiledevice-glue", "libplist", { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "build command line tool", + "supports": "!android & !ios & !xbox", + "dependencies": [ + "getopt" + ] } - ] + } } diff --git a/ports/libvmdk/CMakeLists.txt b/ports/libvmdk/CMakeLists.txt index 1fb043d905fbdd..d04b627bbe3c06 100644 --- a/ports/libvmdk/CMakeLists.txt +++ b/ports/libvmdk/CMakeLists.txt @@ -9,7 +9,6 @@ if(MSVC) add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE) endif() -add_compile_definitions(HAVE_LOCAL_LIBCAES) add_compile_definitions(HAVE_LOCAL_LIBCERROR) add_compile_definitions(HAVE_LOCAL_LIBCTHREADS) add_compile_definitions(HAVE_LOCAL_LIBCDATA) diff --git a/ports/libvmdk/portfile.cmake b/ports/libvmdk/portfile.cmake index 11c689cb0ac2a8..89a244783df4cb 100644 --- a/ports/libvmdk/portfile.cmake +++ b/ports/libvmdk/portfile.cmake @@ -1,16 +1,15 @@ -set(LIB_VERSION 20200926) -set(LIB_FILENAME libvmdk-alpha-${LIB_VERSION}.tar.gz) +set(LIB_FILENAME libvmdk-alpha-${VERSION}.tar.gz) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/libyal/libvmdk/releases/download/${LIB_VERSION}/${LIB_FILENAME}" + URLS "https://github.com/libyal/libvmdk/releases/download/${VERSION}/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 e70c42580dc58ad0a6459fe461504a8ef128f8d5df9d500f84f316e627232606f22eb4906fc1debc3e75e71daa6a07951af80822695de13d5e466adda4cfd5e0 + SHA512 7d7ea415d7c2cb1077d591d53ab3c37a7ab6e01dc9525159a70588e6f55e56bbef4d3f49f6e1c01ff0b1ddcede5ec2beb05aca7f12e5212843761e14f6459bcb ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - SOURCE_BASE "${LIB_VERSION}" + SOURCE_BASE "${VERSION}" ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/libvmdk/vcpkg.json b/ports/libvmdk/vcpkg.json index ea0be7c6f5813d..e8ab9b1e6f2730 100644 --- a/ports/libvmdk/vcpkg.json +++ b/ports/libvmdk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libvmdk", - "version": "20200926", - "port-version": 4, + "version": "20221124", "description": "Library and tools to access the VMware Virtual Disk (VMDK) format", "homepage": "https://github.com/libyal/libvmdk", "supports": "!uwp", diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 55bd9c8ce25187..e14cd8f9a551ce 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -33,7 +33,7 @@ vcpkg_add_to_path(${NASM_EXE_PATH}) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp") if(VCPKG_CRT_LINKAGE STREQUAL static) set(LIBVPX_CRT_LINKAGE --enable-static-msvcrt) @@ -83,7 +83,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() message(STATUS "Generating makefile") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp") vcpkg_execute_required_process( COMMAND ${BASH} --noprofile --norc @@ -92,47 +92,27 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) ${LIBVPX_CRT_LINKAGE} ${OPTIONS} --as=nasm - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp" LOGNAME configure-${TARGET_TRIPLET}) message(STATUS "Generating MSBuild projects") vcpkg_execute_required_process( COMMAND ${BASH} --noprofile --norc -c "make dist" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp" LOGNAME generate-${TARGET_TRIPLET}) - vcpkg_build_msbuild( - PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx.vcxproj" - OPTIONS /p:UseEnv=True + vcpkg_msbuild_install( + SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp" + PROJECT_SUBPATH vpx.vcxproj ) - # note: pdb file names are hardcoded in the lib file, cannot rename - set(LIBVPX_OUTPUT_PREFIX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - if (EXISTS "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.pdb") - file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - else() - file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - endif() - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - if (EXISTS "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.pdb") - file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - else() - file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - endif() - endif() - if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) - set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") + set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL arm) - set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") + set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") else() - set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") + set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") endif() file( INSTALL diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index 39347d71c3ee59..a2045b4cde9fed 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,10 +1,17 @@ { "name": "libvpx", "version": "1.12.0", - "port-version": 1, + "port-version": 2, "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx", "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ], "features": { "highbitdepth": { "description": "use VP9 high bit depth (10/12) profiles" diff --git a/ports/libwebp/0011-fix-include.patch b/ports/libwebp/0011-fix-include.patch new file mode 100644 index 00000000000000..899378541d46c9 --- /dev/null +++ b/ports/libwebp/0011-fix-include.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in +index 74a5891..4c084d9 100644 +--- a/cmake/WebPConfig.cmake.in ++++ b/cmake/WebPConfig.cmake.in +@@ -11,7 +11,7 @@ endif() + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + + set_and_check(WebP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") +-set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) ++set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIR}) + set(WebP_LIBRARIES "") + include(SelectLibraryConfigurations) + foreach(_vcpkg_libwebp_lib IN ITEMS @INSTALLED_LIBRARIES@ sharpyuv) diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index a18000225ec76c..45bb1c31194932 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -2,13 +2,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libwebp REF "v${VERSION}" - SHA512 9131c256f78fa09c3fc569b0b3657f62b06466cfa7b88b81cbae68f0a37f7a36ac6b0fe257b150406e15d623eda288c46ee97ee023aebe7dec25ca0a6d4ba85c + SHA512 2faa1bee1b73ded2b1460fc50a5973a37eefdc7b88d6a013491ba1c921d61413a653d44a953e8f6a3161ca6183f57ca9fe3be0f0a72b480895a299429a500dcf HEAD_REF master PATCHES 0002-cmake-config.patch 0003-simd.patch 0008-sdl.patch 0010-fix_build.patch + 0011-fix-include.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index d0a0ede6e775fd..614a9455e94577 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libwebp", - "version": "1.3.1", - "port-version": 1, + "version": "1.3.2", "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", "license": "BSD-3-Clause", diff --git a/ports/libxcrypt/portfile.cmake b/ports/libxcrypt/portfile.cmake new file mode 100644 index 00000000000000..fac97500e4d77c --- /dev/null +++ b/ports/libxcrypt/portfile.cmake @@ -0,0 +1,20 @@ +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO besser82/libxcrypt + REF "v${VERSION}" + SHA512 61e5e393654f37775457474d4170098314879ee79963d423c1c461e80dc5dc74f0c161dd8754f016ce96109167be6c580ad23994fa1d2c38c54b96e602f3aece +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSING" "${SOURCE_PATH}/COPYING.LIB") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libxcrypt/vcpkg.json b/ports/libxcrypt/vcpkg.json new file mode 100644 index 00000000000000..e0f08eb1832d0e --- /dev/null +++ b/ports/libxcrypt/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libxcrypt", + "version": "4.4.36", + "description": "libxcrypt is a modern library for one-way hashing of passwords. On Linux-based systems, by default libxcrypt will be binary backward compatible with the libcrypt.so.1 shipped as part of the GNU C Library.", + "homepage": "https://github.com/besser82/libxcrypt", + "license": "LGPL-2.1-only", + "supports": "linux" +} diff --git a/ports/libxml2/fix_cmakelist.patch b/ports/libxml2/fix_cmakelist.patch index f8c60d0f15606d..7be171290410cb 100644 --- a/ports/libxml2/fix_cmakelist.patch +++ b/ports/libxml2/fix_cmakelist.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f922d5ab..685964b3 100644 +index 9701bdc..39e96ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -420,15 +420,15 @@ endif() +@@ -393,15 +393,15 @@ endif() if(LIBXML2_WITH_ICU) target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc) if(WIN32) @@ -21,7 +21,7 @@ index f922d5ab..685964b3 100644 endif() if(LIBXML2_WITH_THREADS) -@@ -438,7 +438,7 @@ endif() +@@ -411,7 +411,7 @@ endif() if(LIBXML2_WITH_ZLIB) target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB) @@ -30,7 +30,7 @@ index f922d5ab..685964b3 100644 endif() set_target_properties( -@@ -490,23 +490,9 @@ set_target_properties( +@@ -425,23 +425,9 @@ set_target_properties( SOVERSION ${LIBXML_MAJOR_VERSION} ) @@ -56,7 +56,7 @@ index f922d5ab..685964b3 100644 endif() install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) -@@ -654,30 +640,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN +@@ -574,30 +560,30 @@ endif() configure_package_config_file( libxml2-config.cmake.cmake.in libxml2-config.cmake @@ -92,8 +92,19 @@ index f922d5ab..685964b3 100644 NAMESPACE LibXml2:: FILE libxml2-export.cmake COMPONENT development +@@ -635,9 +621,7 @@ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development) + +-if(WIN32) +- set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..") +-endif() ++set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..") + configure_file(xml2-config.in xml2-config @ONLY) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xml2-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT development) + diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index 2653a7c5..2eb2f362 100644 +index 88e3963b..0d1706c9 100644 --- a/libxml-2.0.pc.in +++ b/libxml-2.0.pc.in @@ -8,6 +8,7 @@ Name: libXML @@ -104,5 +115,5 @@ index 2653a7c5..2eb2f362 100644 -Libs.private: @XML_PRIVATE_LIBS@ @LIBS@ +Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@ +Libs: -L${libdir} -l@XML_LIB_NAME@ -+Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WIN32_EXTRA_LIBADD@ @LIBS@ ++Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WINSOCK_LIBS@ @LIBS@ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index 483416031d596f..9f1cb2c3acc9e7 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxml2 - REF f507d167f1755b7eaea09fb1a44d29aab828b6d1 - SHA512 2ac3dcab31111f608a3fe33dde492c9653ad2bd49a792373acdd03d2787e1a4ef70eeb7a3d47cf67eefd43aee2ab75ec50b36cdcd124445ca206de924abb6021 + REF "v${VERSION}" + SHA512 527e66f6260a399318cfacc06db3ede4b16178ef17492ed0d515884aa00fce685f9e6932cd117df0d83e2440b5a5392c3d5fbe187b601cf19769b495e0865c87 HEAD_REF master PATCHES disable-docs.patch @@ -39,7 +39,6 @@ vcpkg_cmake_configure( -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_READER=ON -DLIBXML2_WITH_REGEXPS=ON - -DLIBXML2_WITH_RUN_DEBUG=OFF -DLIBXML2_WITH_SAX1=ON -DLIBXML2_WITH_SCHEMAS=ON -DLIBXML2_WITH_SCHEMATRON=ON @@ -87,4 +86,4 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Copyright") diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 47f4866b135eb8..042db9ebecaf0b 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libxml2", - "version": "2.10.3", + "version": "2.11.5", "port-version": 1, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home", diff --git a/ports/libxpm/portfile.cmake b/ports/libxpm/portfile.cmake index 631346d5158363..10c8f6932deb6e 100644 --- a/ports/libxpm/portfile.cmake +++ b/ports/libxpm/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH REPO lib/libxpm - REF libXpm-3.5.14 - SHA512 1ae8c48b0d928265cfc6baac1286f241f20e70c88d6f9b6881ccccd7f2e290ca0afaf0f3a051ad5526449dec93c6cc41c48bb6e488e29e2baec87238f17f6bcf + REF "libXpm-${VERSION}" + SHA512 006d5fb2fd951b8857b8d409d65ebe4f819dc51df3bbe933ef9b879a9dc832b0828481c7c0cac453a82a1e81f39990fc49819314a443a1082bdaea6044bb3013 PATCHES remove_strings_h.patch fix-dependency-gettext.patch @@ -47,4 +47,4 @@ endif() # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -endif() \ No newline at end of file +endif() diff --git a/ports/libxpm/vcpkg.json b/ports/libxpm/vcpkg.json index 9169553d22f9ff..f34d6b6ae7e734 100644 --- a/ports/libxpm/vcpkg.json +++ b/ports/libxpm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libxpm", - "version": "3.5.14", + "version": "3.5.16", "description": "XPM format pixmap library", "homepage": "https://github.com/freedesktop/libXpm", "license": "MIT", diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index 8719483153c2e6..daad8957269f19 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-dependency.patch + use-requires.patch ) vcpkg_check_features( diff --git a/ports/libzip/use-requires.patch b/ports/libzip/use-requires.patch new file mode 100644 index 00000000000000..b39bcb4480174c --- /dev/null +++ b/ports/libzip/use-requires.patch @@ -0,0 +1,84 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cf85fc4b7..90615fec9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,12 +41,14 @@ endif() + if(ENABLE_GNUTLS) + find_package(Nettle 3.0) + find_package(GnuTLS) ++ list(APPEND REQUIRES nettle) + endif() + if(ENABLE_MBEDTLS) + find_package(MbedTLS 1.0) + endif() + if(ENABLE_OPENSSL) + find_package(OpenSSL) ++ list(APPEND REQUIRES openssl) + endif() + if(WIN32) + if(ENABLE_WINDOWS_CRYPTO) +@@ -177,7 +179,7 @@ int main(int argc, char *argv[]) { }" HAVE_NULLABLE) + test_big_endian(WORDS_BIGENDIAN) + + find_package(ZLIB 1.1.2 REQUIRED) +- ++list(APPEND REQUIRES zlib) + if(ENABLE_BZIP2) + find_package(BZip2) + if(BZIP2_FOUND) +@@ -185,6 +187,7 @@ if(ENABLE_BZIP2) + else() + message(WARNING "-- bzip2 library not found; bzip2 support disabled") + endif(BZIP2_FOUND) ++ list(APPEND REQUIRES bzip2) + endif(ENABLE_BZIP2) + + if(ENABLE_LZMA) +@@ -194,6 +197,7 @@ if(ENABLE_LZMA) + else() + message(WARNING "-- lzma library not found; lzma/xz support disabled") + endif(LIBLZMA_FOUND) ++ list(APPEND REQUIRES liblzma) + endif(ENABLE_LZMA) + + if(ENABLE_ZSTD) +@@ -203,6 +207,7 @@ if(ENABLE_ZSTD) + else() + message(WARNING "-- zstd library not found; zstandard support disabled") + endif(Zstd_FOUND) ++ list(APPEND REQUIRES libzstd) + endif(ENABLE_ZSTD) + + if (COMMONCRYPTO_FOUND) +@@ -299,13 +304,14 @@ foreach(LIB ${LIBS_PRIVATE}) + endif() + set(LIBS "${LIBS} -l${LIB}") + endforeach() +-string(REGEX REPLACE "-lBZip2::BZip2" "-lbz2" LIBS ${LIBS}) +-string(REGEX REPLACE "-lLibLZMA::LibLZMA" "-llzma" LIBS ${LIBS}) +-string(REGEX REPLACE "-l$,zstd::libzstd_shared,zstd::libzstd_static>" "-lzstd" LIBS ${LIBS}) +-string(REGEX REPLACE "-lOpenSSL::Crypto" "-lssl -lcrypto" LIBS ${LIBS}) +-string(REGEX REPLACE "-lZLIB::ZLIB" "-lz" LIBS ${LIBS}) ++string(REGEX REPLACE "-lBZip2::BZip2" "" LIBS ${LIBS}) ++string(REGEX REPLACE "-lLibLZMA::LibLZMA" "" LIBS ${LIBS}) ++string(REGEX REPLACE "-l$,zstd::libzstd_shared,zstd::libzstd_static>" "" LIBS ${LIBS}) ++string(REGEX REPLACE "-lOpenSSL::Crypto" "" LIBS ${LIBS}) ++string(REGEX REPLACE "-lZLIB::ZLIB" "" LIBS ${LIBS}) + string(REGEX REPLACE "-lGnuTLS::GnuTLS" "-lgnutls" LIBS ${LIBS}) + string(REGEX REPLACE "-lNettle::Nettle" "-lnettle" LIBS ${LIBS}) ++list(JOIN REQUIRES " " REQUIRES) + configure_file(libzip.pc.in libzip.pc @ONLY) + if(LIBZIP_DO_INSTALL) + install(FILES ${PROJECT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +diff --git a/libzip.pc.in b/libzip.pc.in +index d51b0ab63..755685c03 100644 +--- a/libzip.pc.in ++++ b/libzip.pc.in +@@ -9,6 +9,7 @@ zipcmp=${bindir}/zipcmp + Name: libzip + Description: library for handling zip archives + Version: @PROJECT_VERSION@ ++Requires.private: @REQUIRES@ + Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip + Libs.private: @LIBS@ + Cflags: -I${includedir} diff --git a/ports/libzip/vcpkg.json b/ports/libzip/vcpkg.json index eee23532915ac5..5a3ab4fe82ae9e 100644 --- a/ports/libzip/vcpkg.json +++ b/ports/libzip/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libzip", "version": "1.9.2", - "port-version": 1, + "port-version": 2, "description": "A library for reading, creating, and modifying zip archives.", "homepage": "https://github.com/nih-at/libzip", "license": "BSD-3-Clause", diff --git a/ports/libzippp/portfile.cmake b/ports/libzippp/portfile.cmake index 4f60d687734a4b..5b9c820587dcb4 100644 --- a/ports/libzippp/portfile.cmake +++ b/ports/libzippp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ctabin/libzippp - REF 1934adf591ffe2a53e48d46a522b222b9c1df870 #v6.1-1.9.2 with CXX std version c++11 - SHA512 1fcc30b5e94c7b7d4bfcd520e91f8cff3d00feeda9acd280ccefa13986aeb98884f45af44334c965a0b6c33a9300f0757d727ff15b86a98e66dd7bf3179c042a + REF 7bc5e5d7de8808acd0a00fc2f993bf9141086c22 #v7.0-1.10.1 with CXX std version c++11 + SHA512 f84aaab7ccf3d2f90ed1b49e9d71059c045e8aab08bc185a2d63f2ff6ba106c185e7d8938fe653fe96797e9f4f36fb04c12927a4339250ac431eed01ebf900bb HEAD_REF master ) diff --git a/ports/libzippp/vcpkg.json b/ports/libzippp/vcpkg.json index b338b05baeabd7..4aa6d9e78f31a3 100644 --- a/ports/libzippp/vcpkg.json +++ b/ports/libzippp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libzippp", - "version": "6.1-1.9.2", + "version": "7.0-1.10.1", "description": "Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling", "homepage": "https://github.com/ctabin/libzippp", "license": "BSD-3-Clause", diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index 04843e9424aa6d..c439cb5e66b6fb 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://live555.com/liveMedia/public/live.2023.06.20.tar.gz" - FILENAME "live.2023.06.20.tar.gz" - SHA512 dad8cb279aa020a50ffe0e049e37ba872df52da930a75f44abbd8b07db10ba4174b1b96c0a2f4f678972d167c1bab8c5fc2bdc5ef1916c43618f12134293f672 + URLS "http://live555.com/liveMedia/public/live.2023.07.24.tar.gz" + FILENAME "live.2023.07.24.tar.gz" +SHA512 d0708a087d9252b2f13d7b2e14c47e24e895ac329d5dd640a00756e92c846c57573198f6cc79e88272567babf5b0bb8cb268e750685efe8b9693fd9aec384e70 ) vcpkg_extract_source_archive( diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index d1434ef0baadcd..6406ec614cdc92 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,6 +1,6 @@ { "name": "live555", - "version-date": "2023-06-20", + "version-date": "2023-07-24", "description": "A complete RTSP server application", "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", diff --git a/ports/llhttp/fix-usage.patch b/ports/llhttp/fix-usage.patch new file mode 100644 index 00000000000000..3118ea1d33ed7b --- /dev/null +++ b/ports/llhttp/fix-usage.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bdef288..72555c6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,6 +77,10 @@ function(config_library target) + NAMESPACE llhttp:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/llhttp + ) ++ target_include_directories(${target} ++ PRIVATE include ${CMAKE_CURRENT_BINARY_DIR} ++ INTERFACE $ ++ ) + endfunction(config_library target) + + if(BUILD_SHARED_LIBS) diff --git a/ports/llhttp/portfile.cmake b/ports/llhttp/portfile.cmake index 03ce69a1139403..96925d8eeae10d 100644 --- a/ports/llhttp/portfile.cmake +++ b/ports/llhttp/portfile.cmake @@ -1,8 +1,12 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nodejs/llhttp - REF refs/tags/release/v8.1.0 - SHA512 3b79555f734a6a200a790f04f10be6d3ce5bd999c027a43c0900bb408e7d64be38fe4bbe9f15e57e389f07ba26b8089fc6ba5eef3b497742484f0719e92e9722 + REF refs/tags/release/v${VERSION} + SHA512 d3e2c45f631e8bbc5b4b72f931a1af3e7b4f9d2851856a3c797577a3c261c7da15606efe41ff6b4f26713274f44eb3086019711461cb6bbe04e561b20af40a6f + PATCHES + fix-usage.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LLHTTP_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LLHTTP_BUILD_SHARED) diff --git a/ports/llhttp/vcpkg.json b/ports/llhttp/vcpkg.json index e97f3cc111d87e..f1822b1146b2e3 100644 --- a/ports/llhttp/vcpkg.json +++ b/ports/llhttp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "llhttp", - "version": "8.1.0", - "port-version": 1, + "version": "9.1.2", "description": "Port of http_parser to llparse.", "homepage": "https://github.com/nodejs/llhttp", "license": "MIT", diff --git a/ports/llvm/0006-Fix-libffi.patch b/ports/llvm/0006-Fix-libffi.patch deleted file mode 100644 index 3859b81fecb8bd..00000000000000 --- a/ports/llvm/0006-Fix-libffi.patch +++ /dev/null @@ -1,16 +0,0 @@ - llvm/cmake/modules/FindFFI.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/llvm/cmake/modules/FindFFI.cmake b/llvm/cmake/modules/FindFFI.cmake -index b0d859af8959..a756d0c8fdb0 100644 ---- a/llvm/cmake/modules/FindFFI.cmake -+++ b/llvm/cmake/modules/FindFFI.cmake -@@ -34,7 +34,7 @@ else() - endif() - endif() - --find_library(FFI_LIBRARIES ffi PATHS ${FFI_LIBRARY_DIR}) -+find_library(FFI_LIBRARIES ffi libffi PATHS ${FFI_LIBRARY_DIR}) - - if(FFI_LIBRARIES) - include(CMakePushCheckState) diff --git a/ports/llvm/0010-remove-numpy.patch b/ports/llvm/0010-remove-numpy.patch new file mode 100644 index 00000000000000..aefd2eb53491e3 --- /dev/null +++ b/ports/llvm/0010-remove-numpy.patch @@ -0,0 +1,25 @@ +From 80300a7f4533fdfc75ec60b0d1dc1c5d5a6b9e3c Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Fri, 14 Jul 2023 09:45:22 -0700 +Subject: [PATCH] remove_numpy + +--- + mlir/cmake/modules/MLIRDetectPythonEnv.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mlir/cmake/modules/MLIRDetectPythonEnv.cmake b/mlir/cmake/modules/MLIRDetectPythonEnv.cmake +index 9c8966591514..35c94f0d1acc 100644 +--- a/mlir/cmake/modules/MLIRDetectPythonEnv.cmake ++++ b/mlir/cmake/modules/MLIRDetectPythonEnv.cmake +@@ -26,7 +26,7 @@ macro(mlir_configure_python_dev_packages) + set(_python_development_component Development.Module) + + find_package(Python3 ${LLVM_MINIMUM_PYTHON_VERSION} +- COMPONENTS Interpreter ${_python_development_component} NumPy REQUIRED) ++ COMPONENTS Interpreter ${_python_development_component} REQUIRED) + unset(_python_development_component) + message(STATUS "Found python include dirs: ${Python3_INCLUDE_DIRS}") + message(STATUS "Found python libraries: ${Python3_LIBRARIES}") +-- +2.41.0.windows.2 + diff --git a/ports/llvm/0011-missing-include.patch b/ports/llvm/0011-missing-include.patch new file mode 100644 index 00000000000000..c09ed958f690bc --- /dev/null +++ b/ports/llvm/0011-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/llvm/lib/Debuginfod/Debuginfod.cpp b/llvm/lib/Debuginfod/Debuginfod.cpp +index ef4e11ca3..29fdd6ffb 100644 +--- a/llvm/lib/Debuginfod/Debuginfod.cpp ++++ b/llvm/lib/Debuginfod/Debuginfod.cpp +@@ -40,6 +40,7 @@ + #include "llvm/Support/xxhash.h" + + #include ++#include + + namespace llvm { + static std::string uniqueKey(llvm::StringRef S) { return utostr(xxHash64(S)); } diff --git a/ports/llvm/0012-create-destination-mlir-directory.patch b/ports/llvm/0012-create-destination-mlir-directory.patch new file mode 100644 index 00000000000000..a8d6db47be50ff --- /dev/null +++ b/ports/llvm/0012-create-destination-mlir-directory.patch @@ -0,0 +1,13 @@ +diff --git a/mlir/python/CMakeLists.txt b/mlir/python/CMakeLists.txt +index 7eb6e05e4..b9e1a096a 100644 +--- a/mlir/python/CMakeLists.txt ++++ b/mlir/python/CMakeLists.txt +@@ -483,6 +483,8 @@ add_mlir_python_common_capi_library(MLIRPythonCAPI + ${_ADDL_TEST_SOURCES} + ) + ++file(MAKE_DIRECTORY "${MLIR_BINARY_DIR}/python_packages/mlir_core/mlir/_mlir_libs") ++ + ################################################################################ + # The fully assembled package of modules. + # This must come last. diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 1ddcc720d901fe..4d7e26a182b162 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -12,10 +12,12 @@ vcpkg_from_github( 0003-Fix-tools-path.patch 0004-Fix-compiler-rt-install-path.patch 0005-Fix-tools-install-path.patch - 0006-Fix-libffi.patch 0007-Fix-install-bolt.patch 0008-llvm_assert.patch 0009-disable-libomp-aliases.patch + 0010-remove-numpy.patch + 0011-missing-include.patch + 0012-create-destination-mlir-directory.patch ) vcpkg_check_features( @@ -147,6 +149,12 @@ if("lldb" IN_LIST FEATURES) endif() if("mlir" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "mlir") + if("enable-mlir-python-bindings" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS + -DMLIR_ENABLE_BINDINGS_PYTHON=ON + "-Dpybind11_DIR=${CURRENT_INSTALLED_DIR}/share/pybind11" + ) + endif() endif() if("openmp" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "openmp") diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 99f7b717a8b632..4665ef82cf9aeb 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "llvm", "version": "15.0.7", - "port-version": 3, + "port-version": 6, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", @@ -193,6 +193,21 @@ "libxml2" ] }, + "enable-mlir-python-bindings": { + "description": "Build MLIR Python bindings.", + "supports": "!(windows & static)", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "mlir" + ] + }, + "pybind11", + "python3" + ] + }, "enable-rtti": { "description": "Build LLVM with run-time type information." }, diff --git a/ports/lmdb/cmake/CMakeLists.txt b/ports/lmdb/cmake/CMakeLists.txt index babddef004e598..1388328a188eef 100644 --- a/ports/lmdb/cmake/CMakeLists.txt +++ b/ports/lmdb/cmake/CMakeLists.txt @@ -1,81 +1,72 @@ -cmake_minimum_required(VERSION 2.8) - -file(READ "${CMAKE_CURRENT_SOURCE_DIR}/lmdb.h" VERSION_HEADER) -string(REGEX MATCH ".*MDB_VERSION_MAJOR[ \t]+([0-9])" MAJOR_VERSION_MATCH "${VERSION_HEADER}") -set(LMDB_MAJOR_VERSION ${CMAKE_MATCH_1}) -string(REGEX MATCH ".*MDB_VERSION_MINOR[ \t]+([0-9])" MINOR_VERSION_MATCH "${VERSION_HEADER}") -set(LMDB_MINOR_VERSION ${CMAKE_MATCH_1}) -string(REGEX MATCH ".*MDB_VERSION_PATCH[ \t]+([0-9]+)" PATCH_VERSION_MATCH "${VERSION_HEADER}") -set(LMDB_PATCH_VERSION ${CMAKE_MATCH_1}) - -set(LMDB_VERSION "${LMDB_MAJOR_VERSION}.${LMDB_MINOR_VERSION}.${LMDB_PATCH_VERSION}") +cmake_minimum_required(VERSION 3.27) project(lmdb) option(LMDB_BUILD_TOOLS "Build lmdb tools" OFF) option(LMDB_BUILD_TESTS "Build lmdb tests" OFF) option(LMDB_INSTALL_HEADERS "Install LMDB header files" ON) -set(LMDB_INCLUDE_INSTALL_DIR include CACHE PATH "Install directory for headers") -set(LMDB_LIBRARY_INSTALL_DIR lib CACHE PATH "Install directory for library") -set(LMDB_RUNTIME_INSTALL_DIR bin CACHE PATH "Install directory for binaries/dlls") -set(LMDB_CONFIG_INSTALL_DIR share/lmdb CACHE PATH "Install directory for cmake config files") - -if(MSVC AND BUILD_SHARED_LIBS) -set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/lmdbd.def\"") -set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/lmdb.def\"") -endif() -set(SRCS lmdb mdb.c lmdb.h midl.c midl.h ) -add_library(lmdb ${SRCS}) +include(GNUInstallDirs) -if (WIN32) - target_link_libraries(lmdb PRIVATE ntdll.lib) +add_library(lmdb mdb.c lmdb.h midl.c midl.h) +if(WIN32 AND BUILD_SHARED_LIBS) + target_sources(lmdb PRIVATE lmdb.def) endif() -install(TARGETS lmdb DESTINATION lib - EXPORT lmdb-targets - RUNTIME DESTINATION ${LMDB_RUNTIME_INSTALL_DIR} - LIBRARY DESTINATION ${LMDB_LIBRARY_INSTALL_DIR} - ARCHIVE DESTINATION ${LMDB_LIBRARY_INSTALL_DIR} - ) +set(THREADS_PREFER_PTHREAD_FLAG 1) +find_package(Threads REQUIRED) +target_link_libraries(lmdb PRIVATE Threads::Threads) + +install(TARGETS lmdb + EXPORT unofficial-lmdb-targets + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +) if(LMDB_INSTALL_HEADERS) - install(FILES lmdb.h midl.h DESTINATION ${LMDB_INCLUDE_INSTALL_DIR}) + install(FILES lmdb.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") endif() +target_include_directories(lmdb INTERFACE "$") include(CMakePackageConfigHelpers) - -set(INSTALL_INCLUDE_DIR ${LMDB_INCLUDE_INSTALL_DIR}) -configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/package-config.cmakein ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config.cmake - INSTALL_DESTINATION ${LMDB_CONFIG_INSTALL_DIR} - PATH_VARS INSTALL_INCLUDE_DIR - ) - -write_basic_package_version_file( ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config-version.cmake VERSION ${LMDB_VERSION} COMPATIBILITY SameMajorVersion ) - -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config-version.cmake - DESTINATION ${LMDB_CONFIG_INSTALL_DIR} ) - - -install(EXPORT lmdb-targets DESTINATION ${LMDB_CONFIG_INSTALL_DIR}) +configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/package-config.cmakein" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lmdb-config.cmake" + INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/lmdb" +) +write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-lmdb-config-version.cmake" + VERSION "${LMDB_VERSION}" + COMPATIBILITY SameMajorVersion +) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lmdb-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lmdb-config-version.cmake" + DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-lmdb" +) +install(EXPORT unofficial-lmdb-targets + NAMESPACE unofficial::lmdb:: + DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-lmdb" +) if(LMDB_BUILD_TOOLS) - # don't build mdb_dump/load/stat since they will - # not build on windows - foreach(_tool mdb_copy) - add_executable(${_tool} ${_tool}.c) - target_link_libraries(${_tool} lmdb) - endforeach() + set(getopt_libs "") + if(WIN32 AND NOT MINGW) + find_package(unofficial-getopt-win32 REQUIRED) + set(getopt_libs "unofficial::getopt-win32::getopt") + endif() + foreach(tool IN ITEMS mdb_copy mdb_dump mdb_load mdb_stat) + add_executable(${tool} ${tool}.c) + target_link_libraries(${tool} lmdb ${getopt_libs}) + install(TARGETS ${tool} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) + endforeach() endif() if(LMDB_BUILD_TESTS) - enable_testing() - # don't use mtest6 since it will only build in static - # build - foreach(_test mtest mtest2 mtest3 mtest4 mtest5) - add_executable(${_test} ${_test}.c) - target_link_libraries(${_test} lmdb) - add_test(NAME ${_test} - COMMAND ${CMAKE_COMMAND} -DTEST=$ + #include + #include ++#ifdef _MSC_VER ++#include ++#else + #include ++#endif + #include + #include "lmdb.h" + +diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c +index d2a3cec..f050286 100644 +--- a/libraries/liblmdb/mdb_load.c ++++ b/libraries/liblmdb/mdb_load.c +@@ -16,7 +16,11 @@ + #include + #include + #include ++#ifdef _MSC_VER ++#include ++#else + #include ++#endif + #include "lmdb.h" + + #define PRINT 1 +diff --git a/libraries/liblmdb/mdb_stat.c b/libraries/liblmdb/mdb_stat.c +index 3a81175..f1f4a75 100644 +--- a/libraries/liblmdb/mdb_stat.c ++++ b/libraries/liblmdb/mdb_stat.c +@@ -14,7 +14,13 @@ + #include + #include + #include ++#ifdef _MSC_VER ++#include ++#include ++typedef SSIZE_T ssize_t; ++#else + #include ++#endif + #include "lmdb.h" + + #ifdef _WIN32 diff --git a/ports/lmdb/lmdb-config.cmake b/ports/lmdb/lmdb-config.cmake new file mode 100644 index 00000000000000..50b92707f12242 --- /dev/null +++ b/ports/lmdb/lmdb-config.cmake @@ -0,0 +1,14 @@ +file(READ "${CMAKE_CURRENT_LIST_DIR}/../lmdb/usage" usage) +message(WARNING "find_package(lmdb) is deprecated.\n${usage}") + +include(CMakeFindDependencyMacro) +find_dependency(unofficial-lmdb ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION}) + +set(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") +set(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS "${${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIR}") +set(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES lmdb) + +string(TOUPPER "${CMAKE_FIND_PACKAGE_NAME}" UPPER_PACKAGE_NAME) +set(${UPPER_PACKAGE_NAME}_INCLUDE_DIR "${${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIR}") +set(${UPPER_PACKAGE_NAME}_INCLUDE_DIRS "${${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIR}") +set(${UPPER_PACKAGE_NAME}_LIBRARIES lmdb) diff --git a/ports/lmdb/portfile.cmake b/ports/lmdb/portfile.cmake index 263966bbd32ac6..2e32aca98934be 100644 --- a/ports/lmdb/portfile.cmake +++ b/ports/lmdb/portfile.cmake @@ -1,23 +1,43 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LMDB/lmdb - REF 8ad7be2510414b9506ec9f9e24f24d04d9b04a1a # LMDB_0.9.29 - SHA512 a18b6217761bdfcc5964d9817addd2d0c6c735d02a823717eb7ae1561a48110da0708a3290e21297d481e4d8eeb5d92a4a6860ff44888bf2da665cd9f167513c + REF "LMDB_${VERSION}" + SHA512 a5763ff94af0b5bbc2406c52890797e6232e77593bacdb240441ed30c8634e4e6de6eba206880475544e21561ccd0be2dee16733d6ec35483eb1dbbb81913a8d HEAD_REF master + PATCHES + getopt-win32.diff ) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/cmake/" DESTINATION "${SOURCE_PATH}/libraries/liblmdb") +vcpkg_check_features(OUT_FEATURE_OPTIONS options_release + FEATURES + tools LMDB_BUILD_TOOLS +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/libraries/liblmdb" + OPTIONS + "-DLMDB_VERSION=${VERSION}" + OPTIONS_RELEASE + ${options_release} OPTIONS_DEBUG -DLMDB_INSTALL_HEADERS=OFF ) vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lmdb) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(LMDB_BUILD_TOOLS) + vcpkg_copy_tools(TOOL_NAMES mdb_copy mdb_dump mdb_load mdb_stat AUTO_CLEAN) +endif() -file(INSTALL "${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lmdb" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_copy_pdbs() +file(COPY "${CURRENT_PORT_DIR}/lmdb-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT" + "${SOURCE_PATH}/libraries/liblmdb/LICENSE" +) diff --git a/ports/lmdb/usage b/ports/lmdb/usage new file mode 100644 index 00000000000000..ef273ae521f37e --- /dev/null +++ b/ports/lmdb/usage @@ -0,0 +1,4 @@ +lmdb provides CMake targets: + + find_package(unofficial-lmdb CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::lmdb::lmdb) diff --git a/ports/lmdb/vcpkg.json b/ports/lmdb/vcpkg.json index 210c776d13ada1..f743855b266896 100644 --- a/ports/lmdb/vcpkg.json +++ b/ports/lmdb/vcpkg.json @@ -1,11 +1,9 @@ { "name": "lmdb", - "version": "0.9.29", - "port-version": 2, + "version": "0.9.31", "description": "LMDB is an extraordinarily fast, memory-efficient database", "homepage": "https://github.com/LMDB/lmdb", - "license": null, - "supports": "!(arm & windows)", + "license": "OLDAP-2.8", "dependencies": [ { "name": "vcpkg-cmake", @@ -15,5 +13,14 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tools": { + "description": "Build tools", + "supports": "!uwp", + "dependencies": [ + "getopt" + ] + } + } } diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index 849a5c94a9e216..efacf7905d9fb3 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://archive.apache.org/dist/logging/log4cxx/${VERSION}/apache-log4cxx-${VERSION}.tar.gz" FILENAME "apache-log4cxx-${VERSION}.tar.gz" - SHA512 a6b928d7b5b4fb60a67504be082f436a6d1a750b752a89df51d0660670b6c008e7376cf56c1749fd5fc17777ae8a2d957f72879c9a89487ecb0f179999dc1283 + SHA512 66a66eab933a6afd0779e3f73f65afa4fb82481208b591fd7c7c86ded805f50abcd9cdf954bdb49e1e7f5198e6c1c4fff8a7e180ff5fff9491f1946e9ba6fe2b ) vcpkg_extract_source_archive( diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json index 48aeae262ee1ed..f7769b3fd43c8a 100644 --- a/ports/log4cxx/vcpkg.json +++ b/ports/log4cxx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "log4cxx", - "version": "1.0.0", + "version": "1.1.0", "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR", "homepage": "https://logging.apache.org/log4cxx", "license": "Apache-2.0", diff --git a/ports/luajit/Makefile.nmake b/ports/luajit/Makefile.nmake index 5dadd97351ca76..3ca250870e4e64 100644 --- a/ports/luajit/Makefile.nmake +++ b/ports/luajit/Makefile.nmake @@ -3,7 +3,7 @@ all: @echo _LINK_ = $(_LINK_) cd src && .\msvcbuild.bat $(MSVCBUILD_OPTIONS) -install: src/luajit.exe +install: src\luajit.exe -mkdir "$(INSTALLDIR)" -mkdir "$(INSTALLDIR)\bin" copy src\luajit.exe "$(INSTALLDIR)\bin\" @@ -12,9 +12,9 @@ install: src/luajit.exe copy src\lua51.lib "$(INSTALLDIR)\lib\" -mkdir "$(INSTALLDIR)\include" -mkdir "$(INSTALLDIR)\include\luajit" - copy src/lua.h "$(INSTALLDIR)\include\luajit\" - copy src/luajit.h "$(INSTALLDIR)\include\luajit\" - copy src/luaconf.h "$(INSTALLDIR)\include\luajit\" - copy src/lualib.h "$(INSTALLDIR)\include\luajit\" - copy src/lauxlib.h "$(INSTALLDIR)\include\luajit\" - copy src/lua.hpp "$(INSTALLDIR)\include\luajit\" + copy src\lua.h "$(INSTALLDIR)\include\luajit\" + copy src\luajit.h "$(INSTALLDIR)\include\luajit\" + copy src\luaconf.h "$(INSTALLDIR)\include\luajit\" + copy src\lualib.h "$(INSTALLDIR)\include\luajit\" + copy src\lauxlib.h "$(INSTALLDIR)\include\luajit\" + copy src\lua.hpp "$(INSTALLDIR)\include\luajit\" diff --git a/ports/luajit/configure b/ports/luajit/configure index 49171aa39f652d..0384100aa001a4 100755 --- a/ports/luajit/configure +++ b/ports/luajit/configure @@ -58,7 +58,7 @@ TARGET_TESTARCH_COMMON_64 += \$(TARGET_TESTARCH_COMMON) 'LJ_ARCH_BITS 64' 'LJ_TA TARGET_TESTARCH_arm = \$(TARGET_TESTARCH_COMMON_32) LJ_TARGET_ARM TARGET_TESTARCH_arm64 = \$(TARGET_TESTARCH_COMMON_64) LJ_TARGET_ARM64 'LJ_ARCH_VERSION 80' TARGET_TESTARCH_x86 = \$(TARGET_TESTARCH_COMMON_32) LJ_TARGET_X86 -TARGET_TESTARCH_x64 = \$(TARGET_TESTARCH_COMMON_64) LJ_TARGET_X64 'LJ_DUALNUM 1' 'LJ_FR2 1' +TARGET_TESTARCH_x64 = \$(TARGET_TESTARCH_COMMON_64) LJ_TARGET_X64 'LJ_FR2 1' all: \$(MAKE) clean \$(COMMON_OPTIONS) \$(BUILD_OPTIONS) diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index f128baf5d42a63..41e1275a2d1250 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "luajit", "version-date": "2023-01-04", - "port-version": 2, + "port-version": 4, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", "license": "MIT", diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index dac769c141b748..1cc3719d2d4610 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -74,10 +74,15 @@ endforeach() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) +if(VCPKG_CROSSCOMPILING) + set(CORRADE_RC_EXECUTABLE "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + ${CORRADE_RC_EXECUTABLE} -DBUILD_STATIC=${BUILD_PLUGINS_STATIC} -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC} -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d @@ -129,8 +134,6 @@ else() endif() # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") vcpkg_copy_pdbs() diff --git a/ports/magnum-plugins/vcpkg.json b/ports/magnum-plugins/vcpkg.json index 25b2bc70150728..5daaf11f28e888 100644 --- a/ports/magnum-plugins/vcpkg.json +++ b/ports/magnum-plugins/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magnum-plugins", "version-string": "2020.06", - "port-version": 10, + "port-version": 11, "description": "Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "license": null, diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index 2f1a092669d1e3..44b512d34e2b26 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -68,10 +68,15 @@ endforeach() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) +if(VCPKG_CROSSCOMPILING) + set(CORRADE_RC_EXECUTABLE "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + ${CORRADE_RC_EXECUTABLE} -DBUILD_STATIC=${BUILD_STATIC} -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC} -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json index ab30bc9721715a..04d5b3a9282a77 100644 --- a/ports/magnum/vcpkg.json +++ b/ports/magnum/vcpkg.json @@ -1,11 +1,18 @@ { "name": "magnum", "version-string": "2020.06", - "port-version": 13, + "port-version": 14, "description": "C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "license": null, "dependencies": [ + { + "name": "corrade", + "host": true, + "features": [ + "utility" + ] + }, { "name": "corrade", "features": [ diff --git a/ports/mapnik/missing-include.patch b/ports/mapnik/missing-include.patch new file mode 100644 index 00000000000000..49b80d400611cf --- /dev/null +++ b/ports/mapnik/missing-include.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp +index 382b1ce..c0256de 100644 +--- a/plugins/input/csv/csv_utils.cpp ++++ b/plugins/input/csv/csv_utils.cpp +@@ -40,6 +40,8 @@ + #include + #include + ++#include ++ + namespace csv_utils { + namespace detail { + diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index f1baeab41a111a..8ff420149a1cc0 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 123232ffde565af38afd06fe3e8edd9bfdce93bc SHA512 b940312688fcece8bb52b8b687fcc60eaac159d4737966eacacbafbde6fbd3245f9acf170d55a664a781908282cb21347bd4b79bd08b8ab2461270ef453b10c5 HEAD_REF master + PATCHES + missing-include.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 3a87054df95cac..f7c80e196bd48b 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mapnik", "version-date": "2023-06-12", - "port-version": 1, + "port-version": 2, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "license": "LGPL-2.1-only", @@ -85,7 +85,10 @@ "description": "Grid renderer" }, "input-csv": { - "description": "CSV input plugin" + "description": "CSV input plugin", + "dependencies": [ + "boost-algorithm" + ] }, "input-gdal": { "description": "GDAL input plugin", diff --git a/ports/matroska/vcpkg.json b/ports/matroska/vcpkg.json index 6b2f72d7c7ff8e..bd2141554bff0a 100644 --- a/ports/matroska/vcpkg.json +++ b/ports/matroska/vcpkg.json @@ -1,13 +1,13 @@ { "name": "matroska", "version": "1.7.1", - "port-version": 1, + "port-version": 2, "description": "a C++ library to parse Matroska files (.mkv and .mka)", "homepage": "https://github.com/Matroska-Org/libmatroska", "dependencies": [ { "name": "ebml", - "version>=": "1.4.3" + "version>=": "1.4.4" }, { "name": "vcpkg-cmake", diff --git a/ports/mdl-sdk/001-freeimage-from-vcpkg.patch b/ports/mdl-sdk/001-freeimage-from-vcpkg.patch index d02479f7a8d2bb..9dcc6edcc51e12 100644 --- a/ports/mdl-sdk/001-freeimage-from-vcpkg.patch +++ b/ports/mdl-sdk/001-freeimage-from-vcpkg.patch @@ -66,3 +66,16 @@ index b11573a..703458e 100644 # error if dependencies can not be resolved if(NOT EXISTS ${_FREEIMAGE_INCLUDE} OR (WINDOWS AND NOT EXISTS ${_FREEIMAGE_LIB}) OR NOT EXISTS ${_FREEIMAGE_SHARED}) message(STATUS "FREEIMAGE_DIR: ${FREEIMAGE_DIR}") +diff --git a/src/shaders/plugin/freeimage/CMakeLists.txt b/src/shaders/plugin/freeimage/CMakeLists.txt +index a28b50e..910141e 100644 +--- a/src/shaders/plugin/freeimage/CMakeLists.txt ++++ b/src/shaders/plugin/freeimage/CMakeLists.txt +@@ -69,7 +69,7 @@ add_library(mdl::nv_freeimage ALIAS ${PROJECT_NAME}) + # add dependencies other dependencies + target_add_dependencies(TARGET ${PROJECT_NAME} + DEPENDS +- freeimage ++ freeimage::FreeImage + mdl::base-system-version + ) + diff --git a/ports/mdl-sdk/vcpkg.json b/ports/mdl-sdk/vcpkg.json index a6d75c9c90227e..2f473ed2964a18 100644 --- a/ports/mdl-sdk/vcpkg.json +++ b/ports/mdl-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mdl-sdk", "version": "2021.1.2", - "port-version": 2, + "port-version": 3, "description": "NVIDIA Material Definition Language SDK", "homepage": "https://github.com/NVIDIA/MDL-SDK", "license": "BSD-3-Clause", diff --git a/ports/mdnsresponder/portfile.cmake b/ports/mdnsresponder/portfile.cmake index 365e1ba09dc186..14497831088366 100644 --- a/ports/mdnsresponder/portfile.cmake +++ b/ports/mdnsresponder/portfile.cmake @@ -14,25 +14,7 @@ ENDIF() function(FIX_VCXPROJ VCXPROJ_PATH) file(READ ${VCXPROJ_PATH} ORIG) - if(${VCPKG_CRT_LINKAGE} STREQUAL "dynamic") - string(REGEX REPLACE - "MultiThreadedDebug" - "MultiThreadedDebugDLL" - ORIG "${ORIG}") - string(REGEX REPLACE - "MultiThreaded" - "MultiThreadedDLL" - ORIG "${ORIG}") - else() - string(REGEX REPLACE - "MultiThreadedDebugDLL" - "MultiThreadedDebug" - ORIG "${ORIG}") - string(REGEX REPLACE - "MultiThreadedDLL" - "MultiThreaded" - ORIG "${ORIG}") - endif() + if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") string(REPLACE "StaticLibrary" @@ -44,11 +26,7 @@ function(FIX_VCXPROJ VCXPROJ_PATH) "StaticLibrary" ORIG "${ORIG}") endif() - - string(REPLACE - "ProgramDatabase" - "OldStyle" - ORIG "${ORIG}") + file(WRITE ${VCXPROJ_PATH} "${ORIG}") endfunction() @@ -58,15 +36,13 @@ if(${VCPKG_CRT_LINKAGE} STREQUAL "dynamic" AND ${VCPKG_LIBRARY_LINKAGE} STREQUAL endif() FIX_VCXPROJ("${SOURCE_PATH}/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj") -vcpkg_install_msbuild( +vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "mDNSWindows/mDNSResponder.sln" + PROJECT_SUBPATH mDNSWindows/mDNSResponder.sln PLATFORM ${BUILD_ARCH} TARGET dns-sd - SKIP_CLEAN ) file(INSTALL "${SOURCE_PATH}/mDNSShared/dns_sd.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -vcpkg_copy_pdbs() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/mdnsresponder/vcpkg.json b/ports/mdnsresponder/vcpkg.json index d517b6d17a5dec..d157e4fae03cce 100644 --- a/ports/mdnsresponder/vcpkg.json +++ b/ports/mdnsresponder/vcpkg.json @@ -1,8 +1,16 @@ { "name": "mdnsresponder", "version": "1557.140.5.0.1", + "port-version": 1, "description": "The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.", "homepage": "https://github.com/apple-oss-distributions/mDNSResponder", "license": "Apache-2.0", - "supports": "windows & !uwp & !arm" + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/mecab/fix-missing-functional.patch b/ports/mecab/fix-missing-functional.patch new file mode 100644 index 00000000000000..773429ccc68208 --- /dev/null +++ b/ports/mecab/fix-missing-functional.patch @@ -0,0 +1,12 @@ +diff --git a/mecab/src/dictionary.h b/mecab/src/dictionary.h +index 7046023..32ad358 100644 +--- a/mecab/src/dictionary.h ++++ b/mecab/src/dictionary.h +@@ -10,6 +10,7 @@ + #include "mmap.h" + #include "darts.h" + #include "char_property.h" ++#include + + namespace MeCab { + diff --git a/ports/mecab/portfile.cmake b/ports/mecab/portfile.cmake index 62db155caf95ae..b288e2ab3ceb75 100644 --- a/ports/mecab/portfile.cmake +++ b/ports/mecab/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_wpath_unsigned.patch + fix-missing-functional.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/mecab/src") @@ -25,4 +26,4 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/mecab/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/mecab/COPYING") diff --git a/ports/mecab/vcpkg.json b/ports/mecab/vcpkg.json index 7a3c57dc3a2e5e..b59d7130ec59e6 100644 --- a/ports/mecab/vcpkg.json +++ b/ports/mecab/vcpkg.json @@ -1,9 +1,9 @@ { "name": "mecab", "version-date": "2019-09-25", - "port-version": 4, + "port-version": 5, "description": "A morphological analysis engine based on CRF", - "supports": "!(uwp | arm | arm64)", + "supports": "!uwp & !(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index b652de2bf5d458..e2a39246fcdfb4 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,11 +1,11 @@ { "name": "mesa", "version": "23.0.1", - "port-version": 1, + "port-version": 2, "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "license": "MIT AND BSL-1.0 AND SGI-B-2.0", - "supports": "!(windows & arm) & !staticcrt", + "supports": "!(windows & arm) & !staticcrt & !uwp", "dependencies": [ { "name": "vcpkg-get-python-packages", diff --git a/ports/meshoptimizer/no-werror.patch b/ports/meshoptimizer/no-werror.patch deleted file mode 100644 index 9a5de46487c3f1..00000000000000 --- a/ports/meshoptimizer/no-werror.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b13d946..1aa1304 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -55,9 +55,9 @@ set(GLTF_SOURCES - ) - - if(MSVC) -- add_compile_options(/W4 /WX) -+ add_compile_options(/W4) - else() -- add_compile_options(-Wall -Wextra -Wshadow -Wno-missing-field-initializers -Werror) -+ add_compile_options(-Wall -Wextra -Wshadow -Wno-missing-field-initializers) - endif() - - if(MESHOPT_BUILD_SHARED_LIBS) diff --git a/ports/meshoptimizer/portfile.cmake b/ports/meshoptimizer/portfile.cmake index 4e89ff46287aa5..2feb437a45a178 100644 --- a/ports/meshoptimizer/portfile.cmake +++ b/ports/meshoptimizer/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/meshoptimizer - REF v0.18 - SHA512 b9fd6ce61c7d7b673892ace74feb300628d4bbbba4e912dba4a756d9709b952dde45b706c581df3fd0aef1e7065ff730d1827b0d6c724d716ccf41efb1953d3e + REF v0.19 + SHA512 4de938cb8fbbbe42305511a18e1cba64d6774751604d64f06a6e581fa739c656528b443fdda492459138b9a42c898af8d1d0752777b48a8832e3bef08eb4a522 HEAD_REF master - PATCHES - no-werror.patch ) # If we want basisu support in gltfpack we need a particular fork of basisu diff --git a/ports/meshoptimizer/vcpkg.json b/ports/meshoptimizer/vcpkg.json index fb62ed1f824fb1..d6cff3b0534700 100644 --- a/ports/meshoptimizer/vcpkg.json +++ b/ports/meshoptimizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "meshoptimizer", - "version": "0.18", + "version": "0.19", "port-version": 1, "description": "Mesh optimization library that makes meshes smaller and faster to render", "homepage": "https://github.com/zeux/meshoptimizer", @@ -17,7 +17,8 @@ ], "features": { "gltfpack": { - "description": "Build gltfpack tool" + "description": "Build gltfpack tool", + "supports": "!uwp" } } } diff --git a/ports/mfx-dispatch/fix-pkgconf.patch b/ports/mfx-dispatch/fix-pkgconf.patch index d0d2d80bdc23df..c0310e12a9ce1b 100644 --- a/ports/mfx-dispatch/fix-pkgconf.patch +++ b/ports/mfx-dispatch/fix-pkgconf.patch @@ -24,9 +24,16 @@ diff --git a/libmfx.pc.cmake b/libmfx.pc.cmake index fabb541..5d248fe 100644 --- a/libmfx.pc.cmake +++ b/libmfx.pc.cmake -@@ -11,4 +11,4 @@ Requires.private: +@@ -6,9 +6,9 @@ Requires.private: + Name: libmfx + Description: Intel Media SDK Dispatched static library +-Version: 2013 ++Version: 1.35 + Requires: + Requires.private: Conflicts: - Libs: -L${libdir} -lsupc++ ${libdir}/libmfx.lib +-Libs: -L${libdir} -lsupc++ ${libdir}/libmfx.lib ++Libs: -L${libdir} -llibmfx Libs.private: -Cflags: -I${includedir} -I@INTELMEDIASDK_PATH@ +Cflags: -I${includedir} diff --git a/ports/mfx-dispatch/fix-unresolved-symbol.patch b/ports/mfx-dispatch/fix-unresolved-symbol.patch index ce12f8bd79b223..98a48914bcee8e 100644 --- a/ports/mfx-dispatch/fix-unresolved-symbol.patch +++ b/ports/mfx-dispatch/fix-unresolved-symbol.patch @@ -54,11 +54,12 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP diff --git a/src/mfx_driver_store_loader.cpp b/src/mfx_driver_store_loader.cpp --- a/src/mfx_driver_store_loader.cpp (revision 388559e9e8234eb0989e1598a9beea4035a04132) +++ b/src/mfx_driver_store_loader.cpp (revision 5ebef171699530ca01594a5cef10a68811f4d105) -@@ -24,6 +24,8 @@ +@@ -24,6 +24,9 @@ #include "mfx_dispatcher_log.h" #include "mfx_load_dll.h" +#pragma comment(lib, "Ole32.lib") ++#pragma comment(lib, "Advapi32.lib") + namespace MFX { diff --git a/ports/mfx-dispatch/vcpkg.json b/ports/mfx-dispatch/vcpkg.json index 869a1e9abe4a07..505a076b1c86e9 100644 --- a/ports/mfx-dispatch/vcpkg.json +++ b/ports/mfx-dispatch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mfx-dispatch", "version": "1.35.1", - "port-version": 1, + "port-version": 3, "description": "Open source Intel media sdk dispatcher", "homepage": "https://github.com/lu-zero/mfx_dispatch", "license": "BSD-3-Clause", diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index 5830591618837c..d48abb7fee872d 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -15,10 +15,6 @@ vcpkg_check_features( messagepack USE_MSGPACK ) -if("cpprestsdk" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "microsoft-signalr[cpprestsdk] is not supported on UWP, use microsoft-signalr[core] instead") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/microsoft-signalr/vcpkg.json b/ports/microsoft-signalr/vcpkg.json index 6c36df0298d197..b6a78e67cc4109 100644 --- a/ports/microsoft-signalr/vcpkg.json +++ b/ports/microsoft-signalr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "microsoft-signalr", "version": "0.1.0-alpha4", - "port-version": 7, + "port-version": 8, "description": "C++ Client for ASP.NET Core SignalR.", "homepage": "https://github.com/aspnet/SignalR-Client-Cpp", "dependencies": [ @@ -16,10 +16,7 @@ } ], "default-features": [ - { - "name": "cpprestsdk", - "platform": "!uwp" - } + "cpprestsdk" ], "features": { "cpprestsdk": { diff --git a/ports/minhook/portfile.cmake b/ports/minhook/portfile.cmake index 8c95a4dcd917fc..a7fd5e40119469 100644 --- a/ports/minhook/portfile.cmake +++ b/ports/minhook/portfile.cmake @@ -11,9 +11,9 @@ endif() # Download files to enable CMake support for minhook - Adds CMakeLists.txt and minhook-config.cmake.in vcpkg_download_distfile( CMAKE_SUPPORT_PATCH - URLS https://github.com/TsudaKageyu/minhook/commit/3f2e34976c1685ee372a09f54c0c8c8f4240ef90.patch + URLS https://github.com/TsudaKageyu/minhook/commit/3f2e34976c1685ee372a09f54c0c8c8f4240ef90.patch?full_index=1 FILENAME minhook-cmake-support.patch - SHA512 5f353b167e2c31e5e06258420c78fbae0095368cf687ff06a350d6b69b30476824785dde5dbcea3e30ff827e7cdb293727a73e6b1e6875f00aa891b2980c3877 + SHA512 7863c51a4563fbc3694149595a7ef301500a1b3b324cc5571b0843386c2fdb5ae10b7e830c9b9fcc973dd17f77f386fd1dedcd493ce8475d2dcf2c44bb7306d0 ) vcpkg_from_github( diff --git a/ports/minhook/vcpkg.json b/ports/minhook/vcpkg.json index e2a0b7b777e8e3..1ba20905424873 100644 --- a/ports/minhook/vcpkg.json +++ b/ports/minhook/vcpkg.json @@ -1,8 +1,10 @@ { "name": "minhook", "version": "1.3.3", - "port-version": 3, + "port-version": 4, "description": "The Minimalistic x86/x64 API Hooking Library for Windows.", + "homepage": "https://github.com/TsudaKageyu/minhook", + "license": "BSD-2-Clause", "supports": "windows & !uwp & !arm", "dependencies": [ { diff --git a/ports/miniupnpc/cmakelists.diff b/ports/miniupnpc/cmakelists.diff deleted file mode 100644 index 4df7ef74dcc00d..00000000000000 --- a/ports/miniupnpc/cmakelists.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/miniupnpc/CMakeLists.txt 2018-05-07 13:12:58.000000000 +0200 -+++ b/miniupnpc/CMakeLists.txt 2018-11-13 11:51:57.897598000 +0100 -@@ -124,7 +124,7 @@ - target_link_libraries (libminiupnpc-shared PRIVATE miniupnpc-private) - target_compile_definitions(libminiupnpc-shared PRIVATE MINIUPNP_EXPORTS) - -- target_include_directories(libminiupnpc-static INTERFACE ../${CMAKE_CURRENT_SOURCE_DIR}) -+ target_include_directories(libminiupnpc-shared INTERFACE ../${CMAKE_CURRENT_SOURCE_DIR}) - if (WIN32) - target_link_libraries(libminiupnpc-shared INTERFACE ws2_32 iphlpapi) - endif() diff --git a/ports/miniupnpc/portfile.cmake b/ports/miniupnpc/portfile.cmake index 3961a0321ad633..72d5872771c38c 100644 --- a/ports/miniupnpc/portfile.cmake +++ b/ports/miniupnpc/portfile.cmake @@ -1,11 +1,10 @@ +string(REPLACE "." "_" MINIUPNPC_VERSION "${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO miniupnp/miniupnp - REF miniupnpc_2_1 - SHA512 f2ab5116c094982f7838ccab460d3db07a99de1094448277fc45841e0e64ea1b4216d75a7e5dd471c79ff9b0132b89e4d801c3ad1b60d55631c12c916df658f5 + REF "miniupnpc_${MINIUPNPC_VERSION}" + SHA512 575d6be8271c11bb48f95c7f0a7aed82619e9cb871a530d75a47867ef663807e888a6e66be0cd201f29ef3c7df860ee855481d464edb65881e83a6f16279ba76 HEAD_REF master - PATCHES - cmakelists.diff ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MINIUPNPC_BUILD_SHARED) @@ -23,5 +22,21 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH "/lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +else() + file(GLOB DEBUG_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") + file(GLOB RELEASE_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*.exe") + file( + INSTALL ${RELEASE_TOOLS} + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" + ) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE ${DEBUG_TOOLS} ${RELEASE_TOOLS}) +endif() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/miniupnpc/vcpkg.json b/ports/miniupnpc/vcpkg.json index ddd85b1b8c2ce0..dab22f50983eb5 100644 --- a/ports/miniupnpc/vcpkg.json +++ b/ports/miniupnpc/vcpkg.json @@ -1,12 +1,16 @@ { "name": "miniupnpc", - "version": "2.1", - "port-version": 4, + "version": "2.2.5", "description": "UPnP client library/tool to access Internet Gateway Devices", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/minizip-ng/fix-pkgconfig.patch b/ports/minizip-ng/fix-pkgconfig.patch new file mode 100644 index 00000000000000..08d0bbc03db1de --- /dev/null +++ b/ports/minizip-ng/fix-pkgconfig.patch @@ -0,0 +1,43 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ca7729e..9af0a7ad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,6 +128,7 @@ set(MINIZIP_HDR + mz_zip_rw.h) + + set(PC_PRIVATE_LIBS) ++set(PC_PRIVATE_DEPS) + + # Check for system includes + check_include_file(stdint.h HAVE_STDINT_H) +@@ -184,7 +185,7 @@ if(MZ_ZLIB) + list(APPEND MINIZIP_LIB ${ZLIBNG_LIBRARIES}) + list(APPEND MINIZIP_LBD ${ZLIBNG_LIBRARY_DIRS}) + +- set(PC_PRIVATE_LIBS " -lz-ng") ++ set(PC_PRIVATE_DEPS "zlib-ng") + set(ZLIB_COMPAT OFF) + elseif(ZLIB_FOUND AND NOT MZ_FORCE_FETCH_LIBS) + message(STATUS "Using ZLIB ${ZLIB_VERSION}") +@@ -193,7 +194,7 @@ if(MZ_ZLIB) + list(APPEND MINIZIP_LIB ${ZLIB_LIBRARIES}) + list(APPEND MINIZIP_LBD ${ZLIB_LIBRARY_DIRS}) + +- set(PC_PRIVATE_LIBS " -lz") ++ set(PC_PRIVATE_DEPS "zlib") + set(ZLIB_COMPAT ON) + elseif(MZ_FETCH_LIBS) + clone_repo(zlib https://github.com/madler/zlib) +diff --git a/minizip.pc.cmakein b/minizip.pc.cmakein +index d8a0dd72..7aecd852 100644 +--- a/minizip.pc.cmakein ++++ b/minizip.pc.cmakein +@@ -8,7 +8,7 @@ Name: @MINIZIP_TARGET@ + Description: Zip manipulation library + Version: @VERSION@ + +-Requires: zlib ++Requires.private: @PC_PRIVATE_DEPS@ + Libs: -L${libdir} -L${sharedlibdir} -l@MINIZIP_TARGET@ + Libs.private:@PC_PRIVATE_LIBS@ + Cflags: -I${includedir} diff --git a/ports/minizip-ng/fix_find_zstd.patch b/ports/minizip-ng/fix_find_zstd.patch new file mode 100644 index 00000000000000..ec06fa67797835 --- /dev/null +++ b/ports/minizip-ng/fix_find_zstd.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f6c6bc..1856944 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -334,12 +334,8 @@ endif() + if(MZ_ZSTD) + # Check if zstd is present + if(NOT MZ_FORCE_FETCH_LIBS) +- find_package(PkgConfig QUIET) +- if(PKGCONFIG_FOUND) +- pkg_check_modules(ZSTD libzstd) +- endif() + if(NOT ZSTD_FOUND) +- find_package(ZSTD QUIET) ++ find_package(ZSTD NAMES zstd REQUIRED) + if(ZSTD_FOUND) + if(TARGET zstd::libzstd_static) + list(APPEND ZSTD_LIBRARIES zstd::libzstd_static) diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake index 5b0cd5868e3fd8..4229529c0747c2 100644 --- a/ports/minizip-ng/portfile.cmake +++ b/ports/minizip-ng/portfile.cmake @@ -8,6 +8,9 @@ vcpkg_from_github( REF "${VERSION}" SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05 HEAD_REF master + PATCHES + fix_find_zstd.patch + fix-pkgconfig.patch ) vcpkg_check_features( @@ -30,6 +33,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DMZ_FETCH_LIBS=OFF -DMZ_LIB_SUFFIX=-ng + -DMZ_ICONV=OFF ) vcpkg_cmake_install() diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json index 5d83b7facfed15..9ec1b4fe7d8c82 100644 --- a/ports/minizip-ng/vcpkg.json +++ b/ports/minizip-ng/vcpkg.json @@ -1,7 +1,7 @@ { "name": "minizip-ng", "version": "4.0.0", - "port-version": 1, + "port-version": 4, "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", "homepage": "https://github.com/zlib-ng/minizip-ng", "license": "Zlib", diff --git a/ports/minizip/0003-no-io64.patch b/ports/minizip/0003-no-io64.patch deleted file mode 100644 index 6e72e3c91412d2..00000000000000 --- a/ports/minizip/0003-no-io64.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c -index 7f5c191..d42e050 100644 ---- a/contrib/minizip/ioapi.c -+++ b/contrib/minizip/ioapi.c -@@ -17,8 +17,8 @@ - #if defined(__APPLE__) || defined(IOAPI_NO_64) - // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions - #define FOPEN_FUNC(filename, mode) fopen(filename, mode) --#define FTELLO_FUNC(stream) ftello(stream) --#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) -+#define FTELLO_FUNC(stream) ftell(stream) -+#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin) - #else - #define FOPEN_FUNC(filename, mode) fopen64(filename, mode) - #define FTELLO_FUNC(stream) ftello64(stream) -diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c -index 3d65401..a1269ea 100644 ---- a/contrib/minizip/miniunz.c -+++ b/contrib/minizip/miniunz.c -@@ -33,9 +33,9 @@ - #define FTELLO_FUNC(stream) ftello(stream) - #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) - #else --#define FOPEN_FUNC(filename, mode) fopen64(filename, mode) --#define FTELLO_FUNC(stream) ftello64(stream) --#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin) -+#define FOPEN_FUNC(filename, mode) fopen(filename, mode) -+#define FTELLO_FUNC(stream) ftell(stream) -+#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin) - #endif - - -diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c -index 4288962..02267fb 100644 ---- a/contrib/minizip/minizip.c -+++ b/contrib/minizip/minizip.c -@@ -34,9 +34,9 @@ - #define FTELLO_FUNC(stream) ftello(stream) - #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) - #else --#define FOPEN_FUNC(filename, mode) fopen64(filename, mode) --#define FTELLO_FUNC(stream) ftello64(stream) --#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin) -+#define FOPEN_FUNC(filename, mode) fopen(filename, mode) -+#define FTELLO_FUNC(stream) ftell(stream) -+#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin) - #endif - - diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index 6826b5847da58f..db79e72290042c 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -19,7 +19,7 @@ set(HEADERS mztools.h ) if(WIN32) - list(APPEND SRC iowin32.c) + list(APPEND SRC iowin32.c minizip-win32.def) list(APPEND HEADERS iowin32.h) endif() @@ -41,10 +41,6 @@ else() message(STATUS "Building without bzip2 support") endif() -if(ANDROID) - target_compile_definitions(minizip PRIVATE IOAPI_NO_64) -endif() - if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") target_compile_definitions(minizip PRIVATE -DIOWIN32_USING_WINRT_API) endif() diff --git a/ports/minizip/android-fileapi.patch b/ports/minizip/android-fileapi.patch new file mode 100644 index 00000000000000..36171d0dde5731 --- /dev/null +++ b/ports/minizip/android-fileapi.patch @@ -0,0 +1,17 @@ +diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h +index c588a18..b5395e2 100644 +--- a/contrib/minizip/ioapi.h ++++ b/contrib/minizip/ioapi.h +@@ -21,6 +21,12 @@ + #ifndef _ZLIBIOAPI64_H + #define _ZLIBIOAPI64_H + ++#if defined(__ANDROID_API__) && __ANDROID_API__ < 24 ++ // Cf. https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md#32_bit-and ++ // stdio functions for off_t are incomplete. ++ #define USE_FILE32API ++#endif ++ + #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) + + // Linux needs this to support file operation on files larger then 4+GB diff --git a/ports/minizip/lib-to-def.cmake b/ports/minizip/lib-to-def.cmake new file mode 100644 index 00000000000000..f603702f229d8e --- /dev/null +++ b/ports/minizip/lib-to-def.cmake @@ -0,0 +1,40 @@ +function(lib_to_def) + if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW OR NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + return() + endif() + + cmake_parse_arguments(PARSE_ARGV 0 arg "" "BASENAME;REGEX" "") + if(NOT arg_BASENAME) + message(FATAL_ERROR "BASENAME is a required argument.") + endif() + if(NOT arg_REGEX) + set(arg_REGEX "[^ ]+") + endif() + + set(logfile "${CURRENT_BUILDTREES_DIR}/dumpbin-${arg_BASENAME}-${TARGET_TRIPLET}-symbols.log") + vcpkg_execute_required_process( + COMMAND dumpbin /symbols "/OUT:${logfile}" "${CURRENT_PACKAGES_DIR}/lib/${arg_BASENAME}.lib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "dumpbin-${arg_BASENAME}-${TARGET_TRIPLET}" + ) + file(STRINGS "${logfile}" symbols REGEX "^... ........ SECT.. notype .. External [|] ${arg_REGEX}") + list(TRANSFORM symbols REPLACE "^[^|]+[|] " " ") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + string(REPLACE " _" " " symbols "${symbols}") + endif() + list(JOIN symbols "\n" symbols) + set(symbols "EXPORTS\n${symbols}\n") + set(def_file "${CMAKE_CURRENT_LIST_DIR}/${arg_BASENAME}-${VCPKG_TARGET_ARCHITECTURE}.def") + if(NOT EXISTS "${def_file}") + set(def_file "${CMAKE_CURRENT_LIST_DIR}/${arg_BASENAME}-win32.def") + endif() + if(EXISTS "${def_file}") + file(READ "${def_file}" original_symbols) + else() + set(original_symbols "") + endif() + if(NOT symbols STREQUAL original_symbols) + file(WRITE "${CURRENT_BUILDTREES_DIR}/${arg_BASENAME}-${VCPKG_TARGET_ARCHITECTURE}.def.log" "${symbols}") + message(SEND_ERROR "${arg_BASENAME}-${VCPKG_TARGET_ARCHITECTURE}.def has changed.") + endif() +endfunction() diff --git a/ports/minizip/minizip-win32.def b/ports/minizip/minizip-win32.def new file mode 100644 index 00000000000000..2d57c841a9a3f2 --- /dev/null +++ b/ports/minizip/minizip-win32.def @@ -0,0 +1,78 @@ +EXPORTS + fill_win32_filefunc + fill_win32_filefunc64 + fill_win32_filefunc64A + fill_win32_filefunc64W + win32_open_file_func + win32_read_file_func + win32_write_file_func + win32_tell64_file_func + win32_seek64_file_func + win32_close_file_func + win32_error_file_func + win32_open64_file_func + win32_open64_file_funcA + win32_open64_file_funcW + win32_tell_file_func + win32_seek_file_func + unzRepair + zip_copyright + zipOpen + zipOpen64 + zipOpen2 + zipOpen2_64 + zipOpen3 + zipOpenNewFileInZip + zipOpenNewFileInZip64 + zipOpenNewFileInZip2 + zipOpenNewFileInZip2_64 + zipOpenNewFileInZip3 + zipOpenNewFileInZip3_64 + zipOpenNewFileInZip4 + zipOpenNewFileInZip4_64 + zipWriteInFileInZip + zipCloseFileInZip + zipCloseFileInZipRaw + zipCloseFileInZipRaw64 + zipClose + zipRemoveExtraInfoBlock + unz_copyright + unzStringFileNameCompare + unzOpen + unzOpen64 + unzOpen2 + unzOpen2_64 + unzClose + unzGetGlobalInfo + unzGetGlobalInfo64 + unzGetGlobalComment + unzGoToFirstFile + unzGoToNextFile + unzLocateFile + unzGetFilePos + unzGoToFilePos + unzGetFilePos64 + unzGoToFilePos64 + unzGetCurrentFileInfo64 + unzGetCurrentFileInfo + unzGetCurrentFileZStreamPos64 + unzOpenCurrentFile + unzOpenCurrentFilePassword + unzOpenCurrentFile2 + unzOpenCurrentFile3 + unzCloseCurrentFile + unzReadCurrentFile + unztell + unztell64 + unzeof + unzGetLocalExtrafield + unzGetOffset64 + unzGetOffset + unzSetOffset64 + unzSetOffset + fill_fopen64_filefunc + fill_fopen_filefunc + call_zopen64 + call_zseek64 + call_ztell64 + fill_zlib_filefunc64_32_def_from_filefunc32 diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index 1e79583b13cd1e..646560913ce082 100644 --- a/ports/minizip/portfile.cmake +++ b/ports/minizip/portfile.cmake @@ -1,20 +1,30 @@ -# When this port is updated, the minizip port should be updated at the same time - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - +# When zlib updated, the minizip port should be updated at the same time vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO madler/zlib - REF v1.2.13 - SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659 + REF "v${VERSION}" + SHA512 78eecf335b14af1f7188c039a4d5297b74464d61156e4f12a485c74beec7d62c4159584ad482a07ec57ae2616d58873e45b09cb8ea822bb5b17e43d163df84e9 HEAD_REF master PATCHES 0001-remove-ifndef-NOUNCRYPT.patch 0002-add-declaration-for-mkdir.patch - 0003-no-io64.patch pkgconfig.patch + android-fileapi.patch ) +# Maintainer switch: Temporarily set this to 1 to re-generate the lists +# of exported symbols. This is needed when the version is bumped. +set(GENERATE_SYMBOLS 0) +if(GENERATE_SYMBOLS) + vcpkg_cmake_get_vars(cmake_vars_file) + include("${cmake_vars_file}") + if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + else() + set(GENERATE_SYMBOLS 0) + endif() +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES bzip2 ENABLE_BZIP2 @@ -23,6 +33,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/minizip-win32.def" "${CMAKE_CURRENT_LIST_DIR}/unofficial-minizipConfig.cmake.in" DESTINATION "${SOURCE_PATH}/contrib/minizip" ) @@ -56,3 +67,8 @@ endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/minizipConfig.cmake" @ONLY) file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt") + +if(GENERATE_SYMBOLS) + include("${CMAKE_CURRENT_LIST_DIR}/lib-to-def.cmake") + lib_to_def(BASENAME minizip REGEX "(call|fill|unz|win32|zip)") +endif() diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json index 6bbf27021d17da..e4cb6462b1cf72 100644 --- a/ports/minizip/vcpkg.json +++ b/ports/minizip/vcpkg.json @@ -1,7 +1,7 @@ { "name": "minizip", - "version-semver": "1.2.13", - "port-version": 2, + "version": "1.3", + "port-version": 1, "description": "Minizip zip file manipulation library", "homepage": "https://github.com/madler/zlib", "license": "Zlib", @@ -14,6 +14,10 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, "zlib" ], "features": { diff --git a/ports/mmloader/fix-platform-name.patch b/ports/mmloader/fix-platform-name.patch new file mode 100644 index 00000000000000..c30d381fc20d84 --- /dev/null +++ b/ports/mmloader/fix-platform-name.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b672037..f9a6a15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,13 @@ if ((NOT DEFINED CMAKE_VS_PLATFORM_NAME) OR (CMAKE_VS_PLATFORM_NAME STREQUAL "") + message(STATUS "CMAKE_VS_PLATFORM_NAME is empty, use default: Win32") + set(CMAKE_VS_PLATFORM_NAME Win32) + endif() ++ ++if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") ++ set(CMAKE_VS_PLATFORM_NAME "Win32") ++else() ++ set(CMAKE_VS_PLATFORM_NAME "${VCPKG_TARGET_ARCHITECTURE}") ++endif() ++ + message(STATUS "CMAKE_VS_PLATFORM_NAME=" ${CMAKE_VS_PLATFORM_NAME}) + string(COMPARE EQUAL "${CMAKE_VS_PLATFORM_NAME}" Win32 BUILD_ARC_X8632) + string(COMPARE EQUAL "${CMAKE_VS_PLATFORM_NAME}" x64 BUILD_ARC_X8664) diff --git a/ports/mmloader/portfile.cmake b/ports/mmloader/portfile.cmake index 1250881fac7b32..08226de45e67a2 100644 --- a/ports/mmloader/portfile.cmake +++ b/ports/mmloader/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 1.0.1 SHA512 a41749e1b62d5549b821429a03e456a0cb41fbc1ea3fe5e8067f80994fb4645c3145dd1e2a3ccaed13b091ec24338d4e542849628d346f26d2275b0cbff8f4c6 HEAD_REF master + PATCHES + fix-platform-name.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -23,4 +25,4 @@ vcpkg_cmake_install(DISABLE_PARALLEL) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License") diff --git a/ports/mmloader/vcpkg.json b/ports/mmloader/vcpkg.json index e436ab1118b013..52a8e56afd2d80 100644 --- a/ports/mmloader/vcpkg.json +++ b/ports/mmloader/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mmloader", "version": "1.0.1", - "port-version": 2, + "port-version": 3, "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)", "homepage": "http://tishion.github.io/mmLoader/", "license": "MIT", diff --git a/ports/mongo-c-driver/disable-dynamic-when-static.patch b/ports/mongo-c-driver/disable-dynamic-when-static.patch index 4b6e5a462c8075..4404dfcad42cf3 100644 --- a/ports/mongo-c-driver/disable-dynamic-when-static.patch +++ b/ports/mongo-c-driver/disable-dynamic-when-static.patch @@ -1,36 +1,36 @@ diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 7fcdd86..1b32e6c 100644 +index bf95bd0c1..c9900b7fa 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -758,6 +758,7 @@ if (MONGOC_ENABLE_MONGODB_AWS_AUTH) - endif() +@@ -745,6 +745,7 @@ if (MONGOC_ENABLE_STATIC_BUILD) + set_target_properties (mcd_rpc PROPERTIES OUTPUT_NAME "mcd-rpc") endif () - + +if (NOT MONGOC_ENABLE_STATIC_BUILD) add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES}) -@@ -796,7 +797,7 @@ target_include_directories ( +@@ -786,7 +787,7 @@ target_include_directories ( set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0) set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}") - + -if (MONGOC_ENABLE_STATIC_BUILD) -+else () ++else() add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - target_link_libraries (mongoc_static PUBLIC ${STATIC_LIBRARIES} ${BSON_STATIC_LIBRARIES}) - if (NOT WIN32 AND ENABLE_PIC) -@@ -847,7 +848,11 @@ if (ENABLE_APPLE_FRAMEWORK) + if(ENABLE_COVERAGE) + target_compile_options(mongoc_static PRIVATE --coverage) +@@ -840,7 +841,11 @@ if (ENABLE_APPLE_FRAMEWORK) endif () - + add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) +if (NOT MONGOC_ENABLE_STATIC_BUILD) target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) +else() +target_link_libraries (mongoc-stat mongoc_static ${LIBRARIES}) +endif() - + # mongoc-stat works if shared memory performance counters are enabled. - if (ENABLE_SHM_COUNTERS STREQUAL "ON") + if (ENABLE_SHM_COUNTERS) @@ -1161,7 +1166,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests) diff --git a/ports/mongo-c-driver/fix-dependencies.patch b/ports/mongo-c-driver/fix-dependencies.patch index 510abe072558b3..90c9585c559a48 100644 --- a/ports/mongo-c-driver/fix-dependencies.patch +++ b/ports/mongo-c-driver/fix-dependencies.patch @@ -18,23 +18,23 @@ diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt index d108e5d..a097016 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -55,7 +55,7 @@ configure_file ( +@@ -51,7 +51,7 @@ configure_file ( set (ZLIB_INCLUDE_DIRS "") if (ENABLE_ZLIB MATCHES "SYSTEM|AUTO") message (STATUS "Searching for zlib CMake packages") - include (FindZLIB) + find_package(ZLIB REQUIRED) if (ZLIB_FOUND) - message ("-- zlib found version \"${ZLIB_VERSION_STRING}\"") - message ("-- zlib include path \"${ZLIB_INCLUDE_DIRS}\"") -@@ -150,7 +150,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) + message (STATUS " zlib found version \"${ZLIB_VERSION_STRING}\"") + message (STATUS " zlib include path \"${ZLIB_INCLUDE_DIRS}\"") +@@ -146,7 +146,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) if (ENABLE_SSL STREQUAL "OPENSSL" OR (NOT APPLE AND NOT WIN32 AND ENABLE_SSL STREQUAL "AUTO")) # Sets OPENSSL_FOUND on success. - include (FindOpenSSL) + find_package(OpenSSL REQUIRED) endif () - + if (ENABLE_SSL STREQUAL LIBRESSL) @@ -364,10 +364,10 @@ else () endif () diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index fc1f6116c3fe2b..f04c6575adb457 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 36cd8844b1cc9a935c50afc240523f9aaac7cffa58a5d0f9850848f22ab0f1f5a7202ec9b56b0a7d15f075f665bcecbec63b28d2074d35a7cf25065f9075c15e + SHA512 242416638bf6722ccda67ecc15cf78f8531f1a4ae0e89fd66cde74221d7b98b859442f5b70628802972961e69156fd7afcc916d7a83cc134d5723eb0b6e15cc9 HEAD_REF master PATCHES disable-dynamic-when-static.patch @@ -48,7 +48,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} - -DENABLE_BSON=SYSTEM + -DUSE_SYSTEM_LIBBSON=ON -DENABLE_EXAMPLES=OFF -DENABLE_SHM_COUNTERS=OFF -DENABLE_STATIC=${ENABLE_STATIC} diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index db0a19e568a8b6..ef533e5213f55c 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-c-driver", - "version": "1.22.2", + "version": "1.24.3", "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "license": null, diff --git a/ports/mongo-cxx-driver/fix-dependencies.patch b/ports/mongo-cxx-driver/fix-dependencies.patch index fde0d3b6669c69..215a31a05625b7 100644 --- a/ports/mongo-cxx-driver/fix-dependencies.patch +++ b/ports/mongo-cxx-driver/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt -index d87d588..16ba095 100644 +index f30aea836..50610ffb1 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt -@@ -218,6 +221,9 @@ if(BSONCXX_BUILD_STATIC) +@@ -215,6 +215,9 @@ if(BSONCXX_BUILD_STATIC) bsoncxx_install_deprecated_cmake(bsoncxx-static) list(APPEND bsoncxx_target_list bsoncxx_static) set(bsoncxx_pkg_dep "find_dependency(bson-1.0 REQUIRED)") @@ -10,5 +10,5 @@ index d87d588..16ba095 100644 + string(APPEND bsoncxx_pkg_dep "\nfind_dependency(Boost)") + endif() endif() - bsoncxx_install("${bsoncxx_target_list}" "${bsoncxx_pkg_dep}") - + if(BSONCXX_POLY_USE_BOOST) + set(bsoncxx_boost_pkg_dep "find_dependency(Boost 1.56.0 REQUIRED)") diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index a356e69c410e71..c943f3e4d06b47 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-cxx-driver REF "r${VERSION}" - SHA512 de4737fab399e342c8153b2a14d097e54250fd66ca58c3120634bc08cb1943dc2808b81adf8e7a2f7edeb12607ae418c887667548600eee585ba5b27ebdf16b5 + SHA512 f9f0d83ee2ef1f3c2dae1f3663b893d819737d4e646d0137fb623b84663382eb93ab36123c2a85247f43ae979a95276fa231d5da8ad62a6da002ab9daecaa0d4 HEAD_REF master PATCHES fix-dependencies.patch diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index 7927358b5eea49..76231b86e6e257 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-cxx-driver", - "version": "3.7.2", + "version": "3.8.0", "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "license": "Apache-2.0", diff --git a/ports/monkeys-audio/fix-outdir.patch b/ports/monkeys-audio/fix-outdir.patch new file mode 100644 index 00000000000000..1263b6562090ec --- /dev/null +++ b/ports/monkeys-audio/fix-outdir.patch @@ -0,0 +1,18 @@ +diff --git a/Source/Projects/VS2022/MACDll/MACDll.vcxproj b/Source/Projects/VS2022/MACDll/MACDll.vcxproj +index f5b20e8eb..d9fd63c20 100644 +--- a/Source/Projects/VS2022/MACDll/MACDll.vcxproj ++++ b/Source/Projects/VS2022/MACDll/MACDll.vcxproj +@@ -150,10 +150,10 @@ + <_ProjectFileVersion>11.0.50727.1 + + +- C:\Applications\Winamp\plugins\ +- $(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ + false +- in_APE ++ MACDll + .dll + true + -clang-diagnostic-c++98-compat,-clang-diagnostic-zero-as-null-pointer-constant,-clang-diagnostic-language-extension-token,-clang-diagnostic-global-constructors,-clang-diagnostic-exit-time-destructors diff --git a/ports/monkeys-audio/portfile.cmake b/ports/monkeys-audio/portfile.cmake index 0b503f3bcb7593..d24c030ab5ca98 100644 --- a/ports/monkeys-audio/portfile.cmake +++ b/ports/monkeys-audio/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive( NO_REMOVE_ONE_LEVEL PATCHES remove-certificate-step.patch + fix-outdir.patch ) file(REMOVE_RECURSE @@ -49,13 +50,15 @@ foreach(VCXPROJ IN ITEMS endforeach() if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - vcpkg_install_msbuild( + list(APPEND VCPKG_C_FLAGS "-D_AFXDLL") + list(APPEND VCPKG_CXX_FLAGS "-D_AFXDLL") + vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "Source/Projects/VS2022/MACDll/MACDll.vcxproj" PLATFORM ${PLATFORM} ) else() - vcpkg_install_msbuild( + vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "Source/Projects/VS2022/MACLib/MACLib.vcxproj" PLATFORM ${PLATFORM} @@ -63,7 +66,7 @@ else() endif() if ("tools" IN_LIST FEATURES) - vcpkg_install_msbuild( + vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "Source/Projects/VS2022/Console/Console.vcxproj" PLATFORM ${PLATFORM} @@ -71,17 +74,11 @@ if ("tools" IN_LIST FEATURES) file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/Console.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/Console.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/Console.exe" "${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/mac.exe") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - file(COPY "${CURRENT_PACKAGES_DIR}/bin/MACDll.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(COPY "${CURRENT_PACKAGES_DIR}/lib/MACDll.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - file(COPY "${CURRENT_PACKAGES_DIR}/bin/MACDll64.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(COPY "${CURRENT_PACKAGES_DIR}/lib/MACDll64.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") -endif() + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib" "${CURRENT_PACKAGES_DIR}/lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/MACLib.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/MACLib.lib") endif() diff --git a/ports/monkeys-audio/vcpkg.json b/ports/monkeys-audio/vcpkg.json index e0c6268c0d30d0..f47b7ed329ff36 100644 --- a/ports/monkeys-audio/vcpkg.json +++ b/ports/monkeys-audio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "monkeys-audio", "version-string": "10.08", + "port-version": 1, "description": [ "Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods.", "Audio files compressed with it end with .ape extension." @@ -8,6 +9,13 @@ "homepage": "https://monkeysaudio.com", "license": null, "supports": "!(uwp | osx | linux)", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ], "features": { "tools": { "description": "Build monkeys-audio tools" diff --git a/ports/mp-units/config.patch b/ports/mp-units/config.patch index a1cd01d7e47c0f..1642d2b2fcb57d 100644 --- a/ports/mp-units/config.patch +++ b/ports/mp-units/config.patch @@ -1,11 +1,11 @@ diff --git a/src/mp-unitsConfig.cmake b/src/mp-unitsConfig.cmake -index 668fd97d..0eebeded 100644 +index 10f82a82..ea637abd 100644 --- a/src/mp-unitsConfig.cmake +++ b/src/mp-unitsConfig.cmake @@ -42,10 +42,10 @@ endfunction() include(CMakeFindDependencyMacro) - if(UNITS_USE_LIBFMT) + if(MP_UNITS_USE_LIBFMT) - find_dependency(fmt) + find_dependency(fmt CONFIG) endif() diff --git a/ports/mp-units/portfile.cmake b/ports/mp-units/portfile.cmake index a9e2a6b87994b6..4b626bfedd98b2 100644 --- a/ports/mp-units/portfile.cmake +++ b/ports/mp-units/portfile.cmake @@ -1,8 +1,12 @@ +if(VCPKG_TARGET_IS_LINUX) + message("Note: `mp-units` requires Clang16+ or GCC11+") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mpusz/units REF "v${VERSION}" - SHA512 6369c886629955c6457911b98a702c29bacce58e9049e1da700055a3f8b1981cce4f545c1d09550ec1c57f8805f7fc1f0198118950a14b2a7b797dd437ed72df + SHA512 994922a391ed5c1d0e023545beeb0bbeb8ec067be408f715d553e509d9106cdb5b27cfbaa69f0ca1a27cdf9532edacaff7d2cabaafd54b1713f9c8add93bc389 PATCHES config.patch ) @@ -15,7 +19,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/src" OPTIONS - -DUNITS_USE_LIBFMT=${USE_LIBFMT} + -DMP_UNITS_USE_LIBFMT=${USE_LIBFMT} ) vcpkg_cmake_install() diff --git a/ports/mp-units/vcpkg.json b/ports/mp-units/vcpkg.json index 8945076f4fbe12..8ad032daa8db51 100644 --- a/ports/mp-units/vcpkg.json +++ b/ports/mp-units/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mp-units", - "version": "0.8.0", + "version": "2.0.0", "description": "mp-units - A Units Library for C++", "homepage": "https://github.com/mpusz/units", "license": "MIT", @@ -25,19 +25,12 @@ { "name": "mp-units", "features": [ - "install-range-v3", "use-libfmt" ], "platform": "osx" } ] }, - "install-range-v3": { - "description": "Provide range-v3 for compilers not supporting std::ranges", - "dependencies": [ - "range-v3" - ] - }, "use-libfmt": { "description": "Use libfmt instead of std::format", "dependencies": [ diff --git a/ports/mp3lame/portfile.cmake b/ports/mp3lame/portfile.cmake index a178f762729b3b..38fb8f21582850 100644 --- a/ports/mp3lame/portfile.cmake +++ b/ports/mp3lame/portfile.cmake @@ -1,5 +1,3 @@ -set(VERSION 3.100) - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO lame/lame @@ -54,7 +52,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_${vcxproj}" "${vcxproj_con}") endforeach() - vcpkg_install_msbuild( + vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "vc_solution/${machine}_vc11_lame.sln" TARGET "lame" @@ -119,4 +117,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/doc" "${CURRENT_PACKA file(COPY "${SOURCE_PATH}/include/lame.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/lame") configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/mp3lame-config.cmake" @ONLY) file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/mp3lame/vcpkg.json b/ports/mp3lame/vcpkg.json index 0773b73fb2dff6..03925de590ce74 100644 --- a/ports/mp3lame/vcpkg.json +++ b/ports/mp3lame/vcpkg.json @@ -1,8 +1,15 @@ { "name": "mp3lame", "version": "3.100", - "port-version": 10, + "port-version": 11, "description": "LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.", "homepage": "https://sourceforge.net/projects/lame", - "license": "LGPL-2.0-only" + "license": "LGPL-2.0-only", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/mpc/portfile.cmake b/ports/mpc/portfile.cmake index 4b83260ccf10a9..4052fa8231ae33 100644 --- a/ports/mpc/portfile.cmake +++ b/ports/mpc/portfile.cmake @@ -1,26 +1,24 @@ -vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnu.org/gnu/mpc/mpc-1.2.0.tar.gz" - FILENAME "mpc-1.2.0.tar.gz" - SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7 -) - -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE ${ARCHIVE} -) - -vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG -) - -vcpkg_install_make() - -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -# # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/gnu/mpc/mpc-${VERSION}.tar.gz" + FILENAME "mpc-${VERSION}.tar.gz" + SHA512 4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97 +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mpc/vcpkg.json b/ports/mpc/vcpkg.json index d4a8b109c33a4b..0b0c26f130c144 100644 --- a/ports/mpc/vcpkg.json +++ b/ports/mpc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mpc", - "version": "1.2.0", - "port-version": 3, + "version": "1.3.1", "description": "GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.", "homepage": "http://www.multiprecision.org/mpc/", "dependencies": [ diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index e1a1ad204b6f53..219b92d1377b62 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_download_distfile(ARCHIVE URLS "http://www.mpfr.org/mpfr-${VERSION}/mpfr-${VERSION}.tar.xz" "https://ftp.gnu.org/gnu/mpfr/mpfr-${VERSION}.tar.xz" FILENAME "mpfr-${VERSION}.tar.xz" - SHA512 58e843125884ca58837ae5159cd4092af09e8f21931a2efd19c15de057c9d1dc0753ae95c592e2ce59a727fbc491af776db8b00a055320413cdcf2033b90505c + SHA512 bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475 ) vcpkg_extract_source_archive( diff --git a/ports/mpfr/vcpkg.json b/ports/mpfr/vcpkg.json index 56916d8b237468..ec36b1208f8de0 100644 --- a/ports/mpfr/vcpkg.json +++ b/ports/mpfr/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mpfr", - "version": "4.2.0", - "port-version": 1, + "version": "4.2.1", "description": "The MPFR library is a C library for multiple-precision floating-point computations with correct rounding", "homepage": "https://www.mpfr.org", "license": "LGPL-3.0-or-later", diff --git a/ports/mpir/fix-static-include-files.patch b/ports/mpir/fix-static-include-files.patch new file mode 100644 index 00000000000000..5ae30734b65635 --- /dev/null +++ b/ports/mpir/fix-static-include-files.patch @@ -0,0 +1,69 @@ +diff --git a/build.vc/postbuild.bat b/build.vc/postbuild.bat +index de1ed08..e4ecceb 100644 +--- a/build.vc/postbuild.bat ++++ b/build.vc/postbuild.bat +@@ -37,12 +37,10 @@ set bin_dir="..\%extn%\%plat%\%conf%\" + set hdr_dir="..\%extn%\%plat%\%conf%\" + + rem output parametrers for the MPIR tests +-if /i "%filename%" EQU "mpirxx" goto skip + echo (set ldir=%loc%) > output_params.bat + echo (set libr=%extn%) >> output_params.bat + echo (set plat=%plat%) >> output_params.bat + echo (set conf=%conf%) >> output_params.bat +-:skip + + echo copying outputs from %tgt_dir% to %bin_dir% + if not exist %bin_dir% md %bin_dir% +diff --git a/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj b/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj +index 3a23f01..1f44b22 100644 +--- a/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj ++++ b/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj +@@ -70,6 +70,11 @@ + mpirxx + + ++ ++ cd ..\..\build.vc ++prebuild gc Win32 15 ++ ++ + + ..\..\ + NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) +@@ -82,6 +87,11 @@ postbuild "$(TargetPath)" 15 + + + ++ ++ cd ..\..\build.vc ++prebuild gc Win32 15 ++ ++ + + ..\..\ + _DEBUG;WIN32;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) +@@ -94,6 +104,11 @@ postbuild "$(TargetPath)" 15 + + + ++ ++ cd ..\..\build.vc ++prebuild gc Win32 15 ++ ++ + + ..\..\ + NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;_WIN64;%(PreprocessorDefinitions) +@@ -106,6 +121,11 @@ postbuild "$(TargetPath)" 15 + + + ++ ++ cd ..\..\build.vc ++prebuild gc Win32 15 ++ ++ + + ..\..\ + _DEBUG;WIN32;_LIB;HAVE_CONFIG_H;_WIN64;%(PreprocessorDefinitions) diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index db2e2163e0bc35..3ce9ca3b2f8c20 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -1,27 +1,24 @@ -if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR "${CURRENT_INSTALLED_DIR}/include/gmpxx.h") +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR EXISTS "${CURRENT_INSTALLED_DIR}/include/gmpxx.h") message(FATAL_ERROR "Can't build ${PORT} if gmp is installed. Please remove gmp, and try to install ${PORT} again if you need it.") endif() -if(VCPKG_CRT_LINKAGE STREQUAL "static" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - message(FATAL_ERROR "${PORT} currently can only be built using the dynamic CRT when building DLLs") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wbhart/mpir REF cdd444aedfcbb190f00328526ef278428702d56e # 3.0.0 SHA512 f46e45bdba27c9f89953ba23186b694486fd3010bd370ea2de71a4649a2816e716a6520c9baa96936f1884437ef03f92b21c0b1fb5b757beba5a05fed30b2bfc HEAD_REF master - PATCHES enable-runtimelibrary-toggle.patch + PATCHES + enable-runtimelibrary-toggle.patch + fix-static-include-files.patch ) -if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) +if(NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_find_acquire_program(YASM) + set(SHARED_STATIC --disable-static --enable-shared) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(SHARED_STATIC --enable-static --disable-shared --with-pic) - else() - set(SHARED_STATIC --disable-static --enable-shared) endif() set(OPTIONS --disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}) @@ -39,96 +36,48 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) ${AUTOCONFIG} OPTIONS ${OPTIONS} ) - vcpkg_install_make() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - endif() - -elseif(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") +else() + set(MSVC_VERSION 14) + if(VCPKG_PLATFORM_TOOLSET MATCHES "v14(1|2|3)") set(MSVC_VERSION 15) - else() - set(MSVC_VERSION 14) endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(DLL_OR_LIB dll) - else() + set(DLL_OR_LIB dll) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(DLL_OR_LIB lib) endif() - if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(RuntimeLibraryExt "") - else() - set(RuntimeLibraryExt "DLL") - endif() - - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") - file(GLOB FILES "${SOURCE_PATH}/*") - file(COPY ${FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") - - vcpkg_build_msbuild( - PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_gc/${DLL_OR_LIB}_mpir_gc.vcxproj" - OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" - OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" + # Note: Could probably be moved to use vcpkg_configure_make on windows + vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_gc/${DLL_OR_LIB}_mpir_gc.vcxproj" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_build_msbuild( - PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_cxx/${DLL_OR_LIB}_mpir_cxx.vcxproj" - OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" - OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" + vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_cxx/${DLL_OR_LIB}_mpir_cxx.vcxproj" ) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB REL_LIBS_CXX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.lib") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(GLOB DBG_LIBS_CXX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.lib") - endif() endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB HEADERS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmp.h" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmpxx.h" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.h" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.h" - ) - file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") - - file(GLOB REL_DLLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.dll") - file(GLOB REL_LIBS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.lib") - list(APPEND REL_LIBS ${REL_LIBS_CXX}) - - file(INSTALL ${REL_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(INSTALL ${REL_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(GLOB HEADERS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmp.h" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmpxx.h" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.h" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.h" - ) - file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") - - file(GLOB DBG_DLLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.dll") - file(GLOB DBG_LIBS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.lib") - list(APPEND DBG_LIBS ${DBG_LIBS_CXX}) - - file(INSTALL ${DBG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(INSTALL ${DBG_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(GLOB HEADERS + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/*/Release/gmp.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/*/Release/gmpxx.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/*/Release/mpir.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/*/Release/mpirxx.h" + ) + file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() - endif() + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/COPYING.LIB" "${CURRENT_PACKAGES_DIR}/debug/lib/COPYING.LIB") +endif() - vcpkg_copy_pdbs() +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" + "${CURRENT_PACKAGES_DIR}/debug/share" + ) -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING.LIB") diff --git a/ports/mpir/vcpkg.json b/ports/mpir/vcpkg.json index 5a9c0cc9f59bc0..9df67f4e5c1179 100644 --- a/ports/mpir/vcpkg.json +++ b/ports/mpir/vcpkg.json @@ -1,9 +1,16 @@ { "name": "mpir", "version-date": "2022-03-02", - "port-version": 1, + "port-version": 3, "description": "Multiple Precision Integers and Rationals", "homepage": "https://github.com/wbhart/mpir", - "license": "GPL-3.0-only", - "supports": "!(uwp | arm)" + "license": null, + "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/msdfgen/portfile.cmake b/ports/msdfgen/portfile.cmake index 2457cddae2c571..9997d22fac3430 100644 --- a/ports/msdfgen/portfile.cmake +++ b/ports/msdfgen/portfile.cmake @@ -1,8 +1,4 @@ -if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Tools cannot be built on UWP.") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Chlumsky/msdfgen diff --git a/ports/msdfgen/vcpkg.json b/ports/msdfgen/vcpkg.json index 305dba25cfbd38..fa80a40850fd0c 100644 --- a/ports/msdfgen/vcpkg.json +++ b/ports/msdfgen/vcpkg.json @@ -1,6 +1,7 @@ { "name": "msdfgen", "version": "1.10.0", + "port-version": 1, "description": "Multi-channel signed distance field generator", "homepage": "https://github.com/Chlumsky/msdfgen", "license": "MIT", @@ -47,7 +48,8 @@ "description": "Build with OpenMP support for multi-threaded code." }, "tools": { - "description": "Generates an executable inside the tools folder. Not supported on UWP.", + "description": "Generates an executable inside the tools folder.", + "supports": "!uwp", "dependencies": [ { "name": "msdfgen", diff --git a/ports/murmurhash/vcpkg.json b/ports/murmurhash/vcpkg.json index f0e10b48131228..f79ceee27b5ab7 100644 --- a/ports/murmurhash/vcpkg.json +++ b/ports/murmurhash/vcpkg.json @@ -1,10 +1,10 @@ { "name": "murmurhash", "version-date": "2016-01-09", - "port-version": 6, + "port-version": 7, "description": "MurmurHash a family of hash functions.", "homepage": "https://github.com/aappleby/smhasher", - "supports": "!uwp & !arm", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/mvfst/fix_format.patch b/ports/mvfst/fix_format.patch deleted file mode 100644 index 4bf12f2cd31495..00000000000000 --- a/ports/mvfst/fix_format.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/quic/server/QuicServerWorker.cpp b/quic/server/QuicServerWorker.cpp -index 744cb81..ff3e559 100644 ---- a/quic/server/QuicServerWorker.cpp -+++ b/quic/server/QuicServerWorker.cpp -@@ -692,7 +692,7 @@ PacketDropReason QuicServerWorker::isDstConnIdMisrouted( - "Dropping packet due to DCID parsing error={}, errorCode={}," - "routingInfo = {} ", - ex.what(), -- ex.errorCode(), -+ toString(ex.errorCode()), - logRoutingInfo(dstConnId)); - // TODO do we need to reset? - return PacketDropReason::PARSE_ERROR_DCID; diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index 96a8f316c9fef7..66186a536cdb52 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO facebookincubator/mvfst - REF aeee9b372827cea28697755ea1f68bfc5288548a #2023-05-18 - SHA512 feece3f05537b58270507d9423cc95fe577532997b857586aa49c2000516f3297c487696b659a35f194f0e970b8e84ff0c1a7446d4af7b400a2183704df995a2 + REPO facebook/mvfst + REF "v${VERSION}" + SHA512 074ad8201e2c35b51bde0f8eaeb22bfe87af80fd9f3dc6c3de343b19d4b3d7738780a208d4719ee4fbd9d3f2f8a1a95b4858e8dc3fad16c26e4a859ecab75eca HEAD_REF main - PATCHES - fix_format.patch ) vcpkg_cmake_configure( diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index e28cc76b28e7a3..e4df0143ae1666 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,8 +1,8 @@ { "name": "mvfst", - "version-date": "2023-05-18", + "version-string": "2023.10.02.00", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", - "homepage": "https://github.com/facebookincubator/mvfst", + "homepage": "https://github.com/facebook/mvfst", "license": "MIT", "supports": "!windows", "dependencies": [ diff --git a/ports/mygui/Use-vcpkg-sdl2.patch b/ports/mygui/Use-vcpkg-sdl2.patch deleted file mode 100644 index 6a6059ee6004ef..00000000000000 --- a/ports/mygui/Use-vcpkg-sdl2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt -index 2b160ff..559e6a8 100644 ---- a/Common/CMakeLists.txt -+++ b/Common/CMakeLists.txt -@@ -99,6 +99,8 @@ add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) - - mygui_set_platform_name(${MYGUI_RENDERSYSTEM}) - add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform) --target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform) -+ -+find_package(SDL2 CONFIG REQUIRED) -+target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform SDL2::SDL2 SDL2::SDL2main) - - add_dependencies(${PROJECTNAME} MyGUIEngine) diff --git a/ports/mygui/fix-osx-build.patch b/ports/mygui/fix-osx-build.patch deleted file mode 100644 index 5077707134d06c..00000000000000 --- a/ports/mygui/fix-osx-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0c1e0079653223fafb346f67c7e3bb001a39de73 Mon Sep 17 00:00:00 2001 -From: Leander Schulten -Date: Sun, 23 Oct 2022 15:53:08 +0200 -Subject: [PATCH] do not simply include everything - ---- - MyGUIEngine/CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/MyGUIEngine/CMakeLists.txt b/MyGUIEngine/CMakeLists.txt -index 33f74563b..40ec35101 100644 ---- a/MyGUIEngine/CMakeLists.txt -+++ b/MyGUIEngine/CMakeLists.txt -@@ -48,11 +48,6 @@ if (MYGUI_USE_FREETYPE) - endif() - endif() - --# platform specific dependencies --if (APPLE) -- include_directories(/usr/local/include /usr/include) --endif () -- - if (${CMAKE_VERSION} VERSION_EQUAL "3.16" OR ${CMAKE_VERSION} VERSION_GREATER "3.16") - target_precompile_headers(${PROJECTNAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/MyGUI_Precompiled.h") - endif () diff --git a/ports/mygui/opengl.patch b/ports/mygui/opengl.patch new file mode 100644 index 00000000000000..7782b2412cce53 --- /dev/null +++ b/ports/mygui/opengl.patch @@ -0,0 +1,26 @@ +diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt +index db7d6610c..eb9190e07 100644 +--- a/Common/CMakeLists.txt ++++ b/Common/CMakeLists.txt +@@ -41,12 +41,9 @@ elseif(MYGUI_RENDERSYSTEM EQUAL 3) + elseif(MYGUI_RENDERSYSTEM EQUAL 4) + add_definitions("-DMYGUI_OPENGL_PLATFORM") + include_directories(SYSTEM +- ${OPENGL_INCLUDE_DIR} + ${SDL2_IMAGE_INCLUDE_DIRS} + ${MYGUI_SOURCE_DIR}/Platforms/${MYGUI_PLATFORM_NAME}/${MYGUI_PLATFORM_NAME}Platform/include + ) +- include_directories(SYSTEM include/GL) +- link_directories(${OPENGL_LIB_DIR}) + link_directories(${SDL2_IMAGE_LIB_DIR}) + elseif(MYGUI_RENDERSYSTEM EQUAL 5) + add_definitions("-DMYGUI_DIRECTX_PLATFORM") +@@ -106,3 +103,8 @@ if (MYGUI_INSTALL_TOOLS OR MYGUI_INSTALL_DEMOS) + endif() + + add_dependencies(${PROJECTNAME} MyGUIEngine) ++ ++if(MYGUI_RENDERSYSTEM EQUAL 4) ++ find_package(OpenGL REQUIRED) ++ target_link_libraries(${PROJECTNAME} OpenGL::GL) ++endif() diff --git a/ports/mygui/portfile.cmake b/ports/mygui/portfile.cmake index c98a64f2040180..d024c74c6a91c8 100644 --- a/ports/mygui/portfile.cmake +++ b/ports/mygui/portfile.cmake @@ -5,17 +5,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MyGUI/mygui - REF 81e5c67e92920607d16bc2aee1ac32f6fd7d446b #v3.4.1 - SHA512 b13e0a08559b3ddfe42ffcc6cf017fb20d50168785fb551e16f613c60b9ea28a65056a9bc42bdab876368f40dcba1772bc704ad0928c45d8b32e909abc0f1916 + REF MyGUI${VERSION} + SHA512 202f3df35f0767778b5a91b71dbd1ad3409d0a1977d5fbe3f0d48db430276c71b84edc5a28dd1fdb8e60245b56f2bda99872a4d860b83585f08406b28fb850fe HEAD_REF master PATCHES fix-generation.patch - Use-vcpkg-sdl2.patch Install-tools.patch - fix-osx-build.patch # from https://github.com/MyGUI/mygui/pull/244 + opengl.patch + sdl2-static.patch ) -if("opengl" IN_LIST FEATURES) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + message(STATUS "Setting MYGUI_RENDERSYSTEM to 8 (GLES) - officially supported MyGUI render system for wasm32") + set(MYGUI_RENDERSYSTEM 8) +elseif("opengl" IN_LIST FEATURES) set(MYGUI_RENDERSYSTEM 4) else() set(MYGUI_RENDERSYSTEM 1) diff --git a/ports/mygui/sdl2-static.patch b/ports/mygui/sdl2-static.patch new file mode 100644 index 00000000000000..cc5cb1a55e1abd --- /dev/null +++ b/ports/mygui/sdl2-static.patch @@ -0,0 +1,35 @@ +diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake +index 4dd33abe4..3911acef3 100644 +--- a/CMake/Packages/FindSDL2.cmake ++++ b/CMake/Packages/FindSDL2.cmake +@@ -49,7 +49,7 @@ IF(NOT SDL2_FOUND) + ) + + find_library(SDL2_LIBRARY +- NAMES SDL2 ++ NAMES SDL2 SDL2-static + HINTS + ${PC_SDL2_LIBDIR} + ${PC_SDL2_LIBRARY_DIRS} +@@ -87,7 +87,7 @@ IF(NOT SDL2_FOUND) + set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) + set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY}) + if (WIN32) +- set(SDL2_LIBRARIES ${SDL2_LIBRARIES} winmm imm32 version) ++ set(SDL2_LIBRARIES ${SDL2_LIBRARIES} winmm imm32 version setupapi) + endif() + include(FindPackageHandleStandardArgs) + +diff --git a/CMake/Packages/FindSDL2_image.cmake b/CMake/Packages/FindSDL2_image.cmake +index 4f0bc5f17..857806b1f 100644 +--- a/CMake/Packages/FindSDL2_image.cmake ++++ b/CMake/Packages/FindSDL2_image.cmake +@@ -41,7 +41,7 @@ IF(NOT SDL2_IMAGE_FOUND) + ) + + find_library(SDL2_IMAGE_LIBRARY +- NAMES SDL2_image ++ NAMES SDL2_image SDL2_image-static + HINTS + ${PC_SDL2_IMAGE_LIBDIR} + ${PC_SDL2_IMAGE_LIBRARY_DIRS} diff --git a/ports/mygui/vcpkg.json b/ports/mygui/vcpkg.json index 7858fddb83060e..a569a21bccabed 100644 --- a/ports/mygui/vcpkg.json +++ b/ports/mygui/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mygui", - "version": "3.4.1", - "port-version": 5, + "version": "3.4.2", "description": "Fast, flexible and simple GUI", "homepage": "http://mygui.info", "license": "MIT", diff --git a/ports/nanodbc/no-werror.patch b/ports/nanodbc/no-werror.patch new file mode 100644 index 00000000000000..2a71613f7781e7 --- /dev/null +++ b/ports/nanodbc/no-werror.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ce7232..57836fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,7 +35,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) + message(STATUS "nanodbc compile: C++${CMAKE_CXX_STANDARD}") + + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_COMPILER_IS_GNUCXX) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + include(CheckCXXCompilerFlag) + + if (NANODBC_ENABLE_COVERAGE) diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index 60da9c25176ee5..ff21c5b53e3bcd 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( rename-version.patch add-missing-include.patch find-unixodbc.patch + no-werror.patch ) file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") diff --git a/ports/nanodbc/vcpkg.json b/ports/nanodbc/vcpkg.json index 35fd067a31f008..3afcedb0e52644 100644 --- a/ports/nanodbc/vcpkg.json +++ b/ports/nanodbc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanodbc", "version": "2.13.0", - "port-version": 6, + "port-version": 7, "description": "A small C++ wrapper for the native C ODBC API.", "homepage": "https://github.com/nanodbc/nanodbc", "dependencies": [ diff --git a/ports/nanopb/fix-install-location.patch b/ports/nanopb/fix-install-location.patch index e3db1d50a5e289..9fd1c93c4f1e4a 100644 --- a/ports/nanopb/fix-install-location.patch +++ b/ports/nanopb/fix-install-location.patch @@ -1,41 +1,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ce05ea..1e8c4ed 100644 +index 4a3d31e..82611ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -34,18 +34,11 @@ if(NOT DEFINED CMAKE_INSTALL_CMAKEDIR) - set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/nanopb") - endif() - --execute_process( -- COMMAND ${Python_EXECUTABLE} -c -- "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" -- OUTPUT_VARIABLE PYTHON_INSTDIR -- OUTPUT_STRIP_TRAILING_WHITESPACE --) -- - if(nanopb_BUILD_GENERATOR) - set(generator_protos nanopb) -- if(NOT DEFINED nanopb_PROTOC_PATH) -- message(FATAL_ERROR "nanopb_PROTOC_PATH not defined") -- endif() -+ if(NOT DEFINED nanopb_PROTOC_PATH) -+ message(FATAL_ERROR "nanopb_PROTOC_PATH not defined") -+ endif() - foreach(generator_proto IN LISTS generator_protos) - string(REGEX REPLACE "([^;]+)" "${PROJECT_SOURCE_DIR}/generator/proto/\\1.proto" generator_proto_file "${generator_proto}") - string(REGEX REPLACE "([^;]+)" "\\1_pb2.py" generator_proto_py_file "${generator_proto}") -@@ -58,12 +51,12 @@ if(nanopb_BUILD_GENERATOR) +@@ -58,12 +58,15 @@ if(nanopb_BUILD_GENERATOR) install( FILES ${PROJECT_BINARY_DIR}/${generator_proto_py_file} ${generator_proto_file} - DESTINATION ${PYTHON_INSTDIR}/proto/ -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/proto/ ++ DESTINATION ${CMAKE_INSTALL_BINDIR}/proto/ ) endforeach() install( FILES generator/proto/_utils.py - DESTINATION ${PYTHON_INSTDIR}/proto/ ) -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/proto/ ) ++ DESTINATION ${CMAKE_INSTALL_BINDIR}/proto/ ) ++ ++ install( FILES generator/proto/__init__.py ++ DESTINATION ${CMAKE_INSTALL_BINDIR}/proto/ ) endif() if(WIN32) diff --git a/ports/nanopb/portfile.cmake b/ports/nanopb/portfile.cmake index cb90f31966102d..006deb809b3f54 100644 --- a/ports/nanopb/portfile.cmake +++ b/ports/nanopb/portfile.cmake @@ -45,7 +45,7 @@ if(nanopb_BUILD_GENERATOR) file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/nanopb_generator.py" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") if(WIN32) file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - file(INSTALL "${CURRENT_PACKAGES_DIR}/Lib/site-packages/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/site-packages") + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/proto/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/proto") else() file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() diff --git a/ports/nanopb/vcpkg.json b/ports/nanopb/vcpkg.json index 315f5fe63533ea..f63e2203284f0e 100644 --- a/ports/nanopb/vcpkg.json +++ b/ports/nanopb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanopb", "version-semver": "0.4.7", - "port-version": 1, + "port-version": 2, "description": "A small code-size Protocol Buffers implementation in ANSI C.", "homepage": "https://jpa.kapsi.fi/nanopb/", "license": "Zlib", diff --git a/ports/ndis-driver-library/portfile.cmake b/ports/ndis-driver-library/portfile.cmake new file mode 100644 index 00000000000000..a818006f7ad0ee --- /dev/null +++ b/ports/ndis-driver-library/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/ndis-driver-library + REF "release/v${VERSION}" + SHA512 4f96c8769c9363e8e2abc89090d1342dc6b9f868c72434cd1943c3d6d52bc89195463eb7bb5aa6d128b31f1ae61a1fd5131e2fe859c1b591ef3a54de764661a3 + HEAD_REF main +) + +file(COPY "${SOURCE_PATH}/src/include/ndis" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ndis-driver-library/vcpkg.json b/ports/ndis-driver-library/vcpkg.json new file mode 100644 index 00000000000000..93542ce76edcfc --- /dev/null +++ b/ports/ndis-driver-library/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ndis-driver-library", + "version": "1.2.0", + "description": "Code to make it easier to write an NDIS network driver on Windows", + "homepage": "https://github.com/microsoft/ndis-driver-library", + "license": "MIT" +} diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index 8e7ed0a411fd8f..732292c46ac698 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 REF v${VERSION} - SHA512 0ab1a987ec99f7b0652e75a93bebff9a5363f52758be1f6ae8626dcf9f4b2f931dec0a276cdd7b81522c61040e008345ecc5011c17a763b97a48b0f7e2615451 + SHA512 ba143045220f4d1fbbefa6c3944b0a2cd3535b9d4b07ea05fe08cbbaaa2f7eb1f0ff7a65e8e13a5711a3f88855de36ecada54470e583099be14b77ec360a3084 HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index 85e13569274b1c..60f7cb47c6860e 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.55.1", + "version": "1.56.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "license": "MIT", diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index a3e56937ffe8fe..4709cdf51f6796 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 REF v${VERSION} - SHA512 b707c66971e66b58b1d7f3d7a7ce56404337d26fca8552d0de2a0af857ad71fb883fd78b91329312607b631c02362830d07e6a060a35856fa5d7d9ad9056513b + SHA512 e6288157f897007a14587c3a31e26401c338a22b8e1547da731549a0c23e8b18e04048cb661e6b7072835b6bf7f3218f4a7a07c8e43ff94954c274221d8f92f9 HEAD_REF main ) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index ac5ba978626a15..5a302fcce301e1 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp3", - "version": "0.14.0", + "version": "0.15.0", "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/ports/ngspice/portfile.cmake b/ports/ngspice/portfile.cmake index ab96878c9962d7..2a0f1028010b7d 100644 --- a/ports/ngspice/portfile.cmake +++ b/ports/ngspice/portfile.cmake @@ -8,13 +8,13 @@ vcpkg_from_sourceforge( REPO ngspice/ng-spice-rework REF ${VERSION} FILENAME "ngspice-${VERSION}.tar.gz" - SHA512 724415cea3249d049d796360f5f59ec5e68edb1899e82b0fbd68455791863c274abe1a505b7148ef96adbb485bc677d38432fa4effe4069bbdfe284ff3e59921 + SHA512 fb0960cc9fcde1871fad82571cacebb1f5cce09ee3297cc938a24b88173ed102a2cb3f246599cdfbde7275e45e3d551edd0368e3ba6e79c592937c4cc466325e PATCHES use-winbison-sharedspice.patch use-winbison-vngspice.patch remove-post-build.patch remove-64-in-codemodel-name.patch - Fix-C2065.patch + Fix-C2065.patch ) vcpkg_find_acquire_program(BISON) @@ -25,32 +25,29 @@ vcpkg_add_to_path(PREPEND "${BISON_DIR}") # Sadly, vcpkg globs .libs inside install_msbuild and whines that the 47 year old SPICE format isn't a MSVC lib ;) # We need to kill them off first before the source tree is copied to a tmp location by install_msbuild -file(REMOVE_RECURSE "${SOURCE_PATH}/contrib") -file(REMOVE_RECURSE "${SOURCE_PATH}/examples") -file(REMOVE_RECURSE "${SOURCE_PATH}/man") -file(REMOVE_RECURSE "${SOURCE_PATH}/tests") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib") +file(REMOVE_RECURSE "${SOURCE_PATH}/examples") +file(REMOVE_RECURSE "${SOURCE_PATH}/man") +file(REMOVE_RECURSE "${SOURCE_PATH}/tests") # this builds the main dll -vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - INCLUDES_SUBPATH /src/include - LICENSE_SUBPATH COPYING +vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" # install_msbuild swaps x86 for win32(bad) if we dont force our own setting PLATFORM ${TRIPLET_SYSTEM_ARCH} PROJECT_SUBPATH visualc/sharedspice.sln TARGET Build ) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(COPY "${SOURCE_PATH}/src/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + if("codemodels" IN_LIST FEATURES) # vngspice generates "codemodels" to enhance simulation capabilities # we cannot use install_msbuild as they output with ".cm" extensions on purpose - set(BUILDTREE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") - file(REMOVE_RECURSE "${BUILDTREE_PATH}") - file(COPY "${SOURCE_PATH}/" DESTINATION "${BUILDTREE_PATH}") - - vcpkg_install_msbuild( - SOURCE_PATH "${BUILDTREE_PATH}" - PROJECT_SUBPATH visualc/vngspice.sln + vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH visualc/vngspice.sln # build_msbuild swaps x86 for win32(bad) if we dont force our own setting PLATFORM ${TRIPLET_SYSTEM_ARCH} TARGET Build @@ -67,27 +64,26 @@ if("codemodels" IN_LIST FEATURES) endif() #put the code models in the intended location - file(GLOB NGSPICE_CODEMODELS_DEBUG - "${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Debug/*.cm" - ) - file(COPY ${NGSPICE_CODEMODELS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/ngspice") + if(NOT VCPKG_BUILD_TYPE) + file(GLOB NGSPICE_CODEMODELS_DEBUG + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/visualc/codemodels/${OUT_ARCH}/Debug/*.cm" + ) + file(COPY ${NGSPICE_CODEMODELS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/ngspice") + endif() file(GLOB NGSPICE_CODEMODELS_RELEASE - "${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Release/*.cm" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/visualc/codemodels/${OUT_ARCH}/Release/*.cm" ) - file(COPY ${NGSPICE_CODEMODELS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/ngspice") - + file(COPY ${NGSPICE_CODEMODELS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/ngspice") # copy over spinit (spice init) - file(RENAME "${BUILDTREE_PATH}/visualc/spinit_all" "${BUILDTREE_PATH}/visualc/spinit") - file(COPY "${BUILDTREE_PATH}/visualc/spinit" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ngspice") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/visualc/spinit_all" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ngspice") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/ngspice/spinit_all" "${CURRENT_PACKAGES_DIR}/share/ngspice/spinit") endif() -vcpkg_copy_pdbs() - # Unforunately install_msbuild isn't able to dual include directories that effectively layer -file(GLOB NGSPICE_INCLUDES "${SOURCE_PATH}/visualc/src/include/ngspice/*") -file(COPY ${NGSPICE_INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/ngspice") +file(GLOB NGSPICE_INCLUDES "${SOURCE_PATH}/visualc/src/include/ngspice/*") +file(COPY ${NGSPICE_INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/ngspice") # This gets copied by install_msbuild but should not be shared -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cppduals") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cppduals") diff --git a/ports/ngspice/vcpkg.json b/ports/ngspice/vcpkg.json index 0ce5155730bdbd..31cfa6f913ded1 100644 --- a/ports/ngspice/vcpkg.json +++ b/ports/ngspice/vcpkg.json @@ -1,10 +1,17 @@ { "name": "ngspice", - "version": "39", + "version": "41", "description": "Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE", "homepage": "http://ngspice.sourceforge.net/", "license": "CC-BY-SA-4.0", "supports": "!(linux | osx | arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ], "default-features": [ "codemodels" ], diff --git a/ports/ngtcp2/portfile.cmake b/ports/ngtcp2/portfile.cmake index d3161e621a9970..e93dce4b28ed8a 100644 --- a/ports/ngtcp2/portfile.cmake +++ b/ports/ngtcp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/ngtcp2 REF "v${VERSION}" - SHA512 949bfa9e932588e327ca9d8234f30d6400b65a565b266e36ae64ffbb322add54cbd6ab670eaa6555aaf29305307137a779bd1ec87b019c6b82bddacd2de45eeb + SHA512 2979f7609c42a3dc7d5bf76c8d007ee35bfe6a25d5bfe44fe32f3b0d71c9d44b10f0b400c311d150e6cfbc770621416ef7151d4b0a15bf0842da3a597eb171bf HEAD_REF master PATCHES export-unofficical-target.patch diff --git a/ports/ngtcp2/vcpkg.json b/ports/ngtcp2/vcpkg.json index 0ce22396e48c61..896697d2455f4b 100644 --- a/ports/ngtcp2/vcpkg.json +++ b/ports/ngtcp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ngtcp2", - "version": "0.18.0", + "version": "0.19.1", "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.", "homepage": "https://github.com/ngtcp2/ngtcp2", "license": "MIT", diff --git a/ports/nmap/portfile.cmake b/ports/nmap/portfile.cmake index dbfb99a1e655ed..dd92a494567f15 100644 --- a/ports/nmap/portfile.cmake +++ b/ports/nmap/portfile.cmake @@ -38,24 +38,11 @@ if(VCPKG_TARGET_IS_WINDOWS) WORKING_DIRECTORY ${SOURCE_PATH}/mswin32 LOGNAME upgrade-Packet-${TARGET_TRIPLET} ) - # Build - vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/mswin32/nmap.vcxproj - PLATFORM ${MSBUILD_PLATFORM} - USE_VCPKG_INTEGRATION + vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH mswin32/nmap.vcxproj + PLATFORM ${MSBUILD_PLATFORM} ) - - # Install - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Release) - file(INSTALL ${SOURCE_PATH}/mswin32/Release/nmap.exe - ${SOURCE_PATH}/mswin32/Release/nmap.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Debug) - file(INSTALL ${SOURCE_PATH}/mswin32/Debug/nmap.exe - ${SOURCE_PATH}/mswin32/Debug/nmap.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - endif() else() set(ENV{LDFLAGS} "$ENV{LDFLAGS} -pthread") set(OPTIONS --without-nmap-update --with-openssl=${CURRENT_INSTALLED_DIR} --with-libssh2=${CURRENT_INSTALLED_DIR} --with-libz=${CURRENT_INSTALLED_DIR} --with-libpcre=${CURRENT_INSTALLED_DIR}) @@ -112,9 +99,7 @@ else() set(SOURCE_PATH "${source_path_release}") endif() -vcpkg_copy_pdbs() - # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/nmap/vcpkg.json b/ports/nmap/vcpkg.json index 2c9b4066ae8502..21a49388fcc568 100644 --- a/ports/nmap/vcpkg.json +++ b/ports/nmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nmap", "version": "7.70", - "port-version": 9, + "port-version": 10, "description": "A library for scanning network ports.", "dependencies": [ { @@ -16,6 +16,11 @@ "name": "python2", "platform": "windows" }, + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + }, { "name": "winpcap", "platform": "windows" diff --git a/ports/ntf-core/dont-use-lib64.patch b/ports/ntf-core/dont-use-lib64.patch new file mode 100644 index 00000000000000..89cd0dae4c40a9 --- /dev/null +++ b/ports/ntf-core/dont-use-lib64.patch @@ -0,0 +1,17 @@ +diff --git a/repository.cmake b/repository.cmake +index 9b6c699..ed2ce32 100644 +--- a/repository.cmake ++++ b/repository.cmake +@@ -1737,11 +1737,7 @@ function (ntf_group_end) + + ntf_ufid_string_has(UFID ${build_ufid} FLAG "64" OUTPUT is_64_bit) + +- if (${is_64_bit} AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") +- set(lib_name "lib64" CACHE INTERNAL "") +- else() +- set(lib_name "lib" CACHE INTERNAL "") +- endif() ++ set(lib_name "lib" CACHE INTERNAL "") + + # Set the relative path to the library directory under the prefix. For + # example: lib64 diff --git a/ports/ntf-core/portfile.cmake b/ports/ntf-core/portfile.cmake new file mode 100644 index 00000000000000..569f8d922324d5 --- /dev/null +++ b/ports/ntf-core/portfile.cmake @@ -0,0 +1,71 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bloomberg/ntf-core + REF "${VERSION}" + SHA512 57662d2dd105b2781e580623c26cd7bde84fce8374bbd70c18595a5f6934869b7a570f0d3c2e17e115f6c7eb1067541f8d19523639815b285324061f807d3179 + HEAD_REF main + PATCHES dont-use-lib64.patch +) + +# ntf-core requires debugger information to for dev tooling purposes, so we just fake it +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "-DNTF_BUILD_WITH_USAGE_EXAMPLES=0" + "-DNTF_TOOLCHAIN_DEBUGGER_PATH=NOT-FOUND" +) + +vcpkg_cmake_build() + +vcpkg_cmake_install() + +function(fix_pkgconfig_ufid lib_dir ufid pc_name) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/${lib_dir}/pkgconfig/${pc_name}.pc" "/${ufid}" "") + if ("${ufid}" MATCHES opt) + set(build_mode "release") + else() + set(build_mode "debug") + endif() + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/${lib_dir}/cmake/${pc_name}Targets-${build_mode}.cmake" "/${ufid}" "") +endfunction() + +function(fix_install_dir lib_dir ufid) + message(STATUS "Fixing ufid layout for ${CURRENT_PACKAGES_DIR}/${lib_dir}/${ufid}") + file(RENAME "${CURRENT_PACKAGES_DIR}/${lib_dir}/${ufid}" "${CURRENT_PACKAGES_DIR}/tmp") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/${lib_dir}") + file(RENAME "${CURRENT_PACKAGES_DIR}/tmp" "${CURRENT_PACKAGES_DIR}/${lib_dir}") + + fix_pkgconfig_ufid("${lib_dir}" "${ufid}" "nts") + fix_pkgconfig_ufid("${lib_dir}" "${ufid}" "ntc") +endfunction() + +fix_install_dir("lib" "opt_exc_mt") +fix_install_dir("debug/lib" "dbg_exc_mt") + +# The ntf-core build installs CMake configs for both targets into share/ntf-core, which +# find_package will not be able to find on its own. We use vcpkg_cmake_config_fixup to install +# CMake configs into share/nts, and then move the ntc CMake configs into share/ntc with this +# function. +function(ntf_core_fixup_ntc_config) + set(nts_share "${CURRENT_PACKAGES_DIR}/share/nts") + set(ntc_share "${CURRENT_PACKAGES_DIR}/share/ntc") + file(GLOB ntc_configs "${nts_share}/ntc*.cmake") + file(MAKE_DIRECTORY "${ntc_share}") + foreach(ntc_config IN LISTS ntc_configs) + file(RELATIVE_PATH ntc_config_rel "${nts_share}" "${ntc_config}") + file(RENAME "${ntc_config}" "${ntc_share}/${ntc_config_rel}") + endforeach() +endfunction() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake" PACKAGE_NAME nts) +ntf_core_fixup_ntc_config() + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +vcpkg_fixup_pkgconfig() + +# Usage +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + diff --git a/ports/ntf-core/usage b/ports/ntf-core/usage new file mode 100644 index 00000000000000..e20af2f2fd3308 --- /dev/null +++ b/ports/ntf-core/usage @@ -0,0 +1,9 @@ +The package ntf-core provides the CMake targets: + + # Blocking and non-blocking sockets for network programming + find_package(nts CONFIG REQUIRED) + target_link_libraries(main PRIVATE nts) + + # Asynchronous sockets, timers, event loops, and thread pools for network programming + find_package(ntc CONFIG REQUIRED) + target_link_libraries(main PRIVATE ntc) diff --git a/ports/ntf-core/vcpkg.json b/ports/ntf-core/vcpkg.json new file mode 100644 index 00000000000000..13b983626d77ef --- /dev/null +++ b/ports/ntf-core/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ntf-core", + "version": "2.1.0", + "port-version": 1, + "description": "The Network Transport Framework: Core Libraries", + "license": "Apache-2.0", + "dependencies": [ + "bde", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/numcpp/portfile.cmake b/ports/numcpp/portfile.cmake index da4b7c30fd6a9f..f3b91bb78ac0ed 100644 --- a/ports/numcpp/portfile.cmake +++ b/ports/numcpp/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dpilger26/NumCpp REF "Version_${VERSION}" - SHA512 8474e38b2522b52235b38abb556c60284b7c44861b450f310bfa1a66938053006e47dde9106c73dad843bf049a2dd8988cbe2d2ba747a86f548c1f356f39e081 + SHA512 57848211a9ff55b12e9590351e5add36082809a3457b2983317b5cb23d8f1c04a65b2c7a17d119b2c3e3959ef152c8e9dc38cf338da362ef9499c9c9eeb393eb HEAD_REF master ) diff --git a/ports/numcpp/vcpkg.json b/ports/numcpp/vcpkg.json index 900d372ae78889..b4c35e50dcfa71 100644 --- a/ports/numcpp/vcpkg.json +++ b/ports/numcpp/vcpkg.json @@ -1,10 +1,11 @@ { "name": "numcpp", - "version": "2.10.1", + "version": "2.11.0", "description": "C++ implementation of the Python Numpy library", "homepage": "https://dpilger26.github.io/NumCpp", "license": "MIT", "dependencies": [ + "boost", "boost-algorithm", "boost-date-time", "boost-endian", diff --git a/ports/nyan-lang/portfile.cmake b/ports/nyan-lang/portfile.cmake new file mode 100644 index 00000000000000..ded5706d55c248 --- /dev/null +++ b/ports/nyan-lang/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +set(VERSION 0.3) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SFTtech/nyan + REF "v${VERSION}" + SHA512 53411795142aa2dfd197d4e550a9de4f2e68519426a228d7e9fe162e8f113886ae5febbceef8daa643c60a9089ede4b5c8dda9c136617357b58279cc732efba6 + HEAD_REF master +) + +vcpkg_find_acquire_program(FLEX) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DFLEX_EXECUTABLE=${FLEX}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_copy_tools(TOOL_NAMES nyancat AUTO_CLEAN) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/copying.md" + "${SOURCE_PATH}/legal/LGPLv3" + "${SOURCE_PATH}/legal/GPLv3" +) diff --git a/ports/nyan-lang/vcpkg.json b/ports/nyan-lang/vcpkg.json new file mode 100644 index 00000000000000..3dcc1439db11da --- /dev/null +++ b/ports/nyan-lang/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "nyan-lang", + "version": "0.3", + "description": "nyan is a data description language, It is a mixture of python, json, patch, wml, yaml and some new ideas.", + "homepage": "https://github.com/SFTtech/nyan", + "license": "LGPL-3.0-or-later", + "supports": "!osx & !static & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/oatpp-zlib/fix-usage.patch b/ports/oatpp-zlib/fix-usage.patch new file mode 100644 index 00000000000000..c08afc71146c2d --- /dev/null +++ b/ports/oatpp-zlib/fix-usage.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/module-utils.cmake b/cmake/module-utils.cmake +index 8f1d35a..cade49d 100644 +--- a/cmake/module-utils.cmake ++++ b/cmake/module-utils.cmake +@@ -5,7 +5,7 @@ macro(target_link_oatpp target) + message("target_link_oatpp(${target}) to installed oatpp lib") + + target_link_libraries(${target} +- PRIVATE oatpp::oatpp ++ PUBLIC oatpp::oatpp + PRIVATE oatpp::oatpp-test + ) + diff --git a/ports/oatpp-zlib/missing-find_dependency.patch b/ports/oatpp-zlib/missing-find_dependency.patch new file mode 100644 index 00000000000000..f1bdeaeb5d4447 --- /dev/null +++ b/ports/oatpp-zlib/missing-find_dependency.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/module-config.cmake.in b/cmake/module-config.cmake.in +index 5cc12b0..71f8f10 100644 +--- a/cmake/module-config.cmake.in ++++ b/cmake/module-config.cmake.in +@@ -1,5 +1,9 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++find_dependency(oatpp) ++find_dependency(ZLIB) ++ + if(NOT TARGET oatpp::@OATPP_MODULE_NAME@) + include("${CMAKE_CURRENT_LIST_DIR}/@OATPP_MODULE_NAME@Targets.cmake") + endif() diff --git a/ports/oatpp-zlib/portfile.cmake b/ports/oatpp-zlib/portfile.cmake index fc141336c873ee..69e01063cfc078 100644 --- a/ports/oatpp-zlib/portfile.cmake +++ b/ports/oatpp-zlib/portfile.cmake @@ -8,6 +8,9 @@ vcpkg_from_github( REF ${OATPP_VERSION} SHA512 574f0440cbb2cd2bc14ad89e33538a1a300ad23ecc941629b74aa8ccb9aeae5158b1b57e2f1af09d7a6b9b97430a5685354677002dab2261120afa9c6ea74381 HEAD_REF master + PATCHES + missing-find_dependency.patch + fix-usage.patch ) vcpkg_cmake_configure( diff --git a/ports/oatpp-zlib/vcpkg.json b/ports/oatpp-zlib/vcpkg.json index 6e4049a1e16a54..d1b17cb37d4908 100644 --- a/ports/oatpp-zlib/vcpkg.json +++ b/ports/oatpp-zlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "oatpp-zlib", "version": "1.3.0", - "port-version": 1, + "port-version": 2, "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.", "homepage": "https://github.com/oatpp/oatpp-zlib", "license": "Apache-2.0", @@ -14,6 +14,7 @@ { "name": "vcpkg-cmake-config", "host": true - } + }, + "zlib" ] } diff --git a/ports/oatpp/fix-target.patch b/ports/oatpp/fix-target.patch new file mode 100644 index 00000000000000..e2e40c729bc4d3 --- /dev/null +++ b/ports/oatpp/fix-target.patch @@ -0,0 +1,12 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 13cccc2c..c4a3fe44 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -301,6 +301,7 @@ set_target_properties(oatpp PROPERTIES + CXX_EXTENSIONS OFF + CXX_STANDARD_REQUIRED ON + ) ++target_compile_features(oatpp PUBLIC cxx_std_11) + if (MSVC) + target_compile_options(oatpp PRIVATE /permissive-) + endif() diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake index 1e4a62583b1019..202929b6590074 100644 --- a/ports/oatpp/portfile.cmake +++ b/ports/oatpp/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF ${OATPP_VERSION} SHA512 4fe8587efe1b4ecae14554ec8edb209e5558a3e4a4e6ff49bbfaaf06d2cc12f2cc306c5edc43b8dafc465aff53098ad4bebb9971694761b91a553730d5acb59a HEAD_REF master + PATCHES + fix-target.patch ) if (VCPKG_CRT_LINKAGE STREQUAL "static") diff --git a/ports/oatpp/vcpkg.json b/ports/oatpp/vcpkg.json index 13495e4c61bc10..92c799fe51ae6a 100644 --- a/ports/oatpp/vcpkg.json +++ b/ports/oatpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "oatpp", "version": "1.3.0", - "port-version": 1, + "port-version": 2, "description": "Modern web framework.", "homepage": "https://github.com/oatpp/oatpp", "license": "Apache-2.0", diff --git a/ports/ocilib/portfile.cmake b/ports/ocilib/portfile.cmake index dced1beb25b9ed..efb093d7bca2d4 100644 --- a/ports/ocilib/portfile.cmake +++ b/ports/ocilib/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vrogier/ocilib REF "v${VERSION}" - SHA512 310c25fbe47ab59570103afdc6f4517b979d4077c77665c931592d95e8c706dcf34d5c2f10309a9971534499b2c4367efd05b25cdf8ebd4de15cb2c104059760 + SHA512 5982b17d04ebbcb281848a998b3f2f35c5a83bc6d14cd6fecb8eef695300b577fb8dcc1377e9a8827587ac06d58441328cb0d55b19ae65788c2fce8da7ce702a HEAD_REF master PATCHES fix-DisableWC4191.patch ) @@ -12,15 +12,14 @@ if(VCPKG_TARGET_IS_WINDOWS) # There is no debug configuration # As it is a C library, build the release configuration and copy its output to the debug folder set(VCPKG_BUILD_TYPE release) - vcpkg_install_msbuild( + vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH proj/dll/ocilib_dll.sln - INCLUDES_SUBPATH include - LICENSE_SUBPATH LICENSE RELEASE_CONFIGURATION "Release - ANSI" - PLATFORM "${VCPKG_TARGET_ARCHITECTURE}" - USE_VCPKG_INTEGRATION - ALLOW_ROOT_INCLUDES) + PLATFORM ${VCPKG_TARGET_ARCHITECTURE} + ) + + file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") @@ -42,5 +41,6 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") - file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ocilib/vcpkg.json b/ports/ocilib/vcpkg.json index 7185fea52b4427..6fe117b84fb80e 100644 --- a/ports/ocilib/vcpkg.json +++ b/ports/ocilib/vcpkg.json @@ -1,9 +1,15 @@ { "name": "ocilib", - "version": "4.7.5", - "port-version": 2, + "version": "4.7.6", "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.", "homepage": "https://vrogier.github.io/ocilib/", "license": "Apache-2.0", - "supports": "!uwp & !(arm & windows)" + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/octomap/fix-compilation.patch b/ports/octomap/fix-compilation.patch new file mode 100644 index 00000000000000..ebb6e4a535981c --- /dev/null +++ b/ports/octomap/fix-compilation.patch @@ -0,0 +1,22 @@ +diff --git a/octomap/include/octomap/ScanGraph.h b/octomap/include/octomap/ScanGraph.h +index 07c7436..e54eaf5 100644 +--- a/octomap/include/octomap/ScanGraph.h ++++ b/octomap/include/octomap/ScanGraph.h +@@ -60,7 +60,7 @@ namespace octomap { + + ~ScanNode(); + +- bool operator == (const ScanNode& other) { ++ bool operator == (const ScanNode& other) const { + return (id == other.id); + } + +@@ -87,7 +87,7 @@ namespace octomap { + : first(_first), second(_second), constraint(_constraint), weight(1.0) { } + ScanEdge() {} + +- bool operator == (const ScanEdge& other) { ++ bool operator == (const ScanEdge& other) const { + return ( (*first == *(other.first) ) && ( *second == *(other.second) ) ); + } + diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake index be17c875b5126f..e33e45d2b6e6cc 100644 --- a/ports/octomap/portfile.cmake +++ b/ports/octomap/portfile.cmake @@ -7,7 +7,8 @@ vcpkg_from_github( SHA512 ec321a5355091acbd3d3fda7c858e2078c29195e73461c8a34db2c4614c6b2e38b35a59671f1071f7eb397cac4df78869f14a13af2e68d64e5a2e2d8727846cd HEAD_REF master PATCHES - "001-fix-exported-targets.patch" + 001-fix-exported-targets.patch + fix-compilation.patch ) vcpkg_cmake_configure( @@ -38,7 +39,7 @@ endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/octomap") # Handle copyright -file(INSTALL "${SOURCE_PATH}/octomap/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/octomap/LICENSE.txt") vcpkg_copy_pdbs() diff --git a/ports/octomap/vcpkg.json b/ports/octomap/vcpkg.json index 7409ae814629b3..868c7ce7c6ce65 100644 --- a/ports/octomap/vcpkg.json +++ b/ports/octomap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "octomap", "version": "1.9.6", + "port-version": 1, "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees", "homepage": "https://octomap.github.io/", "license": "BSD-3-Clause", diff --git a/ports/ogre-next/avoid-name-clashes.patch b/ports/ogre-next/avoid-name-clashes.patch new file mode 100644 index 00000000000000..a1d167d1f3b0a6 --- /dev/null +++ b/ports/ogre-next/avoid-name-clashes.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 800e956..436c3d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -678,5 +678,5 @@ include(Packaging) + + + # Show feature summary +-include(FeatureSummary) ++include(OgreFeatureSummary) + diff --git a/ports/ogre-next/environment-overrides.cmake b/ports/ogre-next/environment-overrides.cmake deleted file mode 100644 index 4957cdcd5d5d51..00000000000000 --- a/ports/ogre-next/environment-overrides.cmake +++ /dev/null @@ -1,16 +0,0 @@ -#[[ - -Building steps for ogre-next[d3d9]: - -1. Download and install "Microsoft DirectX SDK" -https://www.microsoft.com/en-us/download/confirmation.aspx?id=6812 - -2. Set env variable -set DXSDK_DIR=C:/Program Files (x86)/Microsoft DirectX SDK (June 2010) - -3. Install port -.\vcpkg.exe install ogre-next[d3d9] --triplet x64-windows - -]] - -set(VCPKG_ENV_PASSTHROUGH DXSDK_DIR) diff --git a/ports/ogre-next/fix-error-c2039.patch b/ports/ogre-next/fix-error-c2039.patch new file mode 100644 index 00000000000000..f6071f8303048f --- /dev/null +++ b/ports/ogre-next/fix-error-c2039.patch @@ -0,0 +1,79 @@ +diff --git a/OgreMain/include/OgreString.h b/OgreMain/include/OgreString.h +index 8693c57..720a243 100644 +--- a/OgreMain/include/OgreString.h ++++ b/OgreMain/include/OgreString.h +@@ -34,44 +34,6 @@ THE SOFTWARE. + + #include "OgreHeaderPrefix.h" + +-// If we're using the GCC 3.1 C++ Std lib +-#if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT) +- +-// For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html +-# if __cplusplus >= 201103L +-# include +-# elif OGRE_COMP_VER >= 430 +-# include +-# else +-# include +-namespace __gnu_cxx +-{ +- template <> struct hash< Ogre::_StringBase > +- { +- size_t operator()( const Ogre::_StringBase _stringBase ) const +- { +- /* This is the PRO-STL way, but it seems to cause problems with VC7.1 +- and in some other cases (although I can't recreate it) +- hash H; +- return H(_stringBase.c_str()); +- */ +- /** This is our custom way */ +- register size_t ret = 0; +- for( Ogre::_StringBase::const_iterator it = _stringBase.begin(); it != _stringBase.end(); ++it ) +- ret = 5 * ret + *it; +- +- return ret; +- } +- }; +-} +-# endif +- +-#endif +- +-#if OGRE_COMPILER == OGRE_COMPILER_MSVC +- #include +-#endif +- + namespace Ogre { + /** \addtogroup Core + * @{ +@@ -205,28 +167,8 @@ namespace Ogre { + static const String replaceAll(const String& source, const String& replaceWhat, const String& replaceWithWhat); + }; + ++ typedef ::std::hash<_StringBase> _StringHash; + +-#if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT) +-# if __cplusplus >= 201103L +- typedef std::hash< _StringBase > _StringHash; +-# elif OGRE_COMP_VER < 430 +- typedef ::__gnu_cxx::hash< _StringBase > _StringHash; +-# else +- typedef ::std::tr1::hash< _StringBase > _StringHash; +-# endif +-#elif OGRE_COMPILER == OGRE_COMPILER_CLANG +-# if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L +- typedef ::std::hash< _StringBase > _StringHash; +-# else +- typedef ::std::tr1::hash< _StringBase > _StringHash; +-# endif +-#elif OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_COMP_VER >= 1600 && OGRE_COMP_VER < 1910 && !defined(STLPORT) // VC++ 10.0 +- typedef ::std::tr1::hash< _StringBase > _StringHash; +-#elif !defined( _STLP_HASH_FUN_H ) +- typedef stdext::hash_compare< _StringBase, std::less< _StringBase > > _StringHash; +-#else +- typedef std::hash< _StringBase > _StringHash; +-#endif + /** @} */ + /** @} */ + diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index 266c930c2bdbe6..16b3a0e97637b4 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -10,15 +10,20 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre-next - REF e4c5f0f6d36c07af594e3ef143d017bda1581442 #v2.3.1 - SHA512 263a50b64defa7345a109a068cc17c347a696f83f64abc071256bb46571ed6b2ef94ee3480d90938cdb7f745d36a4c4890d82677d357c62c9a2956eae8d4ac15 + REF v${VERSION} + SHA512 62c721680ed77e74b6e1649ab7324bd49fc3c7c2e60ad76a62ec5f899f327d65a140462d75300eac4f41567a8903a748d07a760dc376eddcadf0aeea5a3ca5a7 HEAD_REF master PATCHES toolchain_fixes.patch fix_find_package_sdl2.patch + avoid-name-clashes.patch + fix-error-c2039.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") +if(EXISTS "${SOURCE_PATH}/CMake/FeatureSummary.cmake") + file(RENAME "${SOURCE_PATH}/CMake/FeatureSummary.cmake" "${SOURCE_PATH}/CMake/OgreFeatureSummary.cmake") +endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(OGRE_STATIC ON) @@ -26,22 +31,18 @@ else() set(OGRE_STATIC OFF) endif() - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 - java OGRE_BUILD_COMPONENT_JAVA - python OGRE_BUILD_COMPONENT_PYTHON - csharp OGRE_BUILD_COMPONENT_CSHARP + planar-reflections OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DOGRE_BUILD_DEPENDENCIES=OFF -DOGRE_COPY_DEPENDENCIES=OFF - -DOGRE_BUILD_SAMPLES=OFF + -DOGRE_BUILD_SAMPLES2=OFF -DOGRE_BUILD_TESTS=OFF -DOGRE_BUILD_TOOLS=OFF -DOGRE_BUILD_MSVC_MP=ON @@ -94,6 +95,11 @@ if(VCPKG_TARGET_IS_WINDOWS) else() file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib") endif() + file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/lib/release/*") + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/bin/release/*") + file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/release/" "${CURRENT_PACKAGES_DIR}/bin/release/") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") @@ -102,6 +108,11 @@ if(VCPKG_TARGET_IS_WINDOWS) else() file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib") endif() + file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/debug/*") + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/bin/debug/*") + file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/debug/" "${CURRENT_PACKAGES_DIR}/debug/bin/debug/") endif() file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake") @@ -113,7 +124,9 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index bc4fe07bb429e2..d9fdfe9e3fa877 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ogre-next", "version": "2.3.1", + "port-version": 2, "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "license": "MIT", @@ -27,20 +28,8 @@ "zziplib" ], "features": { - "csharp": { - "description": "Build csharp bindings" - }, - "d3d9": { - "description": "Build Direct3D9 RenderSystem" - }, - "java": { - "description": "Build Java (JNI) bindings" - }, - "python": { - "description": "Build Python bindings", - "dependencies": [ - "python3" - ] + "planar-reflections": { + "description": "Component to use planar reflections, can be used by both HlmsPbs and HlmsUnlit" } } } diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 068653198f5d8f..a76bdb54eb5580 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,9 +1,11 @@ { "name": "ogre", "version": "14.0.1", + "port-version": 1, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", + "supports": "!uwp", "dependencies": [ "pugixml", { diff --git a/ports/onnxruntime-gpu/portfile.cmake b/ports/onnxruntime-gpu/portfile.cmake index 1057acb8d3695d..017e146bd63649 100644 --- a/ports/onnxruntime-gpu/portfile.cmake +++ b/ports/onnxruntime-gpu/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/microsoft/onnxruntime/releases/download/v${VERSION}/onnxruntime-win-x64-gpu-${VERSION}.zip" FILENAME "onnxruntime-win-x64-gpu-${VERSION}.zip" - SHA512 f927302daa7b778eaf15693e446303060c0a38dfd18b8026c28ac65f545dd463ee7cd3f0aa6bfe59301c5c85ccf4512584ed968ac42ce8d78c12a79d8af2de1e + SHA512 6e95199e8cfdee7c056811c2c27f45f7b45bd00b48424d331d8685993102d1b59e14fc3c86e7307b780531ac3e5dcbe760c93018d1b1f106bb36fe32dc44974c ) vcpkg_extract_source_archive( @@ -17,7 +17,7 @@ vcpkg_from_github( OUT_SOURCE_PATH REPO_PATH REPO microsoft/onnxruntime REF v${VERSION} - SHA512 d8f7ea161e850a738b9a22187662218871f88ad711282c58631196a74f4a4567184047bab0001b973f841a3b63c7dc7e350f92306cc5fa9a7adc4db2ce09766f + SHA512 c9ad2ab1102bb97bdd88aa8e06432fff2960fb21172891eee9631ff7cbbdf3366cd7cf5c0baa494eb883135eab47273ed3128851ff4d9adfa004a479e941b6b5 ) file(COPY diff --git a/ports/onnxruntime-gpu/vcpkg.json b/ports/onnxruntime-gpu/vcpkg.json index 1894348e0373ac..92fe66767d603d 100644 --- a/ports/onnxruntime-gpu/vcpkg.json +++ b/ports/onnxruntime-gpu/vcpkg.json @@ -1,7 +1,6 @@ { "name": "onnxruntime-gpu", - "version": "1.14.1", - "port-version": 1, + "version": "1.15.1", "description": "onnxruntime (GPU)", "homepage": "https://github.com/microsoft/onnxruntime", "license": "MIT", diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 765b2df6403a2a..ffdb3a3e09be05 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS - REF 394a9fbafe9010b76a2615c562204277a956eb52 # v0.3.23 - SHA512 d79ae7ba4f9146f0bcacdef9b9cf4cd287e5eb2e3891f7deb4b3992b742a557ca094ac2f258420a16cfe6bbda7ca82addf415aecd7ced425a02374847c0b6013 + REF "v${VERSION}" + SHA512 fe66e3a258ca1720764ed243f6d61017d6ef14bd33b76f20b19b34754096ec2be9fbeb1a78743f38ee71381746d6af9a1c16a8f3982e423afec422fcb50852d0 HEAD_REF develop PATCHES uwp.patch @@ -68,7 +68,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/OpenBLAS) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenBLAS) if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/getarch${VCPKG_HOST_EXECUTABLE_SUFFIX}") vcpkg_copy_tools(TOOL_NAMES getarch AUTO_CLEAN) diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 1c0c10f5f1d4af..68a68293ee9bfb 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openblas", - "version": "0.3.23", - "port-version": 1, + "version": "0.3.24", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "license": "BSD-3-Clause", diff --git a/ports/opencascade/fix-depend-freetype.patch b/ports/opencascade/fix-depend-freetype.patch index b37b7ee4e09e5d..4abcddf6db884e 100644 --- a/ports/opencascade/fix-depend-freetype.patch +++ b/ports/opencascade/fix-depend-freetype.patch @@ -8,7 +8,7 @@ index fbcede5..66b127d 100644 add_definitions (-DHAVE_FREETYPE) - OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype") + find_package(freetype CONFIG REQUIRED) -+ get_target_property(FREETYPE_INCLUDE_DIR freetype INTERFACE_INCLUDE_DIRECTORIES) ++ get_target_property(FREETYPE_INCLUDE_DIR freetype INTERFACE_INCLUDE_DIRECTORIES) + list (APPEND 3RDPARTY_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR}") else() OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE") diff --git a/ports/opencascade/fix-depend-vtk.patch b/ports/opencascade/fix-depend-vtk.patch new file mode 100644 index 00000000000000..26e528def72ded --- /dev/null +++ b/ports/opencascade/fix-depend-vtk.patch @@ -0,0 +1,16 @@ +diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake +index a81cdf9bb2..f265dc3489 100644 +--- a/adm/cmake/vtk.cmake ++++ b/adm/cmake/vtk.cmake +@@ -98,6 +98,11 @@ if (VTK_FOUND) + # get paths from corresponding variables + if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}") + list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}") ++ else() ++ get_target_property(${VTK_LIBRARY}_INCLUDE_DIRS ${VTK_LIBRARY} INTERFACE_INCLUDE_DIRECTORIES) ++ if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}") ++ list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}") ++ endif() + endif() + + if (${VTK_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_LIBRARY_DIRS}") diff --git a/ports/opencascade/fix-dependence.patch b/ports/opencascade/fix-dependence.patch index d5390163277ceb..d44ce2961d8636 100644 --- a/ports/opencascade/fix-dependence.patch +++ b/ports/opencascade/fix-dependence.patch @@ -1,16 +1,17 @@ diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in -index c926c499..2fbc4023 100644 +index c926c49..a0502cc 100644 --- a/adm/templates/OpenCASCADEConfig.cmake.in +++ b/adm/templates/OpenCASCADEConfig.cmake.in -@@ -4,6 +4,7 @@ - # +@@ -5,6 +5,8 @@ # This file is configured by OpenCASCADE. # -+include(CMakeFindDependencyMacro) ++include(CMakeFindDependencyMacro) ++ if(OpenCASCADE_ALREADY_INCLUDED) return() -@@ -71,6 +72,13 @@ set (OpenCASCADE_WITH_GLES2 @USE_GLES2@) + endif() +@@ -71,6 +73,16 @@ set (OpenCASCADE_WITH_GLES2 @USE_GLES2@) @SET_OpenCASCADE_WITH_D3D@ @SET_OpenCASCADE_WITH_GLX@ @@ -19,7 +20,10 @@ index c926c499..2fbc4023 100644 +endif() + +find_dependency(OpenGL) -+find_dependency(Eigen3 REQUIRED) ++ ++if(@USE_EIGEN@) ++ find_dependency(Eigen3) ++endif() + # Import OpenCASCADE compile definitions, C and C++ flags for each installed configuration. file(GLOB CONFIG_FILES "${CMAKE_CURRENT_LIST_DIR}/OpenCASCADECompileDefinitionsAndFlags-*.cmake") diff --git a/ports/opencascade/fix-find-tbb.patch b/ports/opencascade/fix-find-tbb.patch new file mode 100644 index 00000000000000..2732502ac6dab3 --- /dev/null +++ b/ports/opencascade/fix-find-tbb.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1bacca1a48..9c7d924769 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -731,6 +731,13 @@ endif() + if (NOT DEFINED ANDROID AND CAN_USE_TBB) + if (USE_TBB) + add_definitions (-DHAVE_TBB) ++ if (NOT DEFINED 3RDPARTY_TBB_DIR) ++ find_package(TBB REQUIRED) ++ get_target_property(TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES) ++ get_filename_component(MY_DIRECTORY ${TBB_INCLUDE_DIR} DIRECTORY) ++ message(STATUS "TBB_INCLUDE_DIR: ${TBB_INCLUDE_DIR} ${TBB_FOUND} ${MY_DIRECTORY}") ++ set(3RDPARTY_TBB_DIR ${MY_DIRECTORY}) ++ endif() + OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb") + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB") diff --git a/ports/opencascade/fix-pdb-find.patch b/ports/opencascade/fix-pdb-find.patch index c74aba04f53fd3..5446f9455e0e74 100644 --- a/ports/opencascade/fix-pdb-find.patch +++ b/ports/opencascade/fix-pdb-find.patch @@ -1,33 +1,33 @@ -diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake -index a63f3ce..aa77c20 100644 ---- a/adm/cmake/cotire.cmake -+++ b/adm/cmake/cotire.cmake -@@ -3114,6 +3114,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) - OSX_ARCHITECTURES OSX_ARCHITECTURES_ PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST - IOS_INSTALL_COMBINED) - # copy Windows platform specific stuff -+ if (BUILD_SHARED_LIBS) - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} - GNUtoMS - COMPILE_PDB_NAME COMPILE_PDB_NAME_ -@@ -3129,6 +3130,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) - WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS - DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE - VS_SDK_REFERENCES) -+ endif() - # copy Android platform specific stuff - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} - ANDROID_API ANDROID_API_MIN ANDROID_GUI -diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake -index 2f96c6f..78f15f0 100644 ---- a/adm/cmake/occt_toolkit.cmake -+++ b/adm/cmake/occt_toolkit.cmake -@@ -235,7 +235,7 @@ if (EXECUTABLE_PROJECT) - else() - add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES}) - -- if (MSVC) -+ if (MSVC AND BUILD_SHARED_LIBS) +diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake +index acdca71a9f..aa41f2c8b8 100644 +--- a/adm/cmake/cotire.cmake ++++ b/adm/cmake/cotire.cmake +@@ -3291,6 +3291,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) + OSX_ARCHITECTURES OSX_ARCHITECTURES_ PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST + IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE) + # copy Windows platform specific stuff ++ if (BUILD_SHARED_LIBS) + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} + GNUtoMS + COMPILE_PDB_NAME COMPILE_PDB_NAME_ +@@ -3306,6 +3307,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) + WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS + DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE + VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY) ++ endif() + # copy Android platform specific stuff + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} + ANDROID_API ANDROID_API_MIN ANDROID_GUI +diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake +index c9399159f1..ce74b918df 100644 +--- a/adm/cmake/occt_toolkit.cmake ++++ b/adm/cmake/occt_toolkit.cmake +@@ -278,7 +278,7 @@ else() + # endif() + endif() + +- if (MSVC) ++ if (MSVC AND BUILD_SHARED_LIBS) if (BUILD_FORCE_RelWithDebInfo) set (aReleasePdbConf "Release") else() diff --git a/ports/opencascade/install-include-dir.patch b/ports/opencascade/install-include-dir.patch index 85ab582bd346f8..a568ce8aee300d 100644 --- a/ports/opencascade/install-include-dir.patch +++ b/ports/opencascade/install-include-dir.patch @@ -1,31 +1,19 @@ -From 32c4bdd88555309752215c53842d438cb51bcb62 Mon Sep 17 00:00:00 2001 -From: bloess -Date: Mon, 15 Feb 2021 16:26:36 +0100 -Subject: [PATCH] install include-dir - ---- - CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 100d613..464f95a 100644 +index f4ec871..59e5134 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1171,6 +1171,14 @@ foreach (OCCT_MODULE ${OCCT_MODULES}) +@@ -1246,6 +1246,14 @@ foreach (OCCT_MODULE ${OCCT_MODULES}) endforeach() set (OCCT_MODULES_ENABLED ${OCCT_MODULES_ENABLED_SORTED}) +foreach (OCCT_LIBRARY ${OCCT_LIBRARIES}) -+ target_include_directories( -+ ${OCCT_LIBRARY} -+ INTERFACE -+ $) -+ ++ target_include_directories( ++ ${OCCT_LIBRARY} ++ INTERFACE ++ $ ++ $) +endforeach() + # Add all targets to the build-tree export set export (TARGETS ${OCCT_LIBRARIES} FILE "${CMAKE_BINARY_DIR}/OpenCASCADETargets.cmake") --- -2.14.3.windows.1 - diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index 294f2dee64a860..29fbac075a147e 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -1,15 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Open-Cascade-SAS/OCCT - REF bb368e271e24f63078129283148ce83db6b9670a #V7.6.2 - SHA512 500c7ff804eb6b202bef48e1be904fe43a3c0137e9a402affe128b3b75a1adbb20bfe383cee82503b13efc083a95eb97425f1afb1f66bae38543d29f871a91f9 + REF cec1ecd0c9f3b3d2572c47035d11949e8dfa85e2 #V7.7.2 + SHA512 2fe98eadd7f9b922729bf80b56f260729d1c257c41392e4be4f070667ee77e94e2b286a873430b41ea61076acf1388aee7ba8b91789aa6199db56066796bb2d3 HEAD_REF master PATCHES fix-pdb-find.patch fix-install-prefix-path.patch install-include-dir.patch fix-depend-freetype.patch + fix-depend-vtk.patch fix-dependence.patch + fix-find-tbb.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -23,11 +25,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "freeimage" USE_FREEIMAGE "tbb" USE_TBB "rapidjson" USE_RAPIDJSON - "samples" INSTALL_SAMPLES + "samples" INSTALL_SAMPLES + "vtk" USE_VTK ) -# VTK option in opencascade not currently supported because only 6.1.0 is supported but vcpkg has >= 9.0 - # We turn off BUILD_MODULE_Draw as it requires TCL 8.6 and TK 8.6 specifically which conflicts with vcpkg only having TCL 9.0 # And pre-built ActiveTCL binaries are behind a marketing wall :( # We use the Unix install layout for Windows as it matches vcpkg @@ -42,6 +43,7 @@ vcpkg_cmake_configure( -DBUILD_SAMPLES_QT=OFF -DBUILD_DOC_Overview=OFF -DINSTALL_TEST_CASES=OFF + -DBUILD_MODULE_DETools=OFF ) vcpkg_cmake_install() @@ -112,4 +114,10 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +if (INSTALL_SAMPLES) + foreach(dir "Tutorial" "FuncDemo" "IESample" "OCCTOverview") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencascade/samples/qt/${dir}/env.sh" "${CURRENT_PACKAGES_DIR}/bin/env.sh" "") + endforeach() +endif() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt") diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index a1c81c8ee486f4..4cb456768fc519 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencascade", - "version": "7.6.2", - "port-version": 6, + "version": "7.7.2", + "port-version": 1, "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", "license": "LGPL-2.1", @@ -39,6 +39,18 @@ "dependencies": [ "tbb" ] + }, + "vtk": { + "description": "Enable optional usage of vtk", + "dependencies": [ + { + "name": "vtk", + "default-features": false, + "features": [ + "opengl" + ] + } + ] } } } diff --git a/ports/opencolorio/fix-del-install-file.patch b/ports/opencolorio/fix-del-install-file.patch new file mode 100644 index 00000000000000..6605d721cc4d98 --- /dev/null +++ b/ports/opencolorio/fix-del-install-file.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17e188d..c6c5ff5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -341,11 +341,7 @@ if (NOT BUILD_SHARED_LIBS) + + # Install custom Find modules. + install(FILES +- ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findexpat.cmake +- ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/FindImath.cmake +- ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findpystring.cmake + ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findminizip-ng.cmake +- ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findyaml-cpp.cmake + DESTINATION ${OCIO_CUSTOM_FIND_MODULE_DIR} + ) + endif() diff --git a/ports/opencolorio/fix-dependency.patch b/ports/opencolorio/fix-dependency.patch index d446358fc3be4f..b08c3f357c7478 100644 --- a/ports/opencolorio/fix-dependency.patch +++ b/ports/opencolorio/fix-dependency.patch @@ -1,17 +1,17 @@ diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake -index 8787b87..f953ceb 100644 +index 5455a08..3b9530e 100644 --- a/share/cmake/modules/FindExtPackages.cmake +++ b/share/cmake/modules/FindExtPackages.cmake -@@ -26,15 +26,15 @@ set(CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY ON CACHE BOOL +@@ -37,20 +37,20 @@ endif() # expat # https://github.com/libexpat/libexpat --find_package(expat 2.2.8 REQUIRED) +-find_package(expat 2.4.1 REQUIRED) +find_package(expat CONFIG REQUIRED) # yaml-cpp # https://github.com/jbeder/yaml-cpp --find_package(yaml-cpp 0.6.3 REQUIRED) +-find_package(yaml-cpp 0.7.0 REQUIRED) +find_package(yaml-cpp CONFIG REQUIRED) # pystring @@ -19,27 +19,24 @@ index 8787b87..f953ceb 100644 -find_package(pystring 1.1.3 REQUIRED) +find_package(pystring CONFIG REQUIRED) - # Half - # NOTE: OCIO_USE_IMATH_HALF needs to be an integer for use in utils/Half.h.in -@@ -42,7 +42,7 @@ if(NOT OCIO_USE_OPENEXR_HALF) + # Imath (>=3.1) + # https://github.com/AcademySoftwareFoundation/Imath + set(_Imath_ExternalProject_VERSION "3.1.5") +-find_package(Imath 3.0 REQUIRED) ++find_package(Imath CONFIG REQUIRED) - # Imath (>=3.0) - # https://github.com/AcademySoftwareFoundation/Imath -- find_package(Imath 3.1.2 REQUIRED) -+ find_package(Imath CONFIG REQUIRED) - - set(OCIO_HALF_LIB Imath::Imath CACHE STRING "Half library target" FORCE) - set(OCIO_USE_IMATH_HALF "1" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE) -@@ -50,7 +50,7 @@ else() + ############################################################################### + ### ZLIB (https://github.com/madler/zlib) +@@ -138,7 +138,7 @@ endif() - # OpenEXR/IlmBase (<=2.5) - # https://github.com/AcademySoftwareFoundation/openexr -- find_package(Half 2.4.0 REQUIRED) -+ find_package(Half CONFIG REQUIRED) + # minizip-ng + # https://github.com/zlib-ng/minizip-ng +-find_package(minizip-ng 3.0.7 REQUIRED) ++find_package(minizip-ng CONFIG REQUIRED) - set(OCIO_HALF_LIB IlmBase::Half CACHE STRING "Half library target" FORCE) - set(OCIO_USE_IMATH_HALF "0" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE) -@@ -65,7 +65,7 @@ if(OCIO_BUILD_APPS) + if(OCIO_BUILD_APPS) + +@@ -149,7 +149,7 @@ if(OCIO_BUILD_APPS) # lcms2 # https://github.com/mm2/Little-CMS @@ -48,34 +45,20 @@ index 8787b87..f953ceb 100644 endif() if(OCIO_BUILD_OPENFX) -diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt -index 034185d..b992bbc 100755 ---- a/src/OpenColorIO/CMakeLists.txt -+++ b/src/OpenColorIO/CMakeLists.txt -@@ -226,9 +226,9 @@ target_link_libraries(OpenColorIO - expat::expat - ${OCIO_HALF_LIB} - pystring::pystring -- sampleicc::sampleicc -- utils::from_chars -- utils::strings -+ "$" -+ "$" -+ "$" - yaml-cpp - ) - diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in -index eebb2c1..7147dc3 100644 +index 6a4932a..2a08f5a 100644 --- a/src/cmake/Config.cmake.in +++ b/src/cmake/Config.cmake.in -@@ -2,4 +2,9 @@ - +@@ -1,6 +1,12 @@ + @PACKAGE_INIT@ + include(CMakeFindDependencyMacro) - +find_dependency(expat CONFIG) +find_dependency(Imath CONFIG) +find_dependency(pystring CONFIG) +find_dependency(yaml-cpp CONFIG) -+ - include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) ++find_dependency(minizip-ng CONFIG) ++find_dependency(lcms2 CONFIG) + + if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ + if (APPLE) diff --git a/ports/opencolorio/fix-func-param.patch b/ports/opencolorio/fix-func-param.patch new file mode 100644 index 00000000000000..0da99a62ad16c1 --- /dev/null +++ b/ports/opencolorio/fix-func-param.patch @@ -0,0 +1,93 @@ +diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp +index 85fc7bb..aa90943 100644 +--- a/src/OpenColorIO/OCIOZArchive.cpp ++++ b/src/OpenColorIO/OCIOZArchive.cpp +@@ -24,9 +24,11 @@ + #include "mz_strm_mem.h" + #include "mz_strm_os.h" + #include "mz_strm_split.h" +-#include "mz_strm_zlib.h" + #include "mz_zip.h" + #include "mz_zip_rw.h" ++#ifndef __APPLE__ ++#include "mz_strm_zlib.h" ++#endif + + namespace OCIO_NAMESPACE + { +@@ -225,7 +227,11 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c + std::string configStr = ss.str(); + + // Write zip to memory stream. ++#if MZ_VERSION_BUILD >= 040000 ++ write_mem_stream = mz_stream_mem_create(); ++#else + mz_stream_mem_create(&write_mem_stream); ++#endif + mz_stream_mem_set_grow_size(write_mem_stream, 128 * 1024); + mz_stream_open(write_mem_stream, NULL, MZ_OPEN_MODE_CREATE); + +@@ -237,7 +243,11 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c + options.compress_level = ArchiveCompressionLevels::BEST; + + // Create the writer handle. ++#if MZ_VERSION_BUILD >= 040000 ++ archiver = mz_zip_writer_create(); ++#else + mz_zip_writer_create(&archiver); ++#endif + + // Archive options. + // Compression method +@@ -332,7 +342,11 @@ void ExtractOCIOZArchive(const char * archivePath, const char * destination) + std::string outputDestination = pystring::os::path::normpath(destination); + + // Create zip reader. ++#if MZ_VERSION_BUILD >= 040000 ++ extracter = mz_zip_reader_create(); ++#else + mz_zip_reader_create(&extracter); ++#endif + + MinizipNgHandlerGuard extracterGuard(extracter, false, false); + +@@ -450,7 +464,11 @@ std::vector getFileStringFromArchiveFile(const std::string & filepath, + std::vector buffer; + + // Create the reader object. ++#if MZ_VERSION_BUILD >= 040000 ++ reader = mz_zip_reader_create(); ++#else + mz_zip_reader_create(&reader); ++#endif + + MinizipNgHandlerGuard extracterGuard(reader, false, true); + +@@ -510,7 +528,11 @@ void getEntriesMappingFromArchiveFile(const std::string & archivePath, + void *reader = NULL; + + // Create the reader object. ++#if MZ_VERSION_BUILD >= 040000 ++ reader = mz_zip_reader_create(); ++#else + mz_zip_reader_create(&reader); ++#endif + + MinizipNgHandlerGuard extracterGuard(reader, false, false); + +diff --git a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp +index 190cade..68054a6 100644 +--- a/src/apps/ocioarchive/main.cpp ++++ b/src/apps/ocioarchive/main.cpp +@@ -235,7 +235,11 @@ int main(int argc, const char **argv) + } + + std::string path = args[0]; ++#if MZ_VERSION_BUILD >= 040000 ++ reader = mz_zip_reader_create(); ++#else + mz_zip_reader_create(&reader); ++#endif + struct tm tmu_date; + + err = mz_zip_reader_open_file(reader, path.c_str()); diff --git a/ports/opencolorio/fix-pkgconfig.patch b/ports/opencolorio/fix-pkgconfig.patch index 7337952c8c12a2..976afe122c52e3 100644 --- a/ports/opencolorio/fix-pkgconfig.patch +++ b/ports/opencolorio/fix-pkgconfig.patch @@ -7,4 +7,4 @@ index f25c280..d9a450b 100644 Libs: -L${libdir} -l@PROJECT_NAME@ Cflags: -I${includedir} +Libs.private: -lpystring -+Requires.private: expat Imath yaml-cpp ++Requires.private: expat Imath yaml-cpp minizip-ng diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index a9bf1feeaacaf2..3b89e97fc06242 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -1,18 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenColorIO - REF v2.1.2 - SHA512 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353 + REF "v${VERSION}" + SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9 HEAD_REF master PATCHES fix-dependency.patch + fix-del-install-file.patch + fix-func-param.patch #https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1806 fix-pkgconfig.patch ) -file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findexpat.cmake") -file(REMOVE "${SOURCE_PATH}/share/cmake/modules/FindImath.cmake") -file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findpystring.cmake") -file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findyaml-cpp.cmake") file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findlcms2.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -36,6 +34,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_OpenImageIO + OCIO_USE_OPENEXR_HALF ) vcpkg_cmake_install() @@ -61,11 +60,11 @@ file(REMOVE_RECURSE ) if(OCIO_BUILD_APPS) vcpkg_copy_tools( - TOOL_NAMES ociowrite ociomakeclf ociochecklut ociocheck ociobakelut + TOOL_NAMES ociowrite ociomakeclf ociochecklut ociocheck ociobakelut ocioarchive ocioconvert ociolutimage ocioperf AUTO_CLEAN ) endif() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json index b206a5688534ef..1b98a97ffb367e 100644 --- a/ports/opencolorio/vcpkg.json +++ b/ports/opencolorio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencolorio", - "version-semver": "2.1.2", + "version-semver": "2.2.1", + "port-version": 1, "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", "homepage": "https://opencolorio.org/", "license": "BSD-3-Clause", @@ -8,6 +9,7 @@ "dependencies": [ "expat", "imath", + "minizip-ng", "pystring", { "name": "vcpkg-cmake", @@ -24,7 +26,8 @@ "description": "Installs tools", "dependencies": [ "glew", - "lcms" + "lcms", + "openexr" ] } } diff --git a/ports/opencv2/0020-missing-include.patch b/ports/opencv2/0020-missing-include.patch new file mode 100644 index 00000000000000..2967ebf35a268b --- /dev/null +++ b/ports/opencv2/0020-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/modules/ts/src/gpu_test.cpp b/modules/ts/src/gpu_test.cpp +index 21d9ad9..a626b0b 100644 +--- a/modules/ts/src/gpu_test.cpp ++++ b/modules/ts/src/gpu_test.cpp +@@ -42,6 +42,7 @@ + + #include "opencv2/ts/gpu_test.hpp" + #include ++#include + + using namespace cv; + using namespace cv::gpu; diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index 041c844db59988..28d22137686138 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( 0006-fix-jasper.patch 0007-fix-config.patch 0019-fix-openexr.patch + 0020-missing-include.patch ) # Disallow accidental build of vendored copies file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json index 15eff84eeed391..a8fc9c1d41d324 100644 --- a/ports/opencv2/vcpkg.json +++ b/ports/opencv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 18, + "port-version": 19, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv3/0019-missing-include.patch b/ports/opencv3/0019-missing-include.patch new file mode 100644 index 00000000000000..2da142b0af3c79 --- /dev/null +++ b/ports/opencv3/0019-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/modules/dnn/src/op_halide.cpp b/modules/dnn/src/op_halide.cpp +index c96971bc6aac..d107e01887d0 100644 +--- a/modules/dnn/src/op_halide.cpp ++++ b/modules/dnn/src/op_halide.cpp +@@ -11,6 +11,7 @@ + + #ifdef HAVE_HALIDE + #include ++#include + #endif // HAVE_HALIDE + + namespace cv diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 8904d19935aed0..8712c07ce44a4d 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_from_github( 0010-fix-uwp-tiff-imgcodecs.patch 0011-remove-python2.patch 0012-fix-zlib.patch + 0019-missing-include.patch fix-tbb-error.patch ) # Disallow accidental build of vendored copies diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 3ad32ac8b353b6..4a1291f68dcb90 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.18", - "port-version": 10, + "port-version": 11, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/0017-fix-flatbuffers.patch b/ports/opencv4/0017-fix-flatbuffers.patch new file mode 100644 index 00000000000000..517c6ea99ac650 --- /dev/null +++ b/ports/opencv4/0017-fix-flatbuffers.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/OpenCVDetectFlatbuffers.cmake b/cmake/OpenCVDetectFlatbuffers.cmake +index 537b738..6dba0fb 100644 +--- a/cmake/OpenCVDetectFlatbuffers.cmake ++++ b/cmake/OpenCVDetectFlatbuffers.cmake +@@ -1,9 +1,11 @@ + if(WITH_FLATBUFFERS) + set(HAVE_FLATBUFFERS 1) +- set(flatbuffers_VERSION "23.5.9") +- ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt") +- ocv_add_external_target(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1") +- set(CUSTOM_STATUS_flatbuffers " Flatbuffers:" "builtin/3rdparty (${flatbuffers_VERSION})") ++ set(flatbuffers_VERSION "23.5.26") ++ #ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt") ++ find_path(FLATBUFFERS_INCLUDE_DIR flatbuffers.h PATH_SUFFIXES flatbuffers) ++ get_filename_component(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_INCLUDE_DIR}" PATH) ++ ocv_add_external_target(flatbuffers "${FLATBUFFERS_INCLUDE_DIR}" "" "HAVE_FLATBUFFERS=1") ++ #set(CUSTOM_STATUS_flatbuffers " Flatbuffers:" "builtin/3rdparty (${flatbuffers_VERSION})") + endif() + + if(WITH_FLATBUFFERS OR HAVE_FLATBUFFERS) diff --git a/ports/opencv4/0019-fix-ogre-dependency.patch b/ports/opencv4/0019-fix-ogre-dependency.patch new file mode 100644 index 00000000000000..314ea821e7ee64 --- /dev/null +++ b/ports/opencv4/0019-fix-ogre-dependency.patch @@ -0,0 +1,9 @@ +--- a/modules/ovis/CMakeLists.txt ++++ b/modules/ovis/CMakeLists.txt +@@ -27,4 +27,6 @@ ocv_create_module() + ocv_add_samples(opencv_aruco) + + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wunused-parameter) ++# The target always has the name OgreGLSupport ++string(REPLACE "OgreGLSupportStatic" "OgreGLSupport" OGRE_LIBRARIES "${OGRE_LIBRARIES}") + ocv_target_link_libraries(${the_module} ${OGRE_LIBRARIES}) diff --git a/ports/opencv4/0019-missing-include.patch b/ports/opencv4/0019-missing-include.patch new file mode 100644 index 00000000000000..c1d4d3c1579db2 --- /dev/null +++ b/ports/opencv4/0019-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/modules/dnn/src/op_halide.cpp b/modules/dnn/src/op_halide.cpp +index 653de36146cc..db1a72278e70 100644 +--- a/modules/dnn/src/op_halide.cpp ++++ b/modules/dnn/src/op_halide.cpp +@@ -14,6 +14,7 @@ + #include "halide_scheduler.hpp" + + #include ++#include + #endif // HAVE_HALIDE + + namespace cv { diff --git a/ports/opencv4/0020-fix-compat-cuda12.2.patch b/ports/opencv4/0020-fix-compat-cuda12.2.patch new file mode 100644 index 00000000000000..e027f4e4e42f5b --- /dev/null +++ b/ports/opencv4/0020-fix-compat-cuda12.2.patch @@ -0,0 +1,32 @@ +commit ab8cb6f8a9034da2a289b84685c6d959266029be +Author: cudawarped <12133430+cudawarped@users.noreply.github.com> +Date: Tue Aug 1 13:02:42 2023 +0300 + + cuda: fix for compatibility with CUDA Toolkit >= 12.2.0 + +diff --git a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp +index f067dddaa7..91ff33f817 100644 +--- a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp ++++ b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp +@@ -111,7 +111,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { + * or there might be several weights + * or we don't have to scale + */ +- if (weight != 1.0) ++ if (weight != static_cast(1.0f)) + { + kernels::scale1_with_bias1(stream, output, input, weight, 1.0); + } +diff --git a/modules/dnn/src/cuda4dnn/primitives/region.hpp b/modules/dnn/src/cuda4dnn/primitives/region.hpp +index d22d44214e..3af05155fe 100644 +--- a/modules/dnn/src/cuda4dnn/primitives/region.hpp ++++ b/modules/dnn/src/cuda4dnn/primitives/region.hpp +@@ -121,7 +121,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { + new_coords + ); + +- if (nms_iou_threshold > 0) { ++ if (nms_iou_threshold > static_cast(0.0f)) { + auto output_mat = output_wrapper->getMutableHostMat(); + CV_Assert(output_mat.type() == CV_32F); + for (int i = 0; i < input.get_axis_size(0); i++) { diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 974e103160c19f..d783f99fea4649 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -2,8 +2,8 @@ set(USE_QT_VERSION "6") # https://github.com/opencv/opencv/pull/24043 vcpkg_download_distfile(ARM64_WINDOWS_FIX - URLS https://github.com/opencv/opencv/commit/e5e1a3bfdea96bebda2ad963bc8f6cf17930aef7.patch - SHA512 b91b45ac49994c3f4481d5ca04d708d9b063239fd2105e2eb1aae26cc70361ff042e99c51edd67beb9463624147ba77fd562097ab20676bba3b8ce068d455dbc + URLS https://github.com/opencv/opencv/commit/e5e1a3bfdea96bebda2ad963bc8f6cf17930aef7.patch?full_index=1 + SHA512 8ae2544e4a7ece19efe21261acc183f91202ac5352c1ac42fb86bf33d698352eff1b8962422b092240f4e8c7a691e9aa5ef20d6070adcd37e92bb94c6010ce56 FILENAME opencv4-e5e1a3bfdea96bebda2ad963bc8f6cf17930aef7.patch ) @@ -26,10 +26,14 @@ vcpkg_from_github( 0011-remove-python2.patch 0012-fix-zlib.patch 0015-fix-freetype.patch + 0017-fix-flatbuffers.patch + 0019-missing-include.patch + 0020-fix-compat-cuda12.2.patch "${ARM64_WINDOWS_FIX}" ) # Disallow accidental build of vendored copies file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/flatbuffers") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(TARGET_IS_AARCH64 1) @@ -68,6 +72,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "nonfree" OPENCV_ENABLE_NONFREE "openexr" WITH_OPENEXR "opengl" WITH_OPENGL + "ovis" CMAKE_REQUIRE_FIND_PACKAGE_OGRE "png" WITH_PNG "quirc" WITH_QUIRC "sfm" BUILD_opencv_sfm @@ -86,6 +91,12 @@ if("dnn" IN_LIST FEATURES) else() message(WARNING "The dnn module cannot be enabled on Android") endif() + set(FLATC "${CURRENT_HOST_INSTALLED_DIR}/tools/flatbuffers/flatc${VCPKG_HOST_EXECUTABLE_SUFFIX}") + vcpkg_execute_required_process( + COMMAND "${FLATC}" --cpp -o "${SOURCE_PATH}/modules/dnn/misc/tflite" "${SOURCE_PATH}/modules/dnn/src/tflite/schema.fbs" + WORKING_DIRECTORY "${SOURCE_PATH}/modules/dnn/misc/tflite" + LOGNAME flatc-${TARGET_TRIPLET} + ) endif() set(WITH_QT OFF) @@ -174,6 +185,7 @@ if("contrib" IN_LIST FEATURES) 0007-fix-hdf5.patch 0016-fix-freetype-contrib.patch 0018-fix-depend-tesseract.patch + 0019-fix-ogre-dependency.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -521,7 +533,7 @@ find_dependency(Tesseract)") string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)") endif() if(BUILD_opencv_ovis) - string(APPEND DEPS_STRING "\nfind_dependency(Ogre)") + string(APPEND DEPS_STRING "\nfind_dependency(OGRE)") endif() if("quirc" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(quirc)") @@ -577,6 +589,12 @@ if(VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android") endif() +if("python" IN_LIST FEATURES) + file(GLOB python_dir LIST_DIRECTORIES true RELATIVE "${CURRENT_PACKAGES_DIR}/lib/" "${CURRENT_PACKAGES_DIR}/lib/python*") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/${python_dir}/site-packages/cv2/typing") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${python_dir}/site-packages/cv2/typing") +endif() + vcpkg_fixup_pkgconfig() configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 0a925c89c87ea5..28ceb72bba6221 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencv4", "version": "4.8.0", + "port-version": 7, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -102,6 +103,12 @@ "dnn": { "description": "Enable dnn module", "dependencies": [ + "flatbuffers", + { + "name": "flatbuffers", + "host": true, + "default-features": false + }, "protobuf" ] }, diff --git a/ports/openimageio/fix-openexr-dll.patch b/ports/openimageio/fix-openexr-dll.patch index e686cf7aff9ea0..d5b7d8c7d44d82 100644 --- a/ports/openimageio/fix-openexr-dll.patch +++ b/ports/openimageio/fix-openexr-dll.patch @@ -1,8 +1,8 @@ diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index dad053c..4d7e11c 100644 +index 0ca1fe6..1eeb5ab 100644 --- a/src/cmake/externalpackages.cmake +++ b/src/cmake/externalpackages.cmake -@@ -103,7 +103,7 @@ checked_find_package (OpenEXR REQUIRED +@@ -105,7 +105,7 @@ checked_find_package (OpenEXR REQUIRED # building against Imath/OpenEXR 3.x when there is still a system-level # install version of 2.x. include_directories(BEFORE ${IMATH_INCLUDES} ${OPENEXR_INCLUDES}) @@ -10,4 +10,4 @@ index dad053c..4d7e11c 100644 +if (WIN32 AND BUILD_SHARED_LIBS) add_definitions (-DOPENEXR_DLL) # Is this needed for new versions? endif () - if (OPENEXR_VERSION VERSION_GREATER_EQUAL 3.0) + if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.0) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 78a7aad113001e..c583243183bbe7 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio REF "v${VERSION}" - SHA512 9325beefce55b66a58fcfc2ce93e1406558ed5f6cc37cb1e8e04aee470c4f30a14483bebfb311c329f7868afb6c508a052661c6b12d819a69f707c1a30cd9549 + SHA512 59c38667ae792f5c5cc6f7f9655159e9b0e048d99f1232766407c01ab635a319ad4ba28cd3c6a115924ea0e4ec994d4c1bdb2f6301fbb9ae11b2820768bd1ff1 HEAD_REF master PATCHES fix-dependencies.patch diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index c76049d4a76ef2..b63a14c3bcc118 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openimageio", - "version": "2.4.13.0", + "version": "2.4.14.0", + "port-version": 1, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "license": "BSD-3-Clause", @@ -98,7 +99,8 @@ "pybind11": { "description": "Enable Python bindings support for openimageio", "dependencies": [ - "pybind11" + "pybind11", + "python3" ] }, "tools": { diff --git a/ports/openjpeg/vcpkg.json b/ports/openjpeg/vcpkg.json index be472aca99f8db..a4abc2532e04e2 100644 --- a/ports/openjpeg/vcpkg.json +++ b/ports/openjpeg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openjpeg", "version": "2.5.0", + "port-version": 1, "description": "OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, a still-image compression standard from the Joint Photographic Experts Group (JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a JPEG 2000 Reference Software.", "homepage": "https://github.com/uclouvain/openjpeg", "license": "BSD-2-Clause", @@ -19,7 +20,8 @@ "description": "(deprecated)" }, "jpip": { - "description": "Build optional component jpip" + "description": "Build optional component jpip", + "supports": "!uwp" }, "jpwl": { "description": "(deprecated)" diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index 5f7f39ce2f3bc0..aacf1805362658 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -23,6 +23,12 @@ file(REMOVE "${SOURCE_PATH}/build/Modules/FindCERES.cmake") file(REMOVE "${SOURCE_PATH}/build/Modules/FindCGAL.cmake") file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(USE_SSE ON) +else() + set(USE_SSE OFF) +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} @@ -33,6 +39,7 @@ vcpkg_cmake_configure( -DOpenMVS_USE_OPENGL=ON -DOpenMVS_USE_BREAKPAD=OFF -DOpenMVS_ENABLE_TESTS=OFF + -DOpenMVS_USE_SSE=${USE_SSE} OPTIONS_RELEASE -DOpenMVS_BUILD_TOOLS=ON OPTIONS_DEBUG diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json index 809fe85cd88e68..2ea8a37cb37acd 100644 --- a/ports/openmvs/vcpkg.json +++ b/ports/openmvs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvs", "version": "2.1.0", - "port-version": 1, + "port-version": 2, "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", "license": "AGPL-3.0-only", diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake index e06d555e83ad96..ce6124f98360fd 100644 --- a/ports/openni2/portfile.cmake +++ b/ports/openni2/portfile.cmake @@ -17,13 +17,21 @@ vcpkg_from_github( replace_environment_variable.patch ) -file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR) +file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) configure_file("${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" "${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" @ONLY) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(additional_options PLATFORM "x86") +endif() + # Build OpenNI2 -vcpkg_build_msbuild( - PROJECT_PATH "${SOURCE_PATH}/OpenNI.sln" +vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH OpenNI.sln OPTIONS "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" + NO_TOOLCHAIN_PROPS # Port uses /clr which conflicts with /EHs(a) from the toolchain + NO_INSTALL # Port seems to have its own layout regarding bin/lib + ${additional_options} ) # Install OpenNI2 @@ -34,8 +42,8 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") endif() set(SOURCE_INCLUDE_PATH "${SOURCE_PATH}/Include") -set(SOURCE_BIN_PATH_RELEASE "${SOURCE_PATH}/Bin/${PLATFORM}-Release") -set(SOURCE_BIN_PATH_DEBUG "${SOURCE_PATH}/Bin/${PLATFORM}-Debug") +set(SOURCE_BIN_PATH_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Bin/${PLATFORM}-Release") +set(SOURCE_BIN_PATH_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Bin/${PLATFORM}-Debug") set(SOURCE_CONFIG_PATH "${SOURCE_PATH}/Config") set(SOURCE_THIRDPARTY_PATH "${SOURCE_PATH}/ThirdParty") diff --git a/ports/openni2/vcpkg.json b/ports/openni2/vcpkg.json index c0aa598769e0be..933540a52c672d 100644 --- a/ports/openni2/vcpkg.json +++ b/ports/openni2/vcpkg.json @@ -1,12 +1,17 @@ { "name": "openni2", "version": "2.2.0.33", - "port-version": 14, + "port-version": 15, "description": "OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.", "homepage": "https://github.com/OpenNI/OpenNI2", "license": "Apache-2.0", "supports": "!uwp & !staticcrt", "dependencies": [ - "kinectsdk1" + "kinectsdk1", + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } ] } diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index edc816b3d259c3..e9209b4b7332d3 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -19,14 +19,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openssl/openssl REF "openssl-${VERSION}" - SHA512 c48ad86265b0fee18b23863b645a286d131a863a3418c7d2ed6c819eebb822ad0f2985ba3ecbf4def32515442f0eb40aba08f3146d113247e86ec80fbddca1c1 + SHA512 248353b000ef6b9a3434bf808b147eb4672c82f36968b2995c159373680f80208183bb70c02effa36ae4a1705fe5a5e315960075e8899352c4e84069d6c651c2 PATCHES disable-apps.patch disable-install-docs.patch script-prefix.patch windows/install-layout.patch windows/install-pdbs.patch - windows/perlasm-scheme.patch unix/android-cc.patch unix/move-openssldir.patch unix/no-empty-dirs.patch diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake index 9eff266edf3fc1..02e62732d5f034 100644 --- a/ports/openssl/unix/portfile.cmake +++ b/ports/openssl/unix/portfile.cmake @@ -45,7 +45,8 @@ vcpkg_list(SET MAKEFILE_OPTIONS) if(VCPKG_TARGET_IS_ANDROID) set(ENV{ANDROID_NDK_ROOT} "${VCPKG_DETECTED_CMAKE_ANDROID_NDK}") set(OPENSSL_ARCH "android-${VCPKG_DETECTED_CMAKE_ANDROID_ARCH}") - if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" AND NOT VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON) + # asm on arm32 NEON is broken, https://github.com/openssl/openssl/pull/21583#issuecomment-1727057735 + if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" #[[AND NOT VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON]]) vcpkg_list(APPEND CONFIGURE_OPTIONS no-asm) endif() elseif(VCPKG_TARGET_IS_LINUX) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index d8c8b824cac3e6..c5b8f43a5f29db 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openssl", - "version": "3.1.2", - "port-version": 1, + "version": "3.1.3", "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/ports/openssl/windows/perlasm-scheme.patch b/ports/openssl/windows/perlasm-scheme.patch deleted file mode 100644 index 2849d49470784d..00000000000000 --- a/ports/openssl/windows/perlasm-scheme.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf -index e8084ab..263ecd0 100644 ---- a/Configurations/10-main.conf -+++ b/Configurations/10-main.conf -@@ -9,19 +9,22 @@ sub vc_win64a_info { - $vc_win64a_info = { AS => "nasm", - ASFLAGS => "-g", - asflags => "-Ox -f win64 -DNEAR", -- asoutflag => "-o " }; -+ asoutflag => "-o ", -+ perlasm_scheme => "nasm" }; - } elsif ($disabled{asm}) { - # assembler is still used to compile uplink shim - $vc_win64a_info = { AS => "ml64", - ASFLAGS => "/nologo /Zi", - asflags => "/c /Cp /Cx", -- asoutflag => "/Fo" }; -+ asoutflag => "/Fo", -+ perlasm_scheme => "masm" }; - } else { - $die->("NASM not found - make sure it's installed and available on %PATH%\n"); - $vc_win64a_info = { AS => "{unknown}", - ASFLAGS => "", - asflags => "", -- asoutflag => "" }; -+ asoutflag => "", -+ perlasm_scheme => "auto" }; - } - } - return $vc_win64a_info; -@@ -1493,7 +1496,7 @@ my %targets = ( - sys_id => "WIN64A", - uplink_arch => 'x86_64', - asm_arch => 'x86_64', -- perlasm_scheme => "auto", -+ perlasm_scheme => sub { vc_win64a_info()->{perlasm_scheme} }, - multilib => "-x64", - }, - "VC-WIN32" => { diff --git a/ports/opentelemetry-cpp/add-missing-include-file.patch b/ports/opentelemetry-cpp/add-missing-include-file.patch new file mode 100644 index 00000000000000..c23bc53468888b --- /dev/null +++ b/ports/opentelemetry-cpp/add-missing-include-file.patch @@ -0,0 +1,24 @@ +diff --git a/exporters/jaeger/src/TUDPTransport.cc b/exporters/jaeger/src/TUDPTransport.cc +index e411127..a5e08fa 100644 +--- a/exporters/jaeger/src/TUDPTransport.cc ++++ b/exporters/jaeger/src/TUDPTransport.cc +@@ -2,7 +2,9 @@ + // SPDX-License-Identifier: Apache-2.0 + + #include // std::stringstream +- ++#ifndef _MSC_VER ++#include ++#endif + #include "TUDPTransport.h" + #include "opentelemetry/sdk_config.h" + +@@ -48,7 +50,7 @@ void TUDPTransport::open() + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; + +- sprintf(port, "%d", port_); ++ snprintf(port, sizeof(port), "%d", port_); + + error = getaddrinfo(host_.c_str(), port, &hints, &server_addr_info_); + diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index fa3749a846c79a..24ae31aae2e197 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( add-missing-dependencies.patch # Missing find_dependency for Abseil add-missing-find-dependency.patch + add-missing-include-file.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index b525fbeb2d56a4..3886f3ba29ce2d 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", "version-semver": "1.9.1", + "port-version": 1, "description": [ "OpenTelemetry is a collection of tools, APIs, and SDKs.", "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index da6297ebecc4f1..91cbc769ba28a7 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -19,25 +19,16 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "tools" OPENVDB_BUILD_TOOLS + "ax" OPENVDB_BUILD_AX ) - -if ("ax" IN_LIST FEATURES) - if(NOT VCPKG_TARGET_IS_WINDOWS) - set(OPENVDB_BUILD_AX ON) - else() - message(FATAL_ERROR "Currently no support for building OpenVDB AX on Windows.") - endif() -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DOPENVDB_BUILD_UNITTESTS=OFF -DOPENVDB_BUILD_PYTHON_MODULE=OFF - -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF + -DOPENVDB_3_ABI_COMPATIBLE=OFF -DUSE_EXR=ON - -DUSE_GLFW3=ON -DUSE_IMATH_HALF=ON -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC} -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED} @@ -46,7 +37,10 @@ vcpkg_cmake_configure( -DOPENVDB_BUILD_VDB_RENDER=${OPENVDB_BUILD_TOOLS} -DOPENVDB_BUILD_VDB_LOD=${OPENVDB_BUILD_TOOLS} -DUSE_PKGCONFIG=OFF - ${OPENVDB_BUILD_AX} + -DOPENVDB_BUILD_AX=${OPENVDB_BUILD_AX} + -DUSE_EXPLICIT_INSTANTIATION=OFF + MAYBE_UNUSED_VARIABLES + OPENVDB_3_ABI_COMPATIBLE ) vcpkg_cmake_install() diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json index 9e9f38433b16e2..a566325859e3ae 100644 --- a/ports/openvdb/vcpkg.json +++ b/ports/openvdb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openvdb", "version": "10.0.0", - "port-version": 3, + "port-version": 5, "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", "license": "MPL-2.0", @@ -30,7 +30,14 @@ ], "features": { "ax": { - "description": "Provides a powerful and easy way of interacting with OpenVDB volume and point data." + "description": "Provides a powerful and easy way of interacting with OpenVDB volume and point data.", + "supports": "!windows", + "dependencies": [ + { + "name": "llvm", + "default-features": false + } + ] }, "tools": { "description": "OpenVDB utilities: view, print and render", diff --git a/ports/openvino/002-typo-in-default-option-value.patch b/ports/openvino/002-typo-in-default-option-value.patch deleted file mode 100644 index 29231648855fc1..00000000000000 --- a/ports/openvino/002-typo-in-default-option-value.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/features.cmake b/cmake/features.cmake -index fc7a07252e..546fc72193 100644 ---- a/cmake/features.cmake -+++ b/cmake/features.cmake -@@ -126,7 +126,7 @@ ie_option(ENABLE_OV_IR_FRONTEND "Enable IR FrontEnd" ON) - ie_option(ENABLE_OV_TF_FRONTEND "Enable TensorFlow FrontEnd" ON) - ie_option(ENABLE_OV_TF_LITE_FRONTEND "Enable TensorFlow Lite FrontEnd" ON) - ie_dependent_option(ENABLE_SNAPPY_COMPRESSION "Enables compression support for TF FE" ON -- "ENABLE_OV_TF_FRONTEND" ON) -+ "ENABLE_OV_TF_FRONTEND" OFF) - - if(CMAKE_HOST_LINUX AND LINUX) - # Debian packages are enabled on Ubuntu systems diff --git a/ports/openvino/004-compilation-with-cpp17.patch b/ports/openvino/004-compilation-with-cpp17.patch new file mode 100644 index 00000000000000..da6548b7c91159 --- /dev/null +++ b/ports/openvino/004-compilation-with-cpp17.patch @@ -0,0 +1,16 @@ +diff --git a/src/plugins/intel_cpu/src/cpu_tensor.cpp b/src/plugins/intel_cpu/src/cpu_tensor.cpp +index 48d8fdd4be..815edd9309 100644 +--- a/src/plugins/intel_cpu/src/cpu_tensor.cpp ++++ b/src/plugins/intel_cpu/src/cpu_tensor.cpp +@@ -68,8 +68,9 @@ void Tensor::update_strides() const { + OPENVINO_ASSERT(blocked_desc, "not a valid blocked memory descriptor."); + auto& strides = blocked_desc->getStrides(); + m_strides.resize(strides.size()); +- std::transform(strides.cbegin(), strides.cend(), m_strides.begin(), +- std::bind1st(std::multiplies(), m_element_type.size())); ++ std::transform(strides.cbegin(), strides.cend(), m_strides.begin(), [this] (const size_t stride) { ++ return stride * m_element_type.size(); ++ }); + } + + void* Tensor::data(const element::Type& element_type) const { diff --git a/ports/openvino/004-onednn-build.patch b/ports/openvino/004-onednn-build.patch deleted file mode 100644 index 1850def857ec63..00000000000000 --- a/ports/openvino/004-onednn-build.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/cmake/ie_parallel.cmake b/src/cmake/ie_parallel.cmake -index e8aa1c30ef..259e4152c2 100644 ---- a/src/cmake/ie_parallel.cmake -+++ b/src/cmake/ie_parallel.cmake -@@ -282,7 +282,7 @@ function(set_ie_threading_interface_for TARGET_NAME) - foreach(include_directory IN LISTS include_directories) - # cannot include /usr/include headers as SYSTEM - if(NOT "${include_directory}" MATCHES "^/usr.*$") -- target_include_directories(${TARGET_NAME} SYSTEM BEFORE -+ target_include_directories(${TARGET_NAME} SYSTEM - ${LINK_TYPE} $) - else() - set(_system_library ON) -diff --git a/src/plugins/intel_cpu/CMakeLists.txt b/src/plugins/intel_cpu/CMakeLists.txt -index e1f04b4ad2..d1150fdab0 100644 ---- a/src/plugins/intel_cpu/CMakeLists.txt -+++ b/src/plugins/intel_cpu/CMakeLists.txt -@@ -83,18 +83,19 @@ elseif(RISCV64) - set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "openvino_riscv_cpu_plugin") - endif() - --set_ie_threading_interface_for(${TARGET_NAME}) -- - ie_mark_target_as_cc(${TARGET_NAME}) - - target_link_libraries(${TARGET_NAME} PRIVATE dnnl - ov_shape_inference -- openvino::pugixml - inference_engine_snippets) - -+target_include_directories(${TARGET_NAME} SYSTEM PRIVATE $) - target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_EXTENSION_API) - target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) --target_include_directories(${TARGET_NAME} SYSTEM PRIVATE $) -+ -+# system libraries must go last -+target_link_libraries(${TARGET_NAME} PRIVATE openvino::pugixml) -+set_ie_threading_interface_for(${TARGET_NAME}) - - # Cross compiled function - # TODO: The same for proposal, proposalONNX, topk diff --git a/ports/openvino/005-rename-utils.patch b/ports/openvino/005-rename-utils.patch deleted file mode 100644 index 06346e086dbf13..00000000000000 --- a/ports/openvino/005-rename-utils.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/common/util/CMakeLists.txt b/src/common/util/CMakeLists.txt -index 4b538aab7c..1cae344ed6 100644 ---- a/src/common/util/CMakeLists.txt -+++ b/src/common/util/CMakeLists.txt -@@ -2,7 +2,7 @@ - # SPDX-License-Identifier: Apache-2.0 - # - --set(TARGET_NAME util) -+set(TARGET_NAME openvino_util) - - file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) - file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp) diff --git a/ports/openvino/005-tflite-search.patch b/ports/openvino/005-tflite-search.patch new file mode 100644 index 00000000000000..40efb3f0ec8e51 --- /dev/null +++ b/ports/openvino/005-tflite-search.patch @@ -0,0 +1,12 @@ +diff --git a/src/frontends/common/src/manager.cpp b/src/frontends/common/src/manager.cpp +index 2fa59398b1..fa917dadb1 100644 +--- a/src/frontends/common/src/manager.cpp ++++ b/src/frontends/common/src/manager.cpp +@@ -49,6 +49,7 @@ public: + {"ir", "ir"}, + {"onnx", "onnx"}, + {"tf", "tensorflow"}, ++ {"tflite", "tensorflow_lite"}, + {"paddle", "paddle"}, + {"pytorch", "pytorch"}, + }; diff --git a/ports/openvino/006-onednn-gpu-build.patch b/ports/openvino/006-onednn-gpu-build.patch index 33cf6cf9669a75..3ae691da808225 100644 --- a/ports/openvino/006-onednn-gpu-build.patch +++ b/ports/openvino/006-onednn-gpu-build.patch @@ -1,5 +1,5 @@ diff --git a/cmake/OpenCL.cmake b/cmake/OpenCL.cmake -index df86d3434..cf4274b47 100644 +index df86d3434d..cf4274b472 100644 --- a/cmake/OpenCL.cmake +++ b/cmake/OpenCL.cmake @@ -42,5 +42,5 @@ endif() @@ -10,7 +10,7 @@ index df86d3434..cf4274b47 100644 +# include_directories(${OpenCL_INCLUDE_DIRS}) list(APPEND EXTRA_SHARED_LIBS OpenCL::OpenCL) diff --git a/cmake/TBB.cmake b/cmake/TBB.cmake -index d6bbe3e80..a62a25117 100644 +index d6bbe3e801..a62a251175 100644 --- a/cmake/TBB.cmake +++ b/cmake/TBB.cmake @@ -26,7 +26,7 @@ include("cmake/Threading.cmake") @@ -23,24 +23,24 @@ index d6bbe3e80..a62a25117 100644 # Print TBB location diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt -index e38723312..f19c63f3d 100644 +index 9f0aa2a1db..ade68da1af 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -50,5 +50,7 @@ endif() - set(OBJ_LIB ${DNNL_LIBRARY_NAME}_common) + set(OBJ_LIB ${LIB_PACKAGE_NAME}_common) add_library(${OBJ_LIB} OBJECT ${SOURCES}) +target_include_directories(${OBJ_LIB} PRIVATE + $) set_property(GLOBAL APPEND PROPERTY DNNL_LIB_DEPS $) diff --git a/src/gpu/CMakeLists.txt b/src/gpu/CMakeLists.txt -index e31655ec4..867dcac6f 100644 +index 0292ebb021..0c79f7a7aa 100644 --- a/src/gpu/CMakeLists.txt +++ b/src/gpu/CMakeLists.txt @@ -27,6 +27,8 @@ add_definitions_with_host_compiler(-DNGEN_WINDOWS_COMPAT) - set(OBJ_LIB ${DNNL_LIBRARY_NAME}_gpu) + set(OBJ_LIB ${LIB_PACKAGE_NAME}_gpu) add_library(${OBJ_LIB} OBJECT ${SOURCES}) +target_include_directories(${OBJ_LIB} PRIVATE + $) @@ -48,36 +48,36 @@ index e31655ec4..867dcac6f 100644 $) diff --git a/src/gpu/compute/CMakeLists.txt b/src/gpu/compute/CMakeLists.txt -index 3f08abbe1..51c59f026 100644 +index d69ed519a1..e6a1fe6924 100644 --- a/src/gpu/compute/CMakeLists.txt +++ b/src/gpu/compute/CMakeLists.txt @@ -23,5 +23,7 @@ file(GLOB_RECURSE SOURCES - set(OBJ_LIB ${DNNL_LIBRARY_NAME}_gpu_compute) + set(OBJ_LIB ${LIB_PACKAGE_NAME}_gpu_compute) add_library(${OBJ_LIB} OBJECT ${SOURCES}) +target_include_directories(${OBJ_LIB} PRIVATE + $) set_property(GLOBAL APPEND PROPERTY DNNL_LIB_DEPS $) diff --git a/src/gpu/jit/CMakeLists.txt b/src/gpu/jit/CMakeLists.txt -index 178d325ed..a84b54b02 100644 +index 38fb5abe07..ac4b0a3523 100644 --- a/src/gpu/jit/CMakeLists.txt +++ b/src/gpu/jit/CMakeLists.txt @@ -32,5 +32,7 @@ endif() - set(OBJ_LIB ${DNNL_LIBRARY_NAME}_gpu_jit) + set(OBJ_LIB ${LIB_PACKAGE_NAME}_gpu_jit) add_library(${OBJ_LIB} OBJECT ${SOURCES}) +target_include_directories(${OBJ_LIB} PRIVATE + $) set_property(GLOBAL APPEND PROPERTY DNNL_LIB_DEPS $) diff --git a/src/gpu/ocl/CMakeLists.txt b/src/gpu/ocl/CMakeLists.txt -index 2ccb8d1f5..ab6310e39 100644 +index 711645b87f..6e9623798f 100644 --- a/src/gpu/ocl/CMakeLists.txt +++ b/src/gpu/ocl/CMakeLists.txt @@ -39,5 +39,7 @@ list(APPEND SOURCES ${kernel_list_src}) - set(OBJ_LIB ${DNNL_LIBRARY_NAME}_gpu_ocl) + set(OBJ_LIB ${LIB_PACKAGE_NAME}_gpu_ocl) add_library(${OBJ_LIB} OBJECT ${SOURCES}) +target_include_directories(${OBJ_LIB} PRIVATE + $) diff --git a/ports/openvino/007-macos-14.patch b/ports/openvino/007-macos-14.patch new file mode 100644 index 00000000000000..77a0f321ff6c7c --- /dev/null +++ b/ports/openvino/007-macos-14.patch @@ -0,0 +1,12 @@ +diff --git a/src/plugins/intel_cpu/src/nodes/mha.cpp b/src/plugins/intel_cpu/src/nodes/mha.cpp +index d4405be5d468d..19cf63ac727cb 100644 +--- a/src/plugins/intel_cpu/src/nodes/mha.cpp ++++ b/src/plugins/intel_cpu/src/nodes/mha.cpp +@@ -16,6 +16,7 @@ + #include "common/cpu_convert.h" + #include "transformations/cpu_opset/x64/op/mha.hpp" + #include "dnnl_extension_utils.h" ++#include "utils/bfloat16.hpp" + #include + + using namespace InferenceEngine; diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index 26f72b2cbe3e04..d1ad458ecea01d 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openvinotoolkit/openvino - REF 50c85f01ab44b2470f08b0f8824cced109628fc6 - SHA512 1673cdab4f0d73ba5e3d0ac1e8a7b136d25df59704575a468016650c3c6c0dcba0bdc0a2306f61a14d49792651b21e9233d166610e0b463624b309758f1b1c04 + REF "${VERSION}" + SHA512 29ee621c1428808607ce499e527b5943b8a2172769cb7315ef25253db818f54f2da4bbf5539198c012e25e78c8c830205b46f6e6a83032e732e82a7d00d46312 PATCHES 001-disable-tools.patch - 002-typo-in-default-option-value.patch 003-fix-find-onnx.patch - 004-onednn-build.patch - 005-rename-utils.patch + 004-compilation-with-cpp17.patch + 005-tflite-search.patch + 007-macos-14.patch # from https://github.com/openvinotoolkit/openvino/pull/19946 HEAD_REF master) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -39,10 +39,10 @@ if(ENABLE_INTEL_GPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO oneapi-src/oneDNN - REF f27dedbfc093f51032a4580198bb80579440dc15 - SHA512 882eb42e31490df1b35b5e55bef1be8452b710b7a16f5ad648961510abd288e16dbd783e0163aab9dd161fd3a9bd836b0f4afc82b14043d80d1dad9c3400af1b + REF ec0b2ee85fc2a2dbdeec10035c5ef5813d8fb5ea + SHA512 abc09c9ab190cc043ba675fdcaf2da0069eacce14aad6e788a9957d8b6704cfcefe5a707e78d544d25acac35bc83217660ee64528150311f577d2ccbdd165de1 PATCHES 006-onednn-gpu-build.patch - ) + ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu") endif() @@ -55,11 +55,19 @@ if(ENABLE_INTEL_CPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO openvinotoolkit/oneDNN - REF 48bf41e04ba8cdccb1e7ad166fecfb329f5f84a1 - SHA512 8a5ef1ce07545bc28328d1cfd49a8ee8f2ff13c2e393623cb842982b83963881f3d096230805d2a187100c68a2ca30c99add5a975f3f623d9f4a51517c2d585f - ) + REF a1aa20ca8f19465dc2fd18389953ed83798b2fd3 + SHA512 0ff5b235a6f349ad94f52a3b8282f5c825eac7275ad784986d7f533863ace7a4ed71094b9f5cac85d473d2678e197727c1cb33dee5cf75cd793ded7be58f946e + ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn") + vcpkg_from_github( + OUT_SOURCE_PATH DEP_SOURCE_PATH + REPO openvinotoolkit/mlas + REF c7c8a631315000f17c650af34431009d2f22129c + SHA512 4146598ce6b30a3eaea544d6703b949061118398e67b773aa11a3c0f3e8fbcc446d09ea893b9879f8869e977162bcada0d4895cb225cf2e2469fb71cd5942e53 + ) + file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/mlas") + if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") # scons (python tool) is required for ARM Compute Library building vcpkg_find_acquire_program(PYTHON3) @@ -76,7 +84,7 @@ if(ENABLE_INTEL_CPU) REPO ARM-software/ComputeLibrary REF v23.02.1 SHA512 ee9439e0804bacd365f079cedc548ffe2c12b0d4a86780e0783186884eb5a6d7aa7ceac11c504e242bedc55c3d026b826c90adaafbdbd3e5cfa2562a1c4ee04d - ) + ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary") endif() endif() @@ -104,7 +112,6 @@ vcpkg_cmake_configure( "-DENABLE_NCC_STYLE=OFF" "-DENABLE_CPPLINT=OFF" "-DENABLE_SAMPLES=OFF" - "-DENABLE_COMPILE_TOOL=OFF" "-DENABLE_TEMPLATE=OFF" "-DENABLE_INTEL_GNA=OFF" "-DENABLE_PYTHON=OFF" @@ -117,6 +124,8 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -124,7 +133,6 @@ vcpkg_install_copyright( FILE_LIST "${SOURCE_PATH}/LICENSE" "${SOURCE_PATH}/licensing/third-party-programs.txt" - "${SOURCE_PATH}/licensing/tbb_third-party-programs.txt" "${SOURCE_PATH}/licensing/onednn_third-party-programs.txt" "${SOURCE_PATH}/licensing/runtime-third-party-programs.txt" COMMENT diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json index bcebd5a47ce9c4..226c63665fb24b 100644 --- a/ports/openvino/vcpkg.json +++ b/ports/openvino/vcpkg.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "openvino", - "version-date": "2023-06-11", - "port-version": 5, + "version": "2023.1.0", + "port-version": 3, "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ @@ -16,7 +16,6 @@ "documentation": "https://docs.openvino.ai/latest/index.html", "license": "Apache-2.0", "dependencies": [ - "ade", { "name": "pkgconf", "host": true @@ -24,14 +23,7 @@ "pugixml", { "name": "tbb", - "default-features": false, - "features": [ - { - "name": "hwloc", - "platform": "!static & !osx" - } - ], - "version>=": "2021.9.0#2" + "version>=": "2021.10.0#2" }, { "name": "vcpkg-cmake", @@ -103,12 +95,12 @@ }, { "name": "protobuf", - "version>=": "3.20.3" + "version>=": "3.21.2" }, { "name": "protobuf", "host": true, - "version>=": "3.20.3" + "version>=": "3.21.2" } ] }, @@ -117,12 +109,12 @@ "dependencies": [ { "name": "protobuf", - "version>=": "3.20.3" + "version>=": "3.21.2" }, { "name": "protobuf", "host": true, - "version>=": "3.20.3" + "version>=": "3.21.2" } ] }, @@ -134,12 +126,12 @@ "dependencies": [ { "name": "protobuf", - "version>=": "3.20.3" + "version>=": "3.21.2" }, { "name": "protobuf", "host": true, - "version>=": "3.20.3" + "version>=": "3.21.2" }, "snappy" ] diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index f5b28f806f162f..67a96af992e5e7 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/orc REF "v${VERSION}" - SHA512 e79eea2d7a318354d3c6d0a7d0961f6356a590ba53c54911a478a88c63dd1117d6fc3760cae2b2071144fe0418f6ed3aab5ae6f5f093da8a4ddf804964f87e25 + SHA512 21ae89915acb731b19f2cba10b35731c5d0993a44160a7afd063f04fa5cc714e1fe3984282214d1fe8a19944969f28d5e6d67a33ac6dafcbc2cecf30d34b752f HEAD_REF master PATCHES fix-cmake.patch @@ -77,6 +77,10 @@ if(NOT BINS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +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}/debug/share") diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index fcc7aec45bf822..c7af34b06ad2c2 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "orc", - "version": "1.9.0", + "version": "1.9.1", "description": "The smallest, fastest columnar storage for Hadoop workloads.", "homepage": "https://orc.apache.org/", "license": "Apache-2.0", diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index f61e0a6d954d13..b9c99ca7c93a20 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -134,6 +134,15 @@ vcpkg_copy_pdbs() configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-osg-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-osg/unofficial-osg-config.cmake" @ONLY) vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-osg) +# Add debug folder prefix for plugin targets. vcpkg_cmake_config_fixup only handles this for targets in bin/ and lib/. +set(osg_plugins_debug_targets "${CURRENT_PACKAGES_DIR}/share/unofficial-osg/osg-plugins-debug.cmake") +if(EXISTS "${osg_plugins_debug_targets}") + file(READ "${osg_plugins_debug_targets}" contents) + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}") + string(REPLACE "\${_IMPORT_PREFIX}/plugins" "\${_IMPORT_PREFIX}/debug/plugins" contents "${contents}") + file(WRITE "${osg_plugins_debug_targets}" "${contents}") +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(APPEND "${CURRENT_PACKAGES_DIR}/include/osg/Config" "#ifndef OSG_LIBRARY_STATIC\n#define OSG_LIBRARY_STATIC 1\n#endif\n") endif() diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index f27b33c37fff16..30a3d86f9e780d 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version": "3.6.5", - "port-version": 20, + "port-version": 22, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://www.openscenegraph.com/", "license": null, diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 7f30291e61509b..c30aea11903f11 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -15,9 +15,6 @@ vcpkg_from_gitlab( vcpkg_replace_string("${SOURCE_PATH}/meson.build" "-Werror=array-bounds" "") if("introspection" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature introspection currently only supports dynamic build.") - endif() list(APPEND OPTIONS_DEBUG -Dintrospection=disabled) list(APPEND OPTIONS_RELEASE -Dintrospection=enabled) else() diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index 35248a357d66d3..e61eb9bc0202b1 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pango", "version": "1.50.14", - "port-version": 3, + "port-version": 4, "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "license": "LGPL-2.0-or-later", @@ -39,14 +39,6 @@ "introspection": { "description": "build with introspection", "dependencies": [ - { - "name": "gobject-introspection", - "host": true - }, - { - "name": "gobject-introspection", - "platform": "windows & x86" - }, { "name": "harfbuzz", "features": [ diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 6cdac7bb8b77c4..189311d7fe29ab 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -197,6 +197,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +file(GLOB cmake_files "${CURRENT_PACKAGES_DIR}/share/${PORT}/*.cmake") +foreach(file IN LISTS cmake_files) + vcpkg_replace_string("${file}" "pv5.11d.exe" "pv5.11.exe") +endforeach() + # The plugins also work without these files file(REMOVE "${CURRENT_PACKAGES_DIR}/Applications/paraview.app/Contents/Resources/paraview.conf") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/Applications/paraview.app/Contents/Resources/paraview.conf") diff --git a/ports/paraview/vcpkg.json b/ports/paraview/vcpkg.json index 03277763a36bf5..2292f60c9db0c4 100644 --- a/ports/paraview/vcpkg.json +++ b/ports/paraview/vcpkg.json @@ -1,7 +1,7 @@ { "name": "paraview", "version": "5.11.0", - "port-version": 3, + "port-version": 4, "description": "VTK-based Data Analysis and Visualization Application", "homepage": "https://www.paraview.org/", "license": "BSD-3-Clause", diff --git a/ports/pbc/portfile.cmake b/ports/pbc/portfile.cmake index 1fd27f8a4ab015..fd3b1f8557f1ca 100644 --- a/ports/pbc/portfile.cmake +++ b/ports/pbc/portfile.cmake @@ -47,20 +47,17 @@ else() PATCHES windows.patch ) - set(CMAKE_FIND_LIBRARY_PREFIXES "") - set(CMAKE_FIND_LIBRARY_SUFFIXES "") - - find_path(MPIR_INCLUDE_DIR "gmp.h" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES include) + find_path(MPIR_INCLUDE_DIR "gmp.h" HINTS "${CURRENT_INSTALLED_DIR}" PATH_SUFFIXES include) if(NOT MPIR_INCLUDE_DIR) message(FATAL_ERROR "GMP includes not found") endif() - find_library(MPIR_LIBRARIES_REL NAMES "mpir.lib" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES lib) + find_library(MPIR_LIBRARIES_REL NAMES "mpir.lib" HINTS "${CURRENT_INSTALLED_DIR}" PATH_SUFFIXES lib) if(NOT MPIR_LIBRARIES_REL) message(FATAL_ERROR "mpir library not found") endif() - find_library(MPIR_LIBRARIES_DBG NAMES "mpir.lib" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES debug/lib) + find_library(MPIR_LIBRARIES_DBG NAMES "mpir.lib" HINTS "${CURRENT_INSTALLED_DIR}" PATH_SUFFIXES debug/lib) if(NOT MPIR_LIBRARIES_DBG) message(FATAL_ERROR "mpir debug library not found") endif() @@ -73,12 +70,6 @@ else() set(ConfigurationSuffix " DLL") endif() - if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(RuntimeLibraryExt "") - else() - set(RuntimeLibraryExt "DLL") - endif() - if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") set(Platform "Win32") else() @@ -86,26 +77,23 @@ else() endif() # PBC expects mpir directory in build root - get_filename_component(SOURCE_PATH_PARENT ${SOURCE_PATH} DIRECTORY) - file(REMOVE_RECURSE ${SOURCE_PATH_PARENT}/mpir) - file(MAKE_DIRECTORY ${SOURCE_PATH_PARENT}/mpir) + get_filename_component(SOURCE_PATH_PARENT "${SOURCE_PATH}" DIRECTORY) + file(REMOVE_RECURSE "${SOURCE_PATH_PARENT}/mpir") + file(MAKE_DIRECTORY "${SOURCE_PATH_PARENT}/mpir") file(GLOB FILES ${MPIR_INCLUDE_DIR}/gmp*.h) file(COPY ${FILES} ${MPIR_LIBRARIES_REL} DESTINATION "${SOURCE_PATH_PARENT}/mpir/${LibrarySuffix}/${Platform}/Release") file(COPY ${FILES} ${MPIR_LIBRARIES_DBG} DESTINATION "${SOURCE_PATH_PARENT}/mpir/${LibrarySuffix}/${Platform}/Debug") - get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME) - vcpkg_install_msbuild(SOURCE_PATH ${SOURCE_PATH_PARENT} - PROJECT_SUBPATH ${SOURCE_PATH_SUFFIX}/pbcwin/projects/pbclib.vcxproj - INCLUDES_SUBPATH ${SOURCE_PATH_SUFFIX}/include - LICENSE_SUBPATH ${SOURCE_PATH_SUFFIX}/COPYING + get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) + vcpkg_msbuild_install(SOURCE_PATH "${SOURCE_PATH_PARENT}" + PROJECT_SUBPATH "${SOURCE_PATH_SUFFIX}/pbcwin/projects/pbclib.vcxproj" RELEASE_CONFIGURATION "Release${ConfigurationSuffix}" DEBUG_CONFIGURATION "Debug${ConfigurationSuffix}" - OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" - OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" OPTIONS /p:SolutionDir=../ - ALLOW_ROOT_INCLUDES ) + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") + file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # clean up mpir stuff file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/mpir.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/mpir.lib") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-pbc-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") diff --git a/ports/pbc/vcpkg.json b/ports/pbc/vcpkg.json index 5a440a2089d722..3fb364a31eb23a 100644 --- a/ports/pbc/vcpkg.json +++ b/ports/pbc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pbc", "version": "0.5.14", - "port-version": 7, + "port-version": 9, "description": "Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.", "homepage": "https://crypto.stanford.edu/pbc", "license": "LGPL-3.0", @@ -14,6 +14,11 @@ { "name": "mpir", "platform": "windows" + }, + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" } ] } diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 7be7620e113c8f..02fedfdf9e584c 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -117,5 +117,11 @@ if(BUILD_tools OR BUILD_apps OR BUILD_examples) vcpkg_copy_tools(TOOL_NAMES ${tool_names} AUTO_CLEAN) endif() +# pcl_apps.dll is only build for release but not used at all since BUILD_apps_3d_rec_framework is OFF. +# Because it is not copied to the tool folder and there is no debug variant, we get an post build check error. +# Since the lib is not needed. Delete it: +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pcl_apps.dll" "${CURRENT_PACKAGES_DIR}/bin/pcl_apps.pdb" + "${CURRENT_PACKAGES_DIR}/lib/pcl_apps.lib" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/pcl_apps.pc") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json index 9158a0901fa163..f9834ad4036999 100644 --- a/ports/pcl/vcpkg.json +++ b/ports/pcl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pcl", "version": "1.13.1", + "port-version": 1, "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.", "homepage": "https://github.com/PointCloudLibrary/pcl", "license": "BSD-3-Clause", diff --git a/ports/pcre2/fix-cmake.patch b/ports/pcre2/fix-cmake.patch new file mode 100644 index 00000000000000..68a6c5f1acd595 --- /dev/null +++ b/ports/pcre2/fix-cmake.patch @@ -0,0 +1,334 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b5081e..ba2e993 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -100,6 +100,9 @@ + # 2021-08-28 PH increased minimum version + # 2021-08-28 PH added test for realpath() + # 2022-12-10 PH added support for pcre2posix_test ++# 2023-01-15 Carlo added C99 as the minimum required ++# 2023-06-03 Theodore used standard CMake constructs to export the library's targets. ++# 2023-08-06 PH added support for setting variable length lookbehind maximum + + # Increased minimum to 2.8.5 to support GNUInstallDirs. + # Increased minimum to 3.1 to support imported targets. +@@ -136,6 +139,7 @@ INCLUDE(CheckFunctionExists) + INCLUDE(CheckSymbolExists) + INCLUDE(CheckIncludeFile) + INCLUDE(CheckTypeSize) ++INCLUDE(CMakePackageConfigHelpers) + INCLUDE(GNUInstallDirs) # for CMAKE_INSTALL_LIBDIR + + CHECK_INCLUDE_FILE(dirent.h HAVE_DIRENT_H) +@@ -706,7 +710,9 @@ IF(PCRE2_BUILD_PCRE2_8) + VERSION ${LIBPCRE2_8_VERSION} + SOVERSION ${LIBPCRE2_8_SOVERSION}) + TARGET_COMPILE_DEFINITIONS(pcre2-8-static PUBLIC PCRE2_STATIC) +- TARGET_INCLUDE_DIRECTORIES(pcre2-8-static PUBLIC ${PROJECT_BINARY_DIR}) ++ TARGET_INCLUDE_DIRECTORIES(pcre2-8-static PUBLIC ++ $ ++ $) + IF(REQUIRE_PTHREAD) + TARGET_LINK_LIBRARIES(pcre2-8-static Threads::Threads) + ENDIF(REQUIRE_PTHREAD) +@@ -719,8 +725,9 @@ IF(PCRE2_BUILD_PCRE2_8) + VERSION ${LIBPCRE2_POSIX_VERSION} + SOVERSION ${LIBPCRE2_POSIX_SOVERSION}) + TARGET_LINK_LIBRARIES(pcre2-posix-static pcre2-8-static) +- TARGET_COMPILE_DEFINITIONS(pcre2-posix-static PUBLIC PCRE2_STATIC) +- TARGET_INCLUDE_DIRECTORIES(pcre2-posix-static PUBLIC ${PROJECT_BINARY_DIR}) ++ TARGET_INCLUDE_DIRECTORIES(pcre2-posix-static PUBLIC ++ $ ++ $) + SET(targets ${targets} pcre2-posix-static) + + IF(MSVC) +@@ -737,7 +744,9 @@ IF(PCRE2_BUILD_PCRE2_8) + + IF(BUILD_SHARED_LIBS) + ADD_LIBRARY(pcre2-8-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h) +- TARGET_INCLUDE_DIRECTORIES(pcre2-8-shared PUBLIC ${PROJECT_BINARY_DIR}) ++ TARGET_INCLUDE_DIRECTORIES(pcre2-8-shared PUBLIC ++ $ ++ $) + SET_TARGET_PROPERTIES(pcre2-8-shared PROPERTIES + COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8 + MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_8_MACHO_COMPATIBILITY_VERSION}" +@@ -750,7 +759,9 @@ IF(PCRE2_BUILD_PCRE2_8) + ENDIF(REQUIRE_PTHREAD) + SET(targets ${targets} pcre2-8-shared) + ADD_LIBRARY(pcre2-posix-shared SHARED ${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES}) +- TARGET_INCLUDE_DIRECTORIES(pcre2-posix-shared PUBLIC ${PROJECT_BINARY_DIR}) ++ TARGET_INCLUDE_DIRECTORIES(pcre2-posix-shared PUBLIC ++ $ ++ $) + SET_TARGET_PROPERTIES(pcre2-posix-shared PROPERTIES + COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8 + MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_POSIX_MACHO_COMPATIBILITY_VERSION}" +@@ -787,7 +798,9 @@ ENDIF(PCRE2_BUILD_PCRE2_8) + IF(PCRE2_BUILD_PCRE2_16) + IF(BUILD_STATIC_LIBS) + ADD_LIBRARY(pcre2-16-static STATIC ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h) +- TARGET_INCLUDE_DIRECTORIES(pcre2-16-static PUBLIC ${PROJECT_BINARY_DIR}) ++ TARGET_INCLUDE_DIRECTORIES(pcre2-16-static PUBLIC ++ $ ++ $) + SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES + COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16 + MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}" +@@ -812,7 +825,9 @@ IF(PCRE2_BUILD_PCRE2_16) + + IF(BUILD_SHARED_LIBS) + ADD_LIBRARY(pcre2-16-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h) +- TARGET_INCLUDE_DIRECTORIES(pcre2-16-shared PUBLIC ${PROJECT_BINARY_DIR}) ++ TARGET_INCLUDE_DIRECTORIES(pcre2-16-shared PUBLIC ++ $ ++ $) + SET_TARGET_PROPERTIES(pcre2-16-shared PROPERTIES + COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16 + MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}" +@@ -849,7 +864,9 @@ ENDIF(PCRE2_BUILD_PCRE2_16) + IF(PCRE2_BUILD_PCRE2_32) + IF(BUILD_STATIC_LIBS) + ADD_LIBRARY(pcre2-32-static STATIC ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h) +- TARGET_INCLUDE_DIRECTORIES(pcre2-32-static PUBLIC ${PROJECT_BINARY_DIR}) ++ TARGET_INCLUDE_DIRECTORIES(pcre2-32-static PUBLIC ++ $ ++ $) + SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES + COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32 + MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}" +@@ -874,7 +891,9 @@ IF(PCRE2_BUILD_PCRE2_32) + + IF(BUILD_SHARED_LIBS) + ADD_LIBRARY(pcre2-32-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h) +- TARGET_INCLUDE_DIRECTORIES(pcre2-32-shared PUBLIC ${PROJECT_BINARY_DIR}) ++ TARGET_INCLUDE_DIRECTORIES(pcre2-32-shared PUBLIC ++ $ ++ $) + SET_TARGET_PROPERTIES(pcre2-32-shared PROPERTIES + COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32 + MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}" +@@ -1076,9 +1095,13 @@ ENDIF(PCRE2_BUILD_TESTS) + SET(CMAKE_INSTALL_ALWAYS 1) + + INSTALL(TARGETS ${targets} +- RUNTIME DESTINATION bin ++ EXPORT pcre2-targets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++INSTALL(EXPORT pcre2-targets ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pcre2 ++ NAMESPACE pcre2::) + INSTALL(FILES ${pkg_config_files} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/pcre2-config" + DESTINATION bin +@@ -1090,11 +1113,12 @@ INSTALL(FILES ${PCRE2_HEADERS} ${PCRE2POSIX_HEADERS} DESTINATION include) + # CMake config files. + set(PCRE2_CONFIG_IN ${CMAKE_CURRENT_SOURCE_DIR}/cmake/pcre2-config.cmake.in) + set(PCRE2_CONFIG_OUT ${CMAKE_CURRENT_BINARY_DIR}/cmake/pcre2-config.cmake) +-configure_file(${PCRE2_CONFIG_IN} ${PCRE2_CONFIG_OUT} @ONLY) +-set(PCRE2_CONFIG_VERSION_IN ${CMAKE_CURRENT_SOURCE_DIR}/cmake/pcre2-config-version.cmake.in) ++configure_package_config_file(${PCRE2_CONFIG_IN} ${PCRE2_CONFIG_OUT} INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pcre2) + set(PCRE2_CONFIG_VERSION_OUT ${CMAKE_CURRENT_BINARY_DIR}/cmake/pcre2-config-version.cmake) +-configure_file(${PCRE2_CONFIG_VERSION_IN} ${PCRE2_CONFIG_VERSION_OUT} @ONLY) +-install(FILES ${PCRE2_CONFIG_OUT} ${PCRE2_CONFIG_VERSION_OUT} DESTINATION cmake) ++write_basic_package_version_file(${PCRE2_CONFIG_VERSION_OUT} ++ VERSION ${PCRE2_MAJOR}.${PCRE2_MINOR}.0 ++ COMPATIBILITY SameMajorVersion) ++install(FILES ${PCRE2_CONFIG_OUT} ${PCRE2_CONFIG_VERSION_OUT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pcre2) + + FILE(GLOB html ${PROJECT_SOURCE_DIR}/doc/html/*.html) + FILE(GLOB man1 ${PROJECT_SOURCE_DIR}/doc/*.1) +diff --git a/cmake/pcre2-config-version.cmake.in b/cmake/pcre2-config-version.cmake.in +deleted file mode 100644 +index dac149e..0000000 +--- a/cmake/pcre2-config-version.cmake.in ++++ /dev/null +@@ -1,15 +0,0 @@ +-set(PACKAGE_VERSION_MAJOR @PCRE2_MAJOR@) +-set(PACKAGE_VERSION_MINOR @PCRE2_MINOR@) +-set(PACKAGE_VERSION_PATCH 0) +-set(PACKAGE_VERSION @PCRE2_MAJOR@.@PCRE2_MINOR@.0) +- +-# Check whether the requested PACKAGE_FIND_VERSION is compatible +-if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION OR +- PACKAGE_VERSION_MAJOR GREATER PACKAGE_FIND_VERSION_MAJOR) +- set(PACKAGE_VERSION_COMPATIBLE FALSE) +-else() +- set(PACKAGE_VERSION_COMPATIBLE TRUE) +- if(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION) +- set(PACKAGE_VERSION_EXACT TRUE) +- endif() +-endif() +diff --git a/cmake/pcre2-config.cmake.in b/cmake/pcre2-config.cmake.in +index b313d6d..5b2aafa 100644 +--- a/cmake/pcre2-config.cmake.in ++++ b/cmake/pcre2-config.cmake.in +@@ -5,11 +5,17 @@ + # + # Static vs. shared + # ----------------- +-# To make use of the static library instead of the shared one, one needs ++# To force using the static library instead of the shared one, one needs + # to set the variable PCRE2_USE_STATIC_LIBS to ON before calling find_package. ++# If the variable is not set, the static library will be used if only that has ++# been built, otherwise the shared library will be used. ++# ++# The following components are supported: 8BIT, 16BIT, 32BIT and POSIX. ++# They used to be required but not anymore; all available targets will ++# be defined regardless of the requested components. + # Example: + # set(PCRE2_USE_STATIC_LIBS ON) +-# find_package(PCRE2 CONFIG COMPONENTS 8BIT) ++# find_package(PCRE2 CONFIG) + # + # This will define the following variables: + # +@@ -23,70 +29,42 @@ + # PCRE2::32BIT - The 32 bit PCRE2 library. + # PCRE2::POSIX - The POSIX PCRE2 library. + +-set(PCRE2_NON_STANDARD_LIB_PREFIX @NON_STANDARD_LIB_PREFIX@) +-set(PCRE2_NON_STANDARD_LIB_SUFFIX @NON_STANDARD_LIB_SUFFIX@) +-set(PCRE2_8BIT_NAME pcre2-8) +-set(PCRE2_16BIT_NAME pcre2-16) +-set(PCRE2_32BIT_NAME pcre2-32) +-set(PCRE2_POSIX_NAME pcre2-posix) +-find_path(PCRE2_INCLUDE_DIR NAMES pcre2.h DOC "PCRE2 include directory") +-if (PCRE2_USE_STATIC_LIBS) +- if (MSVC) +- set(PCRE2_8BIT_NAME pcre2-8-static) +- set(PCRE2_16BIT_NAME pcre2-16-static) +- set(PCRE2_32BIT_NAME pcre2-32-static) +- set(PCRE2_POSIX_NAME pcre2-posix-static) +- endif () ++@PACKAGE_INIT@ + +- set(PCRE2_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX}) +- set(PCRE2_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX}) +-else () +- set(PCRE2_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX}) +- if (MINGW AND PCRE2_NON_STANDARD_LIB_PREFIX) +- set(PCRE2_PREFIX "") +- endif () ++include(CMakeFindDependencyMacro) ++if("@REQUIRE_PTHREAD@") # REQUIRE_PTHREAD ++ find_dependency(Threads) ++endif() + +- set(PCRE2_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) +- if (MINGW AND PCRE2_NON_STANDARD_LIB_SUFFIX) +- set(PCRE2_SUFFIX "-0.dll") +- endif () +-endif () +-find_library(PCRE2_8BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "8 bit PCRE2 library") +-find_library(PCRE2_16BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "16 bit PCRE2 library") +-find_library(PCRE2_32BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "32 bit PCRE2 library") +-find_library(PCRE2_POSIX_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "8 bit POSIX PCRE2 library") +-unset(PCRE2_NON_STANDARD_LIB_PREFIX) +-unset(PCRE2_NON_STANDARD_LIB_SUFFIX) +-unset(PCRE2_8BIT_NAME) +-unset(PCRE2_16BIT_NAME) +-unset(PCRE2_32BIT_NAME) +-unset(PCRE2_POSIX_NAME) ++include("${CMAKE_CURRENT_LIST_DIR}/pcre2-targets.cmake") + + # Set version +-if (PCRE2_INCLUDE_DIR) +- set(PCRE2_VERSION "@PCRE2_MAJOR@.@PCRE2_MINOR@.0") +-endif () +- +-# Which components have been found. +-if (PCRE2_8BIT_LIBRARY) +- set(PCRE2_8BIT_FOUND TRUE) +-endif () +-if (PCRE2_16BIT_LIBRARY) +- set(PCRE2_16BIT_FOUND TRUE) +-endif () +-if (PCRE2_32BIT_LIBRARY) +- set(PCRE2_32BIT_FOUND TRUE) +-endif () +-if (PCRE2_POSIX_LIBRARY) +- set(PCRE2_POSIX_FOUND TRUE) +-endif () ++set(PCRE2_VERSION "@PCRE2_MAJOR@.@PCRE2_MINOR@.0") + +-# Check if at least one component has been specified. +-list(LENGTH PCRE2_FIND_COMPONENTS PCRE2_NCOMPONENTS) +-if (PCRE2_NCOMPONENTS LESS 1) +- message(FATAL_ERROR "No components have been specified. This is not allowed. Please, specify at least one component.") +-endif () +-unset(PCRE2_NCOMPONENTS) ++# Chooses the linkage of the library to expose in the ++# unsuffixed edition of the target. ++macro(_pcre2_add_component_target component target) ++ # If the static library exists and either PCRE2_USE_STATIC_LIBS ++ # is defined, or the dynamic library does not exist, use the static library. ++ if(NOT TARGET PCRE2::${component}) ++ if(TARGET pcre2::pcre2-${target}-static AND (PCRE2_USE_STATIC_LIBS OR NOT TARGET pcre2::pcre2-${target}-shared)) ++ add_library(PCRE2::${component} ALIAS pcre2::pcre2-${target}-static) ++ set(PCRE2_${component}_FOUND TRUE) ++ # Otherwise use the dynamic library if it exists. ++ elseif(TARGET pcre2::pcre2-${target}-shared AND NOT PCRE2_USE_STATIC_LIBS) ++ add_library(PCRE2::${component} ALIAS pcre2::pcre2-${target}-shared) ++ set(PCRE2_${component}_FOUND TRUE) ++ endif() ++ if(PCRE2_${component}_FOUND) ++ get_target_property(PCRE2_${component}_LIBRARY PCRE2::${component} IMPORTED_LOCATION) ++ set(PCRE2_LIBRARIES ${PCRE2_LIBRARIES} ${PCRE2_${component}_LIBRARY}) ++ endif() ++ endif() ++endmacro() ++_pcre2_add_component_target(8BIT 8) ++_pcre2_add_component_target(16BIT 16) ++_pcre2_add_component_target(32BIT 32) ++_pcre2_add_component_target(POSIX posix) + + # When POSIX component has been specified make sure that also 8BIT component is specified. + set(PCRE2_8BIT_COMPONENT FALSE) +@@ -105,41 +83,5 @@ endif() + unset(PCRE2_8BIT_COMPONENT) + unset(PCRE2_POSIX_COMPONENT) + +-include(FindPackageHandleStandardArgs) +-set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG "${CMAKE_CURRENT_LIST_FILE}") +-find_package_handle_standard_args(PCRE2 +- FOUND_VAR PCRE2_FOUND +- REQUIRED_VARS PCRE2_INCLUDE_DIR +- HANDLE_COMPONENTS +- VERSION_VAR PCRE2_VERSION +- CONFIG_MODE +-) +- +-set(PCRE2_LIBRARIES) +-if (PCRE2_FOUND) +- foreach(component ${PCRE2_FIND_COMPONENTS}) +- if (PCRE2_USE_STATIC_LIBS) +- add_library(PCRE2::${component} STATIC IMPORTED) +- target_compile_definitions(PCRE2::${component} INTERFACE PCRE2_STATIC) +- else () +- add_library(PCRE2::${component} SHARED IMPORTED) +- endif () +- set_target_properties(PCRE2::${component} PROPERTIES +- IMPORTED_LOCATION "${PCRE2_${component}_LIBRARY}" +- INTERFACE_INCLUDE_DIRECTORIES "${PCRE2_INCLUDE_DIR}" +- ) +- if (component STREQUAL "POSIX") +- set_target_properties(PCRE2::${component} PROPERTIES +- INTERFACE_LINK_LIBRARIES "PCRE2::8BIT" +- LINK_LIBRARIES "PCRE2::8BIT" +- ) +- endif () +- +- set(PCRE2_LIBRARIES ${PCRE2_LIBRARIES} ${PCRE2_${component}_LIBRARY}) +- mark_as_advanced(PCRE2_${component}_LIBRARY) +- endforeach() +-endif () +- +-mark_as_advanced( +- PCRE2_INCLUDE_DIR +-) ++# Check for required components. ++check_required_components("PCRE2") diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index b247e97d8c8a30..5d6c5c39b6a6c4 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES pcre2-10.35_fix-uwp.patch no-static-suffix.patch + fix-cmake.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -31,11 +32,11 @@ vcpkg_cmake_configure( -DPCRE2_SUPPORT_UNICODE=ON -DPCRE2_BUILD_TESTS=OFF -DPCRE2_BUILD_PCRE2GREP=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=ON + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=ON -DCMAKE_DISABLE_FIND_PACKAGE_Readline=ON -DCMAKE_DISABLE_FIND_PACKAGE_Editline=ON -DINSTALL_MSVC_PDB=${INSTALL_PDB} - -DCMAKE_REQUIRE_FIND_PACKAGE_BZip2=ON - -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON ) vcpkg_cmake_install() @@ -50,16 +51,14 @@ endif() file(WRITE "${CURRENT_PACKAGES_DIR}/include/pcre2.h" "${PCRE2_H}") vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -# The cmake file provided by pcre2 has some problems, so don't use it for now. -#vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/cmake") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/man" + "${CURRENT_PACKAGES_DIR}/share/doc" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/man" + "${CURRENT_PACKAGES_DIR}/debug/share") if(BUILD_STATIC) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -70,4 +69,5 @@ elseif(VCPKG_TARGET_IS_WINDOWS) endif() endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/pcre2/usage b/ports/pcre2/usage new file mode 100644 index 00000000000000..a23aadd334e63f --- /dev/null +++ b/ports/pcre2/usage @@ -0,0 +1,6 @@ +The package pcre2 is compatible with built-in CMake targets: + + # Each component imports a target: + # TARGETS: PCRE2::8BIT PCRE2::16BIT PCRE2::32BIT PCRE2::POSIX + find_package(pcre2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE PCRE2::8BIT PCRE2::16BIT PCRE2::32BIT PCRE2::POSIX) diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json index 20d912a98f01a3..3dd6b9455d55b8 100644 --- a/ports/pcre2/vcpkg.json +++ b/ports/pcre2/vcpkg.json @@ -1,14 +1,11 @@ { "name": "pcre2", "version": "10.42", + "port-version": 1, "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", "homepage": "https://github.com/PCRE2Project/pcre2", "license": "BSD-3-Clause", "dependencies": [ - { - "name": "bzip2", - "default-features": false - }, { "name": "vcpkg-cmake", "host": true @@ -16,15 +13,14 @@ { "name": "vcpkg-cmake-config", "host": true - }, - "zlib" + } ], "default-features": [ "platform-default-features" ], "features": { "jit": { - "description": "Build JIT support", + "description": "Enable support for Just-In-Time compiling regex matchers", "supports": "!emscripten" }, "platform-default-features": { diff --git a/ports/pdal/install-dimbuilder.patch b/ports/pdal/install-dimbuilder.patch new file mode 100644 index 00000000000000..1f156de4249492 --- /dev/null +++ b/ports/pdal/install-dimbuilder.patch @@ -0,0 +1,10 @@ +diff --git a/dimbuilder/CMakeLists.txt b/dimbuilder/CMakeLists.txt +index 615e2e9..db44505 100644 +--- a/dimbuilder/CMakeLists.txt ++++ b/dimbuilder/CMakeLists.txt +@@ -39,3 +39,5 @@ target_link_libraries(dimbuilder + if (MSVC) + target_link_options(dimbuilder PRIVATE /SUBSYSTEM:CONSOLE /ENTRY:mainCRTStartup) + endif(MSVC) ++ ++install(TARGETS dimbuilder) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 8acb6b2c0cd646..ee6c1467e33448 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( fix-gcc-13-build.patch #upstream PR: https://github.com/PDAL/PDAL/pull/4039 gdal-3.7.patch mingw.patch + install-dimbuilder.patch ) # Prefer pristine CMake find modules + wrappers and config files from vcpkg. @@ -47,6 +48,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS pgpointcloud BUILD_PLUGIN_PGPOINTCLOUD zstd WITH_ZSTD ) + +if(VCPKG_CROSSCOMPILING) + set(DIMBUILDER_EXECUTABLE "-DDIMBUILDER_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pdal/dimbuilder${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -59,6 +65,7 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Libexecinfo:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libunwind:BOOL=ON ${FEATURE_OPTIONS} + ${DIMBUILDER_EXECUTABLE} MAYBE_UNUSED_VARIABLES PKG_CONFIG_EXECUTABLE ) @@ -77,7 +84,7 @@ file(GLOB pdal_unsupported "${CURRENT_PACKAGES_DIR}/debug/bin/pdal-config" ) file(REMOVE ${pdal_unsupported}) -vcpkg_copy_tools(TOOL_NAMES pdal AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES pdal dimbuilder AUTO_CLEAN) # Post-install clean-up file(REMOVE_RECURSE diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index e31b17fc3ff94f..48fe2abe653bf0 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pdal", "version": "2.5.3", - "port-version": 2, + "port-version": 3, "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", "license": null, @@ -24,6 +24,11 @@ }, "nanoflann", "nlohmann-json", + { + "name": "pdal", + "host": true, + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake index bbf882bf6169fc..3d98b0375f92e3 100644 --- a/ports/physx/portfile.cmake +++ b/ports/physx/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVIDIA-Omniverse/PhysX - REF 105.0-physx-5.2.1 # newest tag - SHA512 d1c27d79d9c54a6ea0a79f5fa3ccd0b7821a48116c765b185442809d21fdd20086e2bfd6408d8a87e1507e0b951f1d9efb794f33d53bc05ab017fa50a41ba770 + REF 105.1-physx-5.3.0 # newest tag + SHA512 fa3897738aed583f0498587365aafc77107351d72888058d0b725bd39de1c33b37c99294b6346be165eaf3aa3c6228ca7ddb0a3b18e522c1fb79e2559d70b551 HEAD_REF main ) @@ -65,12 +65,14 @@ endif() set($ENV{PM_PATHS} "") -vcpkg_download_distfile(ARCHIVE - URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%40105.0-5.2.498.33012328-public-signed.7z" - FILENAME "PhysXGpu.7z" - SHA512 b834d4e0ed7d015d33d03862e30ad8296974e605bd4de49d9cfa168958d8e3b67a9b52cc1f2169f25c32211e1880de1ff7f76edae4d4a1b1f12dc6d1873c2d8e -) if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_download_distfile(ARCHIVE + URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%40105.1-5.3.4207.33265367-windows-public.7z" + FILENAME "PhysXGpu.7z" + SHA512 010b4c135026a15710b2e0d0d503197456f8f9d2eb291b32df65aa3dbeff09ba0877c52af1724f7a9384af727657d247cabf9c330e11c7ae1e1be5d1b89dce81 + ) + + # 7z might not be preinstalled on Win machines vcpkg_find_acquire_program(7Z) set(ENV{PM_PhysXGpu_PATH} "${CURRENT_BUILDTREES_DIR}/PhysXGpu_dep") file(MAKE_DIRECTORY "$ENV{PM_PhysXGpu_PATH}") @@ -80,6 +82,12 @@ if(VCPKG_TARGET_IS_WINDOWS) LOGNAME "extract-PhysXGpu" ) else() + vcpkg_download_distfile(ARCHIVE + URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%40105.1-5.3.4207.33265367-linux-x86_64-public.7z" + FILENAME "PhysXGpu.7z" + SHA512 a6209a7d4218e80c3cbeec10a80ca3aaa08793469ddcf01ed8bc4582beef0b13697e1bb91f3a59cfdbdfe9652fe22d7569be4de9f0d08a9525a60951c2989acd + ) + vcpkg_extract_source_archive(PHYSXGPU_SOURCE_PATH NO_REMOVE_ONE_LEVEL ARCHIVE "${ARCHIVE}" @@ -90,12 +98,13 @@ endif() message(STATUS "Extracted dependency to $ENV{PM_PhysXGpu_PATH}") list(APPEND ENV{PM_PATHS} $ENV{PM_PhysXGpu_PATH}) -vcpkg_download_distfile(ARCHIVE - URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXDevice%4018.12.7.4.7z" - FILENAME "PhysXDevice.7z" - SHA512 c20eb2f1e0dcb9d692cb718ca7e3a332291e72a09614f37080f101e5ebc1591033029f0f1e6fba33a17d4c9f59f13e561f3fc81cee34cd53d50b579c01dd3f3c -) if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_download_distfile(ARCHIVE + URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXDevice%4018.12.7.4.7z" + FILENAME "PhysXDevice.7z" + SHA512 c20eb2f1e0dcb9d692cb718ca7e3a332291e72a09614f37080f101e5ebc1591033029f0f1e6fba33a17d4c9f59f13e561f3fc81cee34cd53d50b579c01dd3f3c + ) + set(ENV{PM_PhysXDevice_PATH} "${CURRENT_BUILDTREES_DIR}/PhysXDevice_dep") file(MAKE_DIRECTORY "$ENV{PM_PhysXDevice_PATH}") vcpkg_find_acquire_program(7Z) @@ -104,13 +113,6 @@ if(VCPKG_TARGET_IS_WINDOWS) WORKING_DIRECTORY "$ENV{PM_PhysXDevice_PATH}" LOGNAME "extract-PhysXDevice" ) -else() - vcpkg_extract_source_archive(PHYSXDEVICE_SOURCE_PATH - NO_REMOVE_ONE_LEVEL - ARCHIVE "${ARCHIVE}" - BASE_DIRECTORY PhysXDevice_dep - ) - set(ENV{PM_PhysXDevice_PATH} "${PHYSXDEVICE_SOURCE_PATH}") endif() message(STATUS "Extracted dependency to $ENV{PM_PhysXDevice_PATH}") list(APPEND ENV{PM_PATHS} $ENV{PM_PhysXDevice_PATH}) @@ -153,7 +155,7 @@ elseif(targetPlatform STREQUAL "vc17win64") # Again: this will work for any Win6 endif() # Also make sure the packman-downloaded GPU driver is found as a binary -list(APPEND platformCMakeParams -DPHYSX_PHYSXGPU_PATH=${PM_PhysXGpu_PATH}/bin) +list(APPEND platformCMakeParams -DPHYSX_PHYSXGPU_PATH=$ENV{PM_PhysXGpu_PATH}/bin) # Anyway the above only works for clang, see # source/compiler/cmake/linux/CMakeLists.txt:164 diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index d4959d42f8ccca..5d098b177307b4 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "physx", - "version": "5.2.1", + "version": "5.3.0", "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs. This is the latest NVIDIA official version of the PhysX engine which also directly integrates into Omniverse. This port is NOT officially supported by NVIDIA.", "homepage": "https://github.com/NVIDIA-Omniverse/PhysX", "license": "BSD-3-Clause", diff --git a/ports/plf-colony/portfile.cmake b/ports/plf-colony/portfile.cmake index e4ec7bd47358a7..0b5e39b842c96a 100644 --- a/ports/plf-colony/portfile.cmake +++ b/ports/plf-colony/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mattreecebentley/plf_colony - REF 7243b4601b5d7e989550c158a9918ea5a05feaf4 - SHA512 aaf898ac5a37720545a7b7226c8bd09be80dcdd03d9c77a2c64cfe0aedbb59ede4042001c616c4b5d29f13717ae5b637c0608d83819c2bceae5606c8555a64da + REF 394c787ecf5a541b66d08b90f22cebc954f0599c + SHA512 1b452e64b5c029545aa10a1aa1bfe913ce0df798546b31dc04a9677809a3ad4f212e65a8829c5055027a7416bcd82126b974f9cc0ad0561596e6d3253ee42ad2 HEAD_REF master ) diff --git a/ports/plf-colony/vcpkg.json b/ports/plf-colony/vcpkg.json index 01101a6a1d4c52..51d9048f8062cc 100644 --- a/ports/plf-colony/vcpkg.json +++ b/ports/plf-colony/vcpkg.json @@ -1,6 +1,6 @@ { "name": "plf-colony", - "version": "6.33", + "version": "7.3.1", "description": "An unordered C++ data container providing fast iteration/insertion/erasure while maintaining pointer/iterator validity to non-erased elements regardless of insertions/erasures.", "homepage": "https://plflib.org/colony.htm" } diff --git a/ports/pmdk/portfile.cmake b/ports/pmdk/portfile.cmake index 6d60acbf99e1e5..9701c4cb79a686 100644 --- a/ports/pmdk/portfile.cmake +++ b/ports/pmdk/portfile.cmake @@ -1,54 +1,41 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -set(PMDK_VERSION "1.12.0") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pmem/pmdk REF 73d8f958e855904dc0776a7d77d0f0d3698a65b1 #v1.12.0 SHA512 ffe77796c9028478985ca98e4162a671e3e7f580faa46b31d0dcf8c5e97aa6478044efdf7ad238285044f18f754a20a4e2a1b5992c7b9cffa709884eb62007ab HEAD_REF master + PATCHES "remove_getopt.patch" ) +file(REMOVE "${SOURCE_PATH}/src/windows/getopt" "${SOURCE_PATH}/src/test/getopt") + # Build only the selected projects -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/src/PMDK.sln +vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH src/PMDK.sln TARGET "Solution Items\\libpmem,Solution Items\\libpmemlog,Solution Items\\libpmemblk,Solution Items\\libpmemobj,Solution Items\\libpmempool,Solution Items\\Tools\\pmempool" - OPTIONS /p:SRCVERSION=${PMDK_VERSION} + OPTIONS /p:SRCVERSION=${VERSION} + ADDITIONAL_LIBS getopt.lib ) -set(DEBUG_ARTIFACTS_PATH ${SOURCE_PATH}/src/x64/Debug) -set(RELEASE_ARTIFACTS_PATH ${SOURCE_PATH}/src/x64/Release) +set(DEBUG_ARTIFACTS_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/x64/Debug") +set(RELEASE_ARTIFACTS_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/x64/Release") # Install header files -file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/*.h) -file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/libpmemobj/*.h) -file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/libpmemobj) +file(GLOB HEADER_FILES "${SOURCE_PATH}/src/include/*.h") +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(GLOB HEADER_FILES "${SOURCE_PATH}/src/include/libpmemobj/*.h") +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/libpmemobj") # Remove unneeded header files -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/libvmmalloc.h) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/librpmem.h) - -# Install libraries (debug) -file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/libs/libpmem*.lib) -file(INSTALL ${LIB_DEBUG_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libpmemcommon.lib) -file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/libs/libpmem*.dll) -file(INSTALL ${LIB_DEBUG_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -# Install libraries (release) -file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/libs/libpmem*.lib) -file(INSTALL ${LIB_RELEASE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libpmemcommon.lib) -file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/libs/libpmem*.dll) -file(INSTALL ${LIB_RELEASE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/libvmmalloc.h") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/librpmem.h") # Install tools (release only) -file(INSTALL ${RELEASE_ARTIFACTS_PATH}/libs/pmempool.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(INSTALL "${RELEASE_ARTIFACTS_PATH}/libs/pmempool.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/pmdk) -vcpkg_copy_pdbs() - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/pmdk/remove_getopt.patch b/ports/pmdk/remove_getopt.patch new file mode 100644 index 00000000000000..45912a87478de8 --- /dev/null +++ b/ports/pmdk/remove_getopt.patch @@ -0,0 +1,233 @@ +diff --git a/src/PMDK.sln b/src/PMDK.sln +index d8220c159..1959a7a59 100644 +--- a/src/PMDK.sln ++++ b/src/PMDK.sln +@@ -239,8 +239,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_alloc", "test\obj_alloc + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pmempool_info", "test\pmempool_info\pmempool_info.vcxproj", "{42CCEF95-5ADD-460C-967E-DD5B2C744943}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "test\getopt\getopt.vcxproj", "{433F7840-C597-4950-84C9-E4FF7DF6A298}" +-EndProject + Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sys", "sys", "{45027FC5-4A32-47BD-AC5B-66CC7616B1D2}" + ProjectSection(SolutionItems) = preProject + windows\include\sys\file.h = windows\include\sys\file.h +@@ -538,8 +538,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_tx_flow", "test\obj_tx_ + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srcversion", "windows\srcversion\srcversion.vcxproj", "{901F04DB-E1A5-4A41-8B81-9D31C19ACD59}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "windows\getopt\getopt.vcxproj", "{9186EAC4-2F34-4F17-B940-6585D7869BCD}" +-EndProject + Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libpmemlog", "libpmemlog", "{91C30620-70CA-46C7-AC71-71F3C602690E}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_realloc", "test\obj_realloc\obj_realloc.vcxproj", "{91E19AEB-7B75-43E0-B8B4-D2BB60D839EA}" +@@ -2183,7 +2181,6 @@ Global + {3ED56E55-84A6-422C-A8D4-A8439FB8F245} = {BD6CC700-B36B-435B-BAF9-FC5AFCD766C9} + {42B97D47-F800-4100-BFA2-B3AC357E8B6B} = {63C9B3F8-437D-4AD9-B32D-D04AE38C35B6} + {42CCEF95-5ADD-460C-967E-DD5B2C744943} = {59AB6976-D16B-48D0-8D16-94360D3FE51D} +- {433F7840-C597-4950-84C9-E4FF7DF6A298} = {B870D8A6-12CD-4DD0-B843-833695C2310A} + {45027FC5-4A32-47BD-AC5B-66CC7616B1D2} = {9A8482A7-BF0C-423D-8266-189456ED41F6} + {46629F21-089C-4205-B2F8-E01748ECE517} = {A14A4556-9092-430D-B9CA-B2B1223D56CB} + {46B82069-10BE-432A-8D93-F4D995148555} = {4C291EEB-3874-4724-9CC2-1335D13FF0EE} +@@ -2284,7 +2281,6 @@ Global + {8D75FA1A-EC74-4F88-8AC1-CE3F98E4D828} = {63C9B3F8-437D-4AD9-B32D-D04AE38C35B6} + {8E374371-30E1-4623-8755-2A2F3742170B} = {63C9B3F8-437D-4AD9-B32D-D04AE38C35B6} + {901F04DB-E1A5-4A41-8B81-9D31C19ACD59} = {95FAF291-03D1-42FC-9C10-424D551D475D} +- {9186EAC4-2F34-4F17-B940-6585D7869BCD} = {95FAF291-03D1-42FC-9C10-424D551D475D} + {91C30620-70CA-46C7-AC71-71F3C602690E} = {0CC6D525-806E-433F-AB4A-6CFD546418B1} + {91E19AEB-7B75-43E0-B8B4-D2BB60D839EA} = {63C9B3F8-437D-4AD9-B32D-D04AE38C35B6} + {9233FC80-B51C-4A89-AF58-5AE86C068F6A} = {A14A4556-9092-430D-B9CA-B2B1223D56CB} +diff --git a/src/benchmarks/pmembench.vcxproj b/src/benchmarks/pmembench.vcxproj +index ac9b3569e..906a50269 100644 +--- a/src/benchmarks/pmembench.vcxproj ++++ b/src/benchmarks/pmembench.vcxproj +@@ -29,9 +29,6 @@ + + {cf9a0883-6334-44c7-ac29-349468c78e27} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + + +@@ -205,10 +202,10 @@ + + + +- $(SolutionDir)\core;$(SolutionDir)\examples\libpmemobj\hashmap;$(SolutionDir)\examples\libpmemobj\map;$(SolutionDir)\examples\libpmemobj\tree_map;$(SolutionDir)\common;$(SolutionDir)\test\unittest;$(SolutionDir)\windows\include;$(SolutionDir)\libpmemobj\;$(SolutionDir)\include;$(SolutionDir)\libpmemblk;$(SolutionDir)\windows\getopt;$(IncludePath) ++ $(SolutionDir)\core;$(SolutionDir)\examples\libpmemobj\hashmap;$(SolutionDir)\examples\libpmemobj\map;$(SolutionDir)\examples\libpmemobj\tree_map;$(SolutionDir)\common;$(SolutionDir)\test\unittest;$(SolutionDir)\windows\include;$(SolutionDir)\libpmemobj\;$(SolutionDir)\include;$(SolutionDir)\libpmemblk;$(IncludePath) + + +- $(SolutionDir)\core;$(SolutionDir)\examples\libpmemobj\hashmap;$(SolutionDir)\examples\libpmemobj\map;$(SolutionDir)\examples\libpmemobj\tree_map;$(SolutionDir)\common;$(SolutionDir)\test\unittest;$(SolutionDir)\windows\include;$(SolutionDir)\libpmemobj\;$(SolutionDir)\include;$(SolutionDir)\libpmemblk;$(SolutionDir)\windows\getopt;$(IncludePath) ++ $(SolutionDir)\core;$(SolutionDir)\examples\libpmemobj\hashmap;$(SolutionDir)\examples\libpmemobj\map;$(SolutionDir)\examples\libpmemobj\tree_map;$(SolutionDir)\common;$(SolutionDir)\test\unittest;$(SolutionDir)\windows\include;$(SolutionDir)\libpmemobj\;$(SolutionDir)\include;$(SolutionDir)\libpmemblk;$(IncludePath) + + + +diff --git a/src/test/bttdevice/bttdevice.vcxproj b/src/test/bttdevice/bttdevice.vcxproj +index bfcc74064..05cd8c15d 100644 +--- a/src/test/bttdevice/bttdevice.vcxproj ++++ b/src/test/bttdevice/bttdevice.vcxproj +@@ -72,9 +72,6 @@ + + {9e9e3d25-2139-4a5d-9200-18148ddead45} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + {ce3f2dfb-8470-4802-ad37-21caf6cb2681} + +diff --git a/src/test/libpmempool_api_win/libpmempool_test_win.vcxproj b/src/test/libpmempool_api_win/libpmempool_test_win.vcxproj +index 73cb7c0b2..ba87422ea 100644 +--- a/src/test/libpmempool_api_win/libpmempool_test_win.vcxproj ++++ b/src/test/libpmempool_api_win/libpmempool_test_win.vcxproj +@@ -64,9 +64,6 @@ + + {9e9e3d25-2139-4a5d-9200-18148ddead45} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + {ce3f2dfb-8470-4802-ad37-21caf6cb2681} + +diff --git a/src/test/tools/cmpmap/cmpmap.vcxproj b/src/test/tools/cmpmap/cmpmap.vcxproj +index 5a502106c..fc0b07bb0 100644 +--- a/src/test/tools/cmpmap/cmpmap.vcxproj ++++ b/src/test/tools/cmpmap/cmpmap.vcxproj +@@ -17,9 +17,6 @@ + + {9e9e3d25-2139-4a5d-9200-18148ddead45} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + + +diff --git a/src/test/tools/ddmap/ddmap.vcxproj b/src/test/tools/ddmap/ddmap.vcxproj +index 0824e2bb2..d80e82da3 100644 +--- a/src/test/tools/ddmap/ddmap.vcxproj ++++ b/src/test/tools/ddmap/ddmap.vcxproj +@@ -17,9 +17,6 @@ + + {9e9e3d25-2139-4a5d-9200-18148ddead45} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + + +diff --git a/src/test/tools/gran_detecto/gran_detecto.vcxproj b/src/test/tools/gran_detecto/gran_detecto.vcxproj +index abbe5bfb9..316a39c20 100644 +--- a/src/test/tools/gran_detecto/gran_detecto.vcxproj ++++ b/src/test/tools/gran_detecto/gran_detecto.vcxproj +@@ -90,9 +90,6 @@ + + {f596c36c-5c96-4f08-b420-8908af500954} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + + +diff --git a/src/test/tools/pmemalloc/pmemalloc.vcxproj b/src/test/tools/pmemalloc/pmemalloc.vcxproj +index d84b87416..c1f910710 100644 +--- a/src/test/tools/pmemalloc/pmemalloc.vcxproj ++++ b/src/test/tools/pmemalloc/pmemalloc.vcxproj +@@ -26,9 +26,6 @@ + + {9e9e3d25-2139-4a5d-9200-18148ddead45} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + + +diff --git a/src/test/tools/pmemdetect/pmemdetect.vcxproj b/src/test/tools/pmemdetect/pmemdetect.vcxproj +index 1c4cfd70c..10f472eb4 100644 +--- a/src/test/tools/pmemdetect/pmemdetect.vcxproj ++++ b/src/test/tools/pmemdetect/pmemdetect.vcxproj +@@ -93,9 +93,6 @@ + + {9e9e3d25-2139-4a5d-9200-18148ddead45} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + {ce3f2dfb-8470-4802-ad37-21caf6cb2681} + +diff --git a/src/test/tools/pmemobjcli/pmemobjcli.vcxproj b/src/test/tools/pmemobjcli/pmemobjcli.vcxproj +index 092ad91f7..0c13bb915 100644 +--- a/src/test/tools/pmemobjcli/pmemobjcli.vcxproj ++++ b/src/test/tools/pmemobjcli/pmemobjcli.vcxproj +@@ -20,9 +20,6 @@ + + {9e9e3d25-2139-4a5d-9200-18148ddead45} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + + +diff --git a/src/test/tools/pmemspoil/pmemspoil.vcxproj b/src/test/tools/pmemspoil/pmemspoil.vcxproj +index 0d7718e01..5eba7d1f7 100644 +--- a/src/test/tools/pmemspoil/pmemspoil.vcxproj ++++ b/src/test/tools/pmemspoil/pmemspoil.vcxproj +@@ -32,9 +32,6 @@ + + {9e9e3d25-2139-4a5d-9200-18148ddead45} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + + +diff --git a/src/test/tools/pmemwrite/pmemwrite.vcxproj b/src/test/tools/pmemwrite/pmemwrite.vcxproj +index f4e4a229f..efc80865f 100644 +--- a/src/test/tools/pmemwrite/pmemwrite.vcxproj ++++ b/src/test/tools/pmemwrite/pmemwrite.vcxproj +@@ -26,9 +26,6 @@ + + {9e9e3d25-2139-4a5d-9200-18148ddead45} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + + +diff --git a/src/test/tools/sparsefile/sparsefile.vcxproj b/src/test/tools/sparsefile/sparsefile.vcxproj +index 76710038b..481bb9332 100644 +--- a/src/test/tools/sparsefile/sparsefile.vcxproj ++++ b/src/test/tools/sparsefile/sparsefile.vcxproj +@@ -21,9 +21,6 @@ + + {492baa3d-0d5d-478e-9765-500463ae69aa} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + + {3EC30D6A-BDA4-4971-879A-8814204EAE31} +diff --git a/src/tools/pmempool/pmempool.vcxproj b/src/tools/pmempool/pmempool.vcxproj +index 120fe35b6..65709ed92 100644 +--- a/src/tools/pmempool/pmempool.vcxproj ++++ b/src/tools/pmempool/pmempool.vcxproj +@@ -77,9 +77,6 @@ + + {9e9e3d25-2139-4a5d-9200-18148ddead45} + +- +- {9186eac4-2f34-4f17-b940-6585d7869bcd} +- + + + diff --git a/ports/pmdk/vcpkg.json b/ports/pmdk/vcpkg.json index ae45ff2d1fea12..38e47d48dc9a46 100644 --- a/ports/pmdk/vcpkg.json +++ b/ports/pmdk/vcpkg.json @@ -1,8 +1,17 @@ { "name": "pmdk", "version": "1.12.0", + "port-version": 2, "description": "Persistent Memory Development Kit", "homepage": "https://github.com/pmem/pmdk", "license": "BSD-3-Clause", - "supports": "!(arm | x86)" + "supports": "!(linux | arm | x86)", + "dependencies": [ + "getopt", + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/podofo/install-cmake-config.patch b/ports/podofo/install-cmake-config.patch deleted file mode 100644 index 90881aa7264613..00000000000000 --- a/ports/podofo/install-cmake-config.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 597847b..da988ce 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -258,11 +258,6 @@ endif() - # To use these dependencies set PODOFO_DIR to the podofo BUILD directory in - # your build (eg -DPODOFO_DIR=/path/to/podofo when running cmake to configure - # the app that'll use podofo). See: find_package(...) in the cmake docs. --if(PODOFO_BUILD_SHARED) -- export(TARGETS podofo_shared FILE "${PROJECT_BINARY_DIR}/podofoConfig.cmake") --else() -- export(TARGETS podofo_static podofo_private FILE "${PROJECT_BINARY_DIR}/podofoConfig.cmake") --endif() - - # Enable packaging - set(CPACK_PACKAGE_DESCRIPTION "A C++ PDF manipulation library") -diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt -index 3a148fb..4ca1420 100644 ---- a/src/podofo/CMakeLists.txt -+++ b/src/podofo/CMakeLists.txt -@@ -77,11 +77,15 @@ if(PODOFO_BUILD_STATIC) - CLEAN_DIRECT_OUTPUT 1 - OUTPUT_NAME "podofo" - ) -- install(TARGETS podofo_static -+ install(TARGETS podofo_static podofo_private -+ EXPORT podofo-config - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -+ install(EXPORT podofo-config -+ DESTINATION share/podofo -+ ) - set(PODOFO_LIBRARIES podofo_static podofo_private - CACHE INTERNAL "Which podofo library variant to depend on") - endif() -@@ -102,10 +106,14 @@ if(PODOFO_BUILD_SHARED) - # Since we're building a shared podofo, prefer to depend on this one for - # tests and tools over the static library (if built). - install(TARGETS podofo_shared -+ EXPORT podofo-config - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -+ install(EXPORT podofo-config -+ DESTINATION share/podofo -+ ) - - # Create a pkg-config file for linking against shared library - # if pkg-config is available on the system. diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index ac7151ef69f367..0946b18fdd8ae9 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -3,9 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO podofo/podofo REF "${VERSION}" - SHA512 674024af031392253bc9ea02e392fa7b4a5c8894f3129e05f27133774ccf8b696e225789e886dedbe90bc2323c318b76e79857453a56d6014d7a5514e3f861a2 - PATCHES - install-cmake-config.patch + SHA512 cbbd183cd940345f9b077b7da140414c27badc70fdf754e2f3c6f0e51c25072de46d7fe312b014c0eab359bd03e9dca0283260db00f079c5014e268d5c5ef5c9 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json index 3a9cb740166092..23a158cc9f27cd 100644 --- a/ports/podofo/vcpkg.json +++ b/ports/podofo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "podofo", - "version": "0.10.0", - "port-version": 2, + "version": "0.10.1", "description": "PoDoFo is a library to work with the PDF file format", "homepage": "https://github.com/podofo/podofo", "license": "LGPL-2.0-or-later", diff --git a/ports/polyhook2/portfile.cmake b/ports/polyhook2/portfile.cmake index 4a009292890f84..852673df4b779d 100644 --- a/ports/polyhook2/portfile.cmake +++ b/ports/polyhook2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevemk14ebr/PolyHook_2_0 - REF 1ff1d0285fc28bfd206aa0a38ae93022a5ad9be1 - SHA512 056b5ce76683e130e053e1f62ccc3fbd060670ac74e0235f100d16bba36707bad5e84d2100fd2cc3a67a7c294eeaf5fb72a213f3d3af099013fe13c92575cc8b + REF 71553ebf0d197e73c49365cc3ab2a6aa326b3c37 + SHA512 f8daaa0307f07990b10a6487e1b0f2719e7442fcaeff5878eae9c22a741f27b1dfa7a292b91dcf7e2039029dd7dce71083ab2288e9d84de1bc20be7567a858c8 HEAD_REF master PATCHES fix-dep.patch ) diff --git a/ports/polyhook2/vcpkg.json b/ports/polyhook2/vcpkg.json index 17898381b95d55..3c0e272d780a43 100644 --- a/ports/polyhook2/vcpkg.json +++ b/ports/polyhook2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "polyhook2", - "version-date": "2023-05-16", - "port-version": 1, + "version-date": "2023-08-11", "description": "C++17, x86/x64 Hooking Library v2.0", "homepage": "https://github.com/stevemk14ebr/PolyHook_2_0", "license": "MIT", @@ -14,7 +13,8 @@ { "name": "vcpkg-cmake-config", "host": true - } + }, + "zydis" ], "default-features": [ "detours", @@ -28,8 +28,7 @@ "description": "Implement detour functionality", "dependencies": [ "asmjit", - "asmtk", - "zydis" + "asmtk" ] }, "exception": { diff --git a/ports/proj/fix-uwp.patch b/ports/proj/fix-uwp.patch new file mode 100644 index 00000000000000..a55cde15e93599 --- /dev/null +++ b/ports/proj/fix-uwp.patch @@ -0,0 +1,17 @@ +diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt +index cdd85bd3..5c63cab7 100644 +--- a/src/apps/CMakeLists.txt ++++ b/src/apps/CMakeLists.txt +@@ -37,10 +37,12 @@ if(NOT MSVC) + + else() + ++ if(NOT WINDOWS_STORE) + # Linking to setargv.obj enables wildcard globbing for the + # command line utilities, when compiling with MSVC + # https://docs.microsoft.com/cpp/c-language/expanding-wildcard-arguments + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} setargv.obj") ++ endif() + + endif() + diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake index df93a2b15994af..d94c051e009304 100644 --- a/ports/proj/portfile.cmake +++ b/ports/proj/portfile.cmake @@ -2,13 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ REF "${VERSION}" - SHA512 ac6cf14c7a4bf0435b0b6c373b665762f46ea7609fdbffc512efc308441bf0ac7bf4dee2bcf3b60e98a604b2e3f1e7a67fdac9f455c1ad37ad3f705185a2b620 + SHA512 ee8170780c70e09efa4bc3fcf6ee9a2c15554a05a8562617fc5e9698fb33c6c0af380dd0de836db91955eb35623ded1fec67c6afe5fd3b692fcf4f4b3e4f0658 HEAD_REF master PATCHES fix-win-output-name.patch fix-proj4-targets-cmake.patch - remove-doc.patch remove_toolset_restriction.patch + fix-uwp.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -55,8 +55,12 @@ if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) endif () -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/doc" + "${CURRENT_PACKAGES_DIR}/share/man" +) vcpkg_copy_pdbs() diff --git a/ports/proj/remove-doc.patch b/ports/proj/remove-doc.patch deleted file mode 100644 index 3812e9617b6d49..00000000000000 --- a/ports/proj/remove-doc.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4c9744e6..a6d5e4eb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -318,15 +335,12 @@ include_directories(${PROJ_SOURCE_DIR}/src) - add_subdirectory(data) - add_subdirectory(include) - add_subdirectory(src) --add_subdirectory(man) - add_subdirectory(cmake) - if(BUILD_TESTING) - add_subdirectory(test) - endif() - --set(docfiles COPYING NEWS AUTHORS) --install(FILES ${docfiles} -- DESTINATION ${CMAKE_INSTALL_DOCDIR}) -+ - - ################################################################################ - # pkg-config support -@@ -378,6 +392,7 @@ set(CPACK_SOURCE_IGNORE_FILES - - include(CPack) - -+if(0) - # Simplify README.md to README - add_custom_target(README - COMMAND ${CMAKE_COMMAND} -@@ -393,6 +408,7 @@ if(NOT _is_multi_config_generator) - ) - message(STATUS "PROJ: Configured 'dist' target") - endif() -+endif() - - configure_file(cmake/uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/proj_uninstall.cmake @ONLY) - add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/proj_uninstall.cmake) diff --git a/ports/proj/remove_toolset_restriction.patch b/ports/proj/remove_toolset_restriction.patch index 006d3707ba2869..7da27379565f34 100644 --- a/ports/proj/remove_toolset_restriction.patch +++ b/ports/proj/remove_toolset_restriction.patch @@ -2,7 +2,7 @@ diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-versio index d9807b2c5..7ffe39364 100644 --- a/cmake/project-config-version.cmake.in +++ b/cmake/project-config-version.cmake.in -@@ -35,14 +35,6 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR +@@ -28,14 +28,6 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR # since a multi-architecture library is built for that platform). set (REASON "sizeof(*void) = @CMAKE_SIZEOF_VOID_P@") set (PACKAGE_VERSION_UNSUITABLE TRUE) @@ -14,6 +14,6 @@ index d9807b2c5..7ffe39364 100644 - # Reject if there's a mismatch in MSVC compiler versions - set (REASON "MSVC_TOOLSET_VERSION = @MSVC_TOOLSET_VERSION@") - set (PACKAGE_VERSION_UNSUITABLE TRUE) - elseif (NOT CMAKE_CROSSCOMPILING_STR STREQUAL "@CMAKE_CROSSCOMPILING_STR@") - # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING} - set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@") + elseif (PACKAGE_FIND_VERSION) + if (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) + set (PACKAGE_VERSION_EXACT TRUE) diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json index a3f300601e3f40..d9d52ec9e92a34 100644 --- a/ports/proj/vcpkg.json +++ b/ports/proj/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proj", - "version": "9.2.1", + "version": "9.3.0", "port-version": 1, "description": "PROJ library for cartographic projections", "homepage": "https://proj.org/", diff --git a/ports/protobuf-c/portfile.cmake b/ports/protobuf-c/portfile.cmake index 7ff3a5897e55c3..69f6102e1a1cac 100644 --- a/ports/protobuf-c/portfile.cmake +++ b/ports/protobuf-c/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protobuf-c/protobuf-c REF v${VERSION} - SHA512 cba4c6116c0f2ebb034236e8455d493bfaa2517733befcd87b6f8d6d3df0c0149b17fcbf59cd1763fa2318119c664d0dae3d2d3a46ebfe2a0fec3ef4719b033b + SHA512 57f858118a89befc80e111ad9a57eadbcf2317d60e085b6d99e10f6604ee8c08473fe6ab1fdfb0a3196821a6e68e743943338321d23d15a1229987f140341181 HEAD_REF master PATCHES fix-crt-linkage.patch diff --git a/ports/protobuf-c/vcpkg.json b/ports/protobuf-c/vcpkg.json index 85d59d7cc24143..315c33c3368533 100644 --- a/ports/protobuf-c/vcpkg.json +++ b/ports/protobuf-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "protobuf-c", - "version-semver": "1.4.0", - "port-version": 2, + "version-semver": "1.4.1", "description": "This is protobuf-c, a C implementation of the Google Protocol Buffers data serialization format.", "homepage": "https://github.com/protobuf-c/protobuf-c", "dependencies": [ diff --git a/ports/proxygen/fix-dependency.patch b/ports/proxygen/fix-dependency.patch index 734368b0dbdbd8..382cd95554c730 100644 --- a/ports/proxygen/fix-dependency.patch +++ b/ports/proxygen/fix-dependency.patch @@ -1,27 +1,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6bf0f17..343ec2b 100644 +index 112b36b..30e466a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -66,13 +66,13 @@ endif() - # - # IMPORTANT: If you change this, make the analogous update in: - # cmake/proxygen-config.cmake.in --find_package(fmt REQUIRED) --find_package(folly REQUIRED) --find_package(wangle REQUIRED) +@@ -69,7 +69,10 @@ endif() + find_package(fmt REQUIRED) + find_package(folly REQUIRED) + find_package(wangle REQUIRED) +-find_package(mvfst REQUIRED) +find_package(fmt CONFIG REQUIRED) +find_package(folly CONFIG REQUIRED) +find_package(wangle CONFIG REQUIRED) - if (BUILD_QUIC) -- find_package(mvfst REQUIRED) -+ find_package(mvfst CONFIG REQUIRED) - else() -- find_package(Fizz REQUIRED) -+ find_package(fizz CONFIG REQUIRED) - endif() ++find_package(mvfst CONFIG REQUIRED) find_package(zstd CONFIG REQUIRED) find_package(ZLIB REQUIRED) -@@ -128,27 +128,8 @@ SET(GFLAG_DEPENDENCIES "") + find_package(OpenSSL REQUIRED) +@@ -124,27 +127,8 @@ SET(GFLAG_DEPENDENCIES "") SET(PROXYGEN_EXTRA_LINK_LIBRARIES "") SET(PROXYGEN_EXTRA_INCLUDE_DIRECTORIES "") @@ -52,24 +45,22 @@ index 6bf0f17..343ec2b 100644 include(ProxygenTest) diff --git a/cmake/proxygen-config.cmake.in b/cmake/proxygen-config.cmake.in -index 8c1426d..f8b89a4 100644 +index c79875d..0e002b9 100644 --- a/cmake/proxygen-config.cmake.in +++ b/cmake/proxygen-config.cmake.in -@@ -17,19 +17,20 @@ +@@ -17,17 +17,18 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(fmt) -find_dependency(folly) -find_dependency(wangle) +-find_dependency(mvfst) +-find_dependency(Fizz) +find_dependency(fmt CONFIG) +find_dependency(folly CONFIG) +find_dependency(wangle CONFIG) - if ("@BUILD_QUIC@") -- find_dependency(mvfst) -+ find_dependency(mvfst CONFIG) - endif() --find_dependency(Fizz) ++find_dependency(mvfst CONFIG) +find_dependency(fizz CONFIG) +find_dependency(gflags CONFIG) # For now, anything that depends on Proxygen has to copy its FindZstd.cmake diff --git a/ports/proxygen/fix-zstd-zlib-dependency.patch b/ports/proxygen/fix-zstd-zlib-dependency.patch index a56485e87c877a..e117f1e89895d8 100644 --- a/ports/proxygen/fix-zstd-zlib-dependency.patch +++ b/ports/proxygen/fix-zstd-zlib-dependency.patch @@ -1,21 +1,21 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea22eab..6bf0f17 100644 +index 9bf6ec1..112b36b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -74,7 +74,7 @@ if (BUILD_QUIC) - else() - find_package(Fizz REQUIRED) - endif() +@@ -70,7 +70,7 @@ find_package(fmt REQUIRED) + find_package(folly REQUIRED) + find_package(wangle REQUIRED) + find_package(mvfst REQUIRED) -find_package(Zstd REQUIRED) +find_package(zstd CONFIG REQUIRED) find_package(ZLIB REQUIRED) find_package(OpenSSL REQUIRED) find_package(Threads) diff --git a/proxygen/lib/CMakeLists.txt b/proxygen/lib/CMakeLists.txt -index b3fa2d1..5c50ee1 100644 +index ac5005f..fa403ab 100644 --- a/proxygen/lib/CMakeLists.txt +++ b/proxygen/lib/CMakeLists.txt -@@ -235,10 +235,10 @@ target_link_libraries( +@@ -236,10 +236,10 @@ target_link_libraries( Folly::folly fizz::fizz wangle::wangle diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index 2793234344ac7e..148d75cf595f89 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen REF "v${VERSION}" - SHA512 e4f9af0092e810455f029bbd0b6abc152ac90742f88f75f49722bbb99427fb752429852f97d7c15c158d3ef007981bf37a0f61fa7855f1662c19af95bd39307c + SHA512 83b294895878c556b855688a78da524d7034a6dc4f1ed9c2b0e73a1bad55df2c4aae94921eb45e173ac0b53ed3ee885194caf37f0dff442f5a343701e4c0ccd8 HEAD_REF master PATCHES remove-register.patch @@ -29,4 +29,8 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index de1a86dd50ccae..c74d79ae8c8c8a 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2023.07.03.00", + "version-string": "2023.10.02.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "license": "BSD-3-Clause", @@ -21,6 +21,7 @@ "name": "gperf", "host": true }, + "mvfst", "openssl", { "name": "vcpkg-cmake", diff --git a/ports/ptc-print/portfile.cmake b/ports/ptc-print/portfile.cmake index 4d28d6809ab01e..1638033c7e3ae0 100644 --- a/ports/ptc-print/portfile.cmake +++ b/ports/ptc-print/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustWhit3/ptc-print - REF v1.4.0 - SHA512 17218b096bc616a448d5c257b29f3e6c5a263cb56ff0361fb4be19206daf687c012cad9c6fb551aec1d16024eb563962cd15fccff0b7c3ab71cce23dc0846a95 + REF v1.4.1 + SHA512 45f3008cb848f464ac0355660e7cdbd40db60338a4db5e35d29285c8c1afc0556c8dea6ac0e6939837916ec138dd8e385709d1fa89651d3404418cf3e7948fd9 HEAD_REF master ) diff --git a/ports/ptc-print/vcpkg.json b/ports/ptc-print/vcpkg.json index f13a3fbebd44f7..e90efa4e3cfae4 100644 --- a/ports/ptc-print/vcpkg.json +++ b/ports/ptc-print/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ptc-print", - "version": "1.4.0", + "version": "1.4.1", "port-version": 1, "description": "A single-header library for custom printing to the output stream.", "homepage": "https://github.com/JustWhit3/ptc-print", diff --git a/ports/pulzed-mini/portfile.cmake b/ports/pulzed-mini/portfile.cmake new file mode 100644 index 00000000000000..406f0e1b90f846 --- /dev/null +++ b/ports/pulzed-mini/portfile.cmake @@ -0,0 +1,12 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pulzed/mINI + REF ${VERSION} + SHA512 af29b0e59a2bed460a3a4e071932e0c01c017a57643c9414d360e17aa643bce476dc2941760a0cd904ec24483e67ee7f0df6029dc79254052c6c3c1d0941d4d0 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/src/mini/ini.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/mini") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/pulzed-mini/vcpkg.json b/ports/pulzed-mini/vcpkg.json new file mode 100644 index 00000000000000..da79a07712606a --- /dev/null +++ b/ports/pulzed-mini/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pulzed-mini", + "version": "0.9.14", + "description": "INI file reader and writer", + "homepage": "https://github.com/pulzed/mINI", + "license": "MIT" +} diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 558a9b15ddba0a..2c18dbb7e6fc82 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 REF "v${VERSION}" - SHA512 7970defbb6d057a44468ed707c80bfa6ef8c9578528fbc084b03aeea20a52dbd681581f82d55ff90af11ee89693379bd79e2ab6603239ba05b0aa8da29dd93c7 + SHA512 ed1512ff0bca3bc0a45edc2eb8c77f8286ab9389f6ff1d5cb309be24bc608abbe0df6a7f5cb18c8f80a3bfa509058547c13551c3cd6a759af708fd0cdcdd9e95 HEAD_REF master PATCHES fix-debug-link.patch diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json index d4694e2f9b6256..b9fea48f8b523f 100644 --- a/ports/pybind11/vcpkg.json +++ b/ports/pybind11/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pybind11", - "version": "2.10.4", - "port-version": 1, + "version": "2.11.1", "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", "homepage": "https://github.com/pybind/pybind11", "license": "BSD-3-Clause", diff --git a/ports/python2/portfile.cmake b/ports/python2/portfile.cmake index 3280a319e0f2b1..a822803078c763 100644 --- a/ports/python2/portfile.cmake +++ b/ports/python2/portfile.cmake @@ -15,29 +15,29 @@ set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTH set(_PYTHON_PATCHES "") if (VCPKG_TARGET_IS_WINDOWS) list(APPEND _PYTHON_PATCHES - ${CMAKE_CURRENT_LIST_DIR}/001-build-msvc.patch - ${CMAKE_CURRENT_LIST_DIR}/002-build-msvc.patch - ${CMAKE_CURRENT_LIST_DIR}/003-build-msvc.patch + "${CMAKE_CURRENT_LIST_DIR}/001-build-msvc.patch" + "${CMAKE_CURRENT_LIST_DIR}/002-build-msvc.patch" + "${CMAKE_CURRENT_LIST_DIR}/003-build-msvc.patch" ) endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL static) list(APPEND _PYTHON_PATCHES - ${CMAKE_CURRENT_LIST_DIR}/004-static-library-msvc.patch - ${CMAKE_CURRENT_LIST_DIR}/006-static-fix-headers.patch + "${CMAKE_CURRENT_LIST_DIR}/004-static-library-msvc.patch" + "${CMAKE_CURRENT_LIST_DIR}/006-static-fix-headers.patch" ) endif() if (VCPKG_CRT_LINKAGE STREQUAL static) - list(APPEND _PYTHON_PATCHES ${CMAKE_CURRENT_LIST_DIR}/005-static-crt-msvc.patch) + list(APPEND _PYTHON_PATCHES "${CMAKE_CURRENT_LIST_DIR}/005-static-crt-msvc.patch") endif() if (VCPKG_TARGET_IS_WINDOWS) list(APPEND _PYTHON_PATCHES - ${CMAKE_CURRENT_LIST_DIR}/007-fix-build-path.patch + "${CMAKE_CURRENT_LIST_DIR}/007-fix-build-path.patch" ) else() list(APPEND _PYTHON_PATCHES - ${CMAKE_CURRENT_LIST_DIR}/008-bz2d.patch + "${CMAKE_CURRENT_LIST_DIR}/008-bz2d.patch" ) endif() @@ -50,7 +50,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES ${_PYTHON_PATCHES} ) @@ -67,27 +67,32 @@ if (VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() - vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/PCBuild/pythoncore.vcxproj + vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "PCBuild/pythoncore.vcxproj" PLATFORM ${BUILD_ARCH} ) vcpkg_copy_pdbs() - file(GLOB HEADERS ${SOURCE_PATH}/Include/*.h) - file(COPY ${HEADERS} ${SOURCE_PATH}/PC/pyconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) + file(GLOB HEADERS "${SOURCE_PATH}/Include/*.h") + file(COPY ${HEADERS} "${SOURCE_PATH}/PC/pyconfig.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") - file(COPY ${SOURCE_PATH}/Lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}) + file(COPY "${SOURCE_PATH}/Lib" DESTINATION "${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}") - file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() endif() else() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_install_make() @@ -147,6 +152,4 @@ if (NOT VCPKG_TARGET_IS_WINDOWS) endforeach() endif() -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/python2/vcpkg.json b/ports/python2/vcpkg.json index 28d9853f12b183..efd3c6db82d3e7 100644 --- a/ports/python2/vcpkg.json +++ b/ports/python2/vcpkg.json @@ -1,9 +1,16 @@ { "name": "python2", "version": "2.7.18", - "port-version": 6, + "port-version": 7, "description": "The Python programming language as an embeddable library", "homepage": "https://www.python.org", "license": "Python-2.0", - "supports": "!(arm & osx) & !(arm & windows) & !uwp" + "supports": "!(arm & osx) & !(arm & windows) & !uwp", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/python3/0017-fix-win.patch b/ports/python3/0017-fix-win.patch new file mode 100644 index 00000000000000..9d3fb3efb44f9f --- /dev/null +++ b/ports/python3/0017-fix-win.patch @@ -0,0 +1,34 @@ +diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj +index 7d3423251f..7f607742fe 100644 +--- a/PCbuild/_freeze_module.vcxproj ++++ b/PCbuild/_freeze_module.vcxproj +@@ -366,7 +366,7 @@ + + + +- ++ + + + + +- ++ + + + +- $(PreferredToolArchitecture) ++ $(Platform) + $(Configuration) + Release + diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index fcf3034a5cfc13..cb7472d42a64e0 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -47,6 +47,8 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() if(VCPKG_CROSSCOMPILING) list(APPEND PATCHES "0016-fix-win-cross.patch") + else() + list(APPEND PATCHES "0017-fix-win.patch") endif() endif() @@ -54,7 +56,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 de64f0d09bf2c08873bb3d99bb95c0b675895ed05f8ac5f7bc071322c051ad537c61ea9df9b65bb67d74c4e5b3ab8a75f83da101b22046ee41ba4f77cf0bc549 + SHA512 63c1cc817844584c9ea880be0277ebcc18182c5050f59ebbb8dd42c971979bb2cee0f09af6a1e62a6c8c23143dfa6ff21fc1aba25ef50a425fdea46ff3e35896 HEAD_REF master PATCHES ${PATCHES} ) @@ -90,8 +92,8 @@ if(VCPKG_TARGET_IS_WINDOWS) find_library(CRYPTO_DEBUG NAMES libcrypto PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(EXPAT_RELEASE NAMES libexpat libexpatMD libexpatMT PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(EXPAT_DEBUG NAMES libexpatd libexpatdMD libexpatdMT PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) - find_library(FFI_RELEASE NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) - find_library(FFI_DEBUG NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(FFI_RELEASE NAMES ffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(FFI_DEBUG NAMES ffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(LZMA_RELEASE NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(LZMA_DEBUG NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 960553723ad618..3d0df6b2310b66 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "python3", - "version": "3.11.4", - "port-version": 2, + "version": "3.11.5", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index f4f64c562c193c..d3f9901ec70039 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json index 52502d6d8bb8fd..cf1ad089464903 100644 --- a/ports/qt3d/vcpkg.json +++ b/ports/qt3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt3d", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index 95815d67196785..842418a20191a7 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -1,53 +1,10 @@ -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake") set(OPTIONS -system-assimp) -if(VCPKG_TARGET_IS_WINDOWS) - set(VCVER vc140 vc141 vc142 vc143 ) - set(CRT mt md) - set(DBG_NAMES) - set(REL_NAMES) - foreach(_ver IN LISTS VCVER) - foreach(_crt IN LISTS CRT) - list(APPEND DBG_NAMES assimp-${_ver}-${_crt}d) - list(APPEND REL_NAMES assimp-${_ver}-${_crt}) - endforeach() - endforeach() -endif() +x_vcpkg_pkgconfig_get_modules(PREFIX assimp MODULES assimp LIBS) -find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ASSIMP_DBG NAMES assimp assimpd ${DBG_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) - -find_library(MINIZIP_REL NAMES minizip PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(MINIZIP_DBG NAMES minizip minizipd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(KUBAZIP_REL NAMES kubazip PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(KUBAZIP_DBG NAMES kubazip kubazipd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(JPEG_REL NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(JPEG_DBG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(LIBPNG_REL NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #Depends on zlib -find_library(LIBPNG_DBG NAMES png16 png16d libpng16 libpng16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(ZLIB_REL NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ZLIB_DBG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(PUGIXML_REL NAMES pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(PUGIXML_DBG NAMES pugixml pugixmld PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(POLY2TRI_REL NAMES poly2tri PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(POLY2TRI_DBG NAMES poly2tri poly2trid PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(BZ2_REL bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(BZ2_DBG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -if(BZ2_REL) - string(APPEND MINIZIP_REL " ${BZ2_REL}") -endif() -if(BZ2_DBG) - string(APPEND MINIZIP_DBG " ${BZ2_DBG}") -endif() -if(VCPKG_TARGET_IS_WINDOWS) - set(SYSTEM_LIBS "Advapi32.lib user32.lib gdi32.lib") -elseif(VCPKG_TARGET_IS_OSX) - set(SYSTEM_LIBS "-framework OpenGL -framework Cocoa -framework Carbon -framework IOKit -framework AppKit") -else() - set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11") -endif() -set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${PUGIXML_REL} ${POLY2TRI_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}") -set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${PUGIXML_DBG} ${POLY2TRI_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}") +set(OPT_REL "ASSIMP_LIBS=${assimp_LIBS_RELEASE}") +set(OPT_DBG "ASSIMP_LIBS=${assimp_LIBS_DEBUG}") qt_submodule_installation(BUILD_OPTIONS ${OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index 782d5d1c914761..e43904ccdcff2f 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-3d", "version": "5.15.10", + "port-version": 1, "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", "license": null, "dependencies": [ @@ -11,6 +12,10 @@ }, "qt5-declarative", "qt5-gamepad", - "qt5-imageformats" + "qt5-imageformats", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } ] } diff --git a/ports/qt5-base/patches/CVE-2023-43114-5.15.patch b/ports/qt5-base/patches/CVE-2023-43114-5.15.patch new file mode 100644 index 00000000000000..da59ce5433edda --- /dev/null +++ b/ports/qt5-base/patches/CVE-2023-43114-5.15.patch @@ -0,0 +1,120 @@ +diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp +index ba683cf686..217a968c64 100644 +--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp ++++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp +@@ -1471,36 +1471,70 @@ QT_WARNING_POP + return fontEngine; + } + +-static QList getTrueTypeFontOffsets(const uchar *fontData) ++static QList getTrueTypeFontOffsets(const uchar *fontData, const uchar *fileEndSentinel) + { + QList offsets; +- const quint32 headerTag = *reinterpret_cast(fontData); ++ if (fileEndSentinel - fontData < 12) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ return offsets; ++ } ++ ++ const quint32 headerTag = qFromUnaligned(fontData); + if (headerTag != MAKE_TAG('t', 't', 'c', 'f')) { + if (headerTag != MAKE_TAG(0, 1, 0, 0) + && headerTag != MAKE_TAG('O', 'T', 'T', 'O') + && headerTag != MAKE_TAG('t', 'r', 'u', 'e') +- && headerTag != MAKE_TAG('t', 'y', 'p', '1')) ++ && headerTag != MAKE_TAG('t', 'y', 'p', '1')) { + return offsets; ++ } + offsets << 0; + return offsets; + } ++ ++ const quint32 maximumNumFonts = 0xffff; + const quint32 numFonts = qFromBigEndian(fontData + 8); +- for (uint i = 0; i < numFonts; ++i) { +- offsets << qFromBigEndian(fontData + 12 + i * 4); ++ if (numFonts > maximumNumFonts) { ++ qCWarning(lcQpaFonts) << "Font collection of" << numFonts << "fonts is too large. Aborting."; ++ return offsets; + } ++ ++ if (quintptr(fileEndSentinel - fontData) > 12 + (numFonts - 1) * 4) { ++ for (quint32 i = 0; i < numFonts; ++i) ++ offsets << qFromBigEndian(fontData + 12 + i * 4); ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ } ++ + return offsets; + } + +-static void getFontTable(const uchar *fileBegin, const uchar *data, quint32 tag, const uchar **table, quint32 *length) ++static void getFontTable(const uchar *fileBegin, const uchar *fileEndSentinel, const uchar *data, quint32 tag, const uchar **table, quint32 *length) + { +- const quint16 numTables = qFromBigEndian(data + 4); +- for (uint i = 0; i < numTables; ++i) { +- const quint32 offset = 12 + 16 * i; +- if (*reinterpret_cast(data + offset) == tag) { +- *table = fileBegin + qFromBigEndian(data + offset + 8); +- *length = qFromBigEndian(data + offset + 12); +- return; ++ if (fileEndSentinel - data >= 6) { ++ const quint16 numTables = qFromBigEndian(data + 4); ++ if (fileEndSentinel - data >= 28 + 16 * (numTables - 1)) { ++ for (quint32 i = 0; i < numTables; ++i) { ++ const quint32 offset = 12 + 16 * i; ++ if (qFromUnaligned(data + offset) == tag) { ++ const quint32 tableOffset = qFromBigEndian(data + offset + 8); ++ if (quintptr(fileEndSentinel - fileBegin) <= tableOffset) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ break; ++ } ++ *table = fileBegin + tableOffset; ++ *length = qFromBigEndian(data + offset + 12); ++ if (quintptr(fileEndSentinel - *table) < *length) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ break; ++ } ++ return; ++ } ++ } ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; + } ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; + } + *table = 0; + *length = 0; +@@ -1513,8 +1547,9 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + QVector *values) + { + const uchar *data = reinterpret_cast(fontData.constData()); ++ const uchar *dataEndSentinel = data + fontData.size(); + +- QList offsets = getTrueTypeFontOffsets(data); ++ QList offsets = getTrueTypeFontOffsets(data, dataEndSentinel); + if (offsets.isEmpty()) + return; + +@@ -1522,7 +1557,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + const uchar *font = data + offsets.at(i); + const uchar *table; + quint32 length; +- getFontTable(data, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length); ++ getFontTable(data, dataEndSentinel, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length); + if (!table) + continue; + QFontNames names = qt_getCanonicalFontNames(table, length); +@@ -1532,7 +1567,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + families->append(std::move(names)); + + if (values || signatures) +- getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length); ++ getFontTable(data, dataEndSentinel, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length); + + if (values) { + QFontValues fontValues; +-- +2.27.0.windows.1 + diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 261b59f98d790f..e6c737bdfde61e 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -54,6 +54,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/CVE-2023-34410-qtbase-5.15.diff patches/CVE-2023-37369-qtbase-5.15.diff patches/CVE-2023-38197-qtbase-5.15.diff + patches/CVE-2023-43114-5.15.patch patches/winmain_pro.patch #Moves qtmain to manual-link patches/windows_prf.patch #fixes the qtmain dependency due to the above move diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index d17dbb435c74c5..9a9c8342e0ca9d 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version": "5.15.10", - "port-version": 5, + "port-version": 6, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 6bc66f0b44ad68..a821e2510fd659 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.5.2", + "version": "6.5.3", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index 85e6663385e149..dfb26cc80a0254 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.5.2", + "version": "6.5.3", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 85c50fd62b10fd..375e7c50f6c5b5 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake index 9cc95c652ac6a9..fb36579085d46e 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,47 +1,47 @@ -set(qtbase_HASH "8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20") -set(qttools_HASH "d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011") -set(qtdeclarative_HASH "e6fd9dddbab72ee2e323d8ae0f4ac438b935477ad50b3e069a307993e94b289648d29ee265ac535e1396e4c1ba4bdf7e16b0cdf89a17df8d0a43bbe94f7316ef") -set(qtsvg_HASH "34f572eceb27021d2b55d67ed2de84f9d41c0cb2463c5c8e9c9e270b52782d32f707b83fdc95c67f306bb82a3ea44a5d48921e6bc979197ce6bc94eaf89ccb20") -set(qt5compat_HASH "c646231f4bece460bfa6b654cba63a91c938c98b4fca8198e63a3fc15a2c7424ef43a765f612d6555b341a8b46f89293d4567257e489569e4669d9beaee6ed66") -set(qtshadertools_HASH "95a697de1e0b415b700edc86c452847f37478951c547fad42c8373c592a1f474b824df7c2d1ae3b26fb9401df3c523431633e0293f5e472732964cb527def6be") -set(qtquicktimeline_HASH "4447973fba264b4a412f7a29b5d32c6ad1c62a5dc72ced8a8f88d565655fec3bab3e5047d0f7323f5415f2c7e5782bf533a67a778f1daa55cda588ccabe0054c") -set(qtquick3d_HASH "2a26f4fa4e4d88b4205813a8bba1c83811354e5ad5e7aa832fd46c5956b46d15e690c359d83f85018c1430e15edd151207411a50227855de4fc8451db710ace2") -set(qttranslations_HASH "2930153207a6ba7bb6720171f2be1c845e84edef87abd5ec6a4464c4386fb58fbdd59740c210727eb6b058ceffcaaf0aaea99e968215b68b121eb35d6e4f05c2") -set(qtwayland_HASH "520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477") -set(qtdoc_HASH "d51b37ca277b1705b2ee108463de51ee096c9a2c4da50dbdbca018c86905c9876089e84b4fb259aef0dd8c97e80ba2f532d9a2c42a6ea85d10b9d02064cced5f") -set(qtcoap_HASH "2a393a62b1a3901cc4d10f4a1cb259849143faa0a379a2521cd2947faf42150b5e451e90faa9186985f3b7088b2ad8f436a84079c8cef77e15ab4abc4079d058") -set(qtopcua_HASH "f11f95aea8ca63d60407f197cf54afef847ff59d68184ca73482daa9e72fe3577625136f6e203dbf0ab80678279fdce9ec0add76ed9310ab930baa7f16a4154c") -set(qtimageformats_HASH "c7262b773642f216b5f6ca3496cce294f1acf7bbf55aa61db1b60ad24ec0c332b83aa9b43e8baa5ce33a54826364385b4de00426e5556fe821c3b5e770d53819") -set(qtmqtt_HASH "7c07b908b961733d8fcf94428c9acf0a197eaf0db6260c9f14c98ac8efe7e845c5aa0e3f42d82bc1905bd5e647e4b0c13ab3d9558709c86ea007976d5eb1dc8c") -set(qtnetworkauth_HASH "f9374c2729f584532e90114a3bf8939eb27e90e31a2c76c414e8e5fb23a1feac96b23ec31ebfc59122f7d8431ef2ab285a8e840ffba143752e586a0a527d3436") -set(qt3d_HASH "f7bcc09b5c6c01e58b68cb7af67cef5f0477ec3cdcd924fd365b7411b2e5d89c307f29d099289055fb1b04b8237cc87dc071734433fa4d0bbb21eec698ed731a") -set(qtactiveqt_HASH "9c722adc4bcd94b0f90502aeab32bc50c88ccf3a1b7e5010dcc1fa14d9ab294b3914a61a251ecc1ed2df51c25d53056e2c161a5edb9def446362d328339e0a87") -set(qtdatavis3d_HASH "c22f9da6f70486f1764ecbffbe574e188becaf4d05c84c87a7ae718598fec96a5a47b437c1a438b2f252999bff104d7ce90ee98adcb4fc0c0e9ffc53a164def6") -set(qtdeviceutilities_HASH "d1ce053a914bd473dd07e44f9245beb79911c770797c1dbede908f85101e43440bb4f0093b5665135d4a84117907351ed588f120eb5ea4b241bcb894dbe19485") -set(qtlottie_HASH "9037488faa1525e2d2f5823685c81d65100862f2011cdb2014447b0c039fcff7eafbae667c130b3fefc5c7b8e76594d29d9ded175cbf45b2411e67c8a1b945e6") -set(qtscxml_HASH "fafea704d5e592a31c11f0039336de587353a57d5a69b07d0346fd2906488810d0ed1fc9267a0bf06aeae7f93ae19e150c5734bc969c1e0c7bc4e6215744ac3a") -set(qtvirtualkeyboard_HASH "acb1f5de2f0d7f985f14d8f77a37698b7ecc7db15a9911148a5f3dafa26db68f2712f9d0f2c9babec9c20b672e350e0431faed2959d2b6eb43113304ab049470") -set(qtcharts_HASH "913362f21668a81b82eff5125991b0b53ff9eeaf93dc6bf17539d4cffdc60e639a4e3490edec793d02ff942174ea3036854cdc8801382f4b8af341f8cbc3a1f1") -set(qtconnectivity_HASH "76d9569ecfbbb4355587779a9aa0abf20f7d08484a2634e6c3b49a71b057451c54fd5fd344b4c376206384e5f1e9264a6bbbcd85ee44f15637c116f411d4aa30") -set(qtpositioning_HASH "8319e999de227d6ee999a4e7f84e3a12e2a8b070375fd7b86cef7a7962cce1d4d45f17a846df779561e1cedde80a80240bd2a03259c8a2ed5ebda6e209bdd991") -set(qtlocation_HASH "b1e5c1813deb8a4eb9f8548afa935f1a2145ed3168f0276493ea501057fd4f70b8980ae387248a59e50f0e450ae245a04cd8636fb61d37af9c3634ff1cdd24f3") -set(qtmultimedia_HASH "e12a2406e78eda8f3f4674b8fe01b06bc2c7b8fcbe5342e25e28340e13c0ab0db44a78c91a8a1f268664e5bb11c3bc7116248700f0c67faa618e058af0dfb1e0") -set(qtremoteobjects_HASH "a57869f70c74dd40474d6041f3d2481581a66f744a6a3cd5ae72cafcb7f18518376b93d2f57b6435aa07e0b79a879e0208d6028dfc8eb2d0d9a65701a54b8085") -set(qtsensors_HASH "5014ba0bb2ebecd23b26c7eabe5aa1dde2a18f31e1448f2e86411593772cb1fda74520460d7be97c4f612ff6d25d1135fb551d2407660754611a83e8b35aaa7b") -set(qtserialbus_HASH "5d072e05e643a5fef84a9b984fcbbc6516e29bf8c7675a4be18aa76cf10a5e4137deb36ef51b19a3e934babdea61ed7f07c4c3644b009e669f48f9735fe95a92") -set(qtserialport_HASH "9c26fe572272c1dfc7ce795451f2e4a5976a55e13ac8c91ab2dd2f8d07f77f0a18de80dc7b77c31e7233dba962ea2f88495286263fe59ec7f5ac62802f96b2f7") -set(qtwebchannel_HASH "405595dfdfed48aafe42969881994472cb08dc4105a63ccf8c5ca059c0c243b654c38356059ea26cda9165a50b306c92d296dd3eca430b29615ec0ac68431c09") -set(qtwebengine_HASH "f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12") -set(qtwebsockets_HASH "0ede50ef09ec92cc9ff73ac8287d93c82eddaaefb8df05687f24fa1b9fcafe0e34cdef324ad81c89353ea9e21509243efce63bb42b640050309c61d100d354a7") -set(qtwebview_HASH "fd392bd0fce6534d09c79e43db5f16514ae243edd31e0c0ea3a9028a65af5b5c3e5b770ff91e6b924141c412b6e8ca2538767e8280d761f7d33428a5c06daf2a") -set(qtinterfaceframework_REF a2cccc11758439237c6ebd8b84d0382508eb297a) -set(qtapplicationmanager_HASH "4edddd49f59af44dc461d4087d947064b936ad31726d4e4d3a9cc4e2229008a12af971f0e7cab9e992e7a150ca51bc1d511bc7154412f9c49bdd233c88d2f341") -set(qtlanguageserver_HASH "aa285b846eb4ce2527b8fb396af5b3c8656913b2f0fd22ca605454285883752ef0444d50a12db1514d1668a3a6e1b145e7a75e41db7442d8c1e70cce7f06528a") -set(qthttpserver_HASH "e7ee050cc5ed806db5156cda4953efcab3ccd64adaf91da57dd8c77a40a807ee5858f9c81e532163a3b9ced17909a3de728d93834e7a77ed9b26a40f49734387") -set(qtquick3dphysics_HASH "955dfa4b3b7b0ed935f03ee7fa8bea35a74eacbefc1c2c803240b6b4e4005d2be3a2a3fd3b01007ca06201215ed62c11dc0660c4063242694c1810685d16e7c7") -set(qtspeech_HASH "bc6ca225f9eadc838e63bb3b011f604c1ae18eee76445c2c0d22152e473b9316b6903e349aee2555c5a110ef65fbd25ca9065b22ae4cef6e5290daa665c78434") -set(qtgrpc_HASH "2f99658b408d76bf6e17ed3d650e90a3e3fae3ac626de47ba5437e56b6ca6b9df4b3a223e830888ddcf2372e7124d0584934b54b44888ad67bf65e0660c1847e") -set(qtquickeffectmaker_HASH "3714dd32001e18867aa4df5908aa7223501fbf193409f3b4baff6ac0c055be79f009e78f1a2f55701165cee19c3a4efb7d6172f2453606e412579d0046b2554f") +set(qtbase_HASH "31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9") +set(qttools_HASH "7e383cdc575400d19051232dc563eaf330209605f28a93ac01f32921d0d966bc9a51bb5b56fb8f5c00ed4aab5fa2806b3bd0c8750aa2f49f5a04c85fa68fe30b") +set(qtdeclarative_HASH "d3fc2f01de9940cf8715cf525bc0c68555c5dc519b4a78952682c23bfc9c09249fb651c6e4dddac128b7e96f07e0371d3040b8f8c5480c8c3fccc4f3bfec2640") +set(qtsvg_HASH "d9391228f4bce041e7c36711cf3d787b373bb2e470b0d21c903d57ee5aeef672289caf8a7e4c57455db105a510d36536c611ceca4f64c823bf795d0638e6a0d4") +set(qt5compat_HASH "49146eb1591e89b1d62a3615d673a4a29db9d2540fac2b2d03eb29ad24ec77ba97f8209240e512252ff1d3083d21312d6142654993582e95a7e549c94e8bf45c") +set(qtshadertools_HASH "fab49d5c7609b9bf81b98562d21e29d05f001a27d446efddec569033eaa322ab336057076a5f2713ea1941f4e716694a471b5ae81be0913bc19668136d7a9b68") +set(qtquicktimeline_HASH "b177eecd5750dcc1ab29bfc4dd1aeb22a6b7e07dcb11683721abf18476da4ff740c9ea4c351aa5bf31e5c499b4c7da5be71b243cdd895a8f35df8178bb50bc93") +set(qtquick3d_HASH "85611eba47239c342159e704826cdcb7ec2cd79118aaad081d4924c5697b71eddf4307682e9dde23bf973641df2e90301e26f381aa29c023e386918e8d1f7f70") +set(qttranslations_HASH "d14d5c40fe93ba1ee29fe4150710a14122dafe91e5343d5461c7ed3157e3e220effd235cf894f75ec6c26a0e5ac81d75867faff4045456395d76221e70113004") +set(qtwayland_HASH "e516dd5158ed1aadc989b3f1bbaad87fa38b59872b44c7c92ec1c349e7e923a6b07b7fb3a3493312330eaf581b0d27aeaad2ec03629523ee28e3627b7c30ea89") +set(qtdoc_HASH "c8cb3a4f155bf697e9168d575f225ca3ab60d289c62c47db72997d01c81129e4c550f673edb60df02dededfa48028c43d5ee6723577db00e78fec188e1f32f22") +set(qtcoap_HASH "385b60c5fb24087bb87cf468303456338897f15cc32570290603312e491943ab00f4d1f013952f6b883d3deabcc870906628101b1ecbc390371544b676c423af") +set(qtopcua_HASH "e814a3acb00f2b0f17d92c8a5722aa47d3a5ee9863db294416eb0d42201ae7dab9c7bfa9a2c81531fb48f103b862bbee3f7000a889364241061543365986fd7a") +set(qtimageformats_HASH "66b8e7385a1b0db77f81730bd97f7e3488eec32a24829c3b21746e89e6ff179a3feacc4d023f1e4e6864a6a7aba46aeb7f66dca7e76836881829a20bb9afbad7") +set(qtmqtt_HASH "1d660864485540afdafde2b87ae6a27a39066201aedb61cde3d15af71f3325893d0a99ac9ac753182569b0fda21ba25d38478c46921e448050abec255f50a59c") +set(qtnetworkauth_HASH "73f04a144cb08048532aa6638dcaae01e9cee07afce10e5371bfa96ac0aac4fe941d84b888eaa4599304bcae58172665319d3eda43c460ab7df9f1b0e5e37f09") +set(qt3d_HASH "15fa46766ff8c8295bb2273dc528f1952a04d20c786ff62122594395a8f003a7bd07944928da472ec2463bed0e31d63af559391724f935bab70067f9009f1917") +set(qtactiveqt_HASH "3bfc52d8484e869a9ab1b489f7616f76ba48b9ac951d34a5a2b299d4c96dc9e3519c885dd86393578d1bbfdf39b59e6b1cba37a1ecb634bf66cf49264d59b621") +set(qtdatavis3d_HASH "4272007a13651d9bb38d8bee58a66ffe448a7e51be530f6d543e8bc688fd30143f426c5f5210ab6f5a8b1d3981b3570ca2ec13ecd4d0e27d039e1f094c6c1f20") +set(qtdeviceutilities_HASH "89a8198898fe928abe528d1967226daefacdde3c2ff59ce58ea3add38396a26ac75468a193ee42a089dbbde5457024aaecb8be3eb94f074c3aa0189d6c17c2c1") +set(qtlottie_HASH "a0e9cda4363ef72a74e4721472aed8266ac9810273ee6fbfdaf9ed5d82495de5e0471a4e521b33f784097694a3f7d42f0ce5a7d39d23781e2e270932230512e4") +set(qtscxml_HASH "f4aeb2f07a203ef448124b3e988735b46ef38d7800cd60ba3db9c0e0b8a9e9aca44bc07a6d72de2951134200c29d902709a80b52fd030713159c8f1711b60731") +set(qtvirtualkeyboard_HASH "f09d8f4c025a94768582d21598a6cc35647511439fa4136933d724954ddb1cab50335df5609a6e951593175faf03cfb233a8805c1bac90d7fda92cfe3f42b3f6") +set(qtcharts_HASH "ce37650c0e1bacc5432a6549fe6cfa8db19b1164c05172802638b51858e9cfcf68a56b401a84ab8d576fe2e1bf4fb08fc1f9c96cecd7f8251b8562defb647b68") +set(qtconnectivity_HASH "d0a8309143545689c7f6f545ae1aa8e1b4e516398bc6cc0d0f0ea3df6a414d6c933d32ae32451134d2a0d7d2c02078e8e46438b0aec59e938e4b8533d4da9457") +set(qtpositioning_HASH "af3ee341b57029ff10270602a23bde0b922b1f43e0e152b0f091e4447099d34df0410df582261935f6397c121f48bf944cc057772de9c063e679755fae7c5d11") +set(qtlocation_HASH "6633dedba335b8de4c96f98f4709a147e225e82fee1ed741938e15e1540421ad7c3140baec75914f0844a793433abcadaf3ce72d944662b62778327d65ff7348") +set(qtmultimedia_HASH "6b32e79f1fac21dba6a1ca9f82cfde8acdf9b33d1a65439d4a972f98ea23c919ecbd26ee4c08ecdb7d2743cab346437f27a701e45426e47fa89e55d913fe50bf") +set(qtremoteobjects_HASH "17cfc030c4d45b395ba20ff0cdc973d55ae75ba34ed200bd01c3fffb7650000c69b95f935bffb43930a3779c5f15cce09ecd716e2b1284f1e28768ce71dee969") +set(qtsensors_HASH "beb2c13855c42486dcbdb2e4885bbe931ded284dee755ecab539149113e2e8fec0b1c20859c36d9fc59b8188dffcfb8b1f4fc9495e04a33c80d425a0322f7f10") +set(qtserialbus_HASH "9806ad33b24f1798081bd88c2dcd821b62f7455826043586f37ad5b6f833eb8f82b2a5d3a5ac21df5e660b0097c58eaabad503f4c19f30acb511785335a7b147") +set(qtserialport_HASH "2a36851281dbe13317f559567dd3cd8f2c8cc73aad9df22de71883790bf7b1f685bd65dc353cff65b212398b6a72d1c517c2cf15e0b41b93be1d0ed7646d7a76") +set(qtwebchannel_HASH "cf9cf75b3df885676bbaa521b991dd176fba826a1cca8e3a524ea553df709ed5f4ccbdd8af19d952957b87bce2de4144c1f2222ab8fd4dbac04d240675b26e71") +set(qtwebengine_HASH "8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49") +set(qtwebsockets_HASH "0121865827101a73aa2957efa322fcd81bf80d9d9e92c2022fa5bdf94c782fb9997392e6da7523e65b51cfd38c255ee7eb87e2de0069016fc93c1383bd116345") +set(qtwebview_HASH "bedc21846e1dacbd8493dfae9d779e3aba5530b99e7d5ee4fd48e299a498b0cb135a8ad7ccebb95de52fd7608d7b5aa23fecec50a13c09f7308750a26f89bc3e") +set(qtinterfaceframework_REF 2bd16fa1d13f98bec2c4e559e1a0372d2948d832) +set(qtapplicationmanager_HASH "b50e7533208706013d32a06030a520e467a6f3968195810ba5c3277ef2da7c86f8c5321905700aa5cd7cc6412fd4f1c7634ad9ab8f7e81ec1a634d395493e7d9") +set(qtlanguageserver_HASH "7f67e645c176fb2addd7409a8e625d34cf06b1e798f26d1edaa3829a2c2491328b7736c78ec9388d4fc75fcc18718a064ad169e4a3981cd7b344f2337b1f28f5") +set(qthttpserver_HASH "49b8f732d57358c64ca07e7dad4a84c6205a3066939596493ad0bde333b339db84c0d73573a04319bb4954d0f48bdad22447bb50ff48ad2d72f982f1f4340be9") +set(qtquick3dphysics_HASH "dc2b19df44a182bf77d0e45250cb4a4485a2143bca8ca043965beb02678bf944fd1c0c34f7411048d69f25fbc496b190ae3d81010e43a7d4a7ee00c4e5cc622c") +set(qtspeech_HASH "d37c68cb9599e8d9a81ac070a87ed5a942e15e01401b5e179b4127aa0894a272023d717f0fc5f5c167e2ff299f79d6a19f3594172cf9779b400ac218d9587508") +set(qtgrpc_HASH "464bc51a597cbfcf1a4461a62453a7ce7bfa0e5744f88fd6a58904d2bc8bccef15fa7082407dcb51d322b9bb963d1d0238e2472e1b67629cc2d67e9c9543b200") +set(qtquickeffectmaker_HASH "514d60b52937e49737afbec018919bf86793600f423076996bfb5def9d75031590816fa17bd04fa48d884c7dc73e25b41e1bfa5348e43bb30711374c29d64bda") # Keep for beta/rc #set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 4819e4ba08a930..ca5012ffb14f58 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -7,7 +7,7 @@ ## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake ## 7. Set QT_UPDATE_VERSION back to 0 -set(QT_VERSION 6.5.2) +set(QT_VERSION 6.5.3) set(QT_DEV_BRANCH 0) set(QT_UPDATE_VERSION 0) diff --git a/ports/qtbase/patches/CVE-2023-38197-qtbase-6.5.diff b/ports/qtbase/patches/CVE-2023-38197-qtbase-6.5.diff deleted file mode 100644 index d6ee92e0f61fd6..00000000000000 --- a/ports/qtbase/patches/CVE-2023-38197-qtbase-6.5.diff +++ /dev/null @@ -1,220 +0,0 @@ -diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp -index 6e34d4d..cf46d69 100644 ---- a/src/corelib/serialization/qxmlstream.cpp -+++ b/src/corelib/serialization/qxmlstream.cpp -@@ -185,7 +185,7 @@ - addData() or by waiting for it to arrive on the device(). - - \value UnexpectedElementError The parser encountered an element -- that was different to those it expected. -+ or token that was different to those it expected. - - */ - -@@ -322,13 +322,34 @@ - - QXmlStreamReader is a well-formed XML 1.0 parser that does \e not - include external parsed entities. As long as no error occurs, the -- application code can thus be assured that the data provided by the -- stream reader satisfies the W3C's criteria for well-formed XML. For -- example, you can be certain that all tags are indeed nested and -- closed properly, that references to internal entities have been -- replaced with the correct replacement text, and that attributes have -- been normalized or added according to the internal subset of the -- DTD. -+ application code can thus be assured, that -+ \list -+ \li the data provided by the stream reader satisfies the W3C's -+ criteria for well-formed XML, -+ \li tokens are provided in a valid order. -+ \endlist -+ -+ Unless QXmlStreamReader raises an error, it guarantees the following: -+ \list -+ \li All tags are nested and closed properly. -+ \li References to internal entities have been replaced with the -+ correct replacement text. -+ \li Attributes have been normalized or added according to the -+ internal subset of the \l DTD. -+ \li Tokens of type \l StartDocument happen before all others, -+ aside from comments and processing instructions. -+ \li At most one DOCTYPE element (a token of type \l DTD) is present. -+ \li If present, the DOCTYPE appears before all other elements, -+ aside from StartDocument, comments and processing instructions. -+ \endlist -+ -+ In particular, once any token of type \l StartElement, \l EndElement, -+ \l Characters, \l EntityReference or \l EndDocument is seen, no -+ tokens of type StartDocument or DTD will be seen. If one is present in -+ the input stream, out of order, an error is raised. -+ -+ \note The token types \l Comment and \l ProcessingInstruction may appear -+ anywhere in the stream. - - If an error occurs while parsing, atEnd() and hasError() return - true, and error() returns the error that occurred. The functions -@@ -659,6 +680,7 @@ - d->token = -1; - return readNext(); - } -+ d->checkToken(); - return d->type; - } - -@@ -743,6 +765,11 @@ - "ProcessingInstruction" - ); - -+static constexpr auto QXmlStreamReader_XmlContextString = qOffsetStringArray( -+ "Prolog", -+ "Body" -+); -+ - /*! - \property QXmlStreamReader::namespaceProcessing - \brief the namespace-processing flag of the stream reader. -@@ -777,6 +804,15 @@ - return QLatin1StringView(QXmlStreamReader_tokenTypeString.at(d->type)); - } - -+/*! -+ \internal -+ \return \param loc (Prolog/Body) as a string. -+ */ -+static constexpr QLatin1StringView contextString(QXmlStreamReaderPrivate::XmlContext ctxt) -+{ -+ return QLatin1StringView(QXmlStreamReader_XmlContextString.at(static_cast(ctxt))); -+} -+ - #endif // QT_NO_XMLSTREAMREADER - - QXmlStreamPrivateTagStack::QXmlStreamPrivateTagStack() -@@ -864,6 +900,8 @@ - - type = QXmlStreamReader::NoToken; - error = QXmlStreamReader::NoError; -+ currentContext = XmlContext::Prolog; -+ foundDTD = false; - } - - /* -@@ -3838,6 +3876,97 @@ - } - } - -+static constexpr bool isTokenAllowedInContext(QXmlStreamReader::TokenType type, -+ QXmlStreamReaderPrivate::XmlContext loc) -+{ -+ switch (type) { -+ case QXmlStreamReader::StartDocument: -+ case QXmlStreamReader::DTD: -+ return loc == QXmlStreamReaderPrivate::XmlContext::Prolog; -+ -+ case QXmlStreamReader::StartElement: -+ case QXmlStreamReader::EndElement: -+ case QXmlStreamReader::Characters: -+ case QXmlStreamReader::EntityReference: -+ case QXmlStreamReader::EndDocument: -+ return loc == QXmlStreamReaderPrivate::XmlContext::Body; -+ -+ case QXmlStreamReader::Comment: -+ case QXmlStreamReader::ProcessingInstruction: -+ return true; -+ -+ case QXmlStreamReader::NoToken: -+ case QXmlStreamReader::Invalid: -+ return false; -+ } -+ -+ // GCC 8.x does not treat __builtin_unreachable() as constexpr -+#if !defined(Q_CC_GNU_ONLY) || (Q_CC_GNU >= 900) -+ Q_UNREACHABLE_RETURN(false); -+#else -+ return false; -+#endif -+} -+ -+/*! -+ \internal -+ \brief QXmlStreamReader::isValidToken -+ \return \c true if \param type is a valid token type. -+ \return \c false if \param type is an unexpected token, -+ which indicates a non-well-formed or invalid XML stream. -+ */ -+bool QXmlStreamReaderPrivate::isValidToken(QXmlStreamReader::TokenType type) -+{ -+ // Don't change currentContext, if Invalid or NoToken occur in the prolog -+ if (type == QXmlStreamReader::Invalid || type == QXmlStreamReader::NoToken) -+ return false; -+ -+ // If a token type gets rejected in the body, there is no recovery -+ const bool result = isTokenAllowedInContext(type, currentContext); -+ if (result || currentContext == XmlContext::Body) -+ return result; -+ -+ // First non-Prolog token observed => switch context to body and check again. -+ currentContext = XmlContext::Body; -+ return isTokenAllowedInContext(type, currentContext); -+} -+ -+/*! -+ \internal -+ Checks token type and raises an error, if it is invalid -+ in the current context (prolog/body). -+ */ -+void QXmlStreamReaderPrivate::checkToken() -+{ -+ Q_Q(QXmlStreamReader); -+ -+ // The token type must be consumed, to keep track if the body has been reached. -+ const XmlContext context = currentContext; -+ const bool ok = isValidToken(type); -+ -+ // Do nothing if an error has been raised already (going along with an unexpected token) -+ if (error != QXmlStreamReader::Error::NoError) -+ return; -+ -+ if (!ok) { -+ raiseError(QXmlStreamReader::UnexpectedElementError, -+ QObject::tr("Unexpected token type %1 in %2.") -+ .arg(q->tokenString(), contextString(context))); -+ return; -+ } -+ -+ if (type != QXmlStreamReader::DTD) -+ return; -+ -+ // Raise error on multiple DTD tokens -+ if (foundDTD) { -+ raiseError(QXmlStreamReader::UnexpectedElementError, -+ QObject::tr("Found second DTD token in %1.").arg(contextString(context))); -+ } else { -+ foundDTD = true; -+ } -+} -+ - /*! - \fn bool QXmlStreamAttributes::hasAttribute(QAnyStringView qualifiedName) const - -diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h -index 070424a..f09adaa 100644 ---- a/src/corelib/serialization/qxmlstream_p.h -+++ b/src/corelib/serialization/qxmlstream_p.h -@@ -297,6 +297,17 @@ - QStringDecoder decoder; - bool atEnd; - -+ enum class XmlContext -+ { -+ Prolog, -+ Body, -+ }; -+ -+ XmlContext currentContext = XmlContext::Prolog; -+ bool foundDTD = false; -+ bool isValidToken(QXmlStreamReader::TokenType type); -+ void checkToken(); -+ - /*! - \sa setType() - */ diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index b802a7f7f4128b..ccd4731ce3789a 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -9,9 +9,6 @@ set(QT_IS_LATEST ON) include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") set(${PORT}_PATCHES - # CVE fixes from https://download.qt.io/official_releases/qt/6.5/ - patches/CVE-2023-38197-qtbase-6.5.diff - allow_outside_prefix.patch config_install.patch fix_cmake_build.patch diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 2ba6a2f816a55e..164f900871341c 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version": "6.5.2", - "port-version": 1, + "version": "6.5.3", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 5660dae68be6df..caa6072db3d4ff 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.5.2", + "version": "6.5.3", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index a5c2e63ccd67ba..f4716fe9a1fba2 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index 25eb51f00d221f..943d18899cc91d 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 583832498d9da4..2d65222649aa23 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 1e33ff017e69da..d9a554c5c1d5fa 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index 3c977ef4713b47..dae93a3e5bd980 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.5.2", + "version": "6.5.3", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index b1aa26cb612884..833ab24e603b6a 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtgrpc/vcpkg.json b/ports/qtgrpc/vcpkg.json index eb3e42f5ab767c..2873632dd3d7e3 100644 --- a/ports/qtgrpc/vcpkg.json +++ b/ports/qtgrpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtgrpc", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt framework based gRPC clients and services.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json index 96a5f6f0eae1f2..41797f081046f3 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qthttpserver", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Extension: Qt HTTP Server", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index c6556bb496779f..6ab9e61007ef77 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.5.2", + "version": "6.5.3", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index dc93f660104851..3281e51538db04 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtkeychain-qt6/portfile.cmake b/ports/qtkeychain-qt6/portfile.cmake index 875ae642a81301..50e1b3cd866f4d 100644 --- a/ports/qtkeychain-qt6/portfile.cmake +++ b/ports/qtkeychain-qt6/portfile.cmake @@ -3,9 +3,8 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO frankosterfeld/qtkeychain - # 0.13.2 plus three commits, for a CMake export target fix - REF cd4d73299b144d11c310f6ca9a6ab1ef50c45431 - SHA512 a1af668bec23df5d696ad49129ec2aa6d332f043b43bb9875c2b025007452571bfd9431fd37c72189e957329491c04703e8c6d1104c7a117ebf28cb91249b639 + REF "${VERSION}" + SHA512 bf84b19090e667a2946297e63d9813574193d80e4eecbde2fdfca317a66da3f029b3abef326f4ffb32de032a48004f9cf1bc818468af612723d762652dc25eb6 HEAD_REF master ) diff --git a/ports/qtkeychain-qt6/vcpkg.json b/ports/qtkeychain-qt6/vcpkg.json index 3df8b0829f1457..f5d43a44dff5ea 100644 --- a/ports/qtkeychain-qt6/vcpkg.json +++ b/ports/qtkeychain-qt6/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtkeychain-qt6", - "version": "0.13.2", - "port-version": 1, + "version": "0.14.1", "description": "(Unaffiliated with Qt) Platform-independent Qt6 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", "license": "BSD-3-Clause", diff --git a/ports/qtkeychain/portfile.cmake b/ports/qtkeychain/portfile.cmake index 53b7683d8a936f..9ffb5d7a1b767f 100644 --- a/ports/qtkeychain/portfile.cmake +++ b/ports/qtkeychain/portfile.cmake @@ -3,9 +3,8 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO frankosterfeld/qtkeychain - # 0.13.2 plus three commits, for a CMake export target fix - REF cd4d73299b144d11c310f6ca9a6ab1ef50c45431 - SHA512 a1af668bec23df5d696ad49129ec2aa6d332f043b43bb9875c2b025007452571bfd9431fd37c72189e957329491c04703e8c6d1104c7a117ebf28cb91249b639 + REF "${VERSION}" + SHA512 bf84b19090e667a2946297e63d9813574193d80e4eecbde2fdfca317a66da3f029b3abef326f4ffb32de032a48004f9cf1bc818468af612723d762652dc25eb6 HEAD_REF master ) diff --git a/ports/qtkeychain/vcpkg.json b/ports/qtkeychain/vcpkg.json index 36ef1939364d5e..906c0a52b79275 100644 --- a/ports/qtkeychain/vcpkg.json +++ b/ports/qtkeychain/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtkeychain", - "version": "0.13.2", - "port-version": 4, + "version": "0.14.1", "description": "(Unaffiliated with Qt) Platform-independent Qt5 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", "license": "BSD-3-Clause", diff --git a/ports/qtlanguageserver/vcpkg.json b/ports/qtlanguageserver/vcpkg.json index 8d8c2a1a66ce9e..2df617cfc70b3c 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlanguageserver", - "version": "6.5.2", + "version": "6.5.3", "description": "An implementation of the Language Server Protocol", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index 86bc23cc8aecf6..a6069c88f39345 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index f8fece2bb3ed20..7b9a070d74b029 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.5.2", + "version": "6.5.3", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 69a13fbc5327d9..d8852b9eef7710 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 633cf833c5075a..9554d5ed822666 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 21750a21b5d8ed..c49ed51ff77c07 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/fix-build.patch b/ports/qtopcua/fix-build.patch new file mode 100644 index 00000000000000..0c3fcd84eaba74 --- /dev/null +++ b/ports/qtopcua/fix-build.patch @@ -0,0 +1,49 @@ +diff --git a/cmake/FindOpen62541.cmake b/cmake/FindOpen62541.cmake +index b4fcea410..91958e554 100644 +--- a/cmake/FindOpen62541.cmake ++++ b/cmake/FindOpen62541.cmake +@@ -21,6 +21,7 @@ + # ``open62541`` + # The open62541 library + ++if(0) + find_path(Open62541_INCLUDE_DIRS + NAMES open62541.h + HINTS "${OPEN62541_INCDIR}") +@@ -46,6 +47,14 @@ if (Open62541_FOUND) + endif() + + mark_as_advanced(Open62541_INCLUDE_DIRS Open62541_LIBRARIES) ++elseif() ++ find_package(open62541 CONFIG REQUIRED) ++ if(NOT TARGET open62541) ++ add_library(open62541 INTERFACE IMPORTED) ++ set_property(TARGET open62541 APPEND PROPERTY ++ INTERFACE_LINK_LIBRARIES open62541::open62541) ++ endif() ++endif() + + include(FeatureSummary) + set_package_properties(Open62541 PROPERTIES +diff --git a/src/opcua/CMakeLists.txt b/src/opcua/CMakeLists.txt +index d5e3c65df..0d2fa3952 100644 +--- a/src/opcua/CMakeLists.txt ++++ b/src/opcua/CMakeLists.txt +@@ -84,7 +84,7 @@ qt_internal_add_module(OpcUa + ## Scopes: + ##################################################################### + +-qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND NOT APPLE AND NOT WINRT ++qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_openssl AND NOT APPLE AND NOT WINRT + SOURCES + client/qopcuagdsclient.cpp client/qopcuagdsclient_p.h + x509/openssl_symbols.cpp +@@ -102,7 +102,7 @@ qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND + x509/qopcuax509utils.cpp x509/qopcuax509utils_p.h + ) + +-if (QT_FEATURE_gds AND QT_FEATURE_ssl) ++if (QT_FEATURE_gds AND QT_FEATURE_openssl) + qt_internal_extend_target(OpcUa + LIBRARIES WrapOpenSSL::WrapOpenSSL) + endif() diff --git a/ports/qtopcua/portfile.cmake b/ports/qtopcua/portfile.cmake index 403ef2b322cbef..0f2c0ed5933a36 100644 --- a/ports/qtopcua/portfile.cmake +++ b/ports/qtopcua/portfile.cmake @@ -1,7 +1,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES ) +set(${PORT}_PATCHES fix-build.patch) # General features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 7d765ab6abb559..00b0f20972157f 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 3469c7b35cc076..159711fd8f2103 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index bc808f48f4030e..c206c46cfb6e53 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.5.2", + "version": "6.5.3", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3dphysics/vcpkg.json b/ports/qtquick3dphysics/vcpkg.json index 26254be227ae97..60d29d97dbe232 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3dphysics", - "version": "6.5.2", + "version": "6.5.3", "description": "Physics engine integration for Qt Quick 3D", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquickeffectmaker/vcpkg.json b/ports/qtquickeffectmaker/vcpkg.json index 448774bf16e44c..5b3202effbd21d 100644 --- a/ports/qtquickeffectmaker/vcpkg.json +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickeffectmaker", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Quick Effect Maker (QQEM) for creating and editing custom shader effects.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 043334ca35adc8..731a7574f0697e 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.5.2", + "version": "6.5.3", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 53f3b2460ac980..868ecf1cf541a4 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index e3ffef68205816..e31be362de980e 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.5.2", + "version": "6.5.3", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index 7b6248fd809e6c..1cbf295bac49ee 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index 5af1205eb6f428..bbac8197153c54 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.5.2", + "version": "6.5.3", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index 24719c95a1a6d3..308964714aeb99 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index a7ced090cb89e3..4b280b8724086c 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.5.2", + "version": "6.5.3", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtspeech/vcpkg.json b/ports/qtspeech/vcpkg.json index aeb17d0a6742e0..0029247b481d80 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtspeech", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Speech support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index b2cff5bb3516d1..5825b2f10e179b 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index ce5a79d815df2a..8d194de4212ef5 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 459b0f3360bfef..56090e9e6c510f 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/portfile.cmake b/ports/qtvirtualkeyboard/portfile.cmake index bbe2bea69d2325..4c238e8e0aba14 100644 --- a/ports/qtvirtualkeyboard/portfile.cmake +++ b/ports/qtvirtualkeyboard/portfile.cmake @@ -8,11 +8,13 @@ if("hunspell" IN_LIST FEATURES) else() list(APPEND FEATURE_OPTIONS -DINPUT_vkb_hunspell=no) endif() -if("t9write" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=t9write) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=no) -endif() + +# +# To use t9write, overlay this port with the following line changed to: +# list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=t9write) +# and add t9write as a dependency. +# +list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=no) qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 00595f33862f7d..1b47282499fa2f 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtvirtualkeyboard", - "version": "6.5.2", - "description": "SCXML (state machine notation) compiler and related tools", + "version": "6.5.3", + "description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 6 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ @@ -34,12 +34,6 @@ "dependencies": [ "hunspell" ] - }, - "t9write": { - "description": "T9Write handwriting (commercial SDK requires port overlay)", - "dependencies": [ - "t9write" - ] } } } diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index b1c3767894edf0..591593c74d16fb 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.5.2", + "version": "6.5.3", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index 58f9f92995454e..83d8a62c7d7058 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 739eff405da002..66491852070cfc 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 49919cb51d450e..2f3d85d1c67395 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index 9fa07c8aa0ecab..bbe8e71abaef9d 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.5.2", + "version": "6.5.3", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index cc2a31615695c7..d88fe8a352bd84 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 6667b576d5bf2a17e7dc6e3c3ca3b8b33c3d15a7dc8855441e6491b6cb98c227a033147651b3a4ecbcb8937157d2ad994e73bb00c9f4accfd5f4c899ec3f339e + SHA512 b59316c4c2f0544ce88059440950f1457522eebe2efe2eed1ad1b3000e5016dd641a3157fbd2491ba7d558dc281d52f6f6e30892fa87e7a2716c86e1e17387d2 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 3061f337084df5..2a057aac3be2ae 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "3.3.0", + "version": "3.3.1", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/ports/rapidfuzz/portfile.cmake b/ports/rapidfuzz/portfile.cmake index 45dced19f28dcb..fcd8d5afa99e6e 100644 --- a/ports/rapidfuzz/portfile.cmake +++ b/ports/rapidfuzz/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO maxbachmann/rapidfuzz-cpp - REF 87ee0dd61289fa6d7d0d2b5716f5363ee6b38fb7 # rapidfuzz-1.8.0 - SHA512 c1d7c69a291e381453ccad4053353c75fa94288e850183f0b133f617e2b77cae80c9989753fed236e196eb445d821af5dd7e329acbe4994d5a96ab1318af9cf9 + REF "v${VERSION}" + SHA512 02af141b123545303d634ffe84fbe83e635f06c9ffa3a6506661e53beb22fe7221942b3e46d33b2a49ef929c5de9acfb00c48cb5685c760506c5fcf37c716f9a HEAD_REF master ) @@ -15,4 +15,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/rapidfuzz/vcpkg.json b/ports/rapidfuzz/vcpkg.json index 2a095b98d02ebe..71e6d3e7660d3f 100644 --- a/ports/rapidfuzz/vcpkg.json +++ b/ports/rapidfuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rapidfuzz", - "version": "1.8.0", + "version": "2.0.0", "description": "Rapid fuzzy string matching library for C++17 using the Levenshtein Distance.", "homepage": "https://github.com/maxbachmann/rapidfuzz-cpp", "license": "MIT", diff --git a/ports/raygui/portfile.cmake b/ports/raygui/portfile.cmake index 37cd2e82f27b3a..3c82971729289d 100644 --- a/ports/raygui/portfile.cmake +++ b/ports/raygui/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raygui REF "${VERSION}" - SHA512 c1d970d98fb721203934fcc3b50d8185271c43e426112bfd0d350899b76586e1cc82dacf4e676827725cff75bc35c7e7e51acbfb8db47f92ad67ee58c9560778 + SHA512 8e59889af6b6163b9ff9930ae79bdfaab5015e39279d1a50d3f74c0f50b12b2015fdf17016b04d2c4f66420f4e631b25a51ede5c1627dfcde269457f55f34ff1 HEAD_REF master ) diff --git a/ports/raygui/vcpkg.json b/ports/raygui/vcpkg.json index ba505ad1ae6ba2..42ad32a5f46f58 100644 --- a/ports/raygui/vcpkg.json +++ b/ports/raygui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "raygui", - "version": "3.6", + "version": "4.0", "description": "A simple and easy-to-use immediate-mode gui library", "homepage": "https://github.com/raysan5/raylib", "license": "Zlib" diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index 6abf1f8200e42e..d3224442f75744 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -1,11 +1,11 @@ { "name": "raylib", "version-semver": "4.5.0", - "port-version": 1, + "port-version": 2, "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", "license": "Zlib", - "supports": "!(arm | uwp)", + "supports": "!uwp", "dependencies": [ { "name": "glfw3", diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake index 946c4873d1cdcd..425c88d970cd8f 100644 --- a/ports/rbdl/portfile.cmake +++ b/ports/rbdl/portfile.cmake @@ -3,8 +3,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rbdl/rbdl - REF 6e92742d469efaf59ec2503882693b621f41eca8 - SHA512 d266732fe50a4cd5c55f9ff838649157e48994744f39d9eda9feee640dd400a5bb35ca620386ca65c9f1cdcb1adc923c34809dcb025bd6fc052baa9df57a4a6f + REF 619175a441ba769ab1be34a727644f4dd13bf841 + SHA512 0c6cd78c4385e582f481a6f92d5c3a01f5d3bcd3a7cc3417a504209dae1856d788157db8d9f4173493619f103dea323bd57ddae0bc63162d72b03031dae9a822 HEAD_REF master ) diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json index 60096879240bc1..04ed043c7c9ef3 100644 --- a/ports/rbdl/vcpkg.json +++ b/ports/rbdl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rbdl", - "version": "3.2.0", - "port-version": 4, + "version": "3.3.0", + "port-version": 5, "description": "Rigid Body Dynamics Library", "homepage": "https://github.com/rbdl/rbdl", "dependencies": [ diff --git a/ports/readline-unix/8.2p1.diff b/ports/readline-unix/8.2p1.diff new file mode 100644 index 00000000000000..0cb8c9c5d97b36 --- /dev/null +++ b/ports/readline-unix/8.2p1.diff @@ -0,0 +1,24 @@ +diff --git a/nls.c b/nls.c +index 5c6a13b..8c027d6 100644 +--- a/nls.c ++++ b/nls.c +@@ -141,6 +141,10 @@ _rl_init_locale (void) + if (lspec == 0) + lspec = ""; + ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ ++ if (ret == 0 || *ret == 0) ++ ret = setlocale (LC_CTYPE, (char *)NULL); ++ if (ret == 0 || *ret == 0) ++ ret = RL_DEFAULT_LOCALE; + #else + ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; + #endif +diff --git a/patchlevel b/patchlevel +index d8c9df7..fdf4740 100644 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-0 ++1 diff --git a/ports/readline-unix/portfile.cmake b/ports/readline-unix/portfile.cmake index 68d50ff030a747..aca06be6ac94c8 100644 --- a/ports/readline-unix/portfile.cmake +++ b/ports/readline-unix/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} set(filename readline-${VERSION}.tar.gz) vcpkg_download_distfile( ARCHIVE @@ -9,7 +8,11 @@ vcpkg_download_distfile( SHA512 0a451d459146bfdeecc9cdd94bda6a6416d3e93abd80885a40b334312f16eb890f8618a27ca26868cebbddf1224983e631b1cbc002c1a4d1cd0d65fba9fea49a ) -vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + 8.2p1.diff +) vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" @@ -21,7 +24,10 @@ vcpkg_configure_make( vcpkg_install_make() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/tools" +) vcpkg_fixup_pkgconfig() diff --git a/ports/readline-unix/vcpkg.json b/ports/readline-unix/vcpkg.json index 99e9f2142e6725..ffdc931d87b179 100644 --- a/ports/readline-unix/vcpkg.json +++ b/ports/readline-unix/vcpkg.json @@ -1,6 +1,7 @@ { "name": "readline-unix", "version": "8.2", + "port-version": 1, "description": "The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in.", "homepage": "https://tiswww.case.edu/php/chet/readline/rltop.html", "license": "GPL-3.0-or-later", diff --git a/ports/readline-win32/CMakeLists.txt b/ports/readline-win32/CMakeLists.txt deleted file mode 100644 index ae560029d16a36..00000000000000 --- a/ports/readline-win32/CMakeLists.txt +++ /dev/null @@ -1,66 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(readline C) - -add_definitions(-DREADLINE_LIBRARY) -add_definitions(-DHAVE_CONFIG_H) -add_definitions(-D_CRT_SECURE_NO_WARNINGS) - -if(BUILD_SHARED_LIBS) - add_definitions(-DBUILD_READLINE_DLL) -else() - add_definitions(-DREADLINE_STATIC) -endif() - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} # thats where the config.h is located -) - -add_library(readline - readline.c - funmap.c - keymaps.c - vi_mode.c - parens.c - rltty.c - complete.c - bind.c - isearch.c - display.c - signals.c - util.c - kill.c - undo.c - macro.c - input.c - callback.c - terminal.c - xmalloc.c - history.c - histsearch.c - histexpand.c - histfile.c - nls.c - search.c - shell.c - savestring.c - tilde.c - text.c - misc.c - compat.c - mbutil.c - support/wcwidth.c) - -file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h") -install(FILES ${headers} DESTINATION include/readline) - -target_include_directories(readline PUBLIC $ $) - -install(TARGETS readline - EXPORT unofficial-readline-win32-config - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -install(EXPORT unofficial-readline-win32-config - NAMESPACE unofficial::readline-win32:: - DESTINATION share/unofficial-readline-win32) diff --git a/ports/readline-win32/config.h b/ports/readline-win32/config.h deleted file mode 100644 index de0a352fe5677a..00000000000000 --- a/ports/readline-win32/config.h +++ /dev/null @@ -1,58 +0,0 @@ -#define RETSIGTYPE void -#define VOID_SIGHANDLER 1 -#define PROTOTYPES 1 -#define HAVE_ISASCII 1 -#define HAVE_ISXDIGIT 1 -#define HAVE_MBRLEN 1 -#define HAVE_MBRTOWC 1 -#define HAVE_MBRTOWC 1 -#define HAVE_MBSRTOWCS 1 -#define HAVE_MEMMOVE 1 -#define HAVE_PUTENV 1 -#define HAVE_SETENV 1 -#define HAVE_SETLOCALE 1 -#define HAVE_STRCOLL 1 -#define STRCOLL_BROKEN 1 -#define HAVE_STRPBRK 1 -#define HAVE_TCGETATTR 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_WCTOMB 1 -#define HAVE_WCWIDTH 1 -#define STDC_HEADERS 1 -#define HAVE_LANGINFO_H 1 -#define HAVE_LIMITS_H 1 -#define HAVE_LOCALE_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STDARG_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_TERMIOS_H 1 -#define HAVE_WCHAR_H 1 -#define HAVE_WCTYPE_H 1 -#define HAVE_MBSTATE_T 1 -#define HAVE_LANGINFO_CODESET 1 -#define VOID_SIGHANDLER 1 -#define STRUCT_WINSIZE_IN_SYS_IOCTL 1 -#define HAVE_GETPW_DECLS 1 -#define MUST_REINSTALL_SIGHANDLERS 1 -#define CTYPE_NON_ASCII 1 - -/* Ultrix botches type-ahead when switching from canonical to - non-canonical mode, at least through version 4.3 */ -#if !defined (HAVE_TERMIOS_H) || !defined (HAVE_TCGETATTR) || defined (ultrix) -# define TERMIOS_MISSING -#endif - -#if defined (STRCOLL_BROKEN) -# define HAVE_STRCOLL 1 -#endif - -#if defined (__STDC__) && defined (HAVE_STDARG_H) -# define PREFER_STDARG -# define USE_VARARGS -#else -# if defined (HAVE_VARARGS_H) -# define PREFER_VARARGS -# define USE_VARARGS -# endif -#endif diff --git a/ports/readline-win32/portfile.cmake b/ports/readline-win32/portfile.cmake index a3641df868e31b..494c512fc8d28a 100644 --- a/ports/readline-win32/portfile.cmake +++ b/ports/readline-win32/portfile.cmake @@ -1,24 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO lltcggie/readline - REF ea414b4e98475e3976198738061824e8a8379a50 - SHA512 82d54ab3e19fb2673fe97eff07117d36704791669baa283ec737c704635f872e4c7cd30485a6648d445cb2912e4364286e664e9425444f456a4c862b9e4de843 + REPO xiaozhuai/readline-win32 + REF 8f141e9a77f81fae5b67f915621988aef116e9ae + SHA512 2eb88a2fa3780df1bb8fa5dfc0be197113d3789cd7b494c0c30509099a6c4818cf14d8301d312747107b2b4f8e52e5a2ed93d3fe5fbbd6b796f780e2f1e0f729 HEAD_REF master ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src") - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src" + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-readline-win32) +vcpkg_fixup_pkgconfig() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/readline/rlstdc.h" + "defined(USE_READLINE_STATIC)" "1" + ) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/readline-win32/vcpkg.json b/ports/readline-win32/vcpkg.json index 61bf5f62a10bce..bd171c66570fe6 100644 --- a/ports/readline-win32/vcpkg.json +++ b/ports/readline-win32/vcpkg.json @@ -1,10 +1,10 @@ { "name": "readline-win32", "version": "5.0", - "port-version": 5, + "port-version": 7, "description": "Implementation of readline for Windows Desktop", - "homepage": "https://github.com/lltcggie/readline", - "license": null, + "homepage": "https://github.com/xiaozhuai/readline-win32", + "license": "GPL-2.0", "supports": "windows & !uwp", "dependencies": [ { diff --git a/ports/readline/portfile.cmake b/ports/readline/portfile.cmake index 45db4f37a1f227..a9543d16b826cc 100644 --- a/ports/readline/portfile.cmake +++ b/ports/readline/portfile.cmake @@ -3,3 +3,4 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") endif() set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/readline/usage b/ports/readline/usage new file mode 100644 index 00000000000000..6127e2ac6cc9bd --- /dev/null +++ b/ports/readline/usage @@ -0,0 +1,10 @@ +the package readline can be used under windows via: + + find_package(unofficial-readline-win32 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::readline-win32::readline) + +The package readline can be imported via the CMake FindPkgConfig module: + + find_package(PkgConfig REQUIRED) + pkg_check_modules(readline REQUIRED IMPORTED_TARGET readline) + target_link_libraries(main PRIVATE PkgConfig::readline) diff --git a/ports/readline/vcpkg.json b/ports/readline/vcpkg.json index ae7aec6b49de43..a021fe3b3ac69f 100644 --- a/ports/readline/vcpkg.json +++ b/ports/readline/vcpkg.json @@ -1,7 +1,7 @@ { "name": "readline", "version": "0", - "port-version": 4, + "port-version": 5, "description": "GNU readline and history libraries", "supports": "!uwp", "dependencies": [ diff --git a/ports/refl-cpp/portfile.cmake b/ports/refl-cpp/portfile.cmake index 3ef302408c2b18..59d5a4ca083579 100644 --- a/ports/refl-cpp/portfile.cmake +++ b/ports/refl-cpp/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO veselink1/refl-cpp - REF ce47c1355219f3b9af56ae91d997daf2b1555d97 #v0.12.3 - SHA512 f73e542a9ee00d677e2445c148b732cbdf6247adc1f4f412ad8e9587c5971b3cb02b39b15cdb9b0788f53e9efea6c5a485367505ecb569a367be012f6246ea92 + REF "v${VERSION}" + SHA512 fcebda170782fd7cc55395fd64012356f416deb1199e2eceee7391c7c1963e39c214e7d99c42e7ca371d6d86923173e916b09e4867cacfaeed4902b5466aed03 HEAD_REF master ) diff --git a/ports/refl-cpp/vcpkg.json b/ports/refl-cpp/vcpkg.json index 88defcfddae3b7..ab879529b4cd2b 100644 --- a/ports/refl-cpp/vcpkg.json +++ b/ports/refl-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "refl-cpp", - "version": "0.12.3", - "port-version": 1, + "version": "0.12.4", "description": "Static reflection for C++17 (compile-time enumeration, attributes, proxies, overloads, template functions, metaprogramming).", "homepage": "https://github.com/veselink1/refl-cpp", "license": "MIT" diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index dc8c3263dab3c6..6ce236049702e2 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/restinio REF "v.${VERSION}" - SHA512 8a535ebcdfb53ef9f669bbd007d11b6d95bae87b1a8b8403556910e4904483bfcaeb88fa2ee5522c9bef048a9276cbdb1fa15ec62b5bd158fc585b0e84cf046b + SHA512 0d69567a68f17f3ad30978f1ee165e673f77332f519c2e9429284d87886f90c0dea46b8dcaedb55cf4c1611eca79b9196178e37deb56ad89272ca19382f290bc PATCHES fix-cmake-config.diff fix-project.diff diff --git a/ports/restinio/vcpkg.json b/ports/restinio/vcpkg.json index d057f885932593..68cc04cf16c8c5 100644 --- a/ports/restinio/vcpkg.json +++ b/ports/restinio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "restinio", - "version": "0.6.18", + "version": "0.6.19", "description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.", "homepage": "https://github.com/Stiffstream/restinio", "license": "BSD-3-Clause", diff --git a/ports/rhash/portfile.cmake b/ports/rhash/portfile.cmake index fe40f0e848ce13..a274e4dc979751 100644 --- a/ports/rhash/portfile.cmake +++ b/ports/rhash/portfile.cmake @@ -2,8 +2,8 @@ set(RHASH_XVERSION 1.4.2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rhash/RHash - REF 02c8b1dbae01c8d56613b6a3034c3698f94a52be # v1.4.2 - SHA512 4c1d0a91a758ba85bc9ea194cf148834d6a0ebd849ed5384444798c522723ad78c3eedf65e7460fba61989a69b2c0f9a0f12bd6583381c544778c4b1c199a4ba + REF "v${VERSION}" + SHA512 00a7e5e058b53ce20ae79509815452ed9cb699d1322b678220b72c61dea3ea2f8fa131acfade8bb6d9f6af913f0c3c472330841181b22314b8755166310c946f HEAD_REF master ) diff --git a/ports/rhash/vcpkg.json b/ports/rhash/vcpkg.json index 0e489e90329493..14c97cdda63e65 100644 --- a/ports/rhash/vcpkg.json +++ b/ports/rhash/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rhash", - "version": "1.4.2", - "port-version": 1, + "version": "1.4.4", "description": "C library for computing a wide variety of hash sums", "homepage": "https://github.com/rhash/RHash", "license": "0BSD", diff --git a/ports/rocksdb/0001-fix-dependencies.patch b/ports/rocksdb/0001-fix-dependencies.patch new file mode 100644 index 00000000000000..03a8f7dae4a66d --- /dev/null +++ b/ports/rocksdb/0001-fix-dependencies.patch @@ -0,0 +1,123 @@ + CMakeLists.txt | 33 +++++++++++++++------------------ + cmake/RocksDBConfig.cmake.in | 11 ++++++++--- + 2 files changed, 23 insertions(+), 21 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4e30f6631..b428c811b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,7 +87,7 @@ endif() + + include(CMakeDependentOption) + +-if(MSVC) ++if(0) + option(WITH_GFLAGS "build with GFlags" OFF) + option(WITH_XPRESS "build with windows built in compression" OFF) + option(ROCKSDB_SKIP_THIRDPARTY "skip thirdparty.inc" OFF) +@@ -136,10 +136,7 @@ else() + endif() + + if(WITH_SNAPPY) +- find_package(Snappy CONFIG) +- if(NOT Snappy_FOUND) +- find_package(Snappy REQUIRED) +- endif() ++ find_package(Snappy CONFIG REQUIRED) + add_definitions(-DSNAPPY) + list(APPEND THIRDPARTY_LIBS Snappy::snappy) + endif() +@@ -163,16 +160,19 @@ else() + endif() + + if(WITH_LZ4) +- find_package(lz4 REQUIRED) ++ find_package(lz4 CONFIG REQUIRED) + add_definitions(-DLZ4) + list(APPEND THIRDPARTY_LIBS lz4::lz4) + endif() + + if(WITH_ZSTD) +- find_package(zstd REQUIRED) ++ find_package(zstd CONFIG REQUIRED) + add_definitions(-DZSTD) +- include_directories(${ZSTD_INCLUDE_DIR}) +- list(APPEND THIRDPARTY_LIBS zstd::zstd) ++ if(TARGET zstd::libzstd_shared) ++ list(APPEND THIRDPARTY_LIBS zstd::libzstd_shared) ++ elseif(TARGET zstd::libzstd_static) ++ list(APPEND THIRDPARTY_LIBS zstd::libzstd_static) ++ endif() + endif() + endif() + +@@ -312,11 +312,10 @@ int main() { + endif() + + if (WITH_LIBURING) +- find_package(uring) +- if (uring_FOUND) +- add_definitions(-DROCKSDB_IOURING_PRESENT) +- list(APPEND THIRDPARTY_LIBS uring::uring) +- endif() ++ find_package(PkgConfig) ++ pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0) ++ add_definitions(-DROCKSDB_IOURING_PRESENT) ++ list(APPEND THIRDPARTY_LIBS PkgConfig::liburing) + endif() + + # Reset the required flags +@@ -382,9 +381,9 @@ endif() + + option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF) + if(WITH_TBB) +- find_package(TBB REQUIRED) ++ find_package(TBB CONFIG REQUIRED) + add_definitions(-DTBB) +- list(APPEND THIRDPARTY_LIBS TBB::TBB) ++ list(APPEND THIRDPARTY_LIBS TBB::tbb) + endif() + + # Stall notifications eat some performance from inserts +@@ -1195,8 +1194,6 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) + endforeach() + endforeach() + +- install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) +- + install( + TARGETS ${ROCKSDB_STATIC_LIB} + EXPORT RocksDBTargets +diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in +index 0bd14be11..a420d8bfe 100644 +--- a/cmake/RocksDBConfig.cmake.in ++++ b/cmake/RocksDBConfig.cmake.in +@@ -33,11 +33,11 @@ if(@WITH_BZ2@) + endif() + + if(@WITH_LZ4@) +- find_dependency(lz4) ++ find_dependency(lz4 CONFIG) + endif() + + if(@WITH_ZSTD@) +- find_dependency(zstd) ++ find_dependency(zstd CONFIG) + endif() + + if(@WITH_NUMA@) +@@ -45,7 +45,12 @@ if(@WITH_NUMA@) + endif() + + if(@WITH_TBB@) +- find_dependency(TBB) ++ find_dependency(TBB CONFIG) ++endif() ++ ++if(@WITH_LIBURING@) ++ find_dependency(PkgConfig) ++ pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0) + endif() + + find_dependency(Threads) + \ No newline at end of file diff --git a/ports/rocksdb/0002-only-build-one-flavor.patch b/ports/rocksdb/0002-only-build-one-flavor.patch deleted file mode 100644 index 125149b706f7f5..00000000000000 --- a/ports/rocksdb/0002-only-build-one-flavor.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1a6411653..526dfcf60 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1077,13 +1077,17 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) - - install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) - -- install( -- TARGETS ${ROCKSDB_STATIC_LIB} -- EXPORT RocksDBTargets -- COMPONENT devel -- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" -- ) -+ if(NOT ROCKSDB_BUILD_SHARED) -+ install( -+ TARGETS ${ROCKSDB_STATIC_LIB} -+ EXPORT RocksDBTargets -+ COMPONENT devel -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" -+ ) -+ else() -+ set_target_properties(${ROCKSDB_STATIC_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE) -+ endif() - - if(ROCKSDB_BUILD_SHARED) - install( diff --git a/ports/rocksdb/0003-use-find-package.patch b/ports/rocksdb/0003-use-find-package.patch deleted file mode 100644 index 821a48b280d0cc..00000000000000 --- a/ports/rocksdb/0003-use-find-package.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7b4f47a..3d90152 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -87,7 +87,7 @@ endif() - - include(CMakeDependentOption) - --if(MSVC) -+if(MSVC AND NOT VCPKG_TOOLCHAIN) - option(WITH_GFLAGS "build with GFlags" OFF) - option(WITH_XPRESS "build with windows built in compression" OFF) - option(ROCKSDB_SKIP_THIRDPARTY "skip thirdparty.inc" OFF) -@@ -136,10 +136,7 @@ else() - endif() - - if(WITH_SNAPPY) -- find_package(Snappy CONFIG) -- if(NOT Snappy_FOUND) -- find_package(Snappy REQUIRED) -- endif() -+ find_package(Snappy CONFIG REQUIRED) - add_definitions(-DSNAPPY) - list(APPEND THIRDPARTY_LIBS Snappy::snappy) - endif() -@@ -163,16 +160,19 @@ else() - endif() - - if(WITH_LZ4) -- find_package(lz4 REQUIRED) -+ find_package(lz4 CONFIG REQUIRED) - add_definitions(-DLZ4) - list(APPEND THIRDPARTY_LIBS lz4::lz4) - endif() - - if(WITH_ZSTD) -- find_package(zstd REQUIRED) -+ find_package(zstd CONFIG REQUIRED) - add_definitions(-DZSTD) -- include_directories(${ZSTD_INCLUDE_DIR}) -- list(APPEND THIRDPARTY_LIBS zstd::zstd) -+ if(TARGET zstd::libzstd_shared) -+ list(APPEND THIRDPARTY_LIBS zstd::libzstd_shared) -+ elseif(TARGET zstd::libzstd_static) -+ list(APPEND THIRDPARTY_LIBS zstd::libzstd_static) -+ endif() - endif() - endif() - -@@ -402,9 +402,9 @@ endif() - - option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF) - if(WITH_TBB) -- find_package(TBB REQUIRED) -+ find_package(TBB CONFIG REQUIRED) - add_definitions(-DTBB) -- list(APPEND THIRDPARTY_LIBS TBB::TBB) -+ list(APPEND THIRDPARTY_LIBS TBB::tbb) - endif() - - # Stall notifications eat some performance from inserts diff --git a/ports/rocksdb/0004-fix-dependency-in-config.patch b/ports/rocksdb/0004-fix-dependency-in-config.patch deleted file mode 100644 index 59098ca22e63c0..00000000000000 --- a/ports/rocksdb/0004-fix-dependency-in-config.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in -index 0bd14be11..ad07f018a 100644 ---- a/cmake/RocksDBConfig.cmake.in -+++ b/cmake/RocksDBConfig.cmake.in -@@ -33,11 +33,11 @@ if(@WITH_BZ2@) - endif() - - if(@WITH_LZ4@) -- find_dependency(lz4) -+ find_dependency(lz4 CONFIG) - endif() - - if(@WITH_ZSTD@) -- find_dependency(zstd) -+ find_dependency(zstd CONFIG) - endif() - - if(@WITH_NUMA@) -@@ -45,7 +45,7 @@ if(@WITH_NUMA@) - endif() - - if(@WITH_TBB@) -- find_dependency(TBB) -+ find_dependency(TBB CONFIG) - endif() - - find_dependency(Threads) diff --git a/ports/rocksdb/0005-do-not-install-cmake-modules.patch b/ports/rocksdb/0005-do-not-install-cmake-modules.patch deleted file mode 100644 index dc86cb419c9bec..00000000000000 --- a/ports/rocksdb/0005-do-not-install-cmake-modules.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d90152..b0c5d31 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1206,7 +1206,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) - endforeach() - endforeach() - -- install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) -+ #install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) - - if(NOT ROCKSDB_BUILD_SHARED) - install( diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index b76979c7b5957d..5bc017c80aa025 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -2,13 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb REF "v${VERSION}" - SHA512 6640deb2aeef493a36125a081c0a1f5fa0e15636ad824088d26c03bacee95af742d833bb7e601952aa0d278563025934049a8195ab14c1cd18e29636fe5f64d7 + SHA512 2039a4afa9e6ee7d01aba3287f27f43cb48baf55be98b5be06f0b54982f7e28c1032ec1dbd1f10d946554c3c93a93686e7b51aab0d92f731ad4dd7d7c62bed74 HEAD_REF main PATCHES - 0002-only-build-one-flavor.patch - 0003-use-find-package.patch - 0004-fix-dependency-in-config.patch - 0005-do-not-install-cmake-modules.patch + 0001-fix-dependencies.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_MD_LIBRARY) diff --git a/ports/rocksdb/vcpkg.json b/ports/rocksdb/vcpkg.json index bb712a55953a02..6faa032263c283 100644 --- a/ports/rocksdb/vcpkg.json +++ b/ports/rocksdb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rocksdb", - "version": "8.3.2", + "version": "8.5.3", "description": "A library that provides an embeddable, persistent key-value store for fast storage", "homepage": "https://github.com/facebook/rocksdb", "license": "GPL-2.0-only OR Apache-2.0", @@ -16,7 +16,6 @@ } ], "default-features": [ - "liburing", "zlib" ], "features": { @@ -28,6 +27,7 @@ }, "liburing": { "description": "build with liburing", + "supports": "linux", "dependencies": [ { "name": "liburing", diff --git a/ports/rsasynccpp/portfile.cmake b/ports/rsasynccpp/portfile.cmake index db6090c761882e..20db58868f8be0 100644 --- a/ports/rsasynccpp/portfile.cmake +++ b/ports/rsasynccpp/portfile.cmake @@ -26,15 +26,16 @@ else() endif() endif() -vcpkg_install_msbuild( +vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH RStein.AsyncCppLib.sln - LICENSE_SUBPATH LICENSE PLATFORM "${TRIPLET_SYSTEM_ARCH}" DEBUG_CONFIGURATION "${DEBUG_CONFIGURATION}" RELEASE_CONFIGURATION "${RELEASE_CONFIGURATION}" ) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + file(COPY "${SOURCE_PATH}/RStein.AsyncCpp/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/asynccpp" FILES_MATCHING PATTERN "*.h") diff --git a/ports/rsasynccpp/vcpkg.json b/ports/rsasynccpp/vcpkg.json index 31091d0f92bce9..2906bccab69f02 100644 --- a/ports/rsasynccpp/vcpkg.json +++ b/ports/rsasynccpp/vcpkg.json @@ -1,11 +1,18 @@ { "name": "rsasynccpp", "version": "0.0.7", - "port-version": 2, + "port-version": 3, "maintainers": "Rene Stein ", "description": "Task Parallel Library (TPL)/dataflow/actors/async primitives for C++ based on C++ 20 coroutines.", "homepage": "https://github.com/renestein/Rstein.AsyncCpp", "supports": "windows & !arm", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ], "features": { "lib-cl-win-legacy-await": { "description": "Legacy coroutines (/await switch, std::experimental namespace)." diff --git a/ports/rsm-bsa/portfile.cmake b/ports/rsm-bsa/portfile.cmake index 03b46262bedcb1..d832085181abd5 100644 --- a/ports/rsm-bsa/portfile.cmake +++ b/ports/rsm-bsa/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ryan-rsm-McKenzie/bsa - REF 4.0.3 - SHA512 ec8a2aff1c833d7bffd6345ab989bc57137eee3fb2c5b7509027f068783d42d61bcc4b694b53a7961c1c69ee52834efadef9b3c82e1a739c0c5491af75e8dde7 + REF 4.1.0 + SHA512 c488a4f7cffa59064baafd429cf118a8f8a7b5594a0bd49a0ed468572b37af2e7428a83ad83cc7b13b556744a444cb7b8a4591c7018e49cadb1c5d42ae780f51 HEAD_REF master ) diff --git a/ports/rsm-bsa/vcpkg.json b/ports/rsm-bsa/vcpkg.json index 354a0f17d90e71..d27b67918837c0 100644 --- a/ports/rsm-bsa/vcpkg.json +++ b/ports/rsm-bsa/vcpkg.json @@ -1,16 +1,13 @@ { "name": "rsm-bsa", - "version-semver": "4.0.3", + "version-semver": "4.1.0", "description": "A C++ library for working with the Bethesda archive file format", "homepage": "https://github.com/Ryan-rsm-McKenzie/bsa", "documentation": "https://ryan-rsm-mckenzie.github.io/bsa/", "license": "MIT", "supports": "!x86 & !osx & !uwp", "dependencies": [ - { - "name": "directxtex", - "platform": "windows" - }, + "directxtex", "lz4", "rsm-binary-io", "rsm-mmio", diff --git a/ports/rtabmap/vcpkg.json b/ports/rtabmap/vcpkg.json index ecbc94570e5b81..959dd994bfdf98 100644 --- a/ports/rtabmap/vcpkg.json +++ b/ports/rtabmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rtabmap", "version": "0.21.0", - "port-version": 1, + "port-version": 2, "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", "license": "BSD-3-Clause", @@ -119,10 +119,7 @@ "dependencies": [ { "name": "realsense2", - "default-features": false, - "features": [ - "tm2" - ] + "default-features": false } ] }, diff --git a/ports/rtmidi/fix-cmake-install.patch b/ports/rtmidi/fix-cmake-install.patch new file mode 100644 index 00000000000000..3e02c92f5d8bb0 --- /dev/null +++ b/ports/rtmidi/fix-cmake-install.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e6af930..f3eadf2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,7 +191,7 @@ set_target_properties(rtmidi PROPERTIES + target_include_directories(rtmidi PRIVATE ${INCDIRS} + PUBLIC + $ +- $) ++ $) + + # Set compile-time definitions + target_compile_definitions(rtmidi PRIVATE ${API_DEFS}) diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake index 404a49ebc3f103..0d8583716e2744 100644 --- a/ports/rtmidi/portfile.cmake +++ b/ports/rtmidi/portfile.cmake @@ -8,7 +8,9 @@ vcpkg_from_github( REF 84a99422a3faf1ab417fe71c0903a48debb9376a # 5.0.0 SHA512 388e280b7966281e22b0048d6fb2541921df1113d84e49bbc444fff591d2025588edd8d61dbe5ff017afd76c26fd05edc8f9f15d0cce16315ccc15e6aac1d57f HEAD_REF master - PATCHES fix-cmake-usage.patch # Remove this patch in the next update + PATCHES + fix-cmake-usage.patch # Remove this patch in the next update + fix-cmake-install.patch # Remove this patch in the next update ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/rtmidi/vcpkg.json b/ports/rtmidi/vcpkg.json index 91979a2d5394f1..f242870f46ccce 100644 --- a/ports/rtmidi/vcpkg.json +++ b/ports/rtmidi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rtmidi", "version": "5.0.0", - "port-version": 2, + "port-version": 3, "description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)", "homepage": "https://github.com/thestk/rtmidi", "license": "MIT", diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake index 6fa9f61c114706..3e16b36189610a 100644 --- a/ports/scintilla/portfile.cmake +++ b/ports/scintilla/portfile.cmake @@ -20,9 +20,9 @@ vcpkg_extract_source_archive( ) vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH Win32/SciLexer.vcxproj - LICENSE_SUBPATH License.txt ) -file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT} FILES_MATCHING PATTERN "*.*") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") +file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}" FILES_MATCHING PATTERN "*.*") diff --git a/ports/scintilla/vcpkg.json b/ports/scintilla/vcpkg.json index d3e134a2b3700c..156e0a97de5319 100644 --- a/ports/scintilla/vcpkg.json +++ b/ports/scintilla/vcpkg.json @@ -1,8 +1,15 @@ { "name": "scintilla", "version": "4.4.6", - "port-version": 2, + "port-version": 3, "description": "A free source code editing component for Win32, GTK+, and OS X", "homepage": "https://www.scintilla.org/", - "supports": "!(uwp | linux | osx)" + "supports": "!(uwp | linux | osx)", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/scnlib/portfile.cmake b/ports/scnlib/portfile.cmake index 60112042268da2..7e19546e36cf9d 100644 --- a/ports/scnlib/portfile.cmake +++ b/ports/scnlib/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eliaskosunen/scnlib - REF v1.0 - SHA512 0d34b5a710a472618df5d8202bbd647f488aa0ac2ad593c4a212e42b8aee5c35882f6e0ab7a7241c766ed17c9273d5e6704b012ef7f23a1b329b2a2f28ec60c6 + REF "v${VERSION}" + SHA512 5dc2cc0f0817710453c7741cb61df46b4d4a43af0ec5cbbba77e3b6fb055e906840c232f92df5c3f3a9643191268922f059eacb798978767c717cc3578eb117d HEAD_REF master ) diff --git a/ports/scnlib/vcpkg.json b/ports/scnlib/vcpkg.json index a4b786a9c7370e..98b5c8fd21abf5 100644 --- a/ports/scnlib/vcpkg.json +++ b/ports/scnlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "scnlib", - "version": "1.0", - "port-version": 1, + "version": "1.1.2", "description": "scnlib is a modern C++ library for replacing scanf and std::istream", "homepage": "https://scnlib.dev/", "dependencies": [ diff --git a/ports/sdformat13/cmake-config.patch b/ports/sdformat13/cmake-config.patch new file mode 100644 index 00000000000000..34970b6dc6bd98 --- /dev/null +++ b/ports/sdformat13/cmake-config.patch @@ -0,0 +1,23 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3465a8f..2b57440 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -26,6 +26,7 @@ else() + target_link_libraries(using_parser_urdf INTERFACE + GzURDFDOM::GzURDFDOM) + endif() ++install(TARGETS using_parser_urdf EXPORT ${PROJECT_LIBRARY_TARGET_NAME} COMPONENT libraries) + + if (BUILD_TESTING) + # Build this test file only if Gazebo Tools is installed. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,6 @@ + if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) +- gz_find_package(GzURDFDOM VERSION 1.0 QUIET) ++ gz_find_package(GzURDFDOM) + if (NOT GzURDFDOM_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + # fallback to internal urdf + set(USE_INTERNAL_URDF ON) diff --git a/ports/sdformat13/fix-find-urdfdom.patch b/ports/sdformat13/fix-find-urdfdom.patch new file mode 100644 index 00000000000000..4593b083d3b629 --- /dev/null +++ b/ports/sdformat13/fix-find-urdfdom.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e797e8a..0f652d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -56,7 +56,18 @@ if (BUILD_SDF) + # 2. if USE_INTERNAL_URDF is set to True, use the internal copy + # 3. if USE_INTERNAL_URDF is set to False, force to search system installation, fail on error + if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) +- gz_find_package(GzURDFDOM) ++ find_package(urdfdom CONFIG REQUIRED) ++ add_library(GzURDFDOM::GzURDFDOM INTERFACE IMPORTED) ++ target_link_libraries(GzURDFDOM::GzURDFDOM ++ INTERFACE ++ urdfdom::urdfdom_model ++ urdfdom::urdfdom_world ++ urdfdom::urdfdom_sensor ++ urdfdom::urdfdom_model_state ++ ) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(GzURDFDOM DEFAULT_MSG) ++ + if (NOT GzURDFDOM_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + # fallback to internal urdf diff --git a/ports/sdformat13/no-absolute.patch b/ports/sdformat13/no-absolute.patch new file mode 100644 index 00000000000000..42ea51baa8cedf --- /dev/null +++ b/ports/sdformat13/no-absolute.patch @@ -0,0 +1,38 @@ +diff --git a/include/sdf/config.hh.in b/include/sdf/config.hh.in +index d1b3db53..9a9ce91d 100644 +--- a/include/sdf/config.hh.in ++++ b/include/sdf/config.hh.in +@@ -48,5 +48,3 @@ + #cmakedefine SDFORMAT_DISABLE_CONSOLE_LOGFILE 1 + +-#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/" +-#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}" + +diff --git a/src/SDF.cc b/src/SDF.cc +index 20dcd4c6..802cbde3 100644 +--- a/src/SDF.cc ++++ b/src/SDF.cc +@@ -97,22 +97,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath, + filename = filename.substr(idx + sep.length()); + } + +- // Next check the install path. +- std::string path = sdf::filesystem::append(SDF_SHARE_PATH, filename); +- if (sdf::filesystem::exists(path)) +- { +- return path; +- } +- +- // Next check the versioned install path. +- path = sdf::filesystem::append(SDF_SHARE_PATH, +- "sdformat" SDF_MAJOR_VERSION_STR, +- sdf::SDF::Version(), filename); +- if (sdf::filesystem::exists(path)) +- { +- return path; +- } +- + // Next check to see if the given file exists. +- path = filename; ++ std::string path = filename; + if (sdf::filesystem::exists(path)) diff --git a/ports/sdformat13/portfile.cmake b/ports/sdformat13/portfile.cmake new file mode 100644 index 00000000000000..d506d24808d1c1 --- /dev/null +++ b/ports/sdformat13/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gazebosim/sdformat + REF "sdformat13_${VERSION}" + SHA512 adc555527aadaede84d6fde11555bf4872028d9e895fc47c89f4077452fde9a52b233d60d0cbff5a098e261c7810aa2dc38a6275ec9f37ba4d0161af98e2aade + HEAD_REF sdf13 + PATCHES + no-absolute.patch + cmake-config.patch + fix-find-urdfdom.patch +) + +# Ruby is required by the sdformat build process +vcpkg_find_acquire_program(RUBY) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DRUBY=${RUBY}" + -DBUILD_TESTING=OFF + -DSKIP_PYBIND11=ON + -DUSE_INTERNAL_URDF=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat13") +vcpkg_fixup_pkgconfig() + +# fix dependency urdfdom +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/sdformat13-config.cmake" "find_package(TINYXML2" [[ +if (NOT TARGET GzURDFDOM::GzURDFDOM) + find_package(urdfdom CONFIG ${gz_package_quiet} ${gz_package_required}) + add_library(GzURDFDOM::GzURDFDOM INTERFACE IMPORTED) + target_link_libraries(GzURDFDOM::GzURDFDOM + INTERFACE + urdfdom::urdfdom_model + urdfdom::urdfdom_world + urdfdom::urdfdom_sensor + urdfdom::urdfdom_model_state + ) +endif() +find_package(TINYXML2]]) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/sdformat13/vcpkg.json b/ports/sdformat13/vcpkg.json new file mode 100644 index 00000000000000..cd6c3dc4e9092b --- /dev/null +++ b/ports/sdformat13/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "sdformat13", + "version": "13.5.0", + "port-version": 1, + "description": "Simulation Description Format (SDF) parser and description files.", + "homepage": "http://sdformat.org/", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + "gz-math7", + "gz-tools2", + "gz-utils2", + "tinyxml2", + "urdfdom", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake index c4fe695caec34f..772b22899c64d8 100644 --- a/ports/sdl1/portfile.cmake +++ b/ports/sdl1/portfile.cmake @@ -38,16 +38,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH VisualC/SDL1_2017.sln - INCLUDES_SUBPATH include - LICENSE_SUBPATH COPYING - ALLOW_ROOT_INCLUDES ) #Take all the fils into include/SDL to sovle conflict with SDL2 port - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/doxyfile") - file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include.tmp") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") - file(RENAME "${CURRENT_PACKAGES_DIR}/include.tmp" "${CURRENT_PACKAGES_DIR}/include/SDL") + file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/SDL") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDLmain.lib") @@ -82,6 +76,5 @@ else() "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3" ) - - file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/sdl1/vcpkg.json b/ports/sdl1/vcpkg.json index 113aea6732338f..304fabadddabe2 100644 --- a/ports/sdl1/vcpkg.json +++ b/ports/sdl1/vcpkg.json @@ -1,9 +1,16 @@ { "name": "sdl1", "version": "1.2.15", - "port-version": 18, + "port-version": 19, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org", "license": "LGPL-2.1-or-later", - "supports": "!osx & !uwp" + "supports": "!osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/sdl2/alsa-dep-fix.patch b/ports/sdl2/alsa-dep-fix.patch new file mode 100644 index 00000000000000..5b2c77b937d803 --- /dev/null +++ b/ports/sdl2/alsa-dep-fix.patch @@ -0,0 +1,13 @@ +diff --git a/SDL2Config.cmake.in b/SDL2Config.cmake.in +index cc8bcf26d..ead829767 100644 +--- a/SDL2Config.cmake.in ++++ b/SDL2Config.cmake.in +@@ -35,7 +35,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/sdlfind.cmake") + + set(SDL_ALSA @SDL_ALSA@) + set(SDL_ALSA_SHARED @SDL_ALSA_SHARED@) +-if(SDL_ALSA AND NOT SDL_ALSA_SHARED AND TARGET SDL2::SDL2-static) ++if(SDL_ALSA) + sdlFindALSA() + endif() + unset(SDL_ALSA) diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 39a724c511994c..2fa57963787410 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -2,10 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL REF "release-${VERSION}" - SHA512 90858ae8c5fdddd5e13724e05ad0970e11bbab1df8a0201c3f4ce354dc6018e5d4ab7279402a263c716aacdaa52745f78531dc225d48d790ee9307e2f6198695 + SHA512 6383280f12f7fc75b958a4354da2a5b3dfe4364eb7f65354546c5f9e95492c0f5da721a39dc9b90cdd91fdcea0153b153cdf31c0cd635e74786d23828d4184b0 HEAD_REF main PATCHES deps.patch + alsa-dep-fix.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) @@ -46,6 +47,7 @@ vcpkg_cmake_configure( -DSDL_TEST=OFF -DSDL_INSTALL_CMAKEDIR="cmake" -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON -DSDL_LIBSAMPLERATE_SHARED=OFF MAYBE_UNUSED_VARIABLES SDL_FORCE_STATIC_VCRT diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index de2eb9b9af3df3..16d148a40a419c 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,10 +1,15 @@ { "name": "sdl2", - "version": "2.26.5", + "version": "2.28.3", + "port-version": 1, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "license": "Zlib", "dependencies": [ + { + "name": "dbus", + "platform": "linux" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/seasocks/portfile.cmake b/ports/seasocks/portfile.cmake new file mode 100644 index 00000000000000..ec045609d0a907 --- /dev/null +++ b/ports/seasocks/portfile.cmake @@ -0,0 +1,40 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mattgodbolt/seasocks + REF "v${VERSION}" + SHA512 18e596a09a825efd2421eee3b0d5ea389c0056c4b01c8b2078841d03863318e3f3ad59f6fd47fbe90409989c1fe05599f29b34a397427d282124e867371733ed + HEAD_REF master +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + zlib DEFLATE_SUPPORT +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUNITTESTS=OFF + -DSEASOCKS_EXAMPLE_APP=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Seasocks") + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/licenses") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/seasocks/vcpkg.json b/ports/seasocks/vcpkg.json new file mode 100644 index 00000000000000..52133d8e4a2a10 --- /dev/null +++ b/ports/seasocks/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "seasocks", + "version": "1.4.6", + "description": "Simple, small, C++ embeddable webserver with WebSockets support", + "homepage": "https://github.com/mattgodbolt/seasocks", + "license": "BSD-2-Clause", + "supports": "!osx & !android", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "zlib" + ], + "features": { + "zlib": { + "description": "Build with Deflate support via zlib", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/sfml/fix-osx.patch b/ports/sfml/fix-osx.patch new file mode 100644 index 00000000000000..afbaa282b4f373 --- /dev/null +++ b/ports/sfml/fix-osx.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake +index e0118eb..76a4dcc 100644 +--- a/cmake/Macros.cmake ++++ b/cmake/Macros.cmake +@@ -24,8 +24,6 @@ function(sfml_set_stdlib target) + if (${CMAKE_GENERATOR} MATCHES "Xcode") + sfml_set_xcode_property(${target} CLANG_CXX_LIBRARY "libc++") + else() +- target_compile_options(${target} PRIVATE "-stdlib=libc++") +- target_link_libraries(${target} PRIVATE "-stdlib=libc++") + endif() + endif() + endfunction() diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index 464c5644275a21..38d1612dc14a0e 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH SHA512 aac734e8b0e16936c0238ec792c922923545ec6cf06576bc70004fa1920cd05b4c5e56fbc8a77b650bbe6e202adc39df1d30509dbce95778d04338917a38a87a PATCHES fix-dependencies.patch + fix-osx.patch ) # The embedded FindFreetype doesn't properly handle debug libraries diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index 5122f13953bbf0..575742ee9a58dd 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sfml", "version": "2.6.0", - "port-version": 18, + "port-version": 19, "description": "Simple and fast multimedia library", "homepage": "https://github.com/SFML/SFML", "license": "Zlib", diff --git a/ports/si/portfile.cmake b/ports/si/portfile.cmake new file mode 100644 index 00000000000000..4713cc79f72ae4 --- /dev/null +++ b/ports/si/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bernedom/SI + REF "${VERSION}" + SHA512 499bf6cd1c68cf5195f15b94910d4f3973a040c2d217aab4eacaa29bfefc031b441639272cffb4b810fd27ff3a664d55284c1252da5e4504ebc768d1a3567f78 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE release) # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSI_INSTALL_LIBRARY=ON + -DSI_BUILD_TESTING=OFF + -DSI_BUILD_DOC=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME SI CONFIG_PATH share/SI/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/si/usage b/ports/si/usage new file mode 100644 index 00000000000000..d631117213dd36 --- /dev/null +++ b/ports/si/usage @@ -0,0 +1,4 @@ +si provides CMake targets: + + find_package(SI CONFIG REQUIRED) + target_link_libraries(main PRIVATE SI::SI) diff --git a/ports/si/vcpkg.json b/ports/si/vcpkg.json new file mode 100644 index 00000000000000..fb0068c885c7d6 --- /dev/null +++ b/ports/si/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "si", + "version": "2.5.1", + "description": "A header only C++ library that provides type safety and user defined literals for physical units", + "homepage": "https://si.dominikberner.ch/doc/", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/sigmatch/portfile.cmake b/ports/sigmatch/portfile.cmake new file mode 100644 index 00000000000000..afe05cca182f68 --- /dev/null +++ b/ports/sigmatch/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SpriteOvO/sigmatch + REF v0.2.0 + SHA512 a2ae12bf2da4de4b4b65f443febca8bec5ded2cdcbfe5c166538869431558241883576fed04fc373b60fe5b5709c96a56110181d3b1c07dbb42ecfdddae74c06 + HEAD_REF main +) + +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSIGMATCH_BUILD_TESTS=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sigmatch) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/sigmatch/vcpkg.json b/ports/sigmatch/vcpkg.json new file mode 100644 index 00000000000000..bf71d5aa96bf4e --- /dev/null +++ b/ports/sigmatch/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "sigmatch", + "version": "0.2.0", + "description": "Modern C++ 20 signature match / search library", + "homepage": "https://github.com/SpriteOvO/sigmatch", + "license": "Apache-2.0", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/simsimd/portfile.cmake b/ports/simsimd/portfile.cmake new file mode 100644 index 00000000000000..e0beac34cea7f4 --- /dev/null +++ b/ports/simsimd/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ashvardanian/SimSIMD + REF "v${VERSION}" + SHA512 44a3f971bebbb4f4575dc50dc50795762fd5555f4811fc86a8699fe97dff556b4391128abb4f21b3b94210f9f6f20da854d9471d5443f4ad700a9e21ea905041 + HEAD_REF main +) + +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/simsimd/vcpkg.json b/ports/simsimd/vcpkg.json new file mode 100644 index 00000000000000..3945351e9dad9e --- /dev/null +++ b/ports/simsimd/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "simsimd", + "version": "1.4.0", + "description": "Fastest similarity-measures and distance functions on the Wild West – vectors, strings, short molecules, and even DNA sequences. All with a pinch of SIMD for both x86 and ARM.", + "homepage": "https://github.com/ashvardanian/SimSIMD", + "license": "Apache-2.0" +} diff --git a/ports/skia/disable-dev-test.patch b/ports/skia/disable-dev-test.patch new file mode 100644 index 00000000000000..9eb1be33d7c7b6 --- /dev/null +++ b/ports/skia/disable-dev-test.patch @@ -0,0 +1,13 @@ +diff --git a/BUILD.gn b/BUILD.gn +index 3691123..8682b8e 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -97,7 +97,7 @@ config("skia_private") { + if (is_skia_dev_build && !is_wasm) { + defines += [ + "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1", +- "GR_TEST_UTILS=1", ++ "GR_TEST_UTILS=0", + ] + if (skia_enable_graphite) { + defines += [ "GRAPHITE_TEST_UTILS=1" ] diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index f07d07d61f5762..2f76ffcc662c6d 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_git( disable-msvc-env-setup.patch uwp.patch core-opengl32.patch + disable-dev-test.patch ) # these following aren't available in vcpkg diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index b8bb03a5bfc932..67eb48c3fc11c9 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "skia", "version": "0.36.0", - "port-version": 8, + "port-version": 10, "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", @@ -107,6 +107,10 @@ "freetype": { "description": "Freetype support", "dependencies": [ + { + "name": "dlfcn-win32", + "platform": "windows" + }, { "name": "freetype", "default-features": false diff --git a/ports/snap7/0001-remove-using-namespace-std.patch b/ports/snap7/0001-remove-using-namespace-std.patch new file mode 100644 index 00000000000000..d6c493d0cda909 --- /dev/null +++ b/ports/snap7/0001-remove-using-namespace-std.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/s7_partner.h b/src/core/s7_partner.h +index 95211a2..25c1810 100644 +--- a/src/core/s7_partner.h ++++ b/src/core/s7_partner.h +@@ -29,7 +29,7 @@ + #include "snap_threads.h" + #include "s7_peer.h" + //--------------------------------------------------------------------------- +-using namespace std; ++//using namespace std; + //--------------------------------------------------------------------------- + + #define MaxPartners 256 diff --git a/ports/snap7/CMakeLists.txt b/ports/snap7/CMakeLists.txt new file mode 100644 index 00000000000000..5dcf75ace68606 --- /dev/null +++ b/ports/snap7/CMakeLists.txt @@ -0,0 +1,70 @@ +# CMakeList.txt : CMake project for Snap7, include source and define +# project specific logic here. +cmake_minimum_required (VERSION 3.8) + +project(snap7 + VERSION 1.4.2 + LANGUAGES CXX) + +# Add source to this project's executable. +add_library(${PROJECT_NAME} SHARED "core/s7_client.cpp" + "core/s7_client.h" + "core/s7_firmware.h" + "core/s7_isotcp.cpp" + "core/s7_isotcp.h" + "core/s7_micro_client.cpp" + "core/s7_micro_client.h" + "core/s7_partner.cpp" + "core/s7_partner.h" + "core/s7_peer.cpp" + "core/s7_peer.h" + "core/s7_server.cpp" + "core/s7_server.h" + "core/s7_text.cpp" + "core/s7_text.h" + "core/s7_types.h" + "lib/snap7_libmain.cpp" + "lib/snap7_libmain.h" + "sys/snap_msgsock.cpp" + "sys/snap_msgsock.h" + "sys/snap_platform.h" + "sys/snap_sysutils.cpp" + "sys/snap_sysutils.h" + "sys/snap_tcpsrvr.cpp" + "sys/snap_tcpsrvr.h" + "sys/snap_threads.cpp" + "sys/snap_threads.h" + "sys/sol_threads.h" + "sys/unix_threads.h" + "sys/win_threads.h" + "../release/Wrappers/c-cpp/snap7.h" + "../release/Wrappers/c-cpp/snap7.cpp" + ) + +if(MSVC) + target_link_libraries(${PROJECT_NAME} wsock32 ws2_32) + target_link_libraries(${PROJECT_NAME} winmm.lib) +endif() + +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + +target_include_directories(${PROJECT_NAME} PUBLIC $ $) +target_include_directories(${PROJECT_NAME} PUBLIC $ $) +target_include_directories(${PROJECT_NAME} PUBLIC $ $) +target_include_directories(${PROJECT_NAME} PUBLIC $ $) + +install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}) + +install( + EXPORT ${PROJECT_NAME} + FILE ${PROJECT_NAME}-config.cmake + DESTINATION "share/${PROJECT_NAME}" + NAMESPACE ${PROJECT_NAME}:: +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY "core/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h") + install(DIRECTORY "lib/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h") + install(DIRECTORY "sys/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h") + install(DIRECTORY "../release/Wrappers/c-cpp/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h") +endif() diff --git a/ports/snap7/portfile.cmake b/ports/snap7/portfile.cmake new file mode 100644 index 00000000000000..143ae67965aa01 --- /dev/null +++ b/ports/snap7/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO snap7 + REF "${VERSION}" + FILENAME "snap7-full-${VERSION}.7z" + SHA512 84F4E1AD15BFEC201F9EB1EC90A28F37DFC848E370DB5CEA22EF4946F41FF6CC514581D29D592B57EE6D4C77F4AABB4B2BBA1E3637043161821BA2FFAE7F2DD6 + PATCHES + 0001-remove-using-namespace-std.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/src") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/snap7/__history") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/lgpl-3.0.txt") diff --git a/ports/snap7/vcpkg.json b/ports/snap7/vcpkg.json new file mode 100644 index 00000000000000..4655012b4181d6 --- /dev/null +++ b/ports/snap7/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "snap7", + "version": "1.4.2", + "port-version": 1, + "description": "Snap7", + "homepage": "https://snap7.sourceforge.net/", + "license": "LGPL-3.0", + "supports": "!android & !uwp & !static", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/soci/vcpkg.json b/ports/soci/vcpkg.json index c7abe8b51c064c..db687ca0842709 100644 --- a/ports/soci/vcpkg.json +++ b/ports/soci/vcpkg.json @@ -1,6 +1,7 @@ { "name": "soci", "version": "4.0.3", + "port-version": 1, "description": "SOCI database access library", "homepage": "https://github.com/SOCI/soci", "license": "BSL-1.0", @@ -32,7 +33,8 @@ ] }, "odbc": { - "description": "Build odbc backend" + "description": "Build odbc backend", + "supports": "!uwp" }, "postgresql": { "description": "Build postgresql backend", diff --git a/ports/soil2/vcpkg.json b/ports/soil2/vcpkg.json index 55acddbbb1086c..08a5013f029041 100644 --- a/ports/soil2/vcpkg.json +++ b/ports/soil2/vcpkg.json @@ -1,9 +1,11 @@ { "name": "soil2", "version": "1.3.0", + "port-version": 1, "description": "Simple OpenGL Image Library 2", "homepage": "https://github.com/SpartanJ/SOIL2", "license": "MIT-0", + "supports": "!uwp & !android", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake index ffe3bcb84d7dbe..c7e113ff71a20e 100644 --- a/ports/spatialite-tools/portfile.cmake +++ b/ports/spatialite-tools/portfile.cmake @@ -1,11 +1,11 @@ # Allow empty include directory set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -set(SPATIALITE_TOOLS_VERSION_STR "5.0.1") +string(REPLACE "-" "" SPATIALITE_TOOLS_VERSION_STR "${VERSION}") vcpkg_download_distfile(ARCHIVE URLS "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz" FILENAME "spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz" - SHA512 dad52f6ed3c66ffd95f3a5c21225cd1b20641523af616f7e8defba8e4e46921da169e5f7bf9c53a355e132b6e74750d6db3fe02c870a3386f850df49c83bb8cd + SHA512 cf255c9e04e78e450e20019e3c988b2b0a770c6b7857a5b1c95d0696ee29902e7a85667c1a38dec9aa164fa6d28a444be6365b0444b78015180c1f27fa68ea89 ) vcpkg_extract_source_archive(SOURCE_PATH diff --git a/ports/spatialite-tools/vcpkg.json b/ports/spatialite-tools/vcpkg.json index 5f834eb1194a70..fbde91f0f6ca1f 100644 --- a/ports/spatialite-tools/vcpkg.json +++ b/ports/spatialite-tools/vcpkg.json @@ -1,7 +1,6 @@ { "name": "spatialite-tools", - "version": "5.0.1", - "port-version": 4, + "version": "5.1.0-a", "description": "Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)", "homepage": "https://www.gaia-gis.it/fossil/spatialite-tools/index", "license": "GPL-3.0-or-later", diff --git a/ports/sqlcipher/portfile.cmake b/ports/sqlcipher/portfile.cmake index 1c6fcb6cdddd02..d12800dce8018a 100644 --- a/ports/sqlcipher/portfile.cmake +++ b/ports/sqlcipher/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sqlcipher/sqlcipher REF "v${VERSION}" - SHA512 27dcc83c8088ea32a2bbc3d5493d070e29976dc54ccf91d849df67be19cb553761a32b3613e293a07f50128aeb808d54f363ad12a58a47f06a61a1cc4e1eb0cd + SHA512 deb592d6f27e7cc02bd641bb8f6e07b242f0dc6c7d8732e7a1e70e457eadd487add7d95c881fe9afbff516f4641a6e603473e47c63afa8396a0ddf007a5818fd HEAD_REF master ) diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json index dda4f377969d6f..c1ce2b94524c62 100644 --- a/ports/sqlcipher/vcpkg.json +++ b/ports/sqlcipher/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlcipher", - "version": "4.5.3", - "port-version": 2, + "version": "4.5.4", "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.", "homepage": "https://www.zetetic.net/sqlcipher", "license": null, diff --git a/ports/sqlite3/add-config-include.patch b/ports/sqlite3/add-config-include.patch index cf67c26fc398bb..cb0e957bbe980e 100644 --- a/ports/sqlite3/add-config-include.patch +++ b/ports/sqlite3/add-config-include.patch @@ -1,24 +1,24 @@ diff --git a/sqlite3.c b/sqlite3.c -index a290c82..a5d4d97 100644 +index 310583f..61f7d9e 100644 --- a/sqlite3.c +++ b/sqlite3.c -@@ -17,6 +17,7 @@ - ** language. The code for the "sqlite3" command-line shell is also in a - ** separate file. This file contains only code for the core SQLite library. +@@ -20,6 +20,7 @@ + ** The content in this amalgamation comes from Fossil check-in + ** f80b798b3f4b81a7bb4233c58294edd0f11. */ -+#include ++#include "sqlite3-vcpkg-config.h" #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 #ifndef SQLITE_PRIVATE diff --git a/sqlite3.h b/sqlite3.h -index 24b9167..9fd81b9 100644 +index ec451a5..9c01424 100644 --- a/sqlite3.h +++ b/sqlite3.h @@ -32,6 +32,7 @@ */ #ifndef SQLITE3_H #define SQLITE3_H -+#include "./sqlite3-vcpkg-config.h" ++#include "sqlite3-vcpkg-config.h" #include /* Needed for the definition of va_list */ /* diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 85c6ada8f8f331..ca93d91e2a96dc 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -4,7 +4,7 @@ string(REGEX REPLACE "^([0-9]+),0*([0-9][0-9]),0*([0-9][0-9]),0*([0-9][0-9])," " vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2023/sqlite-amalgamation-${SQLITE_VERSION}.zip" FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" - SHA512 76416dc40dd15611f59d7209087a08c6cf1b7584dee34da4ce11b75acd7f608d794747a7ed87c3ffe16b237699279c2da8f85b009a379e108d39f33bd727e1e1 + SHA512 241b22899c9090d94677328335588ba964a5bc3bfb278b8dcc97d6062cdfab6460b5b03dc166124f6119f5f8ece62ef9d06298de06eb5b36ed3ea49fd6ddc394 ) vcpkg_extract_source_archive( diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index e9a8c802df157f..b78b582414f95b 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlite3", - "version": "3.42.0", - "port-version": 1, + "version": "3.43.0", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", @@ -59,7 +58,8 @@ "description": "Enable the SESSION extension" }, "tool": { - "description": "Build sqlite3 executable" + "description": "Build sqlite3 executable", + "supports": "!uwp" }, "zlib": { "description": "Build sqlite3 command line tool with zlib support; has no effect on the library itself", diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake index de1cf99fb0d903..e2e8363dd092d0 100644 --- a/ports/sqlitecpp/portfile.cmake +++ b/ports/sqlitecpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "SRombauts/SQLiteCpp" REF ${VERSION} HEAD_REF master - SHA512 9702b17c55b1b3bc46a72d5c204b560249e9c1f02647c864fd4ca54011e4b0238638800ee870baa5106512a9568338d3faa9c9f9799d42fbd558d10376e3b73a + SHA512 08a42ef2495b65e8565569842b40882aff91a3bf1887f09b5b2f2950ae4e16ef927809e7ff9870ffcf143bc187bb3eea5c3f2e4881943144e8cb6e1605ba71ce PATCHES fix_dependency.patch add_runtime_destination.patch diff --git a/ports/sqlitecpp/vcpkg.json b/ports/sqlitecpp/vcpkg.json index a78d9e6d57f5be..9eb7de68d7ed69 100644 --- a/ports/sqlitecpp/vcpkg.json +++ b/ports/sqlitecpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sqlitecpp", - "version": "3.3.0", + "version": "3.3.1", "description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.", "homepage": "https://github.com/SRombauts/SQLiteCpp", "license": "MIT", diff --git a/ports/stduuid/fix-gsl-polyfill.patch b/ports/stduuid/fix-gsl-polyfill.patch index 2e07871bd60229..3ae035938481cf 100644 --- a/ports/stduuid/fix-gsl-polyfill.patch +++ b/ports/stduuid/fix-gsl-polyfill.patch @@ -1,15 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f45a7dc..039ee53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -37,11 +37,11 @@ if (UUID_TIME_GENERATOR) +@@ -43,11 +43,11 @@ if (UUID_TIME_GENERATOR) endif() # Using span from std -if (NOT UUID_USING_CXX20_SPAN) - target_include_directories(${PROJECT_NAME} INTERFACE -- $ -- $) +- $ +- $) - install(DIRECTORY gsl DESTINATION include) +if (UUID_USING_CXX20_SPAN) + target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_20) @@ -18,9 +17,8 @@ index f45a7dc..039ee53 100644 + target_link_libraries(${PROJECT_NAME} INTERFACE Microsoft.GSL::GSL) endif () - # Install step and imported target + if(UUID_ENABLE_INSTALL) diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -index 7217b72..fb981d2 100644 --- a/cmake/Config.cmake.in +++ b/cmake/Config.cmake.in @@ -9,6 +9,10 @@ if (@UUID_SYSTEM_GENERATOR@) diff --git a/ports/stduuid/fix-install-directory.patch b/ports/stduuid/fix-install-directory.patch index f80d5b6a630ef2..be1a12bf77ebca 100644 --- a/ports/stduuid/fix-install-directory.patch +++ b/ports/stduuid/fix-install-directory.patch @@ -1,8 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index fffb92c..f45a7dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -11,7 +11,8 @@ option(UUID_USING_CXX20_SPAN "Using span from std instead of gsl" OFF) +@@ -18,7 +18,8 @@ option(UUID_USING_CXX20_SPAN "Using span from std instead of gsl" OFF) add_library(${PROJECT_NAME} INTERFACE) target_include_directories(${PROJECT_NAME} INTERFACE $ @@ -12,12 +11,12 @@ index fffb92c..f45a7dc 100644 # Using system uuid generator if (UUID_SYSTEM_GENERATOR) -@@ -44,7 +45,7 @@ if (NOT UUID_USING_CXX20_SPAN) - endif () +@@ -52,7 +52,7 @@ - # Install step and imported target --install(FILES include/uuid.h DESTINATION include) -+install(FILES include/uuid.h DESTINATION include/stduuid) - install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets) - install(EXPORT ${PROJECT_NAME}-targets - DESTINATION lib/cmake/${PROJECT_NAME}) + if(UUID_ENABLE_INSTALL) + # Install step and imported target +- install(FILES include/uuid.h DESTINATION include) ++ install(FILES include/uuid.h DESTINATION include/stduuid) + install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets) + install(EXPORT ${PROJECT_NAME}-targets + DESTINATION lib/cmake/${PROJECT_NAME}) diff --git a/ports/stduuid/portfile.cmake b/ports/stduuid/portfile.cmake index 27a3bf8d3767e1..696b86763ba199 100644 --- a/ports/stduuid/portfile.cmake +++ b/ports/stduuid/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mariusbancila/stduuid - REF v1.2.2 - SHA512 30970c25992e1ba35d96e3b2fc8530466c1070b8b913b8c37e9f698f39121a5a74361e2c4db4c2ba2feddb0ce9b2f14b78c4761cdac09b89a6a0117b179b08a7 + REF "v${VERSION}" + SHA512 3d2fb21f680fb12559642d6787a5744d4f4fb48a6284bfef77537cb51f9bdbbe271b24a8c3bb1f954b4c845145f22c6d89a09e663df2f96a2e24d1d6f22fdf22 HEAD_REF master PATCHES fix-install-directory.patch @@ -20,15 +20,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS gsl-span UUID_USING_CXX20_SPAN ) -vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUUID_BUILD_TESTS=OFF + -DUUID_ENABLE_INSTALL=ON ${FEATURE_OPTIONS} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") if("gsl-span" IN_LIST FEATURES) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#ifdef __cpp_lib_span" "#if 0") @@ -37,4 +38,4 @@ else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#ifdef __cpp_lib_span" "#if 1") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/stduuid/vcpkg.json b/ports/stduuid/vcpkg.json index 840ce796b08713..406519fbd4b780 100644 --- a/ports/stduuid/vcpkg.json +++ b/ports/stduuid/vcpkg.json @@ -1,7 +1,8 @@ { "name": "stduuid", - "version": "1.2.2", + "version": "1.2.3", "description": "A C++17 cross-platform implementation for UUIDs", + "homepage": "https://github.com/mariusbancila/stduuid", "license": "MIT", "dependencies": [ { diff --git a/ports/strong-type/portfile.cmake b/ports/strong-type/portfile.cmake index 9fd63f0ca8540b..a89cce255391e5 100644 --- a/ports/strong-type/portfile.cmake +++ b/ports/strong-type/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "rollbear/strong_type" - REF "v8" - SHA512 "d9bd43c090aac6d36183f70f6cc066484357e997b1b2081114ecb459f80cd990ad31c9141948bf2a9d12ac504da77331a470f2f0eaadc57fbfc9bec6c4de6464" + REF "v${VERSION}" + SHA512 "ad8302b3c22404f4a12ae49fd1099ad89d1a66f6354b5e751149ce9f739466a279493931b338f9e933817782d58c795cb43afb47af7f9a214212bf85ba7c6235" ) vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") @@ -9,4 +9,4 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME "strong_type" CONFIG_PATH "lib/cmake/strong_type") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/strong-type/vcpkg.json b/ports/strong-type/vcpkg.json index 3051a2b18f2beb..c3ed8abdd8038b 100644 --- a/ports/strong-type/vcpkg.json +++ b/ports/strong-type/vcpkg.json @@ -1,6 +1,6 @@ { "name": "strong-type", - "version": "8", + "version": "12", "description": "An additive strong typedef library for C++14/17/20", "homepage": "https://github.com/rollbear/strong_type", "license": "BSL-1.0", diff --git a/ports/symengine/portfile.cmake b/ports/symengine/portfile.cmake index 63126844e41817..3056150551dc82 100644 --- a/ports/symengine/portfile.cmake +++ b/ports/symengine/portfile.cmake @@ -16,13 +16,7 @@ vcpkg_check_features( llvm WITH_LLVM ) -if(integer-class-boostmp IN_LIST FEATURES) - set(INTEGER_CLASS boostmp) - - if(integer-class-flint IN_LIST FEATURES) - message(WARNING "Both boostmp and flint are given for integer class, will use boostmp only.") - endif() -elseif(integer-class-flint IN_LIST FEATURES) +if(integer-class-flint IN_LIST FEATURES) set(INTEGER_CLASS flint) endif() @@ -31,8 +25,6 @@ if(VCPKG_TARGET_IS_UWP) set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE") endif() -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MSVC_USE_MT) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -40,10 +32,10 @@ vcpkg_cmake_configure( -DBUILD_BENCHMARKS=no -DBUILD_TESTS=no -DMSVC_WARNING_LEVEL=3 - -DMSVC_USE_MT=${MSVC_USE_MT} + -DMSVC_USE_MT=no -DWITH_SYMENGINE_RCP=yes -DWITH_SYMENGINE_TEUCHOS=no - -DINTEGER_CLASS=${INTEGER_CLASS} + -DWITH_SYMENGINE_THREAD_SAFE=yes ${FEATURE_OPTIONS} ) diff --git a/ports/symengine/vcpkg.json b/ports/symengine/vcpkg.json index 2384d9f1d9a7c9..4f3b4d9ba63d27 100644 --- a/ports/symengine/vcpkg.json +++ b/ports/symengine/vcpkg.json @@ -1,12 +1,21 @@ { "name": "symengine", "version": "0.10.1", + "port-version": 1, "description": "SymEngine is a fast symbolic manipulation library", "homepage": "https://github.com/symengine/symengine", "license": "BSD-3-Clause", + "supports": "!uwp", "dependencies": [ "boost-math", "boost-random", + { + "name": "symengine", + "default-features": false, + "features": [ + "integer-class-flint" + ] + }, { "name": "vcpkg-cmake", "host": true @@ -17,7 +26,9 @@ } ], "default-features": [ - "integer-class-boostmp" + "arb", + "llvm", + "mpfr" ], "features": { "arb": { @@ -32,17 +43,10 @@ "flint" ] }, - "integer-class-boostmp": { - "description": "Use Boost.multiprecision integer class", - "dependencies": [ - "boost-multiprecision" - ] - }, "integer-class-flint": { "description": "Use flint integer class", "dependencies": [ - "flint", - "gmp" + "flint" ] }, "llvm": { diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake index fb53b5cf0d4dd6..0a0a501d5141b3 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taglib/taglib - REF v1.13 - SHA512 b6e3253d158b41173073c0da1915f5e4a3de947db918660817cb1c755fba7e3723ea1a335fbbc30b0dcf942348a471b493fe2ce1d52d1a808578edee14e1bfc7 + REF v1.13.1 + SHA512 986231ee62caa975afead7e94630d58acaac25a38bc33d4493d51bd635d79336e81bba60586d7355ebc0670e31f28d32da3ecceaf33292e4bc240c64bf00f35b HEAD_REF master ) diff --git a/ports/taglib/vcpkg.json b/ports/taglib/vcpkg.json index 23293859779a06..1b890327e5158e 100644 --- a/ports/taglib/vcpkg.json +++ b/ports/taglib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "taglib", - "version-semver": "1.13.0", - "port-version": 2, + "version-semver": "1.13.1", + "port-version": 1, "description": "TagLib Audio Meta-Data Library", "homepage": "https://taglib.org/", "license": "LGPL-2.1-only OR MPL-1.1", diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 54550310b43dfe..595eca81407c59 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -30,7 +30,11 @@ if(NOT VCPKG_BUILD_TYPE) if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|arm|wasm32)$") set(arch_suffix "32") endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug") + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug") + else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb" "-ltbb_debug") + endif() unset(arch_suffix) endif() vcpkg_fixup_pkgconfig() diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index d8d158b2e3b07e..f90944c83ae44a 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tbb", "version": "2021.10.0", + "port-version": 2, "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/oneapi-src/oneTBB", "license": "Apache-2.0", @@ -16,9 +17,15 @@ "host": true } ], + "default-features": [ + { + "name": "hwloc", + "platform": "!static & !osx" + } + ], "features": { "hwloc": { - "description": "Builds TBB with TBBBind support for Hibrid CPUs or NUMA architectures.", + "description": "Builds TBB with TBBBind support for Hybrid CPUs or NUMA architectures.", "supports": "!static & !osx", "dependencies": [ "hwloc" diff --git a/ports/tcl/vcpkg.json b/ports/tcl/vcpkg.json index 513c6a97cd73b7..9d9b85d69b0213 100644 --- a/ports/tcl/vcpkg.json +++ b/ports/tcl/vcpkg.json @@ -1,9 +1,10 @@ { "name": "tcl", "version-string": "core-9-0-a1", - "port-version": 5, + "port-version": 6, "description": "Tcl provides a powerful platform for creating integration applications that tie together diverse applications, protocols, devices, and frameworks. When paired with the Tk toolkit, Tcl provides the fastest and most powerful way to create GUI applications that run on PCs, Unix, and Mac OS X. Tcl can also be used for a variety of web-related tasks and for creating powerful command languages for applications.", "homepage": "https://github.com/tcltk/tcl", + "supports": "!android & !(windows & arm) & !uwp", "features": { "profile": { "description": "Adds profiling hooks. Map file is assumed." diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index a28501777de668..2b9a242a9e2c78 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tesseract-ocr/tesseract REF "${VERSION}" - SHA512 1744106d76eafd0786b99b517707afdd22b7b5cb3dfd7f0af02954539715c981ff0f12d142ee103113ba38dac8476052d6880b81d4c8050de650bf1cee6ba06c + SHA512 92db2a513f00b931a0207cc705020bee9fea4ff7fa93c57a6f446b5777713864cce19121b316ef8b78b6bd625ee7e6fd473352515f98c4a2187569cbd0a9713a PATCHES ${tesseract_patch} fix_static_link_icu.patch @@ -29,6 +29,7 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_OpenCL=ON -DLeptonica_DIR=YES -DSW_BUILD=OFF + -DLEPT_TIFF_RESULT=ON MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_OpenCL ) @@ -57,9 +58,6 @@ if("training-tools" IN_LIST FEATURES) wordlist2dawg combine_lang_model lstmeval lstmtraining set_unicharset_properties unicharset_extractor merge_unicharsets ) - if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND TRAINING_TOOLS text2image) - endif() vcpkg_copy_tools(TOOL_NAMES ${TRAINING_TOOLS} AUTO_CLEAN) endif() @@ -105,4 +103,4 @@ file(GLOB WORDREC_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/wordre file(INSTALL ${WORDREC_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/wordrec") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index 4d51f167630340..68480240fcec0a 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,12 +1,15 @@ { "name": "tesseract", - "version": "5.3.1", - "port-version": 1, + "version": "5.3.2", "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ + { + "name": "cpu-features", + "platform": "android" + }, { "name": "curl", "default-features": false diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake index 8b77220e6a22ab..d97c2cf4c1a396 100644 --- a/ports/thorvg/portfile.cmake +++ b/ports/thorvg/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thorvg/thorvg - REF v0.10.0 - SHA512 63e0df26be141eeabf0c7204a75f55c57b59f0f2514d896ee6c73c17453e9e1b606434fa93bbbebc6a2671389ecd7ec39c1099ef25c2e9459932e9cc4d8b1241 + REF v0.10.1 + SHA512 8a105f4d854829995799016bb2837ec3c80da1cca0bc1833069a04928d6104677568d1e80fac02a4aa86d1b79b837586366fa28e2d21d43211f31bbb0e79399c HEAD_REF master PATCHES install-tools.patch @@ -16,9 +16,6 @@ else() endif() if ("tools" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "This feature doesn't support Windows platform") - endif() list(APPEND BUILD_OPTIONS -Dtools=all) endif() diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json index 7019b4eab4ed2f..e36e58ca5115b0 100644 --- a/ports/thorvg/vcpkg.json +++ b/ports/thorvg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "thorvg", - "version": "0.10.0", + "version": "0.10.1", + "port-version": 1, "description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations", "homepage": "https://www.thorvg.org", "license": "MIT", @@ -13,7 +14,8 @@ ], "features": { "tools": { - "description": "Build tools" + "description": "Build tools", + "supports": "!windows" } } } diff --git a/ports/thorvg/windows-build-option.patch b/ports/thorvg/windows-build-option.patch index 1343fe76f4896f..84173ce34a378d 100644 --- a/ports/thorvg/windows-build-option.patch +++ b/ports/thorvg/windows-build-option.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index a04a9546..cfaceb35 100644 +index dff33edb..f8339a3a 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ @@ -7,6 +7,6 @@ index a04a9546..cfaceb35 100644 'cpp', - default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14', 'strip=true'], + default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14'], - version : '0.10.0', + version : '0.10.1', license : 'MIT') diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index f83c03c112bca2..15ee282ac5a899 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -12,8 +12,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF 2a93df80f27739ccabb5b885cb12a8dc7595ecdf #0.16.0 - SHA512 aed4f60b8a4eca5b4bce26f6f29d1178684d2b4e6de290ab1e696ac78a9f85d941afe5dca99d1d22d640371ad538b930cf445f9f899a2e322f39b0cceec307a3 + REF "${VERSION}" + SHA512 f9bfaf149dde4da1f5353e540b862c2088465115564d981bf02cd89e8c1f84ca53143ca0091b63d24f8f515425d9163af52ec6122245b59810a2b98292a71650 HEAD_REF master PATCHES "correct-paths.patch" @@ -83,7 +83,7 @@ if(COMPILER) vcpkg_copy_tools(TOOL_NAMES thrift AUTO_CLEAN) endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/thrift/vcpkg.json b/ports/thrift/vcpkg.json index e6ae5f223b80f6..86418421a8f4c9 100644 --- a/ports/thrift/vcpkg.json +++ b/ports/thrift/vcpkg.json @@ -1,7 +1,6 @@ { "name": "thrift", - "version": "0.16.0", - "port-version": 1, + "version": "0.19.0", "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.", "homepage": "https://github.com/apache/thrift", "license": "Apache-2.0", diff --git a/ports/tomlplusplus/fix-android-fileapi.patch b/ports/tomlplusplus/fix-android-fileapi.patch new file mode 100644 index 00000000000000..43f526e7c21b71 --- /dev/null +++ b/ports/tomlplusplus/fix-android-fileapi.patch @@ -0,0 +1,17 @@ +diff --git a/include/toml++/impl/parser.inl b/include/toml++/impl/parser.inl +index 27de2b0..bb2fb46 100644 +--- a/include/toml++/impl/parser.inl ++++ b/include/toml++/impl/parser.inl +@@ -23,6 +23,12 @@ + #include "unicode.h" + TOML_DISABLE_WARNINGS; + #include ++ ++#if defined(__ANDROID_API__) && __ANDROID_API__ < 24 ++ // Cf. https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md#32_bit-and ++ #define ftello ftell ++ #define fseeko fseek ++#endif + #include + #if TOML_INT_CHARCONV || TOML_FLOAT_CHARCONV + #include diff --git a/ports/tomlplusplus/portfile.cmake b/ports/tomlplusplus/portfile.cmake index dd0d7b8692730e..2cce3ab5dea488 100644 --- a/ports/tomlplusplus/portfile.cmake +++ b/ports/tomlplusplus/portfile.cmake @@ -1,25 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO marzer/tomlplusplus - REF v3.1.0 - SHA512 b5223fa978b606f6b14fa74495884ccd491fa6017ef44b2ac9a384fa1df7100745145163e2a139255927fb51e5ecd779ee2643c19579eab6e4533b15e75c9be9 + REF "v${VERSION}" + SHA512 6ab2de83b7fc44de40e58a47c28a9507bf7c50fa9b08925b5a6d48958868a86e6790aff684d29ceb50ad18905e3832840719e1b7bfec3b8a0c00b15bb0f70f38 HEAD_REF master + PATCHES + fix-android-fileapi.patch ) vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -Dgenerate_cmake_config=true + -Dgenerate_cmake_config=false -Dbuild_tests=false -Dbuild_examples=false ) vcpkg_install_meson() -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/tomlplusplus) -cmake_path(NATIVE_PATH SOURCE_PATH native_source_path) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tomlplusplus/tomlplusplusConfig.cmake" "${native_source_path}" "") vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/tomlplusplus/usage b/ports/tomlplusplus/usage new file mode 100644 index 00000000000000..b178ba27df28d0 --- /dev/null +++ b/ports/tomlplusplus/usage @@ -0,0 +1,5 @@ +The package tomlplusplus can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig REQUIRED) + pkg_check_modules(tomlplusplus REQUIRED IMPORTED_TARGET tomlplusplus) + target_link_libraries(main PkgConfig::tomlplusplus) diff --git a/ports/tomlplusplus/vcpkg.json b/ports/tomlplusplus/vcpkg.json index 2ecfcff5453b8c..73673a29c196e3 100644 --- a/ports/tomlplusplus/vcpkg.json +++ b/ports/tomlplusplus/vcpkg.json @@ -1,15 +1,11 @@ { "name": "tomlplusplus", - "version": "3.1.0", + "version": "3.3.0", "description": "Header-only TOML config file parser and serializer for modern C++.", "homepage": "https://marzer.github.io/tomlplusplus/", "license": "MIT", "supports": "!uwp", "dependencies": [ - { - "name": "vcpkg-cmake-config", - "host": true - }, { "name": "vcpkg-tool-meson", "host": true diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 33c50cc12b2e21..827c028b2b1c3e 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -19,10 +19,10 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - on-demand TRACY_ON_DEMAND - INVERTED_FEATURES - crash-handler TRACY_NO_CRASH_HANDLER + FEATURES + on-demand TRACY_ON_DEMAND + INVERTED_FEATURES + crash-handler TRACY_NO_CRASH_HANDLER ) vcpkg_cmake_configure( @@ -31,41 +31,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -if(VCPKG_TARGET_IS_LINUX) - set(any_tracy_tool_requested OFF) - if(profiler IN_LIST FEATURES) - message(WARNING -"Tracy currently requires the following libraries from the system package manager to build its tools: - gtk+-3.0 - tbb - -These can be installed on Ubuntu systems via sudo apt install libgtk-3-dev libtbb-dev") - set(any_tracy_tool_requested ON) - else() - foreach(CLI_TOOL capture csvexport import-chrome update) - if(${CLI_TOOL} IN_LIST FEATURES) - message(WARNING -"Tracy currently requires the following libraries from the system package manager to build its tools: - tbb - -These can be installed on Ubuntu systems via sudo apt install libtbb-dev") - set(any_tracy_tool_requested ON) - break() - endif() - endforeach() - endif() - -endif() - -vcpkg_list(SET tracy_tools) -if("cli-tools" IN_LIST FEATURES) - vcpkg_list(APPEND tracy_tools capture csvexport import-chrome update) -endif() -if("gui-tools" IN_LIST FEATURES) - vcpkg_list(APPEND tracy_tools profiler) -endif() - -function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME) +function(tracy_tool_install_unix tracy_TOOL tracy_TOOL_NAME) foreach(buildtype IN ITEMS "debug" "release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}") if("${buildtype}" STREQUAL "debug") @@ -97,66 +63,45 @@ function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME) ) vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) - file(INSTALL "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}/${tracy_TOOL_NAME}-${buildtype}" DESTINATION "${CURRENT_PACKAGES_DIR}${path_suffix}/tools/${PORT}" RENAME "${tracy_TOOL_NAME}") + file(INSTALL "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}/${tracy_TOOL_NAME}-${buildtype}" + DESTINATION "${CURRENT_PACKAGES_DIR}${path_suffix}/tools/${PORT}" + RENAME "${tracy_TOOL_NAME}" + USE_SOURCE_PERMISSIONS) endif() endforeach() endfunction() function(tracy_tool_install_win32 tracy_TOOL tracy_TOOL_NAME) - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "${tracy_TOOL}/build/win32/${tracy_TOOL_NAME}.sln" - USE_VCPKG_INTEGRATION - ) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "${tracy_TOOL}/build/win32/${tracy_TOOL_NAME}.sln" + USE_VCPKG_INTEGRATION + ) endfunction() -if("capture" IN_LIST tracy_tools) - if(VCPKG_TARGET_IS_WINDOWS) - tracy_tool_install_win32(capture capture) - else() - tracy_tool_install_make(capture capture) - endif() -endif() - -if("csvexport" IN_LIST tracy_tools) +function(tracy_tool_install tracy_TOOL tracy_TOOL_NAME) if(VCPKG_TARGET_IS_WINDOWS) - tracy_tool_install_win32(csvexport csvexport) + tracy_tool_install_win32("${tracy_TOOL}" "${tracy_TOOL_NAME}") else() - tracy_tool_install_make(csvexport csvexport) + tracy_tool_install_unix("${tracy_TOOL}" "${tracy_TOOL_NAME}") endif() -endif() - -if("import-chrome" IN_LIST tracy_tools) - if(VCPKG_TARGET_IS_WINDOWS) - tracy_tool_install_win32(import-chrome import-chrome) - else() - tracy_tool_install_make(import-chrome import-chrome) - endif() -endif() +endfunction() -if("profiler" IN_LIST tracy_tools) - if(VCPKG_TARGET_IS_WINDOWS) - tracy_tool_install_win32(profiler Tracy) - else() - tracy_tool_install_make(profiler Tracy) - endif() +if("cli-tools" IN_LIST FEATURES) + tracy_tool_install(capture capture) + tracy_tool_install(csvexport csvexport) + tracy_tool_install(import-chrome import-chrome) + tracy_tool_install(update update) endif() - -if("update" IN_LIST tracy_tools) - if(VCPKG_TARGET_IS_WINDOWS) - tracy_tool_install_win32(update update) - else() - tracy_tool_install_make(update update) - endif() +if("gui-tools" IN_LIST FEATURES) + tracy_tool_install(profiler Tracy) endif() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy) vcpkg_fixup_pkgconfig() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") -# Cleanup file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 0da86a0454356d..7431305451baba 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tracy", "version-semver": "0.9.1", - "port-version": 2, + "port-version": 3, "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", @@ -35,6 +35,10 @@ "arm64", "x86" ] + }, + { + "name": "tbb", + "platform": "!windows" } ] }, @@ -58,7 +62,11 @@ "platform": "!windows" }, "freetype", - "glfw3" + "glfw3", + { + "name": "tbb", + "platform": "!windows" + } ] }, "on-demand": { diff --git a/ports/trantor/000-fix-deps.patch b/ports/trantor/000-fix-deps.patch index fb8a971250b57f..49cff8b3d74021 100644 --- a/ports/trantor/000-fix-deps.patch +++ b/ports/trantor/000-fix-deps.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83bd458..ad56a27 100755 +index efa0434..b87a1a3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -135,7 +135,7 @@ endif() +@@ -190,7 +190,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE TRANTOR_TLS_PROVIDER=${TRANTO set(HAVE_C-ARES NO) if (BUILD_C-ARES) @@ -11,7 +11,7 @@ index 83bd458..ad56a27 100755 if(c-ares_FOUND) message(STATUS "c-ares found!") set(HAVE_C-ARES TRUE) -@@ -143,7 +143,7 @@ if (BUILD_C-ARES) +@@ -198,7 +198,7 @@ if (BUILD_C-ARES) endif () if(HAVE_C-ARES) @@ -21,11 +21,11 @@ index 83bd458..ad56a27 100755 ${TRANTOR_SOURCES} trantor/net/inner/AresResolver.cc) diff --git a/cmake/templates/TrantorConfig.cmake.in b/cmake/templates/TrantorConfig.cmake.in -index e18652d..6dad38e 100644 +index 8c62924..dd243d0 100644 --- a/cmake/templates/TrantorConfig.cmake.in +++ b/cmake/templates/TrantorConfig.cmake.in -@@ -14,7 +14,7 @@ if(@OpenSSL_FOUND@) - find_dependency(OpenSSL) +@@ -17,7 +17,7 @@ if(@Botan_FOUND@) + find_dependency(Botan) endif() if(@c-ares_FOUND@) - find_dependency(c-ares) diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index 4bbe3bcb32c291..04f5ea3464a441 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.5.11 - SHA512 dd65938bebb2e6714e5603db3bfc82cd1a63395c17dce014147a41fdc74548cb526e1457a7472aa51bb80ce629a9935b4db9eeadf735efaf30899ef73f776a58 + REF "v${VERSION}" + SHA512 468e5ffe9b47537992b9852ddec7714fb6e63147ff51ecfade7e1b0af02f5231ebc50b71d48d77c188f8d2af77c64c40fcbdc907f4f8d45d488aa2966f9406f9 HEAD_REF master PATCHES 000-fix-deps.patch diff --git a/ports/trantor/vcpkg.json b/ports/trantor/vcpkg.json index 69f33e77cd55b8..6aff8ecd4f58ac 100644 --- a/ports/trantor/vcpkg.json +++ b/ports/trantor/vcpkg.json @@ -1,7 +1,6 @@ { "name": "trantor", - "version-semver": "1.5.11", - "port-version": 1, + "version-semver": "1.5.14", "description": "A non-blocking I/O cross-platform TCP network library, using C++14", "homepage": "https://github.com/an-tao/trantor", "license": "BSD-2-Clause", diff --git a/ports/trompeloeil/portfile.cmake b/ports/trompeloeil/portfile.cmake index 4d6be62ae61907..b870a9dc06c26f 100644 --- a/ports/trompeloeil/portfile.cmake +++ b/ports/trompeloeil/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rollbear/trompeloeil - REF ba406bfd71caf63f2180990a390ff5518e570c21 # v43 - SHA512 5a638392ee4078690e94a61fd5838f6b0ffd67784a6cb139c114286c5cb8453c450252c550e9efee575aa38d02d5de1b51ba4df6a1679d02987606559a96520d + REF v${VERSION} + SHA512 c82a0ff3057056a79890b5880c1755900370a4406dc7e231f9b81545014dfd85a3cea90f90f01931083ef7528360ec7f5f14a4d6b2c5578c59e89b6d28edf110 HEAD_REF master ) diff --git a/ports/trompeloeil/vcpkg.json b/ports/trompeloeil/vcpkg.json index efaae3b1006af5..b4079ddd0cf450 100644 --- a/ports/trompeloeil/vcpkg.json +++ b/ports/trompeloeil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "trompeloeil", - "version": "43", + "version": "45", "description": "A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0", "homepage": "https://github.com/rollbear/trompeloeil", "license": "BSL-1.0", diff --git a/ports/unicorn/fix-build.patch b/ports/unicorn/fix-build.patch new file mode 100644 index 00000000000000..6e1cafcd496260 --- /dev/null +++ b/ports/unicorn/fix-build.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4110ae5..a86b207 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -109,7 +109,7 @@ if(MSVC) + add_compile_options($<$:/wd4267>) + + # handle msvcrt setting being passed in CMAKE_C_FLAGS +- if(DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) ++ if(NOT CMAKE_MSVC_RUNTIME_LIBRARY) + # do not support other methods of setting this (it would be more conformant, tho) + message(FATAL_ERROR "please set msvcrt via CMAKE_C_FLAGS") + endif() +@@ -1431,7 +1431,7 @@ if(UNICORN_BUILD_TESTS) + endif() + + +-if(UNICORN_INSTALL AND NOT MSVC) ++if(UNICORN_INSTALL) + include("GNUInstallDirs") + file(GLOB UNICORN_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/unicorn/*.h) + if (BUILD_SHARED_LIBS) diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index cccfbfe21d8683..70f6b2180cf309 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -1,7 +1,3 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "WindowsStore not supported") -endif() - if(VCPKG_CRT_LINKAGE STREQUAL "dynamic" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") message(FATAL_ERROR "unicorn can currently only be built with /MT or /MTd (static CRT linkage)") endif() @@ -12,45 +8,25 @@ set(VCPKG_CRT_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF 52f90cda023abaca510d59f021c88629270ad6c0 # v1.0.3 - SHA512 bb47e7d680b122e38bd9390f44a3f7e3c3e314ea3ac86dbab3e755b7bcc2db5daca3a4432276a874f59675f811f7785d68ec0d39696c955d3718d6a720adf70b + REF "${VERSION}.post1" + SHA512 8694d6bc92e3424a8ad050316413d53e56e0f55e7cad7517fb3e98e670a0f1768b060ead8f195da13607cec89a964364f05a8b9d0dc074f4ac5e51026f8343ad HEAD_REF master + PATCHES + fix-build.patch ) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(UNICORN_PLATFORM "Win32") -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(UNICORN_PLATFORM "x64") -else() - message(FATAL_ERROR "Unsupported architecture") -endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUNICORN_BUILD_TESTS=OFF + ) -vcpkg_build_msbuild( - PROJECT_PATH "${SOURCE_PATH}/msvc/unicorn.sln" - PLATFORM "${UNICORN_PLATFORM}" -) +vcpkg_cmake_install() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Release/unicorn.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Release/unicorn.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Debug/unicorn.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Debug/unicorn.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") -else() - file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Release/unicorn_static.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Debug/unicorn_static.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") -endif() +vcpkg_fixup_pkgconfig() -file( - INSTALL "${SOURCE_PATH}/msvc/distro/include/unicorn" - DESTINATION "${CURRENT_PACKAGES_DIR}/include" - RENAME "unicorn" -) -file( - INSTALL "${SOURCE_PATH}/COPYING" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/unicorn" - RENAME "copyright" -) -file( - INSTALL "${SOURCE_PATH}/COPYING_GLIB" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/unicorn" -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/unicorn/vcpkg.json b/ports/unicorn/vcpkg.json index e4ea908ad2dc75..5ffa0d52b01e41 100644 --- a/ports/unicorn/vcpkg.json +++ b/ports/unicorn/vcpkg.json @@ -1,8 +1,14 @@ { "name": "unicorn", - "version": "1.0.3", + "version": "2.0.1", "description": "Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework", "homepage": "https://github.com/unicorn-engine/unicorn", "license": "GPL-2.0-only", - "supports": "windows & !uwp & !arm" + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/unordered-dense/portfile.cmake b/ports/unordered-dense/portfile.cmake index d67232df6695b3..0330f93f9f48d5 100644 --- a/ports/unordered-dense/portfile.cmake +++ b/ports/unordered-dense/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_minimum_required(VERSION 2023-04-07) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/unordered_dense REF v${VERSION} - SHA512 105eb88deeb89c9424973d2b5425a6e176f3f66a45f11cf6ed520cce177918cd5345e840d10561f6f790b6cc11b7b6e1357bd2fc4d199254a360de88ce553fe0 + SHA512 3df9824f793553df91c253431e08244584de3cdf96bda2561df1e1b10779214bb75f3801e3b03b98671a38091d3e672db85bcebd74ad5d781d4a9edcf6a83677 HEAD_REF master ) diff --git a/ports/unordered-dense/vcpkg.json b/ports/unordered-dense/vcpkg.json index 03fc9c0bb60b71..66f9b6b3f6bad4 100644 --- a/ports/unordered-dense/vcpkg.json +++ b/ports/unordered-dense/vcpkg.json @@ -1,6 +1,6 @@ { "name": "unordered-dense", - "version": "4.0.1", + "version": "4.1.2", "description": "A fast & densely stored hashmap and hashset based on robin-hood backward shift deletion", "homepage": "https://github.com/martinus/unordered_dense", "license": "MIT", diff --git a/ports/unrar/portfile.cmake b/ports/unrar/portfile.cmake index 8c9f9ac98b358c..6924fa1fcedca5 100644 --- a/ports/unrar/portfile.cmake +++ b/ports/unrar/portfile.cmake @@ -13,30 +13,20 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" SOURCE_BASE ${UNRAR_VERSION} PATCHES msbuild-use-default-sma.patch ) -vcpkg_build_msbuild( - PROJECT_PATH "${SOURCE_PATH}/UnRARDll.vcxproj" - OPTIONS_DEBUG /p:OutDir=../../${TARGET_TRIPLET}-dbg/ - OPTIONS_RELEASE /p:OutDir=../../${TARGET_TRIPLET}-rel/ - OPTIONS /VERBOSITY:Diagnostic /DETAILEDSUMMARY +vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "UnRARDll.vcxproj" ) #INCLUDE (named dll.hpp in source, and unrar.h in all rarlabs distributions) file(INSTALL "${SOURCE_PATH}/dll.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME unrar.h) -#DLL & LIB -file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") -file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") -file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - -vcpkg_copy_pdbs() - configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-unrar/unofficial-unrar-config.cmake" @ONLY) #COPYRIGHT -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/unrar/vcpkg.json b/ports/unrar/vcpkg.json index 4a85edde59ec6f..2331ae20db3ae9 100644 --- a/ports/unrar/vcpkg.json +++ b/ports/unrar/vcpkg.json @@ -1,9 +1,16 @@ { "name": "unrar", "version": "6.1.7", - "port-version": 2, + "port-version": 3, "description": "rarlab's unrar library", "homepage": "https://www.rarlab.com", "license": null, - "supports": "windows & !uwp & !arm & !static" + "supports": "windows & !uwp & !arm & !static", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/upb/vcpkg.json b/ports/upb/vcpkg.json index 26897ea8fcfd52..7a99b8597c78ed 100644 --- a/ports/upb/vcpkg.json +++ b/ports/upb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "upb", "version-date": "2022-06-21", + "port-version": 1, "description": "μpb (often written 'upb') is a small protobuf implementation written in C.", "homepage": "https://github.com/protocolbuffers/upb/", "license": "BSD-2-Clause", @@ -24,6 +25,7 @@ "features": { "codegen": { "description": "Build code generator machinery", + "supports": "!uwp", "dependencies": [ "abseil", "protobuf" diff --git a/ports/urho3d/macosx.patch b/ports/urho3d/macosx.patch index edcae1460d4cc5..bc346def6d8ef7 100644 --- a/ports/urho3d/macosx.patch +++ b/ports/urho3d/macosx.patch @@ -1,5 +1,5 @@ diff --git a/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h b/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h -index 6378d468a..c8563db52 100644 +index 6378d46..c8563db 100644 --- a/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h +++ b/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h @@ -38,6 +38,9 @@ @@ -13,7 +13,7 @@ index 6378d468a..c8563db52 100644 #if defined(_WIN32) # define WIDECHAR diff --git a/Source/ThirdParty/Civetweb/src/civetweb.c b/Source/ThirdParty/Civetweb/src/civetweb.c -index 4d26e0a83..2bd577e81 100644 +index 4d26e0a..2bd577e 100644 --- a/Source/ThirdParty/Civetweb/src/civetweb.c +++ b/Source/ThirdParty/Civetweb/src/civetweb.c @@ -167,6 +167,8 @@ mg_static_assert(sizeof(void *) >= sizeof(int), "data type size check"); @@ -25,3 +25,23 @@ index 4d26e0a83..2bd577e81 100644 #if !defined(DEBUG_TRACE) #if defined(DEBUG) +diff --git a/Source/ThirdParty/SDL/CMakeLists.txt b/Source/ThirdParty/SDL/CMakeLists.txt +index 5c4ef27..fd4c4dd 100644 +--- a/Source/ThirdParty/SDL/CMakeLists.txt ++++ b/Source/ThirdParty/SDL/CMakeLists.txt +@@ -428,15 +428,6 @@ if(USE_GCC OR USE_CLANG) + list(APPEND EXTRA_CFLAGS "-fno-strict-aliasing") + endif() + +- check_c_compiler_flag(-Wdeclaration-after-statement HAVE_GCC_WDECLARATION_AFTER_STATEMENT) +- if(HAVE_GCC_WDECLARATION_AFTER_STATEMENT) +- check_c_compiler_flag(-Werror=declaration-after-statement HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT) +- # Urho3D - bug fix - SDL does not build cleanly for Android platform with this flag on, make a tweak here rather than changing on their code +- if(HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT AND NOT ANDROID) +- list(APPEND EXTRA_CFLAGS "-Werror=declaration-after-statement") +- endif() +- list(APPEND EXTRA_CFLAGS "-Wdeclaration-after-statement") +- endif() + + if(DEPENDENCY_TRACKING) + check_c_source_compiles(" diff --git a/ports/urho3d/vcpkg.json b/ports/urho3d/vcpkg.json index 680d5d0c2dec76..52a7da5b3e2662 100644 --- a/ports/urho3d/vcpkg.json +++ b/ports/urho3d/vcpkg.json @@ -2,7 +2,7 @@ "$note": "Due to the upstream modification of the dependent source code, the internal port of vcpkg cannot be used.", "name": "urho3d", "version-date": "2021-03-01", - "port-version": 4, + "port-version": 5, "description": "Urho3D is a free lightweight, cross-platform 2D and 3D game engine implemented in C++ and released under the MIT license. Greatly inspired by OGRE and Horde3D.", "homepage": "https://github.com/urho3d/Urho3D", "supports": "!(arm | uwp)", diff --git a/ports/usbmuxd/CMakeLists.txt b/ports/usbmuxd/CMakeLists.txt new file mode 100644 index 00000000000000..7e9c5843b5a39e --- /dev/null +++ b/ports/usbmuxd/CMakeLists.txt @@ -0,0 +1,52 @@ +cmake_minimum_required(VERSION 3.15) +project(usbmuxd C) + +include(GNUInstallDirs) + +file(GLOB_RECURSE USBMUXD_SOURCE src/*.c src/*.h) + +set(DEFINITIONS) + +list(APPEND DEFINITIONS -DPACKAGE_NAME="usbmuxd") +list(APPEND DEFINITIONS -DPACKAGE_STRING="1.1.1") +list(APPEND DEFINITIONS -DPACKAGE_VERSION="1.1.1") +list(APPEND DEFINITIONS -DPACKAGE_URL="https://github.com/libimobiledevice/usbmuxd") +list(APPEND DEFINITIONS -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/usbmuxd/issues") + +if(UNIX) + list(APPEND DEFINITIONS -DHAVE_CLOCK_GETTIME) +endif() + +if(UNIX AND NOT APPLE) + list(APPEND DEFINITIONS -DHAVE_PPOLL) +endif() + +if(WIN32) + list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS) + list(APPEND DEFINITIONS -DWIN32) +endif() + +find_package(unofficial-libimobiledevice CONFIG REQUIRED) +find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED) +find_package(libusb CONFIG REQUIRED) +find_path(DIRENT_INCLUDE_DIR dirent.h REQUIRED) + +add_executable(usbmuxd ${USBMUXD_SOURCE}) +target_include_directories(usbmuxd PRIVATE + ${LIBUSB_INCLUDE_DIRS} + ${DIRENT_INCLUDE_DIR} +) +target_compile_definitions(usbmuxd PRIVATE ${DEFINITIONS}) +target_link_libraries(usbmuxd PRIVATE + unofficial::libimobiledevice::libimobiledevice + unofficial::libimobiledevice-glue::libimobiledevice-glue + ${LIBUSB_LIBRARIES} +) +if(WIN32) + find_package(PThreads4W REQUIRED) + find_package(unofficial-getopt-win32 REQUIRED) + target_link_libraries(usbmuxd PRIVATE PThreads4W::PThreads4W unofficial::getopt-win32::getopt) +endif() + +install(TARGETS usbmuxd + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") diff --git a/ports/usbmuxd/fix-definitions.patch b/ports/usbmuxd/fix-definitions.patch deleted file mode 100644 index 34228052429052..00000000000000 --- a/ports/usbmuxd/fix-definitions.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/usbmuxd.vcxproj b/usbmuxd.vcxproj -index 1500a8a..61362c3 100644 ---- a/usbmuxd.vcxproj -+++ b/usbmuxd.vcxproj -@@ -129,7 +129,7 @@ - - Level3 - Disabled -- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE -+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT="" - 4013 - - -@@ -144,7 +144,7 @@ - - Level3 - Disabled -- _DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE -+ _DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT="" - - - Console -@@ -160,7 +160,7 @@ - MaxSpeed - true - true -- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE -+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT="" - 4013 - - -@@ -179,7 +179,7 @@ - MaxSpeed - true - true -- NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE -+ NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT="" - - - Console diff --git a/ports/usbmuxd/fix-dependence-pthreads.patch b/ports/usbmuxd/fix-dependence-pthreads.patch deleted file mode 100644 index 5ff4d8472908d7..00000000000000 --- a/ports/usbmuxd/fix-dependence-pthreads.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/usbmuxd.vcxproj b/usbmuxd.vcxproj -index d1d8a4d..086e8a4 100644 ---- a/usbmuxd.vcxproj -+++ b/usbmuxd.vcxproj -@@ -135,7 +135,7 @@ - - Console - true -- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies) -+ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3d.lib;%(AdditionalDependencies) - - - -@@ -149,7 +149,7 @@ - - Console - true -- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies) -+ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3d.lib;%(AdditionalDependencies) - - - -@@ -168,7 +168,7 @@ - true - true - true -- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies) -+ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3.lib;%(AdditionalDependencies) - - - -@@ -186,7 +186,7 @@ - true - true - true -- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies) -+ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3.lib;%(AdditionalDependencies) - - - diff --git a/ports/usbmuxd/portfile.cmake b/ports/usbmuxd/portfile.cmake index c9ac23d3593a2c..e7f11102c9ce82 100644 --- a/ports/usbmuxd/portfile.cmake +++ b/ports/usbmuxd/portfile.cmake @@ -1,20 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO libimobiledevice-win32/usbmuxd - REF f1329e742825c93fd080bdb8253d710ef8b6f751 # v1.2.235 - SHA512 3259040a3266ce068a6fa1fdecdea824d22f04391ca073fc61d72a1f6d401d93469b9681ddc89a8016ef410bb7443875b2c5df2b571227dd34c66248cbe87fe7 - HEAD_REF master-msvc - PATCHES - fix-dependence-pthreads.patch - fix-definitions.patch + REPO libimobiledevice/usbmuxd + REF 61b99ab5c25609c11369733a0df97c03a0581a56 # commits on 2023-07-21 + SHA512 1b67a41f43e78bbf0966cbe68c9e35351d5a163d7d82aa6e5caed6c4f8ffc3c28faf74dc96890a35481b4856f6b6d95ebec9e8d2a665a099d8909b91bf408381 + HEAD_REF master ) -vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH usbmuxd.vcxproj - LICENSE_SUBPATH COPYING.GPLv2 - USE_VCPKG_INTEGRATION +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -# No headers +vcpkg_cmake_install() +vcpkg_copy_tools(TOOL_NAMES usbmuxd AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.GPLv2" "${SOURCE_PATH}/COPYING.GPLv3") + set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/usbmuxd/vcpkg.json b/ports/usbmuxd/vcpkg.json index ceb268b6d212a8..eabbdd9b4306c2 100644 --- a/ports/usbmuxd/vcpkg.json +++ b/ports/usbmuxd/vcpkg.json @@ -1,15 +1,20 @@ { "name": "usbmuxd", - "version": "1.2.235", - "port-version": 4, + "version-date": "2023-07-21", "description": "A socket daemon to multiplex connections from and to iOS devices", "homepage": "http://www.libimobiledevice.org", - "license": "LGPL-2.1-only", - "supports": "windows & !arm64 & !static & !xbox", + "license": "LGPL-2.0-or-later", + "supports": "(!windows & !android & !ios) | mingw", "dependencies": [ + "dirent", + "getopt", "libimobiledevice", + "libimobiledevice-glue", "libusb", - "libusb-win32", - "pthreads" + "pthreads", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/usearch/portfile.cmake b/ports/usearch/portfile.cmake new file mode 100644 index 00000000000000..fda98d869b5948 --- /dev/null +++ b/ports/usearch/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO unum-cloud/usearch + REF "v${VERSION}" + SHA512 b18006b248ea76b1a8c27c9c1285954f9101305cb5228d3565c854bd1aaf92e430556a5dbeb3f43a6a307914dd60b277a3ed342b953101e502871de294962bd4 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSEARCH_INSTALL=ON + -DUSEARCH_BUILD_TEST=OFF + -DUSEARCH_BUILD_BENCHMARK=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/usearch) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/usearch/vcpkg.json b/ports/usearch/vcpkg.json new file mode 100644 index 00000000000000..87fde8f2387f2c --- /dev/null +++ b/ports/usearch/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "usearch", + "version": "2.3.2", + "description": "Fastest Search & Clustering engine × for Vectors & Strings", + "homepage": "https://github.com/unum-cloud/usearch", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/utfcpp/portfile.cmake b/ports/utfcpp/portfile.cmake index fcd6984e7b18be..33475c0023014b 100644 --- a/ports/utfcpp/portfile.cmake +++ b/ports/utfcpp/portfile.cmake @@ -1,10 +1,10 @@ -vcpkg_minimum_required(VERSION 2022-12-14) +set(VCPKG_BUILD_TYPE release) # header-only vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nemtrif/utfcpp - REF v${VERSION} - SHA512 760977df613abfb34fb7864cbbe90e8f2cf1f42b8502427a5e9c2a756ce87655120b7490ebdaa6c926a2cb56caef9ead0e0e10fb7cb732cf99a5b43c0cca411b + REF "v${VERSION}" + SHA512 1ce12c8158a2f3bcddec104ceacedaea4031b4c88fc0fa1f1fae8dfa8df81c846861df9d01e8f294d79b9e4ab8c51bd1289f404eed24d07abc760688fee13090 HEAD_REF master ) @@ -22,9 +22,7 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH cmake) else() vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH lib/cmake/utf8cpp) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") endif() -# Header only -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") - vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/utfcpp/vcpkg.json b/ports/utfcpp/vcpkg.json index 75d2c9d2eb63a6..c701c870c83c1d 100644 --- a/ports/utfcpp/vcpkg.json +++ b/ports/utfcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "utfcpp", - "version": "3.2.3", + "version": "3.2.5", "description": "UTF-8 with C++ in a Portable Way", "homepage": "https://github.com/nemtrif/utfcpp", "license": "BSL-1.0", diff --git a/ports/v8/portfile.cmake b/ports/v8/portfile.cmake index ef52dd930e629b..0e316e8ae537b8 100644 --- a/ports/v8/portfile.cmake +++ b/ports/v8/portfile.cmake @@ -171,7 +171,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(PREFIX ${CURRENT_PACKAGES_DIR}) configure_file("${CURRENT_PORT_DIR}/v8.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8.pc" @ONLY) configure_file("${CURRENT_PORT_DIR}/v8_libbase.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8_libbase.pc" @ONLY) - configure_file("${CURRENT_PORT_DIR}/v8_libplatform.pc.in" "{CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8_libplatform.pc" @ONLY) + configure_file("${CURRENT_PORT_DIR}/v8_libplatform.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8_libplatform.pc" @ONLY) file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/snapshot_blob.bin" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") set(PREFIX ${CURRENT_PACKAGES_DIR}/debug) diff --git a/ports/v8/vcpkg.json b/ports/v8/vcpkg.json index 177b9e51ef1b71..a37df53207659a 100644 --- a/ports/v8/vcpkg.json +++ b/ports/v8/vcpkg.json @@ -1,7 +1,7 @@ { "name": "v8", "version": "9.1.269.39", - "port-version": 5, + "port-version": 6, "description": "Google Chrome's JavaScript engine", "homepage": "https://v8.dev", "license": "BSD-3-Clause", diff --git a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json index f03dd386808fdc..1980cdd46c563c 100644 --- a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json +++ b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-pkgconfig-get-modules", - "version-date": "2023-02-25", + "version-date": "2023-09-06", "documentation": "https://vcpkg.io/en/docs/README.html", "license": "MIT", "dependencies": [ diff --git a/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake b/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake index 54ad45ad28e723..ca99de757e65b8 100644 --- a/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake +++ b/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake @@ -16,7 +16,7 @@ function(x_vcpkg_pkgconfig_get_modules) set(msvc "--msvc-syntax") endif() - set(PKGCONFIG "${CURRENT_INSTALLED_DIR}/../@HOST_TRIPLET@/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@") + set(PKGCONFIG "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@") set(backup_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}") diff --git a/ports/vcpkg-tool-ninja/portfile.cmake b/ports/vcpkg-tool-ninja/portfile.cmake index eb4ef16dfbd260..2c7880861c0685 100644 --- a/ports/vcpkg-tool-ninja/portfile.cmake +++ b/ports/vcpkg-tool-ninja/portfile.cmake @@ -2,9 +2,9 @@ set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) vcpkg_download_distfile( LONG_PATH_PATCH - URLS "https://patch-diff.githubusercontent.com/raw/ninja-build/ninja/pull/2056.diff" # stable? + URLS "https://patch-diff.githubusercontent.com/raw/ninja-build/ninja/pull/2056.diff?full_index=1" # stable? FILENAME 2056.diff - SHA512 90f17c2cbb5e0c5b41de748f75a3fc3e0c9da8837a0507c8570a49affe15ae7258661dc1f1bc201574847d93ea8b7fe4cbecfffd868395d50ca821033c5f295d + SHA512 3c840b19d51a2c145561e3026aee503eccffcc2d1f28db6d848a504c8e163b699fd09cafcfd326a1a95e08f76ec3b07860e2658386229af2bc2573b615cf2fed ) vcpkg_from_github( diff --git a/ports/vcpkg-tool-ninja/vcpkg.json b/ports/vcpkg-tool-ninja/vcpkg.json index e1eac612065882..98bf21c817ff00 100644 --- a/ports/vcpkg-tool-ninja/vcpkg.json +++ b/ports/vcpkg-tool-ninja/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-tool-ninja", "version-date": "2022-03-31", - "port-version": 1, + "port-version": 2, "description": "Ninja is a small build system with a focus on speed.", "homepage": "https://ninja-build.org/", "license": "Apache-2.0", diff --git a/ports/vlpp/vcpkg.json b/ports/vlpp/vcpkg.json index 95ad4ef0fae646..f6b7c1ef97968f 100644 --- a/ports/vlpp/vcpkg.json +++ b/ports/vlpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vlpp", "version": "1.1.0.0", + "port-version": 1, "maintainers": "vczh", "description": "Common C++ construction, including string operation / generic container / linq / General-LR parser generator / multithreading / reflection for C++ / etc", "homepage": "https://github.com/vczh-libraries/Release", @@ -68,7 +69,8 @@ "description": "Enable Reflection" }, "tools": { - "description": "Build tools" + "description": "Build tools", + "supports": "!osx" }, "workflowcompiler": { "description": "Enable VlppWorkflow Compiler", diff --git a/ports/vsg/portfile.cmake b/ports/vsg/portfile.cmake index 2674789f768bc2..5ff95b3d913adc 100644 --- a/ports/vsg/portfile.cmake +++ b/ports/vsg/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vsg-dev/VulkanSceneGraph REF "v${VERSION}" - SHA512 b5f00190689473402157dfed34234359129a6b62f8eb0c118358af36639dcafce6c747c43d83b8602f3d06c011d3fcc98f27a95282be0a7601795ebe88921dbb + SHA512 79ea02c5816c6b99ce847938d9004e0078cb685523c720d4abce5136b91bf4d17fff52893eba972ce9ac3d6db7fe92581039cba6ef72fb9e44ff37f9d9b314f3 HEAD_REF master PATCHES devendor-glslang.patch ) diff --git a/ports/vsg/vcpkg.json b/ports/vsg/vcpkg.json index b31f8157d5e078..3c7bec627c008c 100644 --- a/ports/vsg/vcpkg.json +++ b/ports/vsg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vsg", - "version": "1.0.6", + "version": "1.0.9", "description": "A modern, cross platform, high performance scene graph library built upon Vulkan.", "homepage": "http://www.vulkanscenegraph.org/", "license": "MIT", diff --git a/ports/vsgxchange/portfile.cmake b/ports/vsgxchange/portfile.cmake new file mode 100644 index 00000000000000..cc617fd399bc43 --- /dev/null +++ b/ports/vsgxchange/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vsg-dev/vsgXchange + REF "v${VERSION}" + SHA512 b2f8c0382dee8d91a31852c29fecd946deb8c3d45dc9a80eb1fb0d7efce8ecefb099bfd2dba4b3171ddd9e7099da41dbf0b72e11ec53bf982aaf9d04afad5104 + HEAD_REF master + PATCHES require-features.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + assimp VSGXCHANGE_WITH_ASSIMP + curl VSGXCHANGE_WITH_CURL + freetype VSGXCHANGE_WITH_FREETYPE + gdal VSGXCHANGE_WITH_GDAL + openexr VSGXCHANGE_WITH_OPENEXR +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "vsgXchange" CONFIG_PATH "lib/cmake/vsgXchange") +vcpkg_copy_pdbs() + +vcpkg_copy_tools(TOOL_NAMES vsgconv AUTO_CLEAN) +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/vsgconvd${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/vsgxchange/require-features.patch b/ports/vsgxchange/require-features.patch new file mode 100644 index 00000000000000..7edc6dc0663ac9 --- /dev/null +++ b/ports/vsgxchange/require-features.patch @@ -0,0 +1,66 @@ +diff --git a/src/assimp/build_vars.cmake b/src/assimp/build_vars.cmake +index 1e413fc..49d77d4 100644 +--- a/src/assimp/build_vars.cmake ++++ b/src/assimp/build_vars.cmake +@@ -1,7 +1,6 @@ + # add assimp if available +-find_package(assimp 5.1 QUIET) +-if(NOT assimp_FOUND) +-find_package(assimp 5.0 QUIET) ++if (VSGXCHANGE_WITH_ASSIMP) ++find_package(assimp REQUIRED) + endif() + + +diff --git a/src/curl/build_vars.cmake b/src/curl/build_vars.cmake +index 015b68c..a4afc8a 100644 +--- a/src/curl/build_vars.cmake ++++ b/src/curl/build_vars.cmake +@@ -1,5 +1,7 @@ + # add CURL if available +-find_package(CURL) ++if(VSGXCHANGE_WITH_CURL) ++find_package(CURL REQUIRED) ++endif() + + if(CURL_FOUND) + OPTION(vsgXchange_curl "Optional CURL support provided" ON) +diff --git a/src/freetype/build_vars.cmake b/src/freetype/build_vars.cmake +index cb63a8b..327db9e 100644 +--- a/src/freetype/build_vars.cmake ++++ b/src/freetype/build_vars.cmake +@@ -1,5 +1,7 @@ + # add freetype if available +-find_package(Freetype) ++if(VSGXCHANGE_WITH_FREETYPE) ++find_package(Freetype REQUIRED) ++endif() + + if(FREETYPE_FOUND) + OPTION(vsgXchange_freetype "Freetype support provided" ON) +diff --git a/src/gdal/build_vars.cmake b/src/gdal/build_vars.cmake +index dd240b0..227c6b7 100644 +--- a/src/gdal/build_vars.cmake ++++ b/src/gdal/build_vars.cmake +@@ -1,5 +1,7 @@ + # add GDAL if available +-find_package(GDAL QUIET) ++if(VSGXCHANGE_WITH_GDAL) ++find_package(GDAL REQUIRED) ++endif() + + if(GDAL_FOUND) + OPTION(vsgXchange_GDAL "GDAL support provided" ON) +diff --git a/src/openexr/build_vars.cmake b/src/openexr/build_vars.cmake +index c4c880a..3ab27c8 100644 +--- a/src/openexr/build_vars.cmake ++++ b/src/openexr/build_vars.cmake +@@ -1,5 +1,7 @@ + # add openexr if available +-find_package(OpenEXR QUIET) ++if(VSGXCHANGE_WITH_OPENEXR) ++find_package(OpenEXR REQUIRED) ++endif() + + if(OpenEXR_FOUND) + OPTION(vsgXchange_openexr "Optional OpenEXR support provided" ON) diff --git a/ports/vsgxchange/vcpkg.json b/ports/vsgxchange/vcpkg.json new file mode 100644 index 00000000000000..c8ad67528c45ea --- /dev/null +++ b/ports/vsgxchange/vcpkg.json @@ -0,0 +1,50 @@ +{ + "name": "vsgxchange", + "version": "1.0.5", + "description": "Utility library for converting 3rd party images, models and fonts formats to/from VulkanSceneGraph.", + "homepage": "https://github.com/vsg-dev/vsgXchange", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vsg" + ], + "features": { + "assimp": { + "description": "Enable support for reading 3D model formats as vsg::Node via Assimp", + "dependencies": [ + "assimp" + ] + }, + "curl": { + "description": "Enable support for reading image and model files from http:// and https://", + "dependencies": [ + "curl" + ] + }, + "freetype": { + "description": "Enable support for reading fonts as vsg::Font via Freetype", + "dependencies": [ + "freetype" + ] + }, + "gdal": { + "description": "Enable support for reading geospatial data formats as vsg::Data via GDAL", + "dependencies": [ + "gdal" + ] + }, + "openexr": { + "description": "Enable support for reading EXR files as vsg::Data", + "dependencies": [ + "openexr" + ] + } + } +} diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 1b29c3d9aeb84c..f33e09d503b8c8 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -7,21 +7,21 @@ set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) vcpkg_download_distfile( STRING_PATCH - URLS https://gitlab.kitware.com/vtk/vtk/-/commit/bfa3e4c7621ddf5826755536eb07284c86db6474.diff + URLS https://gitlab.kitware.com/vtk/vtk/-/commit/bfa3e4c7621ddf5826755536eb07284c86db6474.diff?full_index=1 FILENAME vtk-string-bfa3e4.diff SHA512 c5ccb1193e4e61cf78b63802f87ffb09349c5566ad8a4d51418133953f7acd6b4a206f8d41a426a9eb9be3cf1fd95242e6402973252d7979e5a9cb5e5e480d78 ) vcpkg_download_distfile( MPI4PY_PATCH_1 - URLS https://gitlab.kitware.com/vtk/vtk/-/commit/c938d30634a284fad026f6ae25c30bc84cadc07e.diff + URLS https://gitlab.kitware.com/vtk/vtk/-/commit/c938d30634a284fad026f6ae25c30bc84cadc07e.diff?full_index=1 FILENAME vtk-mpi4py-update-part1-c938d3.diff SHA512 5704c1dd124075bd8f37b0734c5cebd48b470902c74bc23774fd4b69025dbc6bfddf48b7c4511520ed07f03bd666a444d6390569f02a0ab68b5d966ddde3a989 ) vcpkg_download_distfile( MPI4PY_PATCH_2 - URLS https://gitlab.kitware.com/vtk/vtk/-/commit/53e6ce92ae4591552e7e00344d69803117d56bfe.diff + URLS https://gitlab.kitware.com/vtk/vtk/-/commit/53e6ce92ae4591552e7e00344d69803117d56bfe.diff?full_index=1 FILENAME vtk-mpi4py-update-part2-53e6ce.diff SHA512 794a25bff6168fda94d920a6837c3a690bd6d79284ec34dcd67666c55de78962cc7b73c0f074ce58ed78198bb149eab6bf59b2822f29cbfa792e2fe667c9327c ) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index cdb7b3f7249666..79cec81ca488dc 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.2.0-pv5.11.0", - "port-version": 9, + "port-version": 10, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 230e29115a85aa..535de506abb187 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle REF "v${VERSION}" - SHA512 c1dbde9f0c7b9c2edc192123b8420fe6a56038a7dbe90cbef91578ea0e9ebe890de45d3c8aa8bec376fce30e76e3b709a5353b79a91f8e6e63159c97197242a6 + SHA512 d5e44265e9e609d6fa42e7d3b71598e23460b4157eb45adeb1552077d30390775e6523d58d7d52446ea59509cbfdd7906f295220b70994df0c4f24128932cff4 HEAD_REF master PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index 5cfae3e98e3e43..a1e9dfbb43b047 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2023.07.03.00", + "version-string": "2023.10.02.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", diff --git a/ports/wg21-linear-algebra/portfile.cmake b/ports/wg21-linear-algebra/portfile.cmake index 11bf0f3ee1d8c7..ef9d98a1686a20 100644 --- a/ports/wg21-linear-algebra/portfile.cmake +++ b/ports/wg21-linear-algebra/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BobSteagall/wg21 REF "v${VERSION}" - SHA512 c249344d035d09760a9e5ea059ed6db5a1cb42b918735672bd7aa6dbda08f947855582f76ad61d33f59a847d8befe5caed57d25da2bcfc9fa8e6cef50a4c24e2 + SHA512 ab1db0cff476d2f63a5d1fcc1d3b40acbceeacae61a99d7ad0b8d8abe21413da97b71c088a331b70c0d0c3dc4615953485c68af46698ec7f0013e14bea5f9452 ) vcpkg_cmake_configure( diff --git a/ports/wg21-linear-algebra/vcpkg.json b/ports/wg21-linear-algebra/vcpkg.json index bbc34e1d458516..a0e6264c385a88 100644 --- a/ports/wg21-linear-algebra/vcpkg.json +++ b/ports/wg21-linear-algebra/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wg21-linear-algebra", - "version": "0.7.2", + "version": "0.7.3", "description": "A linear algebra proposal for the C++ standard library", "license": "NCSA", "dependencies": [ diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index dd870770976cf1..5663f3cac51179 100644 --- a/ports/wil/portfile.cmake +++ b/ports/wil/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/wil - REF 9db6276dce851dc2b6807fc81bffbec2e27acd0b - SHA512 da26905b2665e952c06a42f1b56e7cb6e335cccb592d7dac5e59a11bbf2b10e5d532649383d2feb2313432c9be5068a2cd57b368a309f65899cbff61e866fc10 + REF v1.0.230824.2 + SHA512 be9774b8d8ccc2df9fce4343aca87f721c90c8ef4a9d00ccf61a3182aafda7d98d4af96cf098ef5400a5234c1457fa745b40f9540e1f1c1cbf402181e484dcf8 HEAD_REF master ) diff --git a/ports/wil/vcpkg.json b/ports/wil/vcpkg.json index f6fc102d611afc..7a2ef8c7557cef 100644 --- a/ports/wil/vcpkg.json +++ b/ports/wil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wil", - "version-date": "2023-04-11", + "version-date": "2023-08-24", "description": "The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.", "homepage": "https://github.com/microsoft/wil", "license": "MIT", diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index 602fc28ab5a141..0f5e9264a84cbc 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_download_distfile(ARCHIVE ) # MSBuild performs in-source builds, so to ensure reliability we must clear them each time -file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src) +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src") if(VCPKG_CRT_LINKAGE STREQUAL "static") set(CRT_LINKAGE "MT") @@ -30,7 +30,7 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/wpcap.patch.in" "${CURRENT_BUILDTREES_ vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" SOURCE_BASE ${WINPCAP_VERSION} PATCHES "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" @@ -59,8 +59,9 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL " configure_file("${CURRENT_PORT_DIR}/Packet.vcxproj.in" "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.vcxproj" COPYONLY) endif() -vcpkg_build_msbuild( - PROJECT_PATH "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.sln" +vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "packetNtx/Dll/Project/Packet.sln" RELEASE_CONFIGURATION "Release" DEBUG_CONFIGURATION "Debug" PLATFORM ${PLATFORM} @@ -70,8 +71,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(FLEX) vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/wpcap/PRJ/build_scanner_parser.bat - WORKING_DIRECTORY ${SOURCE_PATH} + COMMAND "${SOURCE_PATH}/wpcap/PRJ/build_scanner_parser.bat" + WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME build_scanner_parser-${TARGET_TRIPLET} ) @@ -79,7 +80,7 @@ vcpkg_execute_required_process( COMMAND "devenv.exe" "wpcap.sln" /Upgrade - WORKING_DIRECTORY ${SOURCE_PATH}/wpcap/PRJ + WORKING_DIRECTORY "${SOURCE_PATH}/wpcap/PRJ" LOGNAME upgrade-wpcap-${TARGET_TRIPLET} ) @@ -87,16 +88,17 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL " configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" COPYONLY) endif() -vcpkg_build_msbuild( - PROJECT_PATH "${SOURCE_PATH}/wpcap/PRJ/wpcap.sln" +vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "wpcap/PRJ/wpcap.sln" RELEASE_CONFIGURATION "Release - No AirPcap" DEBUG_CONFIGURATION "Debug - No AirPcap" PLATFORM ${PLATFORM} ) vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/create_include.bat - WORKING_DIRECTORY ${SOURCE_PATH} + COMMAND "${SOURCE_PATH}/create_include.bat" + WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME create_include-${TARGET_TRIPLET} ) @@ -123,8 +125,8 @@ file(INSTALL DESTINATION "${CURRENT_PACKAGES_DIR}/include/pcap") vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/create_lib.bat - WORKING_DIRECTORY ${SOURCE_PATH} + COMMAND "${SOURCE_PATH}/create_lib.bat" + WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME create_lib-${TARGET_TRIPLET} ) diff --git a/ports/winpcap/vcpkg.json b/ports/winpcap/vcpkg.json index 215c76b1306184..47dc1cdccf2218 100644 --- a/ports/winpcap/vcpkg.json +++ b/ports/winpcap/vcpkg.json @@ -1,8 +1,15 @@ { "name": "winpcap", "version": "4.1.3", - "port-version": 10, + "port-version": 11, "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.", "homepage": "https://www.winpcap.org", - "supports": "windows" + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/ports/woff2/0001-unofficial-brotli.patch b/ports/woff2/0001-unofficial-brotli.patch index 12997b53d6b565..611e49c56d7603 100644 --- a/ports/woff2/0001-unofficial-brotli.patch +++ b/ports/woff2/0001-unofficial-brotli.patch @@ -2,33 +2,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index ecfbb83..420c578 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -34,13 +34,23 @@ endif() +@@ -34,13 +34,6 @@ endif() # Find Brotli dependencies set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") - find_package(BrotliDec) +-find_package(BrotliDec) -if (NOT BROTLIDEC_FOUND) - message(FATAL_ERROR "librotlidec is needed to build woff2.") -endif () - find_package(BrotliEnc) +-find_package(BrotliEnc) -if (NOT BROTLIENC_FOUND) - message(FATAL_ERROR "librotlienc is needed to build woff2.") -endif () -+if(BROTLIDEC_FOUND AND BROTLIENC_FOUND) -+ include_directories("${BROTLIDEC_INCLUDE_DIRS}" "${BROTLIENC_INCLUDE_DIRS}") -+ set(WOFF2_BROTLIDEC libbrotlidec) -+ set(WOFF2_BROTLIENC libbrotlienc) -+ set(WOFF2_BORTLIDEC_LIBRARIES "${BROTLIDEC_LIBRARIES}") -+ set(WOFF2_BORTLIENC_LIBRARIES "${BROTLIENC_LIBRARIES}") -+else() + find_package(unofficial-brotli REQUIRED) -+ if(TARGET unofficial::brotli::brotlidec-static) -+ set(BROTLI_LINKAGE -static) -+ endif() -+ set(WOFF2_BROTLIDEC unofficial::brotli::brotlidec${BROTLI_LINKAGE}) -+ set(WOFF2_BROTLIENC unofficial::brotli::brotlienc${BROTLI_LINKAGE}) -+ set(WOFF2_BORTLIDEC_LIBRARIES unofficial::brotli::brotlidec${BROTLI_LINKAGE} unofficial::brotli::brotlicommon${BROTLI_LINKAGE}) -+ set(WOFF2_BORTLIENC_LIBRARIES unofficial::brotli::brotlienc${BROTLI_LINKAGE} unofficial::brotli::brotlicommon${BROTLI_LINKAGE}) -+endif() # Set compiler flags if (NOT CANONICAL_PREFIXES) @@ -49,7 +34,7 @@ index ecfbb83..420c578 100644 src/woff2_dec.cc src/woff2_out.cc) -target_link_libraries(woff2dec woff2common "${BROTLIDEC_LIBRARIES}") -+target_link_libraries(woff2dec woff2common ${WOFF2_BORTLIDEC_LIBRARIES}) ++target_link_libraries(woff2dec woff2common unofficial::brotli::brotlidec) add_executable(woff2_decompress src/woff2_decompress.cc) target_link_libraries(woff2_decompress woff2dec) @@ -58,7 +43,7 @@ index ecfbb83..420c578 100644 src/transform.cc src/woff2_enc.cc) -target_link_libraries(woff2enc woff2common "${BROTLIENC_LIBRARIES}") -+target_link_libraries(woff2enc woff2common ${WOFF2_BORTLIENC_LIBRARIES}) ++target_link_libraries(woff2enc woff2common unofficial::brotli::brotlienc) add_executable(woff2_compress src/woff2_compress.cc) target_link_libraries(woff2_compress woff2enc) diff --git a/ports/woff2/vcpkg.json b/ports/woff2/vcpkg.json index 14023e2c59308e..fa3ece813bb3a5 100644 --- a/ports/woff2/vcpkg.json +++ b/ports/woff2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "woff2", "version": "1.0.2", - "port-version": 3, + "port-version": 4, "description": "font compression reference code", "dependencies": [ "brotli", diff --git a/ports/wolfssl/fix-windows-build.patch b/ports/wolfssl/fix-windows-build.patch new file mode 100644 index 00000000000000..5355c414cfea60 --- /dev/null +++ b/ports/wolfssl/fix-windows-build.patch @@ -0,0 +1,49 @@ +diff --git a/wolfcrypt/src/chacha20_poly1305.c b/wolfcrypt/src/chacha20_poly1305.c +index e4ebd10165f..0c37de747af 100644 +--- a/wolfcrypt/src/chacha20_poly1305.c ++++ b/wolfcrypt/src/chacha20_poly1305.c +@@ -355,9 +355,9 @@ static WC_INLINE int wc_XChaCha20Poly1305_crypt_oneshot( + int isEncrypt) + { + int ret; +- ssize_t dst_len = isEncrypt ? +- (ssize_t)src_len + POLY1305_DIGEST_SIZE : +- (ssize_t)src_len - POLY1305_DIGEST_SIZE; ++ long int dst_len = isEncrypt ? ++ (long int)src_len + POLY1305_DIGEST_SIZE : ++ (long int)src_len - POLY1305_DIGEST_SIZE; + const byte *src_i; + byte *dst_i; + size_t src_len_rem; +@@ -375,7 +375,7 @@ static WC_INLINE int wc_XChaCha20Poly1305_crypt_oneshot( + goto out; + } + +- if ((ssize_t)dst_space < dst_len) { ++ if ((long int)dst_space < dst_len) { + ret = BUFFER_E; + goto out; + } +diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h +index 47e3b7363af..feeefe4a2ce 100644 +--- a/wolfssl/wolfcrypt/settings.h ++++ b/wolfssl/wolfcrypt/settings.h +@@ -1876,11 +1876,13 @@ extern void uITRON4_free(void *p) ; + #endif + #endif + +-#ifdef _MSC_VER +- #ifndef HAVE_SSIZE_T +- #include +- typedef SSIZE_T ssize_t; +- #endif ++#if defined(NO_WC_SSIZE_TYPE) || defined(ssize_t) ++ /* ssize_t comes from system headers or user_settings.h */ ++#elif defined(WC_SSIZE_TYPE) ++ typedef WC_SSIZE_TYPE ssize_t; ++#elif defined(_MSC_VER) ++ #include ++ typedef SSIZE_T ssize_t; + #endif + + /* If DCP is used without SINGLE_THREADED, enforce WOLFSSL_CRYPT_HW_MUTEX */ diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake index fcbbc33f5ec2ba..67a6cb7f3115bb 100644 --- a/ports/wolfssl/portfile.cmake +++ b/ports/wolfssl/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES warning-and-include.patch + fix-windows-build.patch # From https://github.com/wolfSSL/wolfssl/pull/6509 ) vcpkg_cmake_configure( diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json index 4c2ac10b7c25b1..08728dfae6ddd5 100644 --- a/ports/wolfssl/vcpkg.json +++ b/ports/wolfssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wolfssl", "version": "5.6.3", + "port-version": 1, "description": "TLS and Cryptographic library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/ports/wpilib/fix-dependency-libuv.patch b/ports/wpilib/fix-dependency-libuv.patch deleted file mode 100644 index 4f681bbc6da8b0..00000000000000 --- a/ports/wpilib/fix-dependency-libuv.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3930be2..f57a46b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -87,7 +87,7 @@ else() - endif() - - if (USE_VCPKG_LIBUV) --set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)") -+set (LIBUV_VCPKG_REPLACE "find_package(libuv CONFIG)") - endif() - - if (USE_VCPKG_EIGEN) -diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt -index 559c8ed..0fe60e9 100644 ---- a/wpiutil/CMakeLists.txt -+++ b/wpiutil/CMakeLists.txt -@@ -210,8 +210,12 @@ if (NOT USE_VCPKG_LIBUV) - endif() - endif() - else() -- find_package(unofficial-libuv CONFIG REQUIRED) -- target_link_libraries(wpiutil unofficial::libuv::libuv) -+ find_package(libuv CONFIG REQUIRED) -+ if (TARGET libuv::uv) -+ target_link_libraries(wpiutil libuv::uv) -+ else() -+ target_link_libraries(wpiutil libuv::uv_a) -+ endif() - endif() - - if (MSVC) diff --git a/ports/wpilib/fix-usage.patch b/ports/wpilib/fix-usage.patch new file mode 100644 index 00000000000000..99d22f549fcbd5 --- /dev/null +++ b/ports/wpilib/fix-usage.patch @@ -0,0 +1,44 @@ +diff --git a/wpilibNewCommands/wpilibNewCommands-config.cmake.in b/wpilibNewCommands/wpilibNewCommands-config.cmake.in +index 75aa6ad7d..8a8d8d8ec 100644 +--- a/wpilibNewCommands/wpilibNewCommands-config.cmake.in ++++ b/wpilibNewCommands/wpilibNewCommands-config.cmake.in +@@ -1,5 +1,4 @@ + include(CMakeFindDependencyMacro) +- @FILENAME_DEP_REPLACE@ + @WPIUTIL_DEP_REPLACE@ + @NTCORE_DEP_REPLACE@ + @CSCORE_DEP_REPLACE@ +@@ -8,4 +7,5 @@ include(CMakeFindDependencyMacro) + @WPILIBC_DEP_REPLACE@ + @WPIMATH_DEP_REPLACE@ + ++ @FILENAME_DEP_REPLACE@ + include(${SELF_DIR}/wpilibNewCommands.cmake) +diff --git a/wpimath/wpimath-config.cmake.in b/wpimath/wpimath-config.cmake.in +index 4769e4317..9100d7943 100644 +--- a/wpimath/wpimath-config.cmake.in ++++ b/wpimath/wpimath-config.cmake.in +@@ -2,5 +2,9 @@ include(CMakeFindDependencyMacro) + @FILENAME_DEP_REPLACE@ + @WPIUTIL_DEP_REPLACE@ + ++if(@USE_SYSTEM_EIGEN@) ++ find_dependency(Eigen3) ++endif() ++ + @FILENAME_DEP_REPLACE@ + include(${SELF_DIR}/wpimath.cmake) +diff --git a/wpiutil/wpiutil-config.cmake.in b/wpiutil/wpiutil-config.cmake.in +index fde839e2f..3f696c8a0 100644 +--- a/wpiutil/wpiutil-config.cmake.in ++++ b/wpiutil/wpiutil-config.cmake.in +@@ -4,5 +4,9 @@ set(THREADS_PREFER_PTHREAD_FLAG ON) + find_dependency(Threads) + @FMTLIB_SYSTEM_REPLACE@ + ++if(@USE_SYSTEM_FMTLIB@) ++ find_dependency(fmt) ++endif() ++ + @FILENAME_DEP_REPLACE@ + include(${SELF_DIR}/wpiutil.cmake) diff --git a/ports/wpilib/missing-find_dependency.patch b/ports/wpilib/missing-find_dependency.patch new file mode 100644 index 00000000000000..06ccb909a57771 --- /dev/null +++ b/ports/wpilib/missing-find_dependency.patch @@ -0,0 +1,12 @@ +diff --git a/ntcore/ntcore-config.cmake.in b/ntcore/ntcore-config.cmake.in +index 17006a583..0a85f8b09 100644 +--- a/ntcore/ntcore-config.cmake.in ++++ b/ntcore/ntcore-config.cmake.in +@@ -1,6 +1,7 @@ + include(CMakeFindDependencyMacro) + @FILENAME_DEP_REPLACE@ + @WPIUTIL_DEP_REPLACE@ ++@WPINET_DEP_REPLACE@ + + @FILENAME_DEP_REPLACE@ + include(${SELF_DIR}/ntcore.cmake) diff --git a/ports/wpilib/no-werror.patch b/ports/wpilib/no-werror.patch new file mode 100644 index 00000000000000..8bcd6997220031 --- /dev/null +++ b/ports/wpilib/no-werror.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/modules/CompileWarnings.cmake b/cmake/modules/CompileWarnings.cmake +index 93b35b8ab..df7ff7365 100644 +--- a/cmake/modules/CompileWarnings.cmake ++++ b/cmake/modules/CompileWarnings.cmake +@@ -1,8 +1,8 @@ + macro(wpilib_target_warnings target) + if(NOT MSVC) +- target_compile_options(${target} PRIVATE -Wall -pedantic -Wextra -Werror -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS}) ++ target_compile_options(${target} PRIVATE -Wall -pedantic -Wextra -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS}) + else() +- target_compile_options(${target} PRIVATE /wd4146 /wd4244 /wd4251 /wd4267 /WX /D_CRT_SECURE_NO_WARNINGS ${WPILIB_TARGET_WARNINGS}) ++ target_compile_options(${target} PRIVATE /wd4146 /wd4244 /wd4251 /wd4267 /D_CRT_SECURE_NO_WARNINGS ${WPILIB_TARGET_WARNINGS}) + endif() + + # Suppress C++-specific OpenCV warning; C compiler rejects it with an error diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index d680107fe5fe99..1d22e6e0400abb 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -1,59 +1,59 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wpilibsuite/allwpilib - REF 35eb90c135eba994a2ca2cbd50a68c367910f4b6 - SHA512 55bc608632ab67c097f3cce7c5ad9790b2b123a633c93bf5b4008f90bf79538cc142c911850d5f49b75e3a12f43ffad9f6f5f9bcdf1351cce7513ecc4b04e439 - PATCHES fix-dependency-libuv.patch + REF 165ebe4c79c437c7ba6c03af4a88a8c8680f742a + SHA512 f6ee07db0a119a7ac5876c4b0cf74abfb6af635d3d3ba913300138c450f62f6595ac4849bc499346f9f0179cc563f548a5e8a9a47122af593b425af453afd99f + PATCHES + no-werror.patch + windows-install-location.patch + missing-find_dependency.patch + fix-usage.patch ) +if("allwpilib" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH_APRILTAG + REPO wpilibsuite/apriltag + REF e55b751f2465bd40a880d9acb87d24289e2af89e + SHA512 a5d824d11312f7f5229bad162349586e9c855cd1dc03f33235c045f2d5235932227eb17f9e9c801b46a28991cddcf7ad16d39549560251d7d9d52ce72f094a73 + ) +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - cameraserver WITHOUT_CSCORE - allwpilib WITHOUT_ALLWPILIB + FEATURES + cameraserver WITH_CSCORE + allwpilib WITH_SIMULATION_MODULES + allwpilib WITH_WPILIB ) +vcpkg_find_acquire_program(PYTHON3) +x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES jinja2) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DWITHOUT_JAVA=ON - ${FEATURE_OPTIONS} - -DUSE_VCPKG_LIBUV=ON - -DUSE_VCPKG_EIGEN=ON - -DFLAT_INSTALL_WPILIB=ON + ${FEATURE_OPTIONS} + -DWITH_JAVA=OFF + -DWITH_EXAMPLES=OFF + -DWITH_TESTS=OFF + -DWITH_GUI=OFF + -DWITH_SIMULATION_MODULES=OFF + -DUSE_SYSTEM_FMTLIB=ON + -DUSE_SYSTEM_LIBUV=ON + -DUSE_SYSTEM_EIGEN=ON + "-DFETCHCONTENT_SOURCE_DIR_APRILTAGLIB=${SOURCE_PATH_APRILTAG}" + MAYBE_UNUSED_VARIABLES + FETCHCONTENT_SOURCE_DIR_APRILTAGLIB ) vcpkg_cmake_install() - -file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") - -if ("allwpilib" IN_LIST FEATURES) - file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") - file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/hal/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gen") -endif() - -if ("cameraserver" IN_LIST FEATURES) - file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") - file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -endif() - -if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dll") - file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dll") - - file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.so") - file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.so") - - file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dylib") - file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dylib") -endif() - -file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.lib") -file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.lib") - -file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.a") -file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.a") +vcpkg_cmake_config_fixup(PACKAGE_NAME wpilib) +vcpkg_cmake_config_fixup(PACKAGE_NAME ntcore) +vcpkg_cmake_config_fixup(PACKAGE_NAME wpimath) +vcpkg_cmake_config_fixup(PACKAGE_NAME wpinet) +vcpkg_cmake_config_fixup(PACKAGE_NAME wpiutil) vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json index b5a1b5ea42b052..48d3edf194ef4a 100644 --- a/ports/wpilib/vcpkg.json +++ b/ports/wpilib/vcpkg.json @@ -1,13 +1,12 @@ { "name": "wpilib", - "version-date": "2020-03-02", - "port-version": 4, + "version-date": "2023-08-24", "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.", "homepage": "https://github.com/wpilibsuite/allwpilib", "license": null, - "supports": "!osx", "dependencies": [ "eigen3", + "fmt", "libuv", { "name": "vcpkg-cmake", @@ -16,6 +15,10 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-get-python-packages", + "host": true } ], "features": { diff --git a/ports/wpilib/windows-install-location.patch b/ports/wpilib/windows-install-location.patch new file mode 100644 index 00000000000000..36087a71f0d096 --- /dev/null +++ b/ports/wpilib/windows-install-location.patch @@ -0,0 +1,338 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 012bcb7cc..ff2ab95b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -153,7 +153,6 @@ endif() + + set( wpilib_dest "") + set( include_dest include ) +-set( main_lib_dest lib ) + set( java_lib_dest java ) + set( jni_lib_dest jni ) + +diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt +index 6f20e3aa0..b5459eb62 100644 +--- a/apriltag/CMakeLists.txt ++++ b/apriltag/CMakeLists.txt +@@ -62,11 +62,7 @@ if (WITH_JAVA) + target_link_libraries(apriltagjni PRIVATE apriltag_jni_headers) + add_dependencies(apriltagjni apriltag_jar) + +- if (MSVC) +- install(TARGETS apriltagjni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +- endif() +- +- install(TARGETS apriltagjni EXPORT apriltagjni DESTINATION "${main_lib_dest}") ++ install(TARGETS apriltagjni EXPORT apriltagjni) + + endif() + +@@ -94,13 +90,9 @@ target_include_directories(apriltag PUBLIC + $ + $) + +-install(TARGETS apriltag EXPORT apriltag DESTINATION "${main_lib_dest}") ++install(TARGETS apriltag EXPORT apriltag) + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/apriltag") + +-if (WITH_JAVA AND MSVC) +- install(TARGETS apriltag RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +-endif() +- + if (WITH_FLAT_INSTALL) + set (apriltag_config_dir ${wpilib_dest}) + else() +diff --git a/cameraserver/CMakeLists.txt b/cameraserver/CMakeLists.txt +index 4916be3b6..665a4ef41 100644 +--- a/cameraserver/CMakeLists.txt ++++ b/cameraserver/CMakeLists.txt +@@ -40,13 +40,9 @@ target_link_libraries(cameraserver PUBLIC ntcore cscore wpiutil ${OpenCV_LIBS}) + + set_property(TARGET cameraserver PROPERTY FOLDER "libraries") + +-install(TARGETS cameraserver EXPORT cameraserver DESTINATION "${main_lib_dest}") ++install(TARGETS cameraserver EXPORT cameraserver) + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/cameraserver") + +-if (WITH_JAVA AND MSVC) +- install(TARGETS cameraserver RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +-endif() +- + if (WITH_FLAT_INSTALL) + set (cameraserver_config_dir ${wpilib_dest}) + else() +diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt +index 81cdd4ec5..1036cdf31 100644 +--- a/cscore/CMakeLists.txt ++++ b/cscore/CMakeLists.txt +@@ -40,7 +40,7 @@ target_link_libraries(cscore PUBLIC wpinet wpiutil ${OpenCV_LIBS}) + + set_property(TARGET cscore PROPERTY FOLDER "libraries") + +-install(TARGETS cscore EXPORT cscore DESTINATION "${main_lib_dest}") ++install(TARGETS cscore EXPORT cscore) + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/cscore") + + if (WITH_FLAT_INSTALL) +@@ -129,11 +129,7 @@ if (WITH_JAVA) + target_link_libraries(cscorejni PRIVATE cscore_jni_headers) + add_dependencies(cscorejni cscore_jar) + +- if (MSVC) +- install(TARGETS cscorejni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +- endif() +- +- install(TARGETS cscorejni EXPORT cscorejni DESTINATION "${main_lib_dest}") ++ install(TARGETS cscorejni EXPORT cscorejni) + + endif() + +diff --git a/glass/CMakeLists.txt b/glass/CMakeLists.txt +index a252c2e83..9192bc7b4 100644 +--- a/glass/CMakeLists.txt ++++ b/glass/CMakeLists.txt +@@ -22,7 +22,7 @@ target_include_directories(libglass PUBLIC + $ + $) + +-install(TARGETS libglass EXPORT libglass DESTINATION "${main_lib_dest}") ++install(TARGETS libglass EXPORT libglass) + install(DIRECTORY src/lib/native/include/ DESTINATION "${include_dest}/glass") + + # +@@ -43,7 +43,7 @@ target_include_directories(libglassnt PUBLIC + $ + $) + +-install(TARGETS libglassnt EXPORT libglassnt DESTINATION "${main_lib_dest}") ++install(TARGETS libglassnt EXPORT libglassnt) + install(DIRECTORY src/libnt/native/include/ DESTINATION "${include_dest}/glass") + + # +diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt +index 45c55675b..52dd44ad6 100644 +--- a/hal/CMakeLists.txt ++++ b/hal/CMakeLists.txt +@@ -55,7 +55,7 @@ target_link_libraries(hal PUBLIC wpiutil) + + set_property(TARGET hal PROPERTY FOLDER "libraries") + +-install(TARGETS hal EXPORT hal DESTINATION "${main_lib_dest}") ++install(TARGETS hal EXPORT hal) + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/hal") + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gen/ DESTINATION "${include_dest}/hal") + +@@ -108,11 +108,7 @@ if (WITH_JAVA) + target_link_libraries(haljni PRIVATE hal_jni_headers) + add_dependencies(haljni hal_jar) + +- if (MSVC) +- install(TARGETS haljni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +- endif() +- +- install(TARGETS haljni EXPORT haljni DESTINATION "${main_lib_dest}") ++ install(TARGETS haljni EXPORT haljni) + + endif() + +diff --git a/ntcore/CMakeLists.txt b/ntcore/CMakeLists.txt +index cd5b3fb7d..1a97ac0c0 100644 +--- a/ntcore/CMakeLists.txt ++++ b/ntcore/CMakeLists.txt +@@ -33,7 +33,7 @@ target_link_libraries(ntcore PUBLIC wpinet wpiutil) + + set_property(TARGET ntcore PROPERTY FOLDER "libraries") + +-install(TARGETS ntcore EXPORT ntcore DESTINATION "${main_lib_dest}") ++install(TARGETS ntcore EXPORT ntcore) + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/ntcore") + install(DIRECTORY ${WPILIB_BINARY_DIR}/ntcore/generated/main/native/include/ DESTINATION "${include_dest}/ntcore") + +@@ -81,7 +81,7 @@ if (WITH_JAVA) + target_link_libraries(ntcorejni PRIVATE ntcore_jni_headers) + add_dependencies(ntcorejni ntcore_jar) + +- install(TARGETS ntcorejni EXPORT ntcorejni DESTINATION "${main_lib_dest}") ++ install(TARGETS ntcorejni EXPORT ntcorejni) + + endif() + +diff --git a/simulation/halsim_ds_socket/CMakeLists.txt b/simulation/halsim_ds_socket/CMakeLists.txt +index 6d770d9a1..4eb23bb70 100644 +--- a/simulation/halsim_ds_socket/CMakeLists.txt ++++ b/simulation/halsim_ds_socket/CMakeLists.txt +@@ -13,4 +13,4 @@ target_include_directories(halsim_ds_socket PRIVATE src/main/native/include) + + set_property(TARGET halsim_ds_socket PROPERTY FOLDER "libraries") + +-install(TARGETS halsim_ds_socket EXPORT halsim_ds_socket DESTINATION "${main_lib_dest}") ++install(TARGETS halsim_ds_socket EXPORT halsim_ds_socket) +diff --git a/simulation/halsim_gui/CMakeLists.txt b/simulation/halsim_gui/CMakeLists.txt +index 949f9f1e8..957a9c223 100644 +--- a/simulation/halsim_gui/CMakeLists.txt ++++ b/simulation/halsim_gui/CMakeLists.txt +@@ -16,4 +16,4 @@ target_include_directories(halsim_gui PRIVATE src/main/native/include) + + set_property(TARGET halsim_gui PROPERTY FOLDER "libraries") + +-install(TARGETS halsim_gui EXPORT halsim_gui DESTINATION "${main_lib_dest}") ++install(TARGETS halsim_gui EXPORT halsim_gui) +diff --git a/simulation/halsim_ws_client/CMakeLists.txt b/simulation/halsim_ws_client/CMakeLists.txt +index 5bc99dbda..18a2a120d 100644 +--- a/simulation/halsim_ws_client/CMakeLists.txt ++++ b/simulation/halsim_ws_client/CMakeLists.txt +@@ -13,4 +13,4 @@ target_include_directories(halsim_ws_client PRIVATE src/main/native/include) + + set_property(TARGET halsim_ws_client PROPERTY FOLDER "libraries") + +-install(TARGETS halsim_ws_client EXPORT halsim_ws_client DESTINATION "${main_lib_dest}") ++install(TARGETS halsim_ws_client EXPORT halsim_ws_client) +diff --git a/simulation/halsim_ws_core/CMakeLists.txt b/simulation/halsim_ws_core/CMakeLists.txt +index 91bcbb25b..f7e240fd2 100644 +--- a/simulation/halsim_ws_core/CMakeLists.txt ++++ b/simulation/halsim_ws_core/CMakeLists.txt +@@ -13,4 +13,4 @@ target_include_directories(halsim_ws_core PUBLIC src/main/native/include) + + set_property(TARGET halsim_ws_core PROPERTY FOLDER "libraries") + +-install(TARGETS halsim_ws_core EXPORT halsim_ws_core DESTINATION "${main_lib_dest}") ++install(TARGETS halsim_ws_core EXPORT halsim_ws_core) +diff --git a/simulation/halsim_ws_server/CMakeLists.txt b/simulation/halsim_ws_server/CMakeLists.txt +index e5b55c801..370d2f83f 100644 +--- a/simulation/halsim_ws_server/CMakeLists.txt ++++ b/simulation/halsim_ws_server/CMakeLists.txt +@@ -13,4 +13,4 @@ target_include_directories(halsim_ws_server PRIVATE src/main/native/include) + + set_property(TARGET halsim_ws_server PROPERTY FOLDER "libraries") + +-install(TARGETS halsim_ws_server EXPORT halsim_ws_server DESTINATION "${main_lib_dest}") ++install(TARGETS halsim_ws_server EXPORT halsim_ws_server) +diff --git a/wpigui/CMakeLists.txt b/wpigui/CMakeLists.txt +index 59c4d6faf..2a6e6b213 100644 +--- a/wpigui/CMakeLists.txt ++++ b/wpigui/CMakeLists.txt +@@ -37,7 +37,7 @@ add_executable(wpiguidev src/dev/native/cpp/main.cpp) + wpilib_link_macos_gui(wpiguidev) + target_link_libraries(wpiguidev wpigui) + +-install(TARGETS wpigui EXPORT wpigui DESTINATION "${main_lib_dest}") ++install(TARGETS wpigui EXPORT wpigui) + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpigui") + + #if (WITH_FLAT_INSTALL) +diff --git a/wpilibNewCommands/CMakeLists.txt b/wpilibNewCommands/CMakeLists.txt +index dc218fa06..fbebf19ea 100644 +--- a/wpilibNewCommands/CMakeLists.txt ++++ b/wpilibNewCommands/CMakeLists.txt +@@ -39,7 +39,7 @@ target_include_directories(wpilibNewCommands PUBLIC + $ + $) + +-install(TARGETS wpilibNewCommands EXPORT wpilibNewCommands DESTINATION "${main_lib_dest}") ++install(TARGETS wpilibNewCommands EXPORT wpilibNewCommands) + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpilibNewCommands") + + if (FLAT_INSTALL_WPILIB) +diff --git a/wpilibc/CMakeLists.txt b/wpilibc/CMakeLists.txt +index 8c2c85ce9..ed8583497 100644 +--- a/wpilibc/CMakeLists.txt ++++ b/wpilibc/CMakeLists.txt +@@ -30,7 +30,7 @@ target_link_libraries(wpilibc PUBLIC hal ntcore wpimath wpiutil) + + set_property(TARGET wpilibc PROPERTY FOLDER "libraries") + +-install(TARGETS wpilibc EXPORT wpilibc DESTINATION "${main_lib_dest}") ++install(TARGETS wpilibc EXPORT wpilibc) + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpilibc") + + if (WITH_FLAT_INSTALL) +diff --git a/wpimath/CMakeLists.txt b/wpimath/CMakeLists.txt +index 01fd5d0f8..15cede1b3 100644 +--- a/wpimath/CMakeLists.txt ++++ b/wpimath/CMakeLists.txt +@@ -71,11 +71,7 @@ if (WITH_JAVA) + target_link_libraries(wpimathjni PRIVATE wpimath_jni_headers) + add_dependencies(wpimathjni wpimath_jar) + +- if (MSVC) +- install(TARGETS wpimathjni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +- endif() +- +- install(TARGETS wpimathjni EXPORT wpimathjni DESTINATION "${main_lib_dest}") ++ install(TARGETS wpimathjni EXPORT wpimathjni) + + endif() + +@@ -116,11 +112,7 @@ target_include_directories(wpimath PUBLIC + $ + $) + +-install(TARGETS wpimath EXPORT wpimath DESTINATION "${main_lib_dest}") +- +-if (WITH_JAVA AND MSVC) +- install(TARGETS wpimath RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +-endif() ++install(TARGETS wpimath EXPORT wpimath) + + if (WITH_FLAT_INSTALL) + set (wpimath_config_dir ${wpilib_dest}) +diff --git a/wpinet/CMakeLists.txt b/wpinet/CMakeLists.txt +index 6d92a5640..c30d21827 100644 +--- a/wpinet/CMakeLists.txt ++++ b/wpinet/CMakeLists.txt +@@ -34,11 +34,7 @@ if (WITH_JAVA) + target_link_libraries(wpinetjni PRIVATE wpinet_jni_headers) + add_dependencies(wpinetjni wpinet_jar) + +- if (MSVC) +- install(TARGETS wpinetjni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +- endif() +- +- install(TARGETS wpinetjni EXPORT wpinetjni DESTINATION "${main_lib_dest}") ++ install(TARGETS wpinetjni EXPORT wpinetjni) + + endif() + +@@ -161,11 +157,7 @@ target_include_directories(wpinet PUBLIC + $ + $) + +-install(TARGETS wpinet EXPORT wpinet DESTINATION "${main_lib_dest}") +- +-if (WITH_JAVA AND MSVC) +- install(TARGETS wpinet RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +-endif() ++install(TARGETS wpinet EXPORT wpinet) + + if (WITH_FLAT_INSTALL) + set (wpinet_config_dir ${wpilib_dest}) +diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt +index 5db2b4c65..f6486286d 100644 +--- a/wpiutil/CMakeLists.txt ++++ b/wpiutil/CMakeLists.txt +@@ -55,11 +55,7 @@ if (WITH_JAVA) + target_link_libraries(wpiutiljni PRIVATE wpiutil_jni_headers) + add_dependencies(wpiutiljni wpiutil_jar) + +- if (MSVC) +- install(TARGETS wpiutiljni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +- endif() +- +- install(TARGETS wpiutiljni EXPORT wpiutiljni DESTINATION "${main_lib_dest}") ++ install(TARGETS wpiutiljni EXPORT wpiutiljni) + + endif() + +@@ -161,11 +157,7 @@ target_include_directories(wpiutil PUBLIC + $ + $) + +-install(TARGETS wpiutil EXPORT wpiutil DESTINATION "${main_lib_dest}") +- +-if (WITH_JAVA AND MSVC) +- install(TARGETS wpiutil RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +-endif() ++install(TARGETS wpiutil EXPORT wpiutil) + + if (WITH_FLAT_INSTALL) + set (wpiutil_config_dir ${wpilib_dest}) diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 4aace861c8942a..17c4553c8edf88 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -42,6 +42,10 @@ if(VCPKG_TARGET_IS_MINGW AND ENABLE_SHARED) endif() vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND ENABLE_SHARED) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/x265-static.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/x265-static.lib") +endif() vcpkg_list(SET pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc") if(NOT VCPKG_BUILD_TYPE) vcpkg_list(APPEND pc_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc") @@ -49,7 +53,9 @@ endif() foreach(FILE IN LISTS pc_files) file(READ "${FILE}" _contents) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lx265" "-lx265-static" _contents "${_contents}") + if (NOT ENABLE_SHARED) + string(REPLACE "-lx265" "-lx265-static" _contents "${_contents}") + endif() else() string(REPLACE " -lgcc_s" "" _contents "${_contents}") string(REPLACE " -lgcc" "" _contents "${_contents}") diff --git a/ports/x265/vcpkg.json b/ports/x265/vcpkg.json index ee7bc4a88a9bfa..f7cec32c975ede 100644 --- a/ports/x265/vcpkg.json +++ b/ports/x265/vcpkg.json @@ -1,7 +1,7 @@ { "name": "x265", "version": "3.4", - "port-version": 9, + "port-version": 10, "description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.", "homepage": "https://github.com/videolan/x265", "license": "GPL-2.0-or-later", diff --git a/ports/xmlsec/portfile.cmake b/ports/xmlsec/portfile.cmake index 576f934275be88..eb879f938f0f74 100644 --- a/ports/xmlsec/portfile.cmake +++ b/ports/xmlsec/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} -string(REPLACE "." "_" release_tag "xmlsec-${VERSION}") +string(REPLACE "." "_" release_tag "xmlsec_${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lsh123/xmlsec REF "${release_tag}" - SHA512 4e4a9d6be76582e207c6c678feeaf1d572e2eac04fb032fa742e059e45f1eeebf664535d723e27cefb7026604cb445faecec0a801dcf65c95ae6d5cf046a0d1f + SHA512 c7b867edc23cb6cf08228f9737fc50e3bd08ac7baedc43e26d3cfd113ea54256ff357335b23aea7b5e49cd24809c3de9da1c9314eb5ab90727aa821530b72ef8 HEAD_REF master PATCHES pkgconfig_fixes.patch diff --git a/ports/xmlsec/vcpkg.json b/ports/xmlsec/vcpkg.json index 9760f5ac4d7533..19c7f7d57cd8c2 100644 --- a/ports/xmlsec/vcpkg.json +++ b/ports/xmlsec/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xmlsec", - "version": "1.2.37", - "port-version": 2, + "version": "1.3.1", + "port-version": 1, "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.", "homepage": "https://www.aleksey.com/xmlsec/", "license": "X11 AND MPL-1.1", diff --git a/ports/xmlsec/xmlsec-config.cmake b/ports/xmlsec/xmlsec-config.cmake index d93c36aed1fe5c..5c8b6f34b3dc58 100644 --- a/ports/xmlsec/xmlsec-config.cmake +++ b/ports/xmlsec/xmlsec-config.cmake @@ -2,5 +2,9 @@ file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage) message(WARNING "find_package(xmlsec) is deprecated.\n${usage}") include(CMakeFindDependencyMacro) find_dependency(unofficial-xmlsec CONFIG REQUIRED) -add_library(xmlsec1 ALIAS unofficial::xmlsec::xmlsec1) -add_library(xmlsec1-openssl ALIAS unofficial::xmlsec::xmlsec1-openssl) +if(NOT TARGET xmlsec1) + add_library(xmlsec1 ALIAS unofficial::xmlsec::xmlsec1) +endif() +if(NOT TARGET xmlsec1-openssl) + add_library(xmlsec1-openssl ALIAS unofficial::xmlsec::xmlsec1-openssl) +endif() diff --git a/ports/xtensor/fix-find-xsimd.patch b/ports/xtensor/fix-find-xsimd.patch new file mode 100644 index 00000000000000..ff8d38bdf0a87f --- /dev/null +++ b/ports/xtensor/fix-find-xsimd.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c93655..f02dc48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -69,7 +69,12 @@ if(XTENSOR_USE_XSIMD) + message(STATUS "Found xsimd v${xsimd_VERSION}") + endif() + else() +- find_package(xsimd ${xsimd_REQUIRED_VERSION} REQUIRED) ++ find_package(xsimd CONFIG REQUIRED) ++ if(${xsimd_VERSION} GREATER_EQUAL ${xsimd_REQUIRED_VERSION}) ++ set(xsimd_REQUIRED_VERSION ${xsimd_VERSION}) ++ else() ++ message(ERROR "Mismatch xsimd versions. Found '${xsimd_VERSION}' but requires: '${xsimd_REQUIRED_VERSION}'") ++ endif() + message(STATUS "Found xsimd: ${xsimd_INCLUDE_DIRS}/xsimd") + endif() + endif() +diff --git a/xtensorConfig.cmake.in b/xtensorConfig.cmake.in +index ec72abb..7825612 100644 +--- a/xtensorConfig.cmake.in ++++ b/xtensorConfig.cmake.in +@@ -25,7 +25,7 @@ if(NOT TARGET @PROJECT_NAME@) + endif() + + if(XTENSOR_USE_XSIMD) +- find_dependency(xsimd @xsimd_REQUIRED_VERSION@) ++ find_dependency(xsimd @xsimd_REQUIRED_VERSION@ CONFIG) + target_link_libraries(@PROJECT_NAME@ INTERFACE xsimd) + target_compile_definitions(@PROJECT_NAME@ INTERFACE XTENSOR_USE_XSIMD) + endif() diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake index 77f102032ff6fe..f4e6ef950e8d7d 100644 --- a/ports/xtensor/portfile.cmake +++ b/ports/xtensor/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-find-tbb-and-install-destination.patch + fix-find-xsimd.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/xtensor/vcpkg.json b/ports/xtensor/vcpkg.json index 91edd794842934..ff8d9ec4adf404 100644 --- a/ports/xtensor/vcpkg.json +++ b/ports/xtensor/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xtensor", "version": "0.24.6", + "port-version": 1, "description": "C++ tensors with broadcasting and lazy computing", "homepage": "https://github.com/xtensor-stack/xtensor", "license": "BSD-3-Clause", diff --git a/ports/yomm2/fix_find_boost.patch b/ports/yomm2/fix_install.patch similarity index 56% rename from ports/yomm2/fix_find_boost.patch rename to ports/yomm2/fix_install.patch index 17fd1bb30b26a5..97d7c481db24ff 100644 --- a/ports/yomm2/fix_find_boost.patch +++ b/ports/yomm2/fix_install.patch @@ -20,7 +20,28 @@ index 7272504..6423a17 100644 # Tell library users about the Boost dependency -find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..) -+find_dependency(Boost 1.53) ++find_dependency(Boost REQUIRED) # Add the targets file include("${CMAKE_CURRENT_LIST_DIR}/YOMM2Targets.cmake") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7e8a282..f550c2d 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -26,6 +29,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) + target_include_directories( + yomm2 INTERFACE + $ + $ +- $ + ) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -36,5 +36,6 @@ + install(TARGETS yomm2 + EXPORT YOMM2Targets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ++ RUNTIME DESTINATION bin + ) diff --git a/ports/yomm2/portfile.cmake b/ports/yomm2/portfile.cmake index 34ff379cf9917c..46c1fc435c80be 100644 --- a/ports/yomm2/portfile.cmake +++ b/ports/yomm2/portfile.cmake @@ -1,17 +1,29 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jll63/yomm2 REF "v${VERSION}" - SHA512 456422f829293339d1d29eda8a00ad1bf5a2b7adcf0eb3727729b25208e1e67bff8187e21d49b64817ebb3a2274cef5504e22d612b1c68de20c8fe458daa81ba + SHA512 35d869f79b278ae219d61e0ae3b01902c5df5457d2ced7bfd109cf0e75f3f7835ce3d4751c34838d134531f6483dc89b7d67d5ecab6e8af42b4b735284573db4 HEAD_REF master - PATCHES "fix_find_boost.patch" + PATCHES "fix_install.patch" ) + +set(YOMM2_SHARED OFF) +if(VCPKG_LIBRARY_LINKAGE MATCHES "dynamic") + set(YOMM2_SHARED ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS -DYOMM2_ENABLE_EXAMPLES=OFF + OPTIONS + -DYOMM2_ENABLE_EXAMPLES=OFF + -DYOMM2_SHARED=${YOMM2_SHARED} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/YOMM2) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE MATCHES "static") # header only library in static build + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") +endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/yomm2/vcpkg.json b/ports/yomm2/vcpkg.json index 12eea2b7e74e0e..09af20dc4a284a 100644 --- a/ports/yomm2/vcpkg.json +++ b/ports/yomm2/vcpkg.json @@ -1,15 +1,14 @@ { "name": "yomm2", - "version": "1.3.1", + "version": "1.4.0", + "port-version": 1, "description": "YOMM2 is an implementation of open multi-methods.", "homepage": "https://github.com/jll63/yomm2", "license": "BSL-1.0", "dependencies": [ "boost-dynamic-bitset", - "boost-integer", - "boost-move", + "boost-mp11", "boost-preprocessor", - "boost-type-traits", { "name": "vcpkg-cmake", "host": true diff --git a/ports/yyjson/portfile.cmake b/ports/yyjson/portfile.cmake index fe84c5743d9b99..f9943a429af3ad 100644 --- a/ports/yyjson/portfile.cmake +++ b/ports/yyjson/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ibireme/yyjson - REF 0.6.0 - SHA512 ad8b9d904ecd6c745d8b261d5c20879922db01a8e4f3d9df2949f2cc7ec40360411d571cb8d0a8d4e1bab39f9b8f9ddf4c54db42f4e5f35b1ea005197374ee17 + REF "${VERSION}" + SHA512 3872b46930fd0f4d659004a4d08cdb1c506ccc2bf2888f5ee50523929a2b72f9d8e72ee71dc958ebca630f1886858d4350521bffc18c300a27d25436833384a9 HEAD_REF master ) diff --git a/ports/yyjson/vcpkg.json b/ports/yyjson/vcpkg.json index d05e66b3e78cc3..72162733ef316e 100644 --- a/ports/yyjson/vcpkg.json +++ b/ports/yyjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yyjson", - "version": "0.6.0", + "version": "0.8.0", "description": "A high performance JSON library written in ANSI C", "homepage": "https://github.com/ibireme/yyjson", "license": "MIT", @@ -31,7 +31,16 @@ "description": "Build with JSON reader" }, "writer": { - "description": "Build with JSON writer" + "description": "Build with JSON writer", + "dependencies": [ + { + "name": "yyjson", + "default-features": false, + "features": [ + "reader" + ] + } + ] } } } diff --git a/ports/zeroc-ice/fix-missing-functional.patch b/ports/zeroc-ice/fix-missing-functional.patch new file mode 100644 index 00000000000000..1125a3f388834a --- /dev/null +++ b/ports/zeroc-ice/fix-missing-functional.patch @@ -0,0 +1,12 @@ +diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h +index 177a7f8..19b8c09 100644 +--- a/cpp/include/IceUtil/Timer.h ++++ b/cpp/include/IceUtil/Timer.h +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + namespace IceUtil + { diff --git a/ports/zeroc-ice/portfile.cmake b/ports/zeroc-ice/portfile.cmake index e0fe436b45066c..13f4955a750967 100644 --- a/ports/zeroc-ice/portfile.cmake +++ b/ports/zeroc-ice/portfile.cmake @@ -4,23 +4,25 @@ vcpkg_from_github( REPO zeroc-ice/ice REF "v${VERSION}" SHA512 07d7c439fbe1f69d808d05a11f32e09cdd8d4df2a93b6f253496304e0a521d417212ae688e316b4450dae406b59d1a460025b51ecd0614c69e48d86c0a6f81c5 - PATCHES mcppd_fix.patch no-werror.patch + PATCHES + mcppd_fix.patch + no-werror.patch + fix-missing-functional.patch ) set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) -get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME) set(UNIX_BUILD_DIR "${SOURCE_PATH}") -set(WIN_DEBUG_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/${SOURCE_PATH_SUFFIX}) -set(WIN_RELEASE_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/${SOURCE_PATH_SUFFIX}) +set(WIN_DEBUG_BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}") +set(WIN_RELEASE_BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}") # install_includes function(install_includes ORIGINAL_PATH RELATIVE_PATHS) foreach(RELATIVE_PATH ${RELATIVE_PATHS}) file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h) - if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH}) - file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) + if(EXISTS "${ORIGINAL_PATH}/${RELATIVE_PATH}") + file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}") endif() endforeach() endfunction() @@ -30,7 +32,7 @@ function(install_slices ORIGINAL_PATH RELATIVE_PATHS) foreach(RELATIVE_PATH ${RELATIVE_PATHS}) file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.ice) if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH}) - file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/ice/slice/${RELATIVE_PATH}) + file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/ice/slice/${RELATIVE_PATH}") endif() endforeach() endfunction() @@ -38,6 +40,7 @@ endfunction() vcpkg_list(SET ICE_INCLUDE_SUB_DIRECTORIES "Glacier2" "Ice" + "IceUtil" "IceBT" "IceBox" "IceBT" @@ -52,6 +55,7 @@ vcpkg_list(SET ICE_INCLUDE_SUB_DIRECTORIES set(ICE_OPTIONAL_COMPONENTS_MSBUILD "") set(ICE_OPTIONAL_COMPONENTS_MAKE "Ice") # Intentional! +set(pkgconfig_packages "") # IceSSL if("icessl" IN_LIST FEATURES) @@ -101,6 +105,7 @@ if("icegridtools" IN_LIST FEATURES) vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode") vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridregistry") vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode") + list(APPEND pkgconfig_packages expat) endif() # IceStorm @@ -131,6 +136,12 @@ if("icediscovery" IN_LIST FEATURES) vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceDiscovery") endif() +# IceLocatorDiscovery +if("icelocatordiscovery" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icelocatordiscovery++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceLocatorDiscovery") +endif() + if(NOT VCPKG_TARGET_IS_WINDOWS) # Clean up for the first round (important for install --editable) vcpkg_execute_build_process( @@ -264,14 +275,16 @@ else() # VCPKG_TARGET_IS_WINDOWS ) # Build Ice - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "cpp/msbuild/ice.${VCPKG_PLATFORM_TOOLSET}.sln" - SKIP_CLEAN TARGET "C++11\\ice++11" - USE_VCPKG_INTEGRATION OPTIONS ${MSBUILD_OPTIONS} + DEPENDENT_PKGCONFIG bzip2 ${pkgconfig_packages} + ADDITIONAL_LIBS lmdb.lib + ADDITIONAL_LIBS_RELEASE mcpp.lib ${libs_rel} + ADDITIONAL_LIBS_DEBUG mcppd.lib ${libs_dbg} ) if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll") @@ -303,4 +316,4 @@ list(FILTER PRLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$") file(REMOVE ${PDLIBS} ${PRLIBS}) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zeroc-ice RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/zeroc-ice/vcpkg.json b/ports/zeroc-ice/vcpkg.json index 3d71a0a2deca36..db1a1c1e7cb781 100644 --- a/ports/zeroc-ice/vcpkg.json +++ b/ports/zeroc-ice/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zeroc-ice", "version": "3.7.9", + "port-version": 4, "maintainers": "Benjamin Oldenburg ", "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", "homepage": "https://github.com/zeroc-ice/ice", @@ -15,6 +16,11 @@ "name": "openssl", "platform": "!windows" }, + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + }, "zlib" ], "default-features": [ @@ -100,6 +106,20 @@ } ] }, + "icelocatordiscovery": { + "description": "IceLocatorDiscovery", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "iceboxlib", + "icessl", + "icestormlib" + ] + } + ] + }, "icessl": { "description": "IceSSL", "dependencies": [ diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake index 9059e587a64fe9..e4a26f40f3a075 100644 --- a/ports/zlib-ng/portfile.cmake +++ b/ports/zlib-ng/portfile.cmake @@ -1,10 +1,8 @@ -set(ZLIB_FULL_VERSION 2.0.7) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/zlib-ng - REF "${ZLIB_FULL_VERSION}" - SHA512 1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988 + REF "${VERSION}" + SHA512 cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e HEAD_REF develop ) diff --git a/ports/zlib-ng/vcpkg.json b/ports/zlib-ng/vcpkg.json index 0bb10ad0a2235a..d3093f486f8976 100644 --- a/ports/zlib-ng/vcpkg.json +++ b/ports/zlib-ng/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zlib-ng", - "version": "2.0.7", + "version": "2.1.3", "description": "zlib replacement with optimizations for 'next generation' systems", "homepage": "https://github.com/zlib-ng/zlib-ng", "license": "Zlib", diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 450cb2c1915b25..1ec750bead8dd9 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO madler/zlib - REF v1.2.13 - SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659 + REF v${VERSION} + SHA512 78eecf335b14af1f7188c039a4d5297b74464d61156e4f12a485c74beec7d62c4159584ad482a07ec57ae2616d58873e45b09cb8ea822bb5b17e43d163df84e9 HEAD_REF master PATCHES 0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch @@ -49,5 +49,7 @@ else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zconf.h" "ifdef ZLIB_DLL" "if 1") endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zlib.h" "#define ZLIB_VERSION \"1.3\"" "#define ZLIB_VERSION \"1.3.0\"") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json index 7ef1f29d8ed9e5..b4d578e45d056c 100644 --- a/ports/zlib/vcpkg.json +++ b/ports/zlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zlib", - "version": "1.2.13", + "version": "1.3", "description": "A compression library", "homepage": "https://www.zlib.net/", "license": "Zlib", diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index 932d13054daf34..36fc1ea7e843e1 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -12,13 +12,19 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZSTD_BUILD_SHARED) +if("tools" IN_LIST FEATURES) + set(ZSTD_BUILD_PROGRAMS 1) +else() + set(ZSTD_BUILD_PROGRAMS 0) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/build/cmake" OPTIONS -DZSTD_BUILD_SHARED=${ZSTD_BUILD_SHARED} -DZSTD_BUILD_STATIC=${ZSTD_BUILD_STATIC} -DZSTD_LEGACY_SUPPORT=1 - -DZSTD_BUILD_PROGRAMS=0 + -DZSTD_BUILD_PROGRAMS=${ZSTD_BUILD_PROGRAMS} -DZSTD_BUILD_TESTS=0 -DZSTD_BUILD_CONTRIB=0 -DZSTD_MULTITHREAD_SUPPORT=1 diff --git a/ports/zstd/vcpkg.json b/ports/zstd/vcpkg.json index 9f974f739c91b7..b66f4ebe9d78e6 100644 --- a/ports/zstd/vcpkg.json +++ b/ports/zstd/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zstd", "version": "1.5.5", + "port-version": 1, "description": "Zstandard - Fast real-time compression algorithm", "homepage": "https://facebook.github.io/zstd/", "license": "BSD-3-Clause OR GPL-2.0-only", @@ -13,5 +14,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tools": { + "description": "Build zstd binary", + "supports": "!uwp" + } + } } diff --git a/scripts/Get-Changelog.ps1 b/scripts/Get-Changelog.ps1 index 5beebce6ecaea8..1a804f9795a1f3 100644 --- a/scripts/Get-Changelog.ps1 +++ b/scripts/Get-Changelog.ps1 @@ -414,7 +414,7 @@ vcpkg ($($StartDate.ToString('yyyy.MM.dd')) - $((($EndDate).AddSeconds(-1)).ToSt |x64-windows-static-md|NUM| |x64-uwp|NUM| |arm64-windows|NUM| -|arm-uwp|NUM| +|arm64-uwp|NUM| |**x64-osx**|NUM| |**x64-linux**|NUM| diff --git a/scripts/azure-pipelines/android/create-docker-image.ps1 b/scripts/azure-pipelines/android/create-docker-image.ps1 index 4dda6cebfd9576..85763cdb98c243 100644 --- a/scripts/azure-pipelines/android/create-docker-image.ps1 +++ b/scripts/azure-pipelines/android/create-docker-image.ps1 @@ -16,17 +16,22 @@ $registry = Get-AzContainerRegistry -ResourceGroupName $ResourceGroupName -Name Connect-AzContainerRegistry -Name $registry.Name $imageName = "vcpkg-android" -docker build . -t $imageName - -$remote = [string]::Format('andcontainerregistry.azurecr.io/{0}:{1}', $imageName, $Date) -docker tag $imageName $remote - -docker push $remote - -#removes from local environment -docker rmi --force $remote $imageName - -# pulls and runs ... -docker logout +Push-Location $PSScriptRoot +try { + docker build . -t $imageName + + $remote = [string]::Format('andcontainerregistry.azurecr.io/{0}:{1}', $imageName, $Date) + docker tag $imageName $remote + + docker push $remote + + #removes from local environment + docker rmi --force $remote $imageName + + # pulls and runs ... + docker logout +} finally { + Pop-Location +} Write-Host "Remote: $remote" diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 094904e70088e6..d14d2aec155242 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -4,9 +4,9 @@ variables: android-pool: 'PrAnd-1ES-Pool' linux-pool: 'PrLin-1ES-Pool' - windows-pool: 'PrWin-2023-08-09' - osx-pool: 'PrOsx-2022-02-04' - linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-04-20' + windows-pool: 'PrWin-2023-09-13' + osx-pool: 'PrOsx-2023-09-11' + linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-09-13' parameters: - name: vcpkgToolSha @@ -69,8 +69,8 @@ jobs: - template: windows/azure-pipelines.yml parameters: - triplet: arm-uwp - jobName: arm_uwp + triplet: arm64-uwp + jobName: arm64_uwp poolName: $(windows-pool) vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} diff --git a/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 b/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 deleted file mode 100755 index 979c41a7418f67..00000000000000 --- a/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 +++ /dev/null @@ -1,128 +0,0 @@ -#!pwsh -#Requires -Version 6.0 - -<# -.SYNOPSIS -Installs the set of prerequisites for the macOS CI hosts. - -.DESCRIPTION -Install-Prerequisites.ps1 installs all of the necessary prerequisites -to run the vcpkg macOS CI in a vagrant virtual machine, -skipping all prerequisites that are already installed and of the right version. - -.INPUTS -None - -.OUTPUTS -None -#> -[CmdletBinding()] -Param() - -Set-StrictMode -Version 2 - -if (-not $IsMacOS) { - Write-Error 'This script should only be run on a macOS host' - throw -} - -Import-Module "$PSScriptRoot/Utilities.psm1" - -$Installables = Get-Content "$PSScriptRoot/configuration/installables.json" | ConvertFrom-Json - -$Installables.Applications | ForEach-Object { - $VersionCommand = $_.VersionCommand - $InstalledVersion = (& $VersionCommand[0] $VersionCommand[1..$VersionCommand.Length]) - if (-not $?) { - Write-Host "$($_.Name) not installed; installing now" - } else { - $InstalledVersion = $InstalledVersion -join "`n" - if ($InstalledVersion -match $_.VersionRegex) { - if ($Matches.Count -ne 2) { - Write-Error "$($_.Name) has a malformed version regex ($($_.VersionRegex)); it should have a single capture group - (it has $($Matches.Count - 1))" - throw - } - if ($Matches[1] -eq $_.Version) { - Write-Host "$($_.Name) already installed and at the correct version ($($Matches[1]))" - return - } else { - Write-Host "$($_.Name) already installed but with the incorrect version - installed version: '$($Matches[1])' - required version : '$($_.Version)' -upgrading now." - } - } else { - Write-Warning "$($_.Name)'s version command ($($VersionCommand -join ' ')) returned a value we did not expect: - $InstalledVersion - expected a version matching the regex: $($_.VersionRegex) -Installing anyways." - } - } - - if ($null -ne (Get-Member -InputObject $_ -Name 'DmgUrl')) { - $pathToDmg = "~/Downloads/$($_.Name).dmg" - Get-RemoteFile -OutFile $pathToDmg -Uri $_.DmgUrl -Sha256 $_.Sha256 - - hdiutil attach $pathToDmg -mountpoint /Volumes/setup-installer - - if ($null -ne (Get-Member -InputObject $_ -Name 'InstallationCommands')) { - $_.InstallationCommands | % { - Write-Host "> $($_ -join ' ')" - & $_[0] $_[1..$_.Length] | Write-Host - } - } elseif ($null -ne (Get-Member -InputObject $_ -Name 'InstallerPath')) { - sudo installer -pkg "/Volumes/setup-installer/$($_.InstallerPath)" -target / - hdiutil detach /Volumes/setup-installer - } else { - Write-Error "$($_.Name) installer object has a DmgUrl, but neither an InstallerPath nor an InstallationCommands" - throw - } - } elseif ($null -ne (Get-Member -InputObject $_ -Name 'PkgUrl')) { - $pathToPkg = "~/Downloads/$($_.Name).pkg" - Get-RemoteFile -OutFile $pathToPkg -Uri $_.PkgUrl -Sha256 $_.Sha256 - - sudo installer -pkg $pathToPkg -target / - } else { - Write-Error "$($_.Name) does not have an installer in the configuration file." - throw - } -} - -$installedVagrantPlugins = @{} -vagrant plugin list --machine-readable | ForEach-Object { - $timestamp, $target, $type, $data = $_ -split ',' - switch ($type) { - # these are not important - 'ui' { } - 'plugin-version-constraint' { } - 'plugin-name' { - $installedVagrantPlugins[$data] = $Null - } - 'plugin-version' { - $version = $data -replace '%!\(VAGRANT_COMMA\)',',' - if ($version -notmatch '^(.*), global') { - Write-Error "Invalid version string for plugin ${target}: $version" - throw - } - $installedVagrantPlugins[$target] = $Matches[1] - } - default { - Write-Warning "Unknown plugin list member type $type for plugin $target" - } - } -} -$Installables.VagrantPlugins | ForEach-Object { - if (-not $installedVagrantPlugins.Contains($_.Name)) { - Write-Host "$($_.Name) not installed; installing now" - } elseif ($installedVagrantPlugins[$_.Name] -ne $_.Version) { - Write-Host "$($_.Name) already installed but with the incorrect version - installed version: '$($installedVagrantPlugins[$_.Name])' - required version: '$($_.Version)'" - } else { - Write-Host "$($_.Name) already installed and at the correct version ($($_.Version))" - return - } - - vagrant plugin install $_.Name --plugin-version $_.Version -} diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index 9dffe7249f1eec..d7ccbd954458f3 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -11,8 +11,6 @@ - [Running the VM](#running-the-vm) - [Getting an Azure Pipelines PAT](#getting-an-azure-pipelines-pat) - [Setting up a new macOS machine](#setting-up-a-new-macos-machine) - - [Troubleshooting](#troubleshooting) - - [(Internal) Accessing the macOS fileshare](#internal-accessing-the-macos-fileshare) ## Basic Usage @@ -41,18 +39,31 @@ You'll need some prerequisites: - An Xcode installer - you can get this from Apple's developer website, although you'll need to sign in first: -- The software installed by `Install-Prerequisites.ps1` If you're updating the CI pool, make sure you update macOS. First, you'll need to create a base VM; this is where you determine what version of macOS is installed. -Follow the Parallels process for creating a macOS VM; this involves -updating to whatever version, and then scrolling right until you find -"Install macOS from recovery partition". - -Once you've done this, you can run through the installation of macOS onto a new VM. -You should set the username to `vagrant`. +Follow the Parallels process for creating a macOS VM: + +1. Get a machine with matching version of Parallels. +2. If you haven't already, install Vagrant and vagrant-parallels: + ```sh + $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" + $ brew install hashicorp/tap/hashicorp-vagrant + $ vagrant plugin install vagrant-parallels + ``` +3. Update your MacOS host. +4. Run parallels, and select 'Other Options' -> 'Install macOS 13.5.2 Using the Recovery Partition' (version number to change :)) +5. Install MacOS like you would on real hardware. + * Apple ID: 'Set Up Later' / Skip + * Account name: vagrant + * Account password: vagrant +6. Install Parallels Tools +7. Shut down the VM +8. Open Parallels Control Center, right click the VM, and make the following edits: + * 12 processors + * 24000 MB of memory Once it's finished installing, make sure to turn on the SSH server. Open System Preferences, then go to Sharing > Remote Login, @@ -71,73 +82,57 @@ $ curl -fsSL 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' $ chmod 0600 ~/.ssh/authorized_keys ``` -Finally, you'll need to install the Parallel Tools. -From your host, in the top bar, -go to Actions > Install Parallels Tools..., -and then follow the instructions. - Now, let's package the VM into a base box. (The following instructions are adapted from [these official instructions][base-box-instructions]). -Run the following commands: +Shut down the VM cleanly. On the host, run the following commands: ```sh $ cd ~/Parallels $ echo '{ "provider": "parallels" }' >metadata.json -$ tar zcvf .box ./metadata.json ./.pvm +$ prl_disk_tool compact --hdd ./.pvm/harddisk.hdd +$ tar zcvf .box ./metadata.json ./.pvm +$ rm ./metadata.json ``` This will create a box file which contains all the necessary data. -You can delete the `metadata.json` file after. - -Once you've done that, you can upload it to the fileshare, -under `share/boxes/macos-base`, add it to `share/boxes/macos-base.json`, -and finally add it to vagrant: ```sh -$ vagrant box add ~/vagrant/share/boxes/macos-base.json +$ vagrant box add .box --name ``` Then, we'll create the final box, which contains all the necessary programs for doing CI work. -Copy `configuration/Vagrantfile-box.rb` as `Vagrantfile`, and -`configuration/vagrant-box-configuration.json` -into a new directory; into that same directory, -download the Xcode command line tools dmg, and name it `clt.dmg`. +Copy `Vagrantfile-box.rb` as `Vagrantfile` +into a new directory. Edit the config.vm.box line to . +Into that same directory, download the Xcode command line tools dmg, typically from +https://developer.apple.com/download/all/ , and name it `clt.dmg`. Then, run the following in that directory: ```sh $ vagrant up $ vagrant package +$ vagrant destroy ``` This will create a `package.box`, which is the box file for the base VM. -Once you've created this box, if you're making it the new box for the CI, -upload it to the fileshare, under `share/boxes/macos-ci`. -Then, add the metadata about the box (the name and version) to -`share/boxes/macos-ci.json`. +Once you've created this box, log in to the Azure Portal, and upload the box to +vcpkg-image-minting/vcpkgvagrantboxes/boxes. (You might need to use scp to copy the box to +a machine that can see the Portal) + Once you've done that, add the software versions under [VM Software Versions](#vm-software-versions). [base-box-instructions]: https://parallels.github.io/vagrant-parallels/docs/boxes/base.html #### VM Software Versions +* 2023-09-11 + * macOS: 13.5 + * Xcode CLTs: 14.3.1 * 2022-02-04 (minor update to 2022-01-03) * macOS: 12.1 * Xcode CLTs: 13.2 -* 2022-01-03: - * macOS: 12.1 - * Xcode CLTs: 13.2 -* 2021-07-27: - * macOS: 11.5.1 - * Xcode CLTs: 12.5.1 -* 2021-04-16: - * macOS: 11.2.3 - * Xcode CLTs: 12.4 -* 2020-09-28: - * macOS: 10.15.6 - * Xcode CLTs: 12 ### Creating a New Azure Agent Pool @@ -156,27 +151,54 @@ to the pool! ### Running the VM -First, make sure that your software is up to date: +First, make sure that your software is up to date, first by checking in + +* macOS system settings +* Parallels' UI +* homebrew: + ```sh + $ brew update + $ brew upgrade + ``` + +If this machine has been used before, you might have to remove an existing boxes: + ```sh -$ cd ~/vcpkg -$ git fetch -$ git switch -d origin/master -$ ./scripts/azure-pipelines/osx/Install-Prerequisites.ps1 +$ cd ~/vagrant/vcpkg-ec-mac +$ vagrant halt +$ vagrant destroy +$ cd ~ +$ rm -rf ~/vagrant +$ mkdir ~/vagrant ``` -as well as checking to make sure macOS is up to date. +[grab a PAT], mint a SAS token to vcpkg-image-minting/vcpkgvagrantboxes/boxes, and pull the box: -Then, follow the instructions for [accessing ~/vagrant/share][access-fileshare]. +```sh +$ vagrant box list +$ vagrant box remove +$ vagrant box add 'https://vcpkgvagrantboxes.blob.core.windows.net/boxes/.box?' --name +``` + +Copy the contents of Vagrantfile-vm.rb to ~/vagrant/Vagrantfile, and edit the values at the top +to match this particular machine: + +* machine_name +* box +* azure_agent_url should be changed to the latest version +* agent_pool +* pat + +Then: -And finally, [grab a PAT], update the vagrant box, set up the VM, and run it: ```sh -$ vagrant box remove -f vcpkg/macos-ci # This won't do anything if the machine never had a box before -$ vagrant box add ~/vagrant/share/boxes/macos-ci.json -$ ~/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 -Date -DevopsPat -$ cd ~/vagrant/vcpkg-eg-mac -$ vagrant up # if this fails, reboot through the kvm and/or log in interactively, then come back here +$ cd ~/vagrant +$ vagrant up ``` +If the `vagrant up` fails you might need to `vagrant halt` and rerun from within the KVM as +sometimes over SSH this fails. + [grab a PAT]: #getting-an-azure-pipelines-pat ## Getting an Azure Pipelines PAT @@ -195,64 +217,10 @@ You can now copy this token and use it to allow machines to join. ## Setting up a new macOS machine -Before anything else, one must download `brew` and `powershell`. - -```sh -$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -$ brew cask install powershell -``` - -Then, we need to download the `vcpkg` repository: - -```sh -$ git clone https://github.com/microsoft/vcpkg -``` - -Then, we need to mint an SSH key: - -```sh -$ ssh-keygen -$ cat .ssh/id_rsa.pub -``` - -Add that SSH key to `authorized_keys` on the file share machine with the base box. - -Next, install prerequisites: -```sh -$ cd vcpkg/scripts/azure-pipelines/osx -$ ./Install-Prerequisites.ps1 -Force -``` - -And finally, make sure you can [access ~/vagrant/share][access-fileshare]. - -## Troubleshooting - -The following are issues that we've run into: - -- (with a Parallels box) `vagrant up` doesn't work, and vagrant gives the error that the VM is `'stopped'`. - - Try logging into the GUI with the KVM, and retrying `vagrant up`. -- (when running a powershell script) The error `Failed to initialize CoreCLR, HRESULT: 0x8007001F` is printed. - - Reboot the machine; run - ```sh - $ sudo shutdown -r now - ``` - and wait for the machine to start back up. Then, start again from where the error was emitted. - -## (Internal) Accessing the macOS fileshare - -The fileshare is located on `vcpkgmm-01`, under the `fileshare` user, in the `share` directory. -In order to get `sshfs` working on the physical machine, -You can run `Install-Prerequisites.ps1` to grab the right software, then either: - -```sh -$ mkdir -p ~/vagrant/share -$ sshfs fileshare@vcpkgmm-01:share ~/vagrant/share -``` - -If you get an error, that means that gatekeeper has prevented the kernel extension from loading, -so you'll need to access the GUI of the machine, go to System Preferences, -Security & Privacy, General, unlock the settings, -and allow system extensions from the osxfuse developer to run. -Then, you'll be able to add ~/vagrant/share as an sshfs. - -[access-fileshare]: #internal-accessing-the-macos-fileshare +* Install Parallels +* Install Homebrew + ```sh + $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" + $ brew install hashicorp/tap/hashicorp-vagrant + $ vagrant plugin install vagrant-parallels + ``` diff --git a/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 b/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 deleted file mode 100755 index eb978d42c4e111..00000000000000 --- a/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 +++ /dev/null @@ -1,126 +0,0 @@ -#!pwsh -#Requires -Version 6.0 - -<# -.SYNOPSIS -Sets up the configuration for the vagrant virtual machines. - -.DESCRIPTION -Setup-VagrantMachines.ps1 sets up the virtual machines for -vcpkg's macOS CI. It puts the VagrantFile and necessary -configuration JSON file into ~/vagrant/vcpkg-eg-mac. - -.PARAMETER MachineId -The number to give the machine; should match [0-9]{2}. -Defaults to the numbers at the end of the machine name, -assuming that that machine name matches `VCPKGMM-[0-9]{2}`. - -.PARAMETER DevopsPat -The personal access token which has Read & Manage permissions on the ADO pool. - -.PARAMETER Date -The date on which this pool is being created. Sets the default values for BoxVersion and AgentPool. - -.PARAMETER BoxVersion -The version of the box to use. If -Date is passed, uses that as the version. - -.PARAMETER AgentPool -The agent pool to add the machine to. If -Date is passed, uses "PrOsx-$Date" as the pool. - -.PARAMETER DevopsUrl -The URL of the ADO instance; defaults to vcpkg's, which is https://dev.azure.com/vcpkg. - -.PARAMETER BaseName -The base name for the vagrant VM; the machine name is $BaseName-$MachineId. -Defaults to 'vcpkg-eg-mac'. - -.PARAMETER BoxName -The name of the box to use. Defaults to 'vcpkg/macos-ci', -which is only available internally. - -.INPUTS -None - -.OUTPUTS -None -#> -[CmdletBinding(PositionalBinding=$False, DefaultParameterSetName='DefineDate')] -Param( - [Parameter(Mandatory=$False)] - [String]$MachineId, - - [Parameter(Mandatory=$True)] - [String]$DevopsPat, - - [Parameter(Mandatory=$True, ParameterSetName='DefineDate')] - [String]$Date, - - [Parameter(Mandatory=$True, ParameterSetName='DefineVersionAndAgentPool')] - [String]$BoxVersion, - - [Parameter(Mandatory=$True, ParameterSetName='DefineVersionAndAgentPool')] - [String]$AgentPool, - - [Parameter(Mandatory=$False)] - [String]$DevopsUrl = 'https://dev.azure.com/vcpkg', - - [Parameter()] - [String]$BaseName = 'vcpkg-eg-mac', - - [Parameter()] - [String]$BoxName = 'vcpkg/macos-ci' -) - -Set-StrictMode -Version 2 - -if (-not $IsMacOS) { - throw 'This script should only be run on a macOS host' -} - -if (-not [String]::IsNullOrEmpty($Date)) { - $BoxVersion = $Date - $AgentPool = "PrOsx-$Date" -} - -if ([String]::IsNullOrEmpty($MachineId)) { - $hostname = hostname -s - if ($hostname -match '^VCPKGMM-([0-9]{2})$') { - $MachineId = $matches[1] - } else { - Write-Error "Hostname ($hostname) does not match the expected format (VCPKGMM-NN). Please pass -MachineId in order to give the VM a number." - } -} - -if (Test-Path '~/vagrant/vcpkg-eg-mac') { - Write-Host 'Deleting existing directories' - - Push-Location '~/vagrant/vcpkg-eg-mac' - vagrant destroy -f - if (-not $?) { - throw "Failed to destroy vagrant VM." - } - Pop-Location - - Remove-Item -Recurse -Force -LiteralPath '~/vagrant/vcpkg-eg-mac' | Out-Null -} - -Write-Host 'Creating new directories' -if (-not (Test-Path -Path '~/vagrant')) { - New-Item -ItemType 'Directory' -Path '~/vagrant' | Out-Null -} -New-Item -ItemType 'Directory' -Path '~/vagrant/vcpkg-eg-mac' | Out-Null - -Copy-Item ` - -Path "$PSScriptRoot/configuration/Vagrantfile-vm.rb" ` - -Destination '~/vagrant/vcpkg-eg-mac/Vagrantfile' - -$configuration = @{ - pat = $DevopsPat - agent_pool = $AgentPool - devops_url = $DevopsUrl - machine_name = "${BaseName}-${MachineId}" - box_name = $BoxName - box_version = $BoxVersion -} -ConvertTo-Json -InputObject $configuration -Depth 5 ` - | Set-Content -Path '~/vagrant/vcpkg-eg-mac/vagrant-configuration.json' diff --git a/scripts/azure-pipelines/osx/Utilities.psm1 b/scripts/azure-pipelines/osx/Utilities.psm1 deleted file mode 100644 index 620ec7f4b06eac..00000000000000 --- a/scripts/azure-pipelines/osx/Utilities.psm1 +++ /dev/null @@ -1,90 +0,0 @@ -#Requires -Version 6.0 -Set-StrictMode -Version 2 - -<# -.SYNOPSIS -Returns whether the specified command exists in the current environment. - -.DESCRIPTION -Get-CommandExists takes a string as a parameter, -and returns whether it exists in the current environment; -either a function, alias, or an executable in the path. -It's somewhat equivalent to `which`. - -.PARAMETER Name -Specifies the name of the command which may or may not exist. - -.INPUTS -System.String - The name of the command. - -.OUTPUTS -System.Boolean - Whether the command exists. -#> -function Get-CommandExists -{ - [CmdletBinding()] - [OutputType([Boolean])] - Param( - [Parameter(ValueFromPipeline)] - [String]$Name - ) - - $null -ne (Get-Command -Name $Name -ErrorAction SilentlyContinue) -} - -<# -.SYNOPSIS -Downloads a file and checks its hash. - -.DESCRIPTION -Get-RemoteFile takes a URI and a hash, -downloads the file at that URI to OutFile, -and checks that the hash of the downloaded file. -It then returns a FileInfo object corresponding to the downloaded file. - -.PARAMETER OutFile -Specifies the file path to download to. - -.PARAMETER Uri -The URI to download from. - -.PARAMETER Sha256 -The expected SHA256 of the downloaded file. - -.INPUTS -None - -.OUTPUTS -System.IO.FileInfo - The FileInfo for the downloaded file. -#> -function Get-RemoteFile -{ - [CmdletBinding(PositionalBinding=$False)] - [OutputType([System.IO.FileInfo])] - Param( - [Parameter(Mandatory=$True)] - [String]$OutFile, - [Parameter(Mandatory=$True)] - [String]$Uri, - [Parameter(Mandatory=$True)] - [String]$Sha256 - ) - - Invoke-WebRequest -OutFile $OutFile -Uri $Uri - $actualHash = Get-FileHash -Algorithm SHA256 -Path $OutFile - - if ($actualHash.Hash -ne $Sha256) { - throw @" -Invalid hash for file $OutFile; - expected: $Sha256 - found: $($actualHash.Hash) -Please make sure that the hash in the powershell file is correct. -"@ - } - - Get-Item $OutFile -} - diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb b/scripts/azure-pipelines/osx/Vagrantfile-box.rb similarity index 79% rename from scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb rename to scripts/azure-pipelines/osx/Vagrantfile-box.rb index cbe76a72076ff5..ae7d9bbcf5f780 100644 --- a/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb +++ b/scripts/azure-pipelines/osx/Vagrantfile-box.rb @@ -1,9 +1,5 @@ -require 'json' - -configuration = JSON.parse(File.read("#{__dir__}/vagrant-box-configuration.json")) - Vagrant.configure('2') do |config| - config.vm.box = 'vcpkg/macos-base' + config.vm.box = 'macos-13-5' config.vm.synced_folder '.', '/Users/vagrant/shared' config.vm.provision 'shell', @@ -30,6 +26,6 @@ config.vm.provision 'shell', run: 'once', name: 'Install brew applications', - inline: "brew install #{configuration['brew'].join(' ')} && brew install --cask #{configuration['brew-cask'].join(' ')}", + inline: "brew install autoconf-archive autoconf automake bison cmake gettext gfortran gperf gtk-doc libtool meson mono nasm ninja pkg-config powershell texinfo yasm", privileged: false end diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb b/scripts/azure-pipelines/osx/Vagrantfile-vm.rb similarity index 78% rename from scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb rename to scripts/azure-pipelines/osx/Vagrantfile-vm.rb index 0b2df0219e7221..3460783c2f91bc 100644 --- a/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb +++ b/scripts/azure-pipelines/osx/Vagrantfile-vm.rb @@ -1,19 +1,15 @@ -require 'json' - -configuration = JSON.parse(File.read("#{__dir__}/vagrant-configuration.json")) - server = { - :machine_name => configuration['machine_name'], - :box => configuration['box_name'], - :box_version => configuration['box_version'], + :machine_name => 'vcpkg-eg-mac-11', + :box => 'vcpkg-macos-2023-09-11', + :box_version => '0', :ram => 24000, - :cpu => 11 + :cpu => 12 } -azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/2.198.3/vsts-agent-osx-x64-2.198.3.tar.gz' -devops_url = configuration['devops_url'] -agent_pool = configuration['agent_pool'] -pat = configuration['pat'] +azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/3.225.0/vsts-agent-osx-x64-3.225.0.tar.gz' +devops_url = 'https://dev.azure.com/vcpkg' +agent_pool = 'PrOsx-2023-09-11' +pat = '' Vagrant.configure('2') do |config| config.vm.box = server[:box] diff --git a/scripts/azure-pipelines/osx/configuration/installables.json b/scripts/azure-pipelines/osx/configuration/installables.json deleted file mode 100644 index 3ae97f355a294b..00000000000000 --- a/scripts/azure-pipelines/osx/configuration/installables.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "$schema": "./installables.schema.json", - - "Applications": [ - { - "Name": "vagrant", - "VersionCommand": [ "vagrant", "-v" ], - "VersionRegex": "Vagrant (.*)", - "Version": "2.2.19", - "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.19/vagrant_2.2.19_x86_64.dmg", - "Sha256": "6307BE217813A11C9E106448BF232803031E434A08C8B2DF8C62FDC9E8543845", - "InstallerPath": "vagrant.pkg" - }, - { - "Name": "Parallels", - "VersionCommand": [ "cat", "/Applications/Parallels Desktop.app/Contents/Info.plist" ], - "VersionRegex": "CFBundleShortVersionString[\\n\\t ]*([0-9.]+)", - "Version": "17.1.1", - "DmgUrl": "https://download.parallels.com/desktop/v17/17.1.1-51537/ParallelsDesktop-17.1.1-51537.dmg", - "Sha256": "BD7BE2DF4D1B3508C127CF1D9C1EF93CDDA63384BCF3893A77FBC9F1169765A9", - "InstallationCommands": [ - [ "bash", "-c", "ps x | grep 'Parallels Desktop' | grep -v 'grep' | sed -E 's/^ *([0-9]+).*(\\/Applications.*)$/\\1: \\2/'" ], - [ "bash", "-c", "ps x | grep 'Parallels Desktop' | grep -v 'grep' | sed -E 's/^ *([0-9]+).*$/\\1/' | xargs -p kill" ], - [ "sudo", "rm", "-rf", "/Applications/Parallels Desktop.app" ], - [ "sudo", "cp", "-r", "/Volumes/setup-installer/Parallels Desktop.app", "/Applications" ], - [ "sudo", "/Applications/Parallels Desktop.app/Contents/MacOS/inittool2", "init", "-b", "/Applications/Parallels Desktop.app" ] - ] - }, - { - "Name": "osxfuse", - "VersionCommand": [ "cat", "/Library/Filesystems/macfuse.fs/Contents/version.plist" ], - "VersionRegex": "CFBundleVersion[\\n\\t ]*([0-9.]+)", - "Version": "4.2.4", - "DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.2.4/macfuse-4.2.4.dmg", - "Sha256": "82A2C30B3A7BF56AA2755C0C192FB50D9EECC3FE42505AB4E8679B50306188BD", - "InstallerPath": "Install macFUSE.pkg" - }, - { - "Name": "sshfs", - "VersionCommand": [ "sshfs", "--version" ], - "VersionRegex": "SSHFS version [0-9.]* \\(OSXFUSE SSHFS (.*)\\)", - "Version": "2.5.0", - "PkgUrl": "https://github.com/osxfuse/sshfs/releases/download/osxfuse-sshfs-2.5.0/sshfs-2.5.0.pkg", - "Sha256": "F8F4F71814273EA42DBE6CD92199F7CFF418571FFD1B10C0608878D3472D2162" - } - ], - "VagrantPlugins": [ - { - "Name": "vagrant-parallels", - "Version": "2.2.4" - } - ] -} diff --git a/scripts/azure-pipelines/osx/configuration/installables.schema.json b/scripts/azure-pipelines/osx/configuration/installables.schema.json deleted file mode 100644 index 6237243c2fd6d1..00000000000000 --- a/scripts/azure-pipelines/osx/configuration/installables.schema.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft-07/schema", - "type": "object", - "definitions": { - "sha256": { - "type": "string", - "pattern": "[A-Z0-9]{64}" - } - }, - "required": [ - "Applications", - "VagrantPlugins" - ], - "properties": { - "Applications": { - "type": "array", - "items": { - "type": "object", - "properties": { - "Name": { - "type": "string" - }, - "VersionCommand": { - "type": "array", - "items": { - "type": "string" - }, - "minItems": 1 - }, - "VersionRegex": { - "type": "string", - "format": "regex" - }, - "Version": { - "type": "string" - }, - "DmgUrl": { - "type": "string", - "format": "uri" - }, - "Sha256": { - "$ref": "#/definitions/sha256" - }, - "InstallerPath": { - "type": "string" - } - } - } - }, - "VagrantPlugins": { - "type": "array", - "items": { - "type": "object", - "required": [ "Name", "Version" ], - "properties": { - "Name": { - "type": "string" - }, - "Version": { - "type": "string" - } - } - } - } - } -} diff --git a/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json b/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json deleted file mode 100644 index 75cb83719ee843..00000000000000 --- a/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$schema": "./vagrant-box-configuration.schema.json", - "brew": [ - "autoconf-archive", - "autoconf", - "automake", - "bison", - "cmake", - "gettext", - "gfortran", - "gperf", - "gtk-doc", - "libtool", - "meson", - "mono", - "nasm", - "ninja", - "pkg-config", - "texinfo", - "yasm" - ], - "brew-cask": [ - "powershell" - ] -} diff --git a/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.schema.json b/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.schema.json deleted file mode 100644 index 80845f70f97722..00000000000000 --- a/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.schema.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft-07/schema", - "type": "object", - "required": [ - "brew", - "brew-cask" - ], - "properties": { - "brew": { - "type": "array", - "items": { "type": "string" } - }, - "brew-cask": { - "type": "array", - "items": { "type": "string" } - } - } -} diff --git a/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json b/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json deleted file mode 100644 index 91540d77c91ac8..00000000000000 --- a/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2019-09/schema", - - "type": "object", - - "required": [ - "pat", - "agent_pool", - "devops_url", - "machine_name", - "box_name", - "box_version" - ], - - "properties": { - "pat": { - "type": "string" - }, - "agent_pool": { - "type": "string" - }, - "devops_url": { - "type": "string" - }, - "machine_name": { - "type": "string" - }, - "box_name": { - "type": "string" - }, - "box_version": { - "type": "string" - } - } -} diff --git a/scripts/azure-pipelines/patch-tuesday-checklist.md b/scripts/azure-pipelines/patch-tuesday-checklist.md index 651bdd458954df..1ceb337444469f 100644 --- a/scripts/azure-pipelines/patch-tuesday-checklist.md +++ b/scripts/azure-pipelines/patch-tuesday-checklist.md @@ -18,3 +18,5 @@ refs/pull/NUMBER/head * [ ] Run `generate-sas-tokens.ps1` and update the relevant libraries on dev.azure.com/vcpkg and devdiv.visualstudio.com. +* [ ] Mint a new macOS base box. +* [ ] Deploy the new base box to all hosts. diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 6124de2eecdd90..65164c310f1b5e 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -9,15 +9,13 @@ $VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/release/vs_enterprise.exe' $Workloads = @( 'Microsoft.VisualStudio.Workload.NativeDesktop', 'Microsoft.VisualStudio.Workload.Universal', + 'Microsoft.VisualStudio.Component.UWP.VC.ARM64', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', - 'Microsoft.VisualStudio.Component.VC.Tools.ARM', 'Microsoft.VisualStudio.Component.VC.Tools.ARM64', 'Microsoft.VisualStudio.Component.VC.ASAN', 'Microsoft.VisualStudio.Component.VC.ATL', 'Microsoft.VisualStudio.Component.VC.ATLMFC', - 'Microsoft.VisualStudio.Component.VC.ATL.ARM', 'Microsoft.VisualStudio.Component.VC.ATL.ARM64', - 'Microsoft.VisualStudio.Component.VC.MFC.ARM', 'Microsoft.VisualStudio.Component.VC.MFC.ARM64', "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Component.Windows10SDK.20348", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 6d2170d3b2f5ab..a669d0635d931c 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.82.0", + $version = "1.83.0", $portsDir = $null ) @@ -22,11 +22,10 @@ else { } # Clear this array when moving to a new boost version -$defaultPortVersion = 2 +$defaultPortVersion = 0 $portVersions = @{ - "boost-atomic" = 3; - "boost-modular-build-helper" = 4; - "boost-ublas" = 3; + 'boost' = 1; + 'boost-fiber' = 1; } function Get-PortVersion { @@ -35,7 +34,7 @@ function Get-PortVersion { ) $nonDefault = $portVersions[$PortName] - if ($nonDefault -ne $null) { + if ($null -ne $nonDefault) { return $nonDefault } @@ -61,7 +60,7 @@ $portData = @{ }; "boost-beast" = @{ "supports" = "!emscripten" }; "boost-fiber" = @{ - "supports" = "!uwp & !arm & !emscripten"; + "supports" = "!uwp & !(arm & windows) & !emscripten"; "features" = @{ "numa" = @{ "description" = "Enable NUMA support"; diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index cad2376661cd54..e1338c7b30cf0b 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -63,7 +63,7 @@ if ($LASTEXITCODE -ne 0) throw } -& "$vcpkgRootDir\vcpkg.exe" version +& "$vcpkgRootDir\vcpkg.exe" version --disable-metrics if ($disableMetrics) { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1091813bf387fe..a5140ccd4be902 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -250,7 +250,7 @@ else cp "$buildDir/vcpkg" "$vcpkgRootDir/" fi -"$vcpkgRootDir/vcpkg" version +"$vcpkgRootDir/vcpkg" version --disable-metrics # Apply the disable-metrics marker file. if [ "$vcpkgDisableMetrics" = "ON" ]; then diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b1e542f2e7853a..6747a2a444da1c 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -327,6 +327,10 @@ else() set(Z_VCPKG_TARGET_TRIPLET_ARCH riscv32) elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "riscv64") set(Z_VCPKG_TARGET_TRIPLET_ARCH riscv64) + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "loongarch32") + set(Z_VCPKG_TARGET_TRIPLET_ARCH loongarch32) + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "loongarch64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH loongarch64) else() if(Z_VCPKG_CMAKE_IN_TRY_COMPILE) message(STATUS "Unable to determine target architecture, continuing without vcpkg.") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8c19b8a8eecd64..ec3f2591e0e5ee 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -24,7 +24,7 @@ ## arm64-android ## arm64-windows ## arm-neon-android -## arm-uwp +## arm64-uwp ## x64-android ## x64-linux ## x64-osx @@ -53,6 +53,8 @@ apsi:arm-neon-android=fail apsi:x64-android=fail # Broken with CUDA 12; needs update to 3.8.3 and https://github.com/arrayfire/arrayfire/issues/3349 fixed arrayfire:x64-linux=fail +# Appears to trigger some form of malformed code on XCode 14.3.1 +arrayfire:x64-osx=fail # Fails with "fatal error LNK1322: cannot avoid potential ARM hazard" even with /Gy allegro5:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h @@ -72,26 +74,24 @@ bento4:arm-neon-android=fail berkeleydb:arm-neon-android=fail berkeleydb:arm64-android=fail berkeleydb:x64-android=fail -bgfx:x64-osx=fail # MacOSX12.1.sdk doesn't define MTLGPUFamilyApple8 binlog:arm-neon-android=fail bitserializer:arm64-osx=fail blitz:x64-android=fail -blitz:x64-linux=fail # python2 +blitz:x64-linux=fail # python2 +blitz:x64-osx=fail boinc:arm-neon-android=fail boinc:arm64-android=fail boinc:x64-android=fail bond:arm-neon-android=fail -bond:arm-uwp=fail bond:arm64-android=fail bond:arm64-osx=fail bond:x64-android=fail bond:x64-osx=fail -bond:x64-uwp=fail # Conflicts with openssl boringssl:arm-neon-android=skip boringssl:arm64-android=skip boringssl:arm64-windows=skip -boringssl:arm-uwp=skip +boringssl:arm64-uwp=skip boringssl:x64-android=skip boringssl:x64-linux=skip boringssl:x64-osx=skip @@ -110,7 +110,7 @@ c4core:arm-neon-android=fail c4core:arm64-android=fail c4core:x64-android=fail caf:arm-neon-android=fail -caf:arm-uwp=fail +caf:arm64-uwp=fail caf:arm64-android=fail caf:x64-android=fail caf:x64-uwp=fail @@ -124,17 +124,17 @@ c-dbg-macro:x64-windows-static=skip c-dbg-macro:x64-windows-static-md=skip c-dbg-macro:x64-uwp=skip c-dbg-macro:arm64-windows=skip -c-dbg-macro:arm-uwp=skip +c-dbg-macro:arm64-uwp=skip c-dbg-macro:x64-osx=skip c-dbg-macro:arm64-osx=skip c-dbg-macro:x64-linux=skip -casclib:arm-uwp=fail +casclib:arm64-uwp=fail casclib:x64-uwp=fail catch-classic:arm-neon-android=skip catch-classic:arm64-android=skip catch-classic:arm64-windows = skip -catch-classic:arm-uwp = skip +catch-classic:arm64-uwp = skip catch-classic:x64-android=skip catch-classic:x64-linux = skip catch-classic:x64-osx = skip @@ -145,14 +145,14 @@ catch-classic:x64-windows-static = skip catch-classic:x64-windows-static-md=skip catch-classic:x86-windows = skip cctag:x64-windows-static-md=fail -cello:arm-uwp=fail +cello:arm64-uwp=fail cello:x64-uwp=fail -cfitsio:arm-uwp=fail +cfitsio:arm64-uwp=fail cfitsio:x64-uwp=fail chakracore:x64-linux=skip # DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy) charls:arm64-windows=skip -charls:arm-uwp=skip +charls:arm64-uwp=skip charls:x64-linux=skip charls:x64-osx=skip charls:x64-uwp=skip @@ -164,7 +164,7 @@ charls:x86-windows=skip chartdir:arm-neon-android=fail chartdir:arm64-android=fail chartdir:arm64-windows=skip -chartdir:arm-uwp=skip +chartdir:arm64-uwp=skip chartdir:x64-android=fail chartdir:x64-uwp=skip chartdir:x64-windows-static=skip @@ -184,9 +184,6 @@ chromium-base:x64-linux=skip # because the first attempt to build it fails, but subsequent attempts succeed chromium-base:x64-osx=skip -civetweb:arm64-windows = skip -civetweb:arm-uwp = skip -civetweb:x64-uwp = skip clamav:arm64-windows=fail # clapack is replaced by lapack-reference on the platforms lapack-reference supports @@ -198,7 +195,7 @@ clapack:x64-windows-static-md=skip clapack:x64-windows=skip clapack:x86-windows=skip lapack-reference:arm64-windows=skip -lapack-reference:arm-uwp=skip +lapack-reference:arm64-uwp=skip lapack-reference:x64-uwp=skip clblas:arm-neon-android=fail @@ -213,7 +210,7 @@ clockutils:x64-android=fail clockutils:x64-linux=fail clrng:arm-neon-android=fail cmcstl2:arm64-windows = skip -cmcstl2:arm-uwp = skip +cmcstl2:arm64-uwp = skip cmcstl2:x64-linux = skip cmcstl2:x64-osx = skip cmcstl2:x64-uwp = skip @@ -228,10 +225,10 @@ coin-or-ipopt:x64-linux=fail concurrencpp:arm-neon-android=fail concurrencpp:arm64-android=fail concurrencpp:x64-android=fail -concurrencpp:x64-osx=fail coroutine:arm-neon-android=fail coroutine:arm64-android=fail coroutine:x64-android=fail +coroutine:x64-osx=fail cpp-ipc:arm-neon-android=fail cpp-ipc:arm64-android=fail cpp-ipc:x64-android=fail @@ -244,7 +241,7 @@ cppgraphqlgen:x64-android=fail cppmicroservices:arm-neon-android=fail cppmicroservices:arm64-android=fail cppmicroservices:arm64-windows=fail -cppmicroservices:arm-uwp=fail +cppmicroservices:arm64-uwp=fail cppmicroservices:x64-android=fail cppmicroservices:x64-uwp=fail # Requires full C++20 support, currently absent from CI for these triplets. @@ -276,7 +273,7 @@ dbg-macro:arm-neon-android=fail dbg-macro:arm64-android=fail dbg-macro:x64-android=fail # Since pipeline cannot automatically install dbghelp dependency, skip this detection -dbghelp:arm-uwp=skip +dbghelp:arm64-uwp=skip dbghelp:arm64-windows=skip dbghelp:x64-uwp=skip dbghelp:x64-windows-static=skip @@ -296,27 +293,15 @@ dimcli:x64-windows-static=fail directxsdk:x86-windows=skip directxsdk:x64-windows=skip directxsdk:x64-windows-static-md=skip -discord-rpc:arm-uwp=fail +discord-rpc:arm64-uwp=fail discord-rpc:x64-uwp=fail discount:x64-android=fail -dlib:arm-uwp=fail +dlib:arm64-uwp=fail dlib:x64-uwp=fail drogon:arm-neon-android=fail drogon:arm64-android=fail drogon:x64-android=fail -# requires python@2 from brew, but that no longer exists -# python2 EOL yay! -duktape:arm-neon-android=fail -duktape:arm64-android=fail -duktape:x64-android=fail -duktape:x64-osx=skip -duktape:arm64-osx=skip -duktape:x64-linux=fail - -eastl:arm-uwp=fail -easyloggingpp:arm-uwp=fail -easyloggingpp:x64-uwp=fail eathread:x64-android=fail elfio:arm-neon-android=fail elfio:arm64-android=fail @@ -327,14 +312,14 @@ elfutils:arm64-android=fail elfutils:x64-android=fail elfutils:x64-osx=fail elfutils:arm64-osx=fail -epsilon:arm-uwp=fail +epsilon:arm64-uwp=fail epsilon:x64-uwp=fail evpp:arm-neon-android=fail evpp:arm64-android=fail evpp:x64-android=fail faiss:arm64-windows=fail fastrtps:arm-neon-android=fail -fastrtps:arm-uwp=fail +fastrtps:arm64-uwp=fail fastrtps:arm64-android=fail fastrtps:x64-android=fail fastrtps:x64-uwp=fail @@ -354,7 +339,7 @@ fltk:arm64-android=fail fltk:x64-android=fail # fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because # fluidlite has no dependencies and thus is less likely to be broken by another package. -fluidlite:arm-uwp=skip +fluidlite:arm64-uwp=skip fluidlite:arm64-windows=skip fluidlite:x64-linux=skip fluidlite:x64-osx=skip @@ -367,20 +352,16 @@ fluidlite:x86-windows=skip fmem:arm-neon-android=fail fmem:arm64-android=fail fmem:x64-android=fail -fmi4cpp:arm-uwp=fail +fmi4cpp:arm64-uwp=fail fmi4cpp:x64-uwp=fail folly:arm64-android=fail folly:x64-android=fail -fontconfig:x64-uwp=fail -fontconfig:arm-uwp=fail foonathan-memory:arm64-windows=fail -foonathan-memory:arm-uwp=fail +foonathan-memory:arm64-uwp=fail foonathan-memory:x64-uwp=fail freeglut:arm-neon-android=fail -freeglut:arm-uwp=fail freeglut:arm64-android=fail freeglut:x64-android=fail -freeglut:x64-uwp=fail freeglut:x64-osx=fail # Needs /bigobj freeopcua:arm-neon-android=fail @@ -393,11 +374,10 @@ fruit:x64-android=fail ftgl:arm-neon-android=fail ftgl:arm64-android=fail ftgl:x64-android=fail -ftgl:x64-uwp=fail -ftgl:arm-uwp=fail fuzzylite:arm-neon-android=fail fuzzylite:arm64-android=fail fuzzylite:x64-android=fail +g2o:arm64-uwp=fail g3log:arm-neon-android=fail g3log:arm64-android=fail g3log:x64-android=fail @@ -424,7 +404,7 @@ gherkin-c:arm64-android=fail gherkin-c:x64-android=fail # Conflicts with libevent gherkin-c:arm64-windows = skip -gherkin-c:arm-uwp = skip +gherkin-c:arm64-uwp = skip gherkin-c:x64-linux = skip gherkin-c:x64-osx = skip gherkin-c:x64-uwp = skip @@ -439,13 +419,13 @@ glew:arm-neon-android=fail glew:arm64-android=fail glew:x64-android=fail glfw3:arm-neon-android=fail -glfw3:arm-uwp=fail +glfw3:arm64-uwp=fail glfw3:arm64-android=fail glfw3:x64-android=fail glfw3:x64-uwp=fail glibmm:x64-windows-static-md=fail glibmm:x64-windows-static=fail -graphicsmagick:arm-uwp=fail +graphicsmagick:arm64-uwp=fail graphicsmagick:x64-uwp=fail # graphicsmagick non-uwp trigger an ICE in VS 2022 17.3 https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1557251 graphicsmagick:arm-neon-android=fail @@ -466,6 +446,9 @@ gsoap:x64-windows-static-md = skip gstreamer:arm-neon-android=fail gstreamer:arm64-android=fail gstreamer:x64-android=fail +# upstream issue https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1629. +gstreamer:x64-windows-static = skip +gstreamer:x64-windows-static-md = skip gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail gts:arm-neon-android=fail @@ -497,7 +480,7 @@ ignition-common1:x64-linux=fail ignition-msgs1:arm-neon-android=fail ignition-msgs1:arm64-android=fail ignition-msgs1:arm64-windows=fail -ignition-msgs1:arm-uwp=fail +ignition-msgs1:arm64-uwp=fail ignition-msgs1:x64-android=fail ignition-msgs1:x64-uwp=fail ignition-msgs5:x64-android=fail @@ -508,7 +491,7 @@ ignition-tools:arm-neon-android=fail ignition-tools:arm64-android=fail ignition-tools:x64-android=fail ijg-libjpeg:arm-neon-android=fail -ijg-libjpeg:arm-uwp = skip +ijg-libjpeg:arm64-uwp = skip ijg-libjpeg:arm64-android=fail ijg-libjpeg:arm64-osx = skip ijg-libjpeg:arm64-windows = skip @@ -520,7 +503,6 @@ ijg-libjpeg:x64-windows = skip ijg-libjpeg:x64-windows-static = skip ijg-libjpeg:x64-windows-static-md=fail ijg-libjpeg:x86-windows = skip -infoware:x64-android=fail intelrdfpmathlib:arm-neon-android=fail intelrdfpmathlib:arm64-android=fail intelrdfpmathlib:x64-android=fail @@ -531,7 +513,7 @@ jaeger-client-cpp:x64-android=fail jemalloc:arm-neon-android=fail jemalloc:arm64-android=fail jemalloc:arm64-windows=fail -jemalloc:arm-uwp=fail +jemalloc:arm64-uwp=fail jemalloc:x64-android=fail jemalloc:x64-uwp=fail jinja2cpplight:arm-neon-android=fail @@ -540,6 +522,7 @@ jinja2cpplight:x64-android=fail json-schema-validator:arm-neon-android=fail json-schema-validator:arm64-android=fail keystone:x64-linux=fail # python2 +keystone:x64-osx=fail kfr:x64-android=fail kfr:x64-uwp=fail lastools:arm-neon-android=fail @@ -551,7 +534,7 @@ lcm:arm-neon-android=fail lcm:arm64-android=fail lcm:x64-android=fail leptonica:x64-uwp=fail -leptonica:arm-uwp=fail +leptonica:arm64-uwp=fail libaiff:x64-linux=fail libbson:arm-neon-android=fail libbson:arm64-android=fail @@ -560,6 +543,10 @@ libcanberra:arm-neon-android=fail libcanberra:arm64-android=fail libcanberra:x64-android=fail libcerf:x64-windows-static-md=fail +libcoro:arm-neon-android=fail +libcoro:arm64-android=fail +libcoro:x64-android=fail +libcoro:x64-osx=fail libcpplocate:arm-neon-android=fail libcpplocate:arm64-android=fail libcpplocate:x64-android=fail @@ -587,21 +574,19 @@ libhdfs3:arm64-osx=fail libidn2:arm-neon-android=fail libidn2:arm64-android=fail libidn2:x64-android=fail -# 120 min build time for libjxl arm-uwp-rel, reason unknown -libjxl:arm-uwp=skip -liblemon:arm-uwp=fail +# 120 min build time for libjxl arm64-uwp-rel, reason unknown +libjxl:arm64-uwp=skip +liblemon:arm64-uwp=fail liblemon:x64-uwp=fail liblo:arm-neon-android=fail -liblo:arm-uwp=fail +liblo:arm64-uwp=fail liblo:arm64-android=fail liblo:x64-android=fail liblo:x64-uwp=fail -libmagic:x64-uwp=fail -libmagic:arm-uwp=fail libmariadb:arm-neon-android=fail libmariadb:arm64-android=fail libmariadb:arm64-windows = skip -libmariadb:arm-uwp = skip +libmariadb:arm64-uwp = skip libmariadb:x64-android=fail libmariadb:x64-linux = skip libmariadb:x64-osx = skip @@ -611,22 +596,7 @@ libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip libmariadb:x64-windows-static-md=skip # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) -libmesh:arm-neon-android=skip -libmesh:arm64-android=skip -libmesh:arm64-windows=skip -libmesh:arm-uwp=skip -libmesh:x64-android=skip -libmesh:x64-uwp=skip -libmesh:x64-windows=skip -libmesh:x64-windows-static=skip -libmesh:x64-windows-static-md=skip -libmesh:x86-windows=skip -libmesh:x64-osx=skip -libmesh:arm64-osx=skip libmesh:x64-linux=skip -# Build fails since PIC is not enabled and some configuration tests do not work properly on UWP -libmicrodns:arm-uwp=fail -libmicrodns:x64-uwp=fail libmikmod:arm-neon-android=fail libmikmod:arm64-android=fail libmikmod:x64-android=fail @@ -645,10 +615,9 @@ libopensp:x64-android=fail libosip2:arm-neon-android=fail libosip2:arm64-android=fail libosip2:x64-android=fail -libosip2:x64-windows-static-md=fail libp7client:x64-android=fail libpng-apng:arm64-windows = skip -libpng-apng:arm-uwp = skip +libpng-apng:arm64-uwp = skip libpng-apng:x64-linux = skip libpng-apng:x64-osx = skip libpng-apng:x64-uwp = skip @@ -658,7 +627,7 @@ libpng-apng:x64-windows-static-md=skip libpng-apng:x86-windows = skip # The developer of libqcow does not offer stable release archives libqcow:arm-neon-android=skip -libqcow:arm-uwp=skip +libqcow:arm64-uwp=skip libqcow:arm64-android=skip libqcow:x64-android=skip libqcow:x64-uwp=skip @@ -671,7 +640,7 @@ libqcow:x86-windows=skip libqcow:arm64-windows=skip # Conflicts with openssl libressl:arm64-windows=skip -libressl:arm-uwp=skip +libressl:arm64-uwp=skip libressl:x64-linux=skip libressl:x64-osx=skip libressl:x64-uwp=skip @@ -680,8 +649,6 @@ libressl:x64-windows-static=skip libressl:x64-windows-static-md=skip libressl:x86-windows=skip libsoundio:arm64-windows=fail -libspatialite:arm-uwp=fail -libspatialite:x64-uwp=fail libtar:arm-neon-android=fail libtar:arm64-android=fail libtcod:arm-neon-android=fail @@ -691,13 +658,14 @@ libtins:arm-neon-android=fail libtins:arm64-android=fail libtins:x64-android=fail libtomcrypt:arm64-windows=fail -libtomcrypt:arm-uwp=fail +libtomcrypt:arm64-uwp=fail +libtorch:x64-osx=fail libusb:arm-neon-android=fail libusb:arm64-android=fail libusb:x64-android=fail -libusb-win32:arm-uwp=fail +libusb-win32:arm64-uwp=fail libusb-win32:x64-uwp=fail -libuv:arm-uwp=fail +libuv:arm64-uwp=fail libuv:x64-uwp=fail #Skip detection to avoid upstream remove older releases libvmdk:x86-windows=skip @@ -716,11 +684,11 @@ libxaw:x64-windows-static=skip # clang-cl ICEd libxt:arm64-windows=fail libzen:arm-neon-android=fail -linenoise-ng:arm-uwp=fail +linenoise-ng:arm64-uwp=fail linenoise-ng:x64-uwp=fail linenoise-ng:x64-windows-static-md=fail live555:arm-neon-android=fail -live555:arm-uwp=fail +live555:arm64-uwp=fail live555:arm64-android=fail live555:x64-android=fail live555:x64-osx=fail @@ -732,23 +700,19 @@ llgl:x64-android=fail llvm:arm-neon-android=fail llvm:arm64-android=fail llvm:x64-android=fail -log4cplus:arm-uwp=fail +log4cplus:arm64-uwp=fail log4cplus:x64-uwp=fail log4cpp:x64-linux=fail # dynamic exception specifications loguru:arm-neon-android=fail loguru:arm64-android=fail loguru:x64-android=fail -luafilesystem:arm-uwp=fail +luafilesystem:arm64-uwp=fail luafilesystem:x64-uwp=fail -magnum:arm-neon-android=fail -magnum:arm64-android=fail -magnum:arm64-windows=skip -magnum:x64-android=fail mchehab-zbar:arm-neon-android=fail mchehab-zbar:arm64-android=fail mchehab-zbar:x64-android=fail mecab:arm64-windows = skip -mecab:arm-uwp = skip +mecab:arm64-uwp = skip mecab:x64-linux = skip mecab:x64-uwp = skip mecab:x64-windows = skip @@ -773,11 +737,9 @@ minifb:arm64-android=fail minifb:x64-android=fail minio-cpp:arm-neon-android=fail miniply:arm-neon-android=fail -miniupnpc:arm-uwp=fail -miniupnpc:x64-uwp=fail # Conflicts with signalrclient microsoft-signalr:arm64-windows=skip -microsoft-signalr:arm-uwp=skip +microsoft-signalr:arm64-uwp=skip microsoft-signalr:x64-linux=skip microsoft-signalr:x64-osx=skip microsoft-signalr:arm64-osx=skip @@ -807,7 +769,7 @@ ms-gdkx:x64-windows-static-md=fail ms-gltf:arm-neon-android=fail ms-gltf:arm64-android=fail ms-gltf:x64-android=fail -ms-quic:arm-uwp=fail +ms-quic:arm64-uwp=fail ms-quic:arm64-windows=fail ms-quic:x64-uwp=fail ms-quic:x64-windows-static-md=fail @@ -815,7 +777,7 @@ ms-quic:x64-windows=fail ms-quic:x86-windows=fail monkeys-audio:arm64-windows=fail monkeys-audio:x64-windows-static=fail -moos-core:arm-uwp=fail +moos-core:arm64-uwp=fail moos-core:x64-uwp=fail moos-core:x64-windows-static=fail moos-essential:arm64-windows=fail @@ -824,7 +786,7 @@ moos-essential:x64-windows=fail moos-essential:x86-windows=fail # Conflicts with libjpeg-turbo mozjpeg:arm64-windows = skip -mozjpeg:arm-uwp = skip +mozjpeg:arm64-uwp = skip mozjpeg:x64-linux = skip mozjpeg:x64-osx = skip mozjpeg:arm64-osx = skip @@ -848,13 +810,13 @@ mysql-connector-cpp:arm-neon-android=fail mysql-connector-cpp:arm64-android=fail mysql-connector-cpp:x64-android=fail nana:arm-neon-android=fail -nana:arm-uwp=fail +nana:arm64-uwp=fail nana:arm64-android=fail nana:x64-android=fail nana:x64-linux=fail nana:x64-osx=fail nana:x64-uwp=fail -nanodbc:arm-uwp=fail +nanodbc:arm64-uwp=fail nanodbc:x64-uwp=fail nanodbc:x64-linux=skip netcdf-cxx4:x64-windows-static-md=fail @@ -863,26 +825,25 @@ ngspice:x64-windows-static=fail nmap:arm-neon-android=fail nmap:arm64-android=fail nmap:x64-android=fail -nng:arm-uwp=fail +nng:arm64-uwp=fail nng:x64-uwp=fail nrf-ble-driver:arm-neon-android=fail nrf-ble-driver:arm64-android=fail nrf-ble-driver:x64-android=fail nvtt:x64-android=fail oatpp-libressl:x64-android=fail -ocilib:x64-windows-static-md=fail -octomap:arm-uwp=fail +octomap:arm64-uwp=fail octomap:x64-uwp=fail ode:arm64-windows=fail -ode:arm-uwp=fail +ode:arm64-uwp=fail ode:x64-uwp=fail -offscale-libetcd-cpp:arm-uwp=fail +offscale-libetcd-cpp:arm64-uwp=fail offscale-libetcd-cpp:x64-uwp=fail ogdf:arm64-android=fail ogre:arm64-osx=fail # Conflicts with ogre ogre-next:arm64-windows = skip -ogre-next:arm-uwp = skip +ogre-next:arm64-uwp = skip ogre-next:x64-osx = skip ogre-next:arm64-osx = skip ogre-next:x64-linux = skip @@ -917,12 +878,10 @@ openblas:arm64-android=fail openblas:x64-android=fail # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. opencc:x64-android=fail -opencsg:arm-uwp=fail -opencsg:x64-uwp=fail opencv2:arm-neon-android=fail opencv2:arm64-android=fail opencv2:arm64-windows = skip -opencv2:arm-uwp = skip +opencv2:arm64-uwp = skip opencv2:x64-android=fail opencv2:x64-linux = skip opencv2:x64-osx = skip @@ -932,7 +891,7 @@ opencv2:x64-windows-static = skip opencv2:x64-windows-static-md = skip opencv2:x86-windows = skip opencv3:arm64-windows = skip -opencv3:arm-uwp = skip +opencv3:arm64-uwp = skip opencv3:x64-linux = skip opencv3:x64-osx = skip opencv3:x64-uwp = skip @@ -949,7 +908,7 @@ openldap:arm64-android=fail openldap:x64-android=fail openmama:x64-windows-static-md=fail openmesh:arm64-windows=fail -openmesh:arm-uwp=fail +openmesh:arm64-uwp=fail openmesh:x64-uwp=fail openmpi:arm-neon-android=fail openmpi:arm64-android=fail @@ -972,7 +931,7 @@ openvpn3:x64-osx=fail openvpn3:arm64-osx=fail openvr:x64-windows-static=fail optional-bare:arm64-windows = skip -optional-bare:arm-uwp = skip +optional-bare:arm64-uwp = skip optional-bare:x64-linux = skip optional-bare:x64-osx = skip optional-bare:x64-uwp = skip @@ -986,29 +945,25 @@ optional-lite:x64-android=fail orc:arm-neon-android=fail orc:arm64-android=fail orc:x64-android=fail -paho-mqtt:arm-uwp=fail +paho-mqtt:arm64-uwp=fail paho-mqtt:x64-uwp=fail pcl:arm-neon-android=fail pcl:arm64-android=fail pcl:x64-android=fail pixman:arm-neon-android=fail pixman:arm64-android=fail -platform-folders:arm-uwp=fail +platform-folders:arm64-uwp=fail platform-folders:x64-uwp=fail plib:arm-neon-android=fail plib:arm64-android=fail plib:x64-android=fail plplot:arm64-windows=fail -plplot:arm-uwp=fail -plplot:x64-uwp=fail pmdk:x64-android=fail pmdk:x64-linux=fail pmdk:x64-osx=fail -pmdk:x64-uwp=fail pmdk:x64-windows-static=fail popsift:x64-windows-static-md=fail popsift:x64-linux=fail # segfaults :( -portable-snippets:arm-uwp=fail ptex:arm-neon-android=fail ptex:arm64-android=fail ptex:x64-android=fail @@ -1022,7 +977,7 @@ python3:x64-android=fail qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail qpid-proton:arm-neon-android=fail -qpid-proton:arm-uwp=fail +qpid-proton:arm64-uwp=fail qpid-proton:arm64-android=fail qpid-proton:x64-android=fail qpid-proton:x64-uwp=fail @@ -1064,7 +1019,7 @@ rabit:x64-android=fail range-v3-vs2015:arm-neon-android=fail range-v3-vs2015:arm64-android=fail range-v3-vs2015:arm64-windows = skip -range-v3-vs2015:arm-uwp = skip +range-v3-vs2015:arm64-uwp = skip range-v3-vs2015:x64-android=fail range-v3-vs2015:x64-linux = skip range-v3-vs2015:x64-osx = skip @@ -1078,7 +1033,7 @@ range-v3:arm-neon-android=fail range-v3:arm64-android=fail range-v3:x64-android=fail rapidstring:arm64-windows=fail -rapidstring:arm-uwp=fail +rapidstring:arm64-uwp=fail rapidstring:x64-linux=fail rapidstring:x64-uwp=fail rapidstring:x64-windows=fail @@ -1091,7 +1046,7 @@ rbdl-orb:x64-windows=skip rbdl-orb:x64-windows-static=skip rbdl-orb:x64-windows-static-md=skip rbdl-orb:x64-uwp=skip -rbdl-orb:arm-uwp=skip +rbdl-orb:arm64-uwp=skip rbdl-orb:arm64-windows=skip rbdl-orb:x64-linux=skip rbdl-orb:x64-osx=skip @@ -1099,7 +1054,7 @@ rbdl:arm-neon-android=fail rbdl:arm64-android=fail rbdl:x64-android=fail realsense2:arm64-windows=fail -realsense2:arm-uwp=fail +realsense2:arm64-uwp=fail realsense2:x64-uwp=fail replxx:arm-neon-android=fail replxx:arm64-android=fail @@ -1108,7 +1063,7 @@ rest-rpc:arm-neon-android=fail rest-rpc:arm64-android=fail rest-rpc:x64-android=fail restbed:arm-neon-android=fail -restbed:arm-uwp=fail +restbed:arm64-uwp=fail restbed:arm64-android=fail restbed:x64-uwp=fail # file conflicts with msgpack @@ -1117,14 +1072,14 @@ rest-rpc:x64-windows=skip rest-rpc:x64-windows-static=skip rest-rpc:x64-windows-static-md=skip rest-rpc:x64-uwp=skip -rest-rpc:arm-uwp=skip +rest-rpc:arm64-uwp=skip rest-rpc:arm64-windows=skip rest-rpc:x64-linux=skip rest-rpc:x64-osx=skip rest-rpc:arm64-osx=skip rhash:arm64-windows=fail rpclib:arm64-windows=fail -rpclib:arm-uwp=fail +rpclib:arm64-uwp=fail rpclib:x64-uwp=fail #The website of rply http://w3.impa.br/~diego/software/rply cannot be accessed rply:x86-windows=skip @@ -1135,11 +1090,6 @@ rply:arm64-windows=skip rply:x64-linux=skip rply:x64-osx=skip rply:x64-windows-static-md=skip -rsm-bsa:arm-neon-android=fail -rsm-bsa:arm64-android=fail -rsm-bsa:x64-android=fail -rtlsdr:x64-uwp=fail - rttr:arm-neon-android=fail rttr:arm64-android=fail rttr:x64-android=fail @@ -1150,7 +1100,7 @@ scintilla:x64-android=fail sciter:arm-neon-android=fail sciter:arm64-android=fail sciter:arm64-windows=skip -sciter:arm-uwp=skip +sciter:arm64-uwp=skip sciter:x64-android=fail sciter:x64-linux=skip sciter:x64-osx=skip @@ -1160,7 +1110,7 @@ sciter:x64-windows=skip sciter:x64-windows-static=skip sciter:x64-windows-static-md=skip sciter:x86-windows=skip -scnlib:arm-uwp=fail +scnlib:arm64-uwp=fail scnlib:x64-uwp=fail sdformat10:x64-windows-static-md=fail sdformat6:x64-windows-static-md=fail @@ -1168,7 +1118,7 @@ sdformat9:x64-windows-static-md=fail sdl1:arm-neon-android=fail sdl1:arm64-android=fail sdl1:x64-android=fail -sdl2-net:arm-uwp=fail +sdl2-net:arm64-uwp=fail sdl2-net:x64-uwp=fail sentencepiece:arm-neon-android=fail sentencepiece:arm64-android=fail @@ -1184,7 +1134,7 @@ shiva-sfml:arm64-osx=fail shiva-sfml:x86-windows=fail shiva-sfml:x64-windows=fail shogun:arm64-windows = skip -shogun:arm-uwp = skip +shogun:arm64-uwp = skip shogun:x64-osx = skip shogun:x64-uwp = skip shogun:x64-windows = skip @@ -1194,8 +1144,6 @@ shogun:x86-windows = skip signalrclient:arm-neon-android=fail signalrclient:arm64-android=fail signalrclient:x64-android=fail -signalrclient:x64-uwp=fail -signalrclient:arm-uwp=fail simbody:arm64-windows=fail simd:arm-neon-android=fail simd:arm64-android=fail @@ -1218,18 +1166,13 @@ slikenet:x64-android=fail soem:arm-neon-android=fail soem:arm64-android=fail soem:x64-android=fail -soil2:arm-neon-android=fail -soil2:arm-uwp=fail -soil2:arm64-android=fail -soil2:x64-android=fail -soil2:x64-uwp=fail soil:arm-neon-android=fail soil:arm64-android=fail soil:x64-android=fail solid3:arm64-android=fail spaceland:arm64-android=fail spaceland:arm64-windows=fail -spaceland:arm-uwp=fail +spaceland:arm64-uwp=fail spaceland:x64-android=fail spaceland:x64-uwp=fail spatialite-tools:arm-neon-android=fail @@ -1247,30 +1190,22 @@ spscqueue:x64-android=fail status-code:arm-neon-android=fail status-code:arm64-android=fail status-code:x64-android=fail -stormlib:arm-uwp=fail +stormlib:arm64-uwp=fail stormlib:x64-uwp=fail stx:arm-neon-android=fail stx:arm64-android=fail stx:x64-android=fail stxxl:arm-neon-android=fail -stxxl:arm-uwp=fail +stxxl:arm64-uwp=fail stxxl:x64-uwp=fail # upstream issue https://github.com/stxxl/stxxl/issues/99 stxxl:x86-windows=skip stxxl:x64-windows=skip stxxl:x64-windows-static=skip stxxl:x64-windows-static-md=skip -symengine:arm-uwp=fail -symengine:x64-windows-static-md=fail systemc:arm64-windows=fail -systemc:arm-uwp=fail +systemc:arm64-uwp=fail systemc:x64-uwp=fail -tcl:arm-neon-android=fail -tcl:arm-uwp=fail -tcl:arm64-android=fail -tcl:arm64-windows=fail -tcl:x64-android=fail -tcl:x64-uwp=fail teemo:x64-android=fail # tensorflow does not support VS2022 @@ -1282,16 +1217,20 @@ tensorflow-cc:x64-android=fail tensorflow-cc:x64-windows-static-md=fail tensorflow-cc:x64-windows-static=fail tensorflow-cc:x64-windows=fail +# tensorflow is broken with system libraries on macOS 13.5 +# Also skipping because our macOS machines are relatively underpowered and this saves 8 hours of CI +# time for a relatively unpopular library / system combo. +tensorflow:x64-osx=skip +tensorflow:arm-osx=skip +tensorflow-cc:x64-osx=skip +tensorflow-cc:arm-osx=skip -tesseract:arm-neon-android=fail -tesseract:arm64-android=fail -tesseract:x64-android=fail thorvg:arm-neon-android=fail thorvg:arm64-android=fail thorvg:x64-android=fail -tidy-html5:arm-uwp=fail +tidy-html5:arm64-uwp=fail tidy-html5:x64-uwp=fail -tiny-process-library:arm-uwp=fail +tiny-process-library:arm64-uwp=fail tiny-process-library:x64-uwp=fail tinycthread:arm-neon-android=fail tinycthread:arm64-android=fail @@ -1305,7 +1244,7 @@ tmxlite:x64-android=fail torch-th:arm-neon-android=fail torch-th:arm64-android=fail torch-th:arm64-windows=fail -torch-th:arm-uwp=fail +torch-th:arm64-uwp=fail torch-th:x64-android=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail @@ -1319,12 +1258,12 @@ unicorn:x64-windows-static-md=fail unittest-cpp:arm-neon-android=fail unittest-cpp:arm64-android=fail unittest-cpp:arm64-windows=fail -unittest-cpp:arm-uwp=fail +unittest-cpp:arm64-uwp=fail unittest-cpp:x64-android=fail unittest-cpp:x64-uwp=fail # USD has set official policy that they will not update to be compatible with TBB in the near term (https://github.com/PixarAnimationStudios/USD/issues/1600) usd:arm64-windows=skip -usd:arm-uwp=skip +usd:arm64-uwp=skip usd:x64-uwp=skip usd:x64-windows=skip usd:x64-windows-static=skip @@ -1360,7 +1299,7 @@ vulkan:x86-windows=fail vxl:arm-neon-android=skip vxl:arm64-android=skip vxl:arm64-windows = skip -vxl:arm-uwp = skip +vxl:arm64-uwp = skip vxl:x64-android=fail vxl:x64-linux = skip vxl:x64-osx = skip @@ -1375,7 +1314,7 @@ wasmedge:x64-android=fail wavpack:arm-neon-android=fail wavpack:x64-android=fail winpcap:arm64-windows = skip -winpcap:arm-uwp = skip +winpcap:arm64-uwp = skip winpcap:x64-uwp = skip winpcap:x64-windows = skip winpcap:x64-windows-static = skip @@ -1385,15 +1324,13 @@ wordnet:arm-neon-android=fail wordnet:arm64-android=fail wordnet:x64-android=fail workflow:arm-neon-android=fail -workflow:arm-uwp=fail +workflow:arm64-uwp=fail workflow:arm64-android=fail workflow:x64-android=fail workflow:x64-uwp=fail -wpilib:arm-neon-android=fail -wpilib:arm64-android=fail -wpilib:arm64-windows=fail -wpilib:x64-android=fail -wpilib:x64-linux=fail +wpilib:arm-neon-android=fail # requires full c++20 support +wpilib:arm64-android=fail # requires full c++20 support +wpilib:x64-android=fail # requires full c++20 support x264:arm-neon-android=fail x264:arm64-android=fail x265:arm-neon-android=fail @@ -1404,15 +1341,13 @@ xbitmaps:arm-neon-android=fail xbitmaps:arm64-android=fail xbitmaps:x64-android=fail xbitmaps:x64-osx=skip -xmlsec:arm-uwp=fail +xmlsec:arm64-uwp=fail xmlsec:x64-uwp=fail -yara:arm-uwp=fail +yara:arm64-uwp=fail yara:x64-uwp=fail zeroc-ice:arm-neon-android=fail zeroc-ice:arm64-android=fail zeroc-ice:x64-android=fail -zeroc-ice:x64-windows=fail -zeroc-ice:x86-windows=fail ztd-text:arm-neon-android=fail ztd-text:arm64-android=fail ztd-text:x64-android=fail @@ -1425,7 +1360,7 @@ cmake:x64-windows-static-md=pass cmake:arm64-windows=pass cmake:x64-linux=pass cmake:x64-osx=pass -cmake-user:arm-uwp=pass +cmake-user:arm64-uwp=pass cmake-user:arm64-windows=pass cmake-user:x64-linux=pass cmake-user:x64-osx=pass @@ -1451,7 +1386,7 @@ vcpkg-ci-boost:x64-windows-static-md=pass vcpkg-ci-boost:x64-windows-static=pass vcpkg-ci-boost:x64-windows=pass vcpkg-ci-boost:x86-windows=pass -vcpkg-ci-ffmpeg:arm-uwp=pass +vcpkg-ci-ffmpeg:arm64-uwp=pass vcpkg-ci-ffmpeg:arm64-windows=pass vcpkg-ci-ffmpeg:x64-linux=pass vcpkg-ci-ffmpeg:x64-uwp=pass @@ -1480,7 +1415,7 @@ vcpkg-ci-mathgl:x64-windows=pass vcpkg-ci-mathgl:x64-windows-static=pass vcpkg-ci-mathgl:x64-windows-static-md=pass vcpkg-ci-mathgl:x86-windows=pass -vcpkg-ci-opencv:arm-uwp=pass +vcpkg-ci-opencv:arm64-uwp=pass vcpkg-ci-opencv:arm64-windows=pass vcpkg-ci-opencv:x64-linux=pass vcpkg-ci-opencv:x64-uwp=pass diff --git a/scripts/cmake/vcpkg_execute_build_process.cmake b/scripts/cmake/vcpkg_execute_build_process.cmake index 153ce6be104a55..60fd5b587a650f 100644 --- a/scripts/cmake/vcpkg_execute_build_process.cmake +++ b/scripts/cmake/vcpkg_execute_build_process.cmake @@ -86,7 +86,7 @@ function(vcpkg_execute_build_process) RESULT_VARIABLE error_code ) endif() - elseif(all_contents MATCHES "mt : general error c101008d: ") + elseif(all_contents MATCHES "mt(\\.exe)? : general error c101008d: ") # Antivirus workaround - occasionally files are locked and cause mt.exe to fail message(STATUS "mt.exe has failed. This may be the result of anti-virus. Disabling anti-virus on the buildtree folder may improve build speed") foreach(iteration RANGE 1 3) diff --git a/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake b/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake index 7d95d008621e65..b4b34fefea0c12 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake @@ -1,5 +1,7 @@ set(program_name 7z) -set(paths_to_search "${DOWNLOADS}/tools/7z/Files/7-Zip") -set(download_urls "https://7-zip.org/a/7z1900.msi") -set(download_filename "7z1900.msi") -set(download_sha512 f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067) +set(tool_subdirectory "23.01") +set(paths_to_search "${DOWNLOADS}/tools/7zip_msi-${tool_subdirectory}-windows/Files/7-Zip") # vcpkg fetch 7zip_msi path +list(APPEND paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/Files/7-Zip") +set(download_urls "https://7-zip.org/a/7z2301.msi") +set(download_filename "7z2301.msi") +set(download_sha512 002c8ab30be802fa5fa90896d2bdf710bfbd89e39487af25af9d63821986e6d11c42b1c4f4acc79d325719b10193cd31c38f648403ef16f0580609afa8da9596) diff --git a/scripts/cmake/vcpkg_find_acquire_program(GO).cmake b/scripts/cmake/vcpkg_find_acquire_program(GO).cmake index db7f84478b4e63..0ca0e03692c9ef 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(GO).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(GO).cmake @@ -1,8 +1,8 @@ set(program_name go) -set(tool_subdirectory 1.16.6.windows-386) -set(paths_to_search ${DOWNLOADS}/tools/go/${tool_subdirectory}/go/bin) +set(tool_subdirectory 1.21.1.windows-386) +set(paths_to_search "${DOWNLOADS}/tools/go/${tool_subdirectory}/go/bin") set(brew_package_name "go") set(apt_package_name "golang-go") set(download_urls "https://dl.google.com/go/go${tool_subdirectory}.zip") set(download_filename "go${tool_subdirectory}.zip") -set(download_sha512 2a1e539ed628c0cca5935d24d22cf3a7165f5c80e12a4003ac184deae6a6d0aa31f582f3e8257b0730adfc09aeec3a0e62f4732e658c312d5382170bcd8c94d8) +set(download_sha512 417a4bd95a10f21c2166badd2303e1956d91d0e783e334c99ea0176a323e815729c8c3af3f7ec68f057b757d06bcc75be82584031c4069c89a2db62bbfa902e8) diff --git a/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake b/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake index 244bc569e8f91f..1842a26340981b 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake @@ -1,9 +1,11 @@ set(program_name jom) -set(tool_subdirectory "jom-1.1.3") +set(program_version_string 1_1_4) +set(tool_subdirectory "jom-${program_version_string}") set(paths_to_search "${DOWNLOADS}/tools/jom/${tool_subdirectory}") set(download_urls - "https://download.qt.io/official_releases/jom/jom_1_1_3.zip" - "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip" + "https://download.qt.io/official_releases/jom/jom_${program_version_string}.zip" + "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_${program_version_string}.zip" + "https://mirrors.ukfast.co.uk/sites/qt.io/official_releases/jom/jom_${program_version_string}.zip" ) -set(download_filename "jom_1_1_3.zip") -set(download_sha512 5b158ead86be4eb3a6780928d9163f8562372f30bde051d8c281d81027b766119a6e9241166b91de0aa6146836cea77e5121290e62e31b7a959407840fc57b33) +set(download_filename "jom_${program_version_string}.zip") +set(download_sha512 a683bd829c84942223a791dae8abac5cfc2e3fa7de84c6fdc490ad3aa996a26c9fa0be0636890f02c9d56948bbe3225b43497cb590d1cb01e70c6fac447fa17b) diff --git a/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake b/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake index a2ba283d46d3a7..dab39811907d26 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake @@ -1,11 +1,11 @@ set(program_name perl) -set(program_version 5.32.1.1) +set(program_version 5.38.0.1) set(tool_subdirectory ${program_version}) set(paths_to_search ${DOWNLOADS}/tools/perl/${tool_subdirectory}/perl/bin) set(brew_package_name "perl") set(apt_package_name "perl") set(download_urls - "https://strawberryperl.com/download/${program_version}/strawberry-perl-${program_version}-32bit.zip" + "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip" ) -set(download_filename "strawberry-perl-${program_version}-32bit.zip") -set(download_sha512 936381254fea2e596db6a16c23b08ced25c4081fda484e1b8c4356755016e4b956bd00f3d2ee651d5f41a7695e9998f6c1ac3f4a237212b9c55aca8c5fea14e9) +set(download_filename "strawberry-perl-5.38.0.1-64bit-portable.zip") +set(download_sha512 9b604f19e245a809bd18857bd91ebaec81ca031394ec69a3369df64d3590d2c9d557326d8aa10f91e78b1f1d56689aa57a8ec3a8cad4d2e542c96eb714a3831d) diff --git a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake index 6734b0bb6d35b4..64142892f3dff5 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake @@ -1,16 +1,16 @@ if(CMAKE_HOST_WIN32) set(program_name python) - set(program_version 3.11.4) + set(program_version 3.11.5) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(tool_subdirectory "python-${program_version}-x86") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip") set(download_filename "python-${program_version}-embed-win32.zip") - set(download_sha512 4cdbb2efdc7764a87edfb7370716c1caf660d38bce37a280ec59b7aecab5672c5798aabe19a8ae395224bea7dfe644bd92656f0bbc44348717981b45a909c024) + set(download_sha512 d5412c5bc2a0664f86e504a536c201789c8fd8b97c641bbb7b254c87c2f13504d25fa9d0b74e27a1c54c2d9fb592f9546d8c1e82c506dc9c76a21774c4c3ea75) else() set(tool_subdirectory "python-${program_version}-x64") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip") set(download_filename "python-${program_version}-embed-amd64.zip") - set(download_sha512 3f93c2a16764b9ea6343315b70c0c6319aac8edaefbf4e21206fb30eff365e8fe37264a9133bebe12e664ea5d8fd232d587a5603a51fd96e1252a2fc01a2e550) + set(download_sha512 29a526da7624423b09ea1c8f94d83e5ad2d7ba7553c5651d8fcbe1b2483c62f27f9db105d1fdcfca3357b44d456fe1141274725bc97ad5166edfec14f251eb36) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") diff --git a/scripts/cmake/vcpkg_from_gitlab.cmake b/scripts/cmake/vcpkg_from_gitlab.cmake index 6a0e29c1842de7..b739e5bef3d486 100644 --- a/scripts/cmake/vcpkg_from_gitlab.cmake +++ b/scripts/cmake/vcpkg_from_gitlab.cmake @@ -52,20 +52,15 @@ function(vcpkg_from_gitlab) message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified.") endif() - if(arg_REPO MATCHES [[^([^/]*)/([^/]*)$]]) # 2 elements - set(org_name "${CMAKE_MATCH_1}") - set(repo_name "${CMAKE_MATCH_2}") - set(gitlab_link "${arg_GITLAB_URL}/${org_name}/${repo_name}") - elseif(arg_REPO MATCHES [[^([^/]*)/([^/]*)/([^/]*)$]]) # 3 elements - set(org_name "${CMAKE_MATCH_1}") - set(group_name "${CMAKE_MATCH_2}") - set(repo_name "${CMAKE_MATCH_3}") - set(gitlab_link "${arg_GITLAB_URL}/${org_name}/${group_name}/${repo_name}") - else() + if (NOT arg_REPO MATCHES [[^([^/;]+/)+([^/;]+)$]]) message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name. It must be: - an organization name followed by a repository name separated by a single slash, or - - an organization name, group name, and repository name separated by slashes.") + - an organization name, group name, subgroup names and repository name separated by slashes.") endif() + set(gitlab_link "${arg_GITLAB_URL}/${arg_REPO}") + string(REPLACE "/" "-" downloaded_file_name_base "${arg_REPO}") + string(REPLACE "/" ";" repo_parts "${arg_REPO}") + list(GET repo_parts -1 repo_name) set(redownload_param "") set(working_directory_param "") @@ -88,9 +83,9 @@ function(vcpkg_from_gitlab) # we assume that no one will name a ref "foo_-bar" string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") if(DEFINED arg_FILE_DISAMBIGUATOR AND NOT VCPKG_USE_HEAD_VERSION) - set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz") + set(downloaded_file_name "${downloaded_file_name_base}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz") else() - set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") + set(downloaded_file_name "${downloaded_file_name_base}-${sanitized_ref}.tar.gz") endif() diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index d2135a16580079..934515dd18faa7 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -11,6 +11,9 @@ else() endif() set(VCPKG_LANGUAGES "C;CXX" CACHE STRING "Languages to enables for this project") +if(VCPKG_ENABLE_OBJC) + list(APPEND VCPKG_LANGUAGES "OBJC") +endif() project(get_cmake_vars LANGUAGES ${VCPKG_LANGUAGES}) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index ac0b64e6eb45d5..8cc7f125ea11c3 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -1,5 +1,26 @@ cmake_minimum_required(VERSION 3.21) +# Remove CMAKE_ variables from the script call +foreach(i RANGE 0 "${CMAKE_ARGC}") + unset(CMAKE_ARGV${i}) +endforeach() +unset(CMAKE_ARGN) +unset(CMAKE_ARGC) +unset(i) +# These don't make sense in script context +unset(CMAKE_BINARY_DIR) +unset(CMAKE_SOURCE_DIR) +unset(CMAKE_CURRENT_BINARY_DIR) +unset(CMAKE_CURRENT_SOURCE_DIR) +unset(CMAKE_FILES_DIRECTORY) +# Minimum CMake version is forced within vcpkg +unset(CMAKE_MINIMUM_REQUIRED_VERSION) +# CMAKE_VERSION is enough for doing version checks +unset(CMAKE_MAJOR_VERSION) +unset(CMAKE_MINOR_VERSION) +unset(CMAKE_PATCH_VERSION) +unset(CMAKE_TWEAK_VERSION) + set(SCRIPTS "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Location to stored scripts") list(APPEND CMAKE_MODULE_PATH "${SCRIPTS}/cmake") include("${SCRIPTS}/cmake/execute_process.cmake") diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 2737f91b7ca588..9587622d4dfe1a 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -46,7 +46,7 @@ vcpkg_extract_source_archive_ex( # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag). # REF 1.0.0 # (Optional) Read the docs for how to generate patches at: - # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md + # https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/patching.md # PATCHES # 001_port_fixes.patch # 002_more_port_fixes.patch @@ -55,7 +55,7 @@ vcpkg_extract_source_archive_ex( # # Check if one or more features are a part of a package installation. # # See /docs/maintainers/vcpkg_check_features.md for more details # vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -# FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used +# FEATURES # tbb WITH_TBB # INVERTED_FEATURES # tbb ROCKSDB_IGNORE_PACKAGE_TBB diff --git a/scripts/templates/vcpkg.json.in b/scripts/templates/vcpkg.json.in index 81004e8eeb4302..03476f8ff43b17 100644 --- a/scripts/templates/vcpkg.json.in +++ b/scripts/templates/vcpkg.json.in @@ -3,6 +3,7 @@ "version": "", "homepage": "", "description": "", + "license": "", "dependencies": [ { "name": "vcpkg-cmake", @@ -11,11 +12,10 @@ ], "default-features": [], - "features": [ - { - "name": "", + "features": { + "example-feature": { "description": "", "dependencies": [] } - ] + } } diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index eb6591bf4d3567..c8387661b18f23 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,5 @@ -VCPKG_TOOL_RELEASE_TAG=2023-08-09 -VCPKG_MACOS_SHA=b46eaabbcc586b40c21f15ae8da671ce67da9022cd7acef4651bf8de81587f06074e7eb4066f521086270c01f9fa557374972159756412e852426a3ff04759d4 -VCPKG_MUSLC_SHA=114de7c643386ca2b8319bacfd83979e109abe490d4f25a23a0918fc0020f918131fb260cdb8abbbbaae7c170952e0327cf77c26cfa9135c6a1bfd7e6c0d8fca -VCPKG_GLIBC_SHA=4aa9b734b13526385c0d034452a52edd393e9a1d11274634cd4dacf52f16a3579782a9a6069746e15c2b82257046f3be951bf7c7a03846236fb6247211308044 -VCPKG_TOOL_SOURCE_SHA=bcf05ca1f52bd5cd8274fd6e1678bd1d4f9673aecead127fe4a4d7e40c583829f60bc568cdfa9ce36f13a6cbf21d95322dd7088b011024461682813c8ab1ecb3 +VCPKG_TOOL_RELEASE_TAG=2023-09-15 +VCPKG_MACOS_SHA=3c822003ec4e5eb3ea15d8ccf1a156f1d58e742b9d375a79693af9ad5b454796d4a42e05091bafefdf8359b56aee27ff8b07ff9bcb99f549a5bc81cb7ed47cc7 +VCPKG_MUSLC_SHA=125c77acbc6a2271eb882767e44da3fb0acd0719a35f2460e65eafcccae47967a5c370206d7af06b1d5a10d4ea53d04e620ca8df4bface8cd972b27eb89cf04e +VCPKG_GLIBC_SHA=08d27596961819573a66163ca5373e8f20137856d78d58154cc9ad0ba4864a1d22698d25c08c5ebcb3601f2952a476b0f1d12bed25c42cdbe6dab520870fabf3 +VCPKG_TOOL_SOURCE_SHA=a97ed33b6f3a5bbb9ae9e58ccd370f4941a5889098356aacb200effebc26f34b1ea205d21a749550db9e4c4c64b28a66f52bbfa0ba0bb4d5fc5b9be1fe4d76ff diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 595edc83dd7638..2f7bfb8ce63a75 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,18 +1,18 @@ - 3.11.4 + 3.11.5 python.exe - https://www.python.org/ftp/python/3.11.4/python-3.11.4-embed-win32.zip - 4cdbb2efdc7764a87edfb7370716c1caf660d38bce37a280ec59b7aecab5672c5798aabe19a8ae395224bea7dfe644bd92656f0bbc44348717981b45a909c024 - python-3.11.4-embed-win32.zip + https://www.python.org/ftp/python/3.11.5/python-3.11.5-embed-win32.zip + d5412c5bc2a0664f86e504a536c201789c8fd8b97c641bbb7b254c87c2f13504d25fa9d0b74e27a1c54c2d9fb592f9546d8c1e82c506dc9c76a21774c4c3ea75 + python-3.11.5-embed-win32.zip - 3.11.4 + 3.11.5 tools\python.exe - https://www.nuget.org/api/v2/package/python/3.11.4 - 3f311506440238103a3ed5f2b5c62f8fe5f935e24c7a44bd5aac588c9e0383a2eb7651cb3ee18e5873c2edf5718019c8648955bdedb9efe3101c1041776fc31e - python-3.11.4.nupkg.zip + https://www.nuget.org/api/v2/package/python/3.11.5 + d2f0557c7ebe5f3e8cc2a2102fc061abed6aeeb49a2e315241c453346750e3f725261dcac4efb171da9eb44c7b9f791d7a6b59b5072902b1007939e8596a2426 + python-3.11.5.nupkg.zip 3.27.1 @@ -131,18 +131,18 @@ installer-framework-opensource-src-4.4.0.zip - 21.07 + 23.01 Files\7-Zip\7z.exe - https://www.7-zip.org/a/7z2107-x64.msi - d55b44f1255d1b0e629719383a600a7e83dc6378d470096337b886ce24684d26bcc2b04f9cea39ad888179edce23ad2bd0e8e1863ddc40106c176adece8c012d - 7z2107-x64.msi + https://www.7-zip.org/a/7z2301-x64.msi + 09e3ce970ea8383e8c736a51ebb61e3036e655c81d59bc64c5eecb041abdad2cbce2f400fcf4478e22f56fe40f8d912c639f550a5f990e24abfd4e86cdd3755c + 7z2301-x64.msi - 21.07 + 23.01 7za.exe - https://www.7-zip.org/a/7z2107-extra.7z - 648d894940bcc29951752d7a8fd18c770ee8d4fd944e17f1a52588e51ca8f58375ba48514538f2e1387786fd812bb86f75fd6bdd0892685cdcafb2989942c848 - 7z2107-extra.7z + https://www.7-zip.org/a/7z2301-extra.7z + c849c2cb489cf5b6eeb92bfbc27dcb37d0349c36971e1bc7ef32c7cde1b659e19e8b46d734ba90f47affe07fdfd5b4774cbfa0fdf4b681e9f60bb46bba1f7f9b + 7z2301-extra.7z 1.35.0 diff --git a/triplets/community/arm64-uwp.cmake b/triplets/arm64-uwp.cmake similarity index 100% rename from triplets/community/arm64-uwp.cmake rename to triplets/arm64-uwp.cmake diff --git a/triplets/arm-uwp.cmake b/triplets/community/arm-uwp.cmake similarity index 100% rename from triplets/arm-uwp.cmake rename to triplets/community/arm-uwp.cmake diff --git a/triplets/community/loongarch32-linux-release.cmake b/triplets/community/loongarch32-linux-release.cmake new file mode 100644 index 00000000000000..0c0c0c4f301080 --- /dev/null +++ b/triplets/community/loongarch32-linux-release.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE loongarch32) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_BUILD_TYPE release) diff --git a/triplets/community/loongarch32-linux.cmake b/triplets/community/loongarch32-linux.cmake new file mode 100644 index 00000000000000..c6d954e6de0d0c --- /dev/null +++ b/triplets/community/loongarch32-linux.cmake @@ -0,0 +1,5 @@ +set(VCPKG_TARGET_ARCHITECTURE loongarch32) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) diff --git a/triplets/community/loongarch64-linux-release.cmake b/triplets/community/loongarch64-linux-release.cmake new file mode 100644 index 00000000000000..004fc14160fe33 --- /dev/null +++ b/triplets/community/loongarch64-linux-release.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE loongarch64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_BUILD_TYPE release) diff --git a/triplets/community/loongarch64-linux.cmake b/triplets/community/loongarch64-linux.cmake new file mode 100644 index 00000000000000..2a70e0a95acfc8 --- /dev/null +++ b/triplets/community/loongarch64-linux.cmake @@ -0,0 +1,5 @@ +set(VCPKG_TARGET_ARCHITECTURE loongarch64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json index 86ad7bba0b40ba..607eb1738a38ab 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "770ce8dc829180bfcf2c396aa780474a87289f89", + "version-string": "23.01", + "port-version": 0 + }, { "git-tree": "b0a5040bfab9f50a386dc1b40f291fa581b21c79", "version-string": "22.01", diff --git a/versions/a-/ableton-link.json b/versions/a-/ableton-link.json index 7707f5f9b3d1f7..54d3152a5ee010 100644 --- a/versions/a-/ableton-link.json +++ b/versions/a-/ableton-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e88d1fcc5959b44924c1bec7ae3b5535327f41ef", + "version": "3.0.6", + "port-version": 1 + }, { "git-tree": "eb603bd61d919dd4db44c901c00e47198fe186c5", "version": "3.0.6", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 55e06516585200..2a280e9f4a15f2 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49a35a30915907a4e46b57bb33b8aa1f2185e757", + "version": "20230802.1", + "port-version": 0 + }, { "git-tree": "95cfb844950f2cc3e1a530bd23967ee2ea218f74", "version": "20230802.0", @@ -10,11 +15,6 @@ "version": "20230125.3", "port-version": 1 }, - { - "git-tree": "2209360b556a40cf034551f6f9063456eac63986", - "version": "20230125.3", - "port-version": 2 - }, { "git-tree": "6a337fa251c0ac4489d9c0ea1e2f1c9a7d019eb5", "version": "20230125.3", @@ -85,11 +85,6 @@ "version-string": "2020-03-03", "port-version": 8 }, - { - "git-tree": "28fa609b06eec70bb06e61891e94b94f35f7d06e", - "version-string": "2020-03-03", - "port-version": 7 - }, { "git-tree": "606b9214364983e5df021d0556dbec5e44f4b0a8", "version-string": "2020-03-03-7", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 24aa579c4f6819..0ad073e7869912 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "acebbd833daa493d4e2075ce547646719d8cd080", + "version": "7.1.1", + "port-version": 2 + }, { "git-tree": "b9ee0ab32f4cbb2e1df0b0b060e0691e5e684261", "version": "7.1.1", diff --git a/versions/a-/ada-url.json b/versions/a-/ada-url.json index f568cf68afbeef..83cd687770cd7c 100644 --- a/versions/a-/ada-url.json +++ b/versions/a-/ada-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "793a12bdf6a056b11297c61d8129764722fd04b0", + "version": "2.6.8", + "port-version": 0 + }, { "git-tree": "5eeb54c3da6362aa30bddf522b944e1e95bdc005", "version": "2.6.0", diff --git a/versions/a-/ade.json b/versions/a-/ade.json index 06bf4fe6be6325..51cad80808290c 100644 --- a/versions/a-/ade.json +++ b/versions/a-/ade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c42175dddb51914574ff7fdcb8f653ed342f8ff2", + "version-string": "0.1.2c", + "port-version": 0 + }, { "git-tree": "be78a5027373a1ff6c75587da2aa96126c832b1c", "version": "0.1.2", diff --git a/versions/a-/alembic.json b/versions/a-/alembic.json index dc67d45f6531b8..3f84f4eb24f529 100644 --- a/versions/a-/alembic.json +++ b/versions/a-/alembic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca5f035424c794b8cde9d41c7103b612e912a275", + "version": "1.8.6", + "port-version": 0 + }, { "git-tree": "5cb4b9d32a6098f48e3d0a75ddd7eaae7a7df085", "version": "1.8.5", diff --git a/versions/a-/alsa.json b/versions/a-/alsa.json index 6b89ccc12d5dea..c3e28da506fceb 100644 --- a/versions/a-/alsa.json +++ b/versions/a-/alsa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3fa8b1fd27e767f429d0736b6636df796e2c335", + "version": "1.2.10", + "port-version": 0 + }, { "git-tree": "18d67806b319dea0e3c2e9c921a1864901af1d22", "version": "1.2.8", diff --git a/versions/a-/anari.json b/versions/a-/anari.json new file mode 100644 index 00000000000000..7553b296da75fe --- /dev/null +++ b/versions/a-/anari.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "bb2704cfb92a03677f5d7dfbf1d81f1d924accd3", + "version": "0.7.0", + "port-version": 1 + }, + { + "git-tree": "cf756ca650e9d72324024441ad48b760fb587f86", + "version": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/versions/a-/antlr4.json b/versions/a-/antlr4.json index 33c89444ff2b3a..5e041751312bbe 100644 --- a/versions/a-/antlr4.json +++ b/versions/a-/antlr4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8a6e8e88f1e6f604f094ce3a3927a8412eb6011", + "version": "4.13.1", + "port-version": 0 + }, { "git-tree": "1fd51b053d31e5215682e6c2970aca92e24d488b", "version": "4.13.0", diff --git a/versions/a-/apr-util.json b/versions/a-/apr-util.json index c143aa2b17f3d4..c73011dfafb1bf 100644 --- a/versions/a-/apr-util.json +++ b/versions/a-/apr-util.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6555c2af4f36e5aeb1eabc818738e4ffbba77d8", + "version": "1.6.3", + "port-version": 0 + }, { "git-tree": "41451c5e1e1fa8344f6c2d1baf6c0f14b656c433", "version": "1.6.1", diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 3a102e0dd4f3fc..f2acd7ee81996e 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "106ba582ba3d56fd1db284670ed7d94b6cae9f47", + "version": "1.7.4", + "port-version": 0 + }, { "git-tree": "b28b577d536f3eeeb00392ce5f1f7da76f3a9eaa", "version": "1.7.2", diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json index 057b0460d15b51..17218069702dbf 100644 --- a/versions/a-/apsi.json +++ b/versions/a-/apsi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a3eba819cf2ad5252c8ecae5c0d23f77238d98f", + "version-semver": "0.9.0", + "port-version": 2 + }, { "git-tree": "c1614133f3e08c8203102a2dd519c759b01d7156", "version-semver": "0.9.0", diff --git a/versions/a-/argagg.json b/versions/a-/argagg.json index 40e5d2cd7e611f..992fa28a208389 100644 --- a/versions/a-/argagg.json +++ b/versions/a-/argagg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83071d0926bdea724da61b1977f16e819a56500d", + "version": "0.4.7", + "port-version": 0 + }, { "git-tree": "2a90b715c9fa23c9e723c4fac3725a73c9007d5b", "version": "0.4.6", diff --git a/versions/a-/argtable3.json b/versions/a-/argtable3.json index 44141564d28958..ae6317071f462d 100644 --- a/versions/a-/argtable3.json +++ b/versions/a-/argtable3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "949eef38520716ab831bb7f008cce93b28af8f54", + "version-string": "3.2.2.f25c624", + "port-version": 0 + }, { "git-tree": "b84ef22a845ccccda6197d1865ddd1d8df9098c1", "version": "3.2.1", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 39b8f9b79837a0..adedd7fa682bbf 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "58708e6a9ecca81874ff79869e9006d42ca2bbfe", + "version": "13.0.0", + "port-version": 1 + }, + { + "git-tree": "ef87d769431fcefcb1d2864a9266cba168602fa2", + "version": "13.0.0", + "port-version": 0 + }, { "git-tree": "e1f5c7d4ca0f45c1629b3f393d360d5c8d035a01", "version": "12.0.1", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index 440a513e99d113..7f6a47102d5d9e 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0b1256bf350481cdba09fb8586852ca0560e024", + "version": "1.28.1", + "port-version": 0 + }, { "git-tree": "726d66784925af6062a5a8f285c76dab2469572f", "version": "1.28.0", diff --git a/versions/a-/assimp.json b/versions/a-/assimp.json index a150b0743acfd1..f6bd7699ab3355 100644 --- a/versions/a-/assimp.json +++ b/versions/a-/assimp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9934603cb6f42343b122951f22b5af3c1967cde", + "version": "5.3.1", + "port-version": 0 + }, { "git-tree": "bdd963b2ef327bf5e8533689aff4707226e22851", "version": "5.2.5", diff --git a/versions/a-/async-mqtt.json b/versions/a-/async-mqtt.json index 62f213a7f00b1c..c1a7b3fcf497b9 100644 --- a/versions/a-/async-mqtt.json +++ b/versions/a-/async-mqtt.json @@ -1,13 +1,13 @@ { "versions": [ { - "git-tree": "f7194dfdf664f2037e9917fd58220d421dc9de76", - "version": "1.0.9", + "git-tree": "1785cef2cfd89416b423c3a67c5ef0ef29c76100", + "version": "2.0.0", "port-version": 0 }, { - "git-tree": "61071a18dc0dc629c374fa016b81473e04a28ff1", - "version": "1.0.8", + "git-tree": "f7194dfdf664f2037e9917fd58220d421dc9de76", + "version": "1.0.9", "port-version": 0 }, { diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 1e6408a55a9584..dcfc9f090212f7 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c97f8dd9d133fb3e75abf33040b3ec61e032734d", + "version": "2.38.0", + "port-version": 8 + }, { "git-tree": "d21ac2c541d67128cafda7c4b190e217cb943174", "version": "2.38.0", diff --git a/versions/a-/autodock-vina.json b/versions/a-/autodock-vina.json index 665502292d1c91..a3e989fce61d2c 100644 --- a/versions/a-/autodock-vina.json +++ b/versions/a-/autodock-vina.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d962d4e25cc8a74a34729a493203c3060826fa1e", + "version-semver": "1.2.5", + "port-version": 1 + }, { "git-tree": "fbbf68e11b2e95110b26735162c7c07b4db2d670", "version-semver": "1.2.5", diff --git a/versions/a-/avro-cpp.json b/versions/a-/avro-cpp.json index b88e06893cfb1f..bc055ef7d8c964 100644 --- a/versions/a-/avro-cpp.json +++ b/versions/a-/avro-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5b130595cfdd2c5fcecf41bcbbed730aab60285", + "version": "1.11.3", + "port-version": 0 + }, { "git-tree": "0f04b2076c299b830bfdd3a698db754f4f8cf269", "version-date": "2022-11-07", diff --git a/versions/a-/aws-c-auth.json b/versions/a-/aws-c-auth.json index 9d5d45fbde10c0..c6b2ad5cf8ae12 100644 --- a/versions/a-/aws-c-auth.json +++ b/versions/a-/aws-c-auth.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f5aba6169081364e7585dfc613a0a476bac838f2", + "version": "0.7.4", + "port-version": 0 + }, + { + "git-tree": "8c6d3fc7a7471133d8fa5c12f019432a89678da2", + "version": "0.7.3", + "port-version": 0 + }, + { + "git-tree": "2540832abbf669a0efdf221f74ba3bb68f795056", + "version": "0.7.1", + "port-version": 0 + }, { "git-tree": "33b7db583ea58cd2516c5bdc3d2f331dc767eaad", "version": "0.7.0", diff --git a/versions/a-/aws-c-cal.json b/versions/a-/aws-c-cal.json index 0684ce6835832f..3c127a8840357b 100644 --- a/versions/a-/aws-c-cal.json +++ b/versions/a-/aws-c-cal.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "df757b731aa4c59ac71c43d02fe87edaff5680b3", + "version": "0.6.2", + "port-version": 1 + }, + { + "git-tree": "5633a1e4fad4542c5e3a665a09bf77d276031429", + "version": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "c833007ab0c5b36c45e555487117c271d52c4236", + "version": "0.6.1", + "port-version": 0 + }, { "git-tree": "17bf60e8e810ac219b328b2337afc58d65c6b8dd", "version": "0.6.0", diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index 78cfb8a39fe412..f51a7646f206ed 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6d58a5944c2340297985dc05678671129c45d40f", + "version": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "be7b04f5af0c0b475733738be33d3596936764ac", + "version": "0.9.3", + "port-version": 0 + }, + { + "git-tree": "ce8953debbd46bc73523d3e214f42e5a088adae5", + "version": "0.9.0", + "port-version": 0 + }, { "git-tree": "6447f286aa87615dbf0a2d9227939dd537297d92", "version": "0.8.23", diff --git a/versions/a-/aws-c-event-stream.json b/versions/a-/aws-c-event-stream.json index e75a412eb91d0c..d9fe07ba41f1a2 100644 --- a/versions/a-/aws-c-event-stream.json +++ b/versions/a-/aws-c-event-stream.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0c5daf2e95fa6a4e02f178c8ff091b0c8ed6b0e", + "version": "0.3.2", + "port-version": 0 + }, { "git-tree": "9e169d96e976e9c9afae3b1b5d9045f49c6cbec2", "version": "0.3.1", diff --git a/versions/a-/aws-c-http.json b/versions/a-/aws-c-http.json index 0f22d7b468aa4c..2a0fe56e8155af 100644 --- a/versions/a-/aws-c-http.json +++ b/versions/a-/aws-c-http.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "ab0c882c2d7c32b58e11c9e7124574933b701d8f", + "version": "0.7.13", + "port-version": 0 + }, + { + "git-tree": "6333ba487074d6b76f7270654796334049371d08", + "version": "0.7.12", + "port-version": 0 + }, + { + "git-tree": "c33f11482c79e72522708d43522665505d47730d", + "version": "0.7.11", + "port-version": 0 + }, { "git-tree": "c9d908413ad0bba2f32673c4b5b16dcdc6abc559", "version": "0.7.10", diff --git a/versions/a-/aws-c-io.json b/versions/a-/aws-c-io.json index efccd6bd9a0e4e..47add147f10ce6 100644 --- a/versions/a-/aws-c-io.json +++ b/versions/a-/aws-c-io.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "888ba4e86b810e8181ed897d4dc03b1a9f78c9f7", + "version": "0.13.32", + "port-version": 0 + }, + { + "git-tree": "702a1838bbe3f84ac08e515007467ae513eab4da", + "version": "0.13.31", + "port-version": 0 + }, { "git-tree": "5b3bb7fda57741248eff888afaea9724d68b7b5e", "version": "0.13.27", diff --git a/versions/a-/aws-c-mqtt.json b/versions/a-/aws-c-mqtt.json index 290f2c9618a50f..913bdaa4eea1f3 100644 --- a/versions/a-/aws-c-mqtt.json +++ b/versions/a-/aws-c-mqtt.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c48dfcca0c391e496b3ba1709f491d3cba914e89", + "version": "0.9.6", + "port-version": 0 + }, + { + "git-tree": "96d192387fd36708a0cd3cc41552e473c8bcb2f9", + "version": "0.9.5", + "port-version": 0 + }, + { + "git-tree": "7ef9969a5ceba966df73fb157fa6f74b45f8e8f0", + "version": "0.9.3", + "port-version": 0 + }, { "git-tree": "627f6778158776948501ca6a5516ccad59d05a25", "version": "0.8.14", diff --git a/versions/a-/aws-c-s3.json b/versions/a-/aws-c-s3.json index ed246323cd31fc..e591f9a04a43d4 100644 --- a/versions/a-/aws-c-s3.json +++ b/versions/a-/aws-c-s3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "11800b01a8e9e48aa7fe4c7e5f2e64592b5d7ebd", + "version": "0.3.17", + "port-version": 0 + }, + { + "git-tree": "47d21c2fbae187617f4781cd3e6bec932da788d6", + "version": "0.3.14", + "port-version": 0 + }, { "git-tree": "d081cc24b4c9c6af3f47087da235d5684c60128b", "version": "0.3.12", diff --git a/versions/a-/aws-c-sdkutils.json b/versions/a-/aws-c-sdkutils.json index 9d140818fddada..dbd7c039c7ec95 100644 --- a/versions/a-/aws-c-sdkutils.json +++ b/versions/a-/aws-c-sdkutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23164b5e925decd15773f93c5fbe0330be7ac9f5", + "version": "0.1.12", + "port-version": 0 + }, { "git-tree": "5cb38bd6a7671f8a9ee981121f485b78d28aaa0f", "version": "0.1.11", diff --git a/versions/a-/aws-checksums.json b/versions/a-/aws-checksums.json index 5d9eb376c41ff4..166da7bcca9726 100644 --- a/versions/a-/aws-checksums.json +++ b/versions/a-/aws-checksums.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05e17cee2b7d221bb49bebe55e8801f9cea99014", + "version": "0.1.17", + "port-version": 0 + }, { "git-tree": "7b723c21e8848802c057f18cac7185bf0be37a2c", "version": "0.1.16", diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json index c2a57a07ca3eb7..3531c58844434d 100644 --- a/versions/a-/aws-crt-cpp.json +++ b/versions/a-/aws-crt-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8c9935cdadd2baa48566f59d5ca1c253d3187ed1", + "version": "0.23.1", + "port-version": 0 + }, + { + "git-tree": "05d7275131943efc847ecbec0dc1c204b9ee8eb1", + "version": "0.23.0", + "port-version": 0 + }, { "git-tree": "5e1e41fc6b37ccd7b0ddfd9d15c9b06339748feb", "version": "0.20.3", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 09566112f7fed0..6cec92faa398e4 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "714b1b2815e2a3f57c79c8703a9cdc9892240acd", + "version": "1.11.169", + "port-version": 0 + }, + { + "git-tree": "3fb36e871ff39d82abfb7eca5bedbaa2b177c72e", + "version": "1.11.160", + "port-version": 0 + }, + { + "git-tree": "94f8f9c8774eda639d96a707cf3fda55fc9df034", + "version": "1.11.155", + "port-version": 1 + }, + { + "git-tree": "f0cc899ce753e066c26bec70fdfb87c84feaf28f", + "version": "1.11.155", + "port-version": 0 + }, + { + "git-tree": "f8b598e9d9b0ecde285a6898a1962f937f9511e9", + "version": "1.11.149", + "port-version": 0 + }, { "git-tree": "bacc82ba5052ad66e3b20ad1cae53c36989a28ea", "version": "1.11.132", diff --git a/versions/a-/azmq.json b/versions/a-/azmq.json index d29dbb5862f3d8..cf38a99ac885c5 100644 --- a/versions/a-/azmq.json +++ b/versions/a-/azmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a99701bb7160639ec7d75187271a16f6c6c42d8", + "version-date": "2023-03-23", + "port-version": 0 + }, { "git-tree": "4c4381f52a268bbf8084db2b1684ad740d3e4408", "version": "1.0.3", diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json index f8f9863ad28251..7d8610a784bc2f 100644 --- a/versions/a-/azure-core-amqp-cpp.json +++ b/versions/a-/azure-core-amqp-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f2454e03858a910421f6fd248968fd1cb7999ba7", + "version-semver": "1.0.0-beta.3", + "port-version": 1 + }, + { + "git-tree": "cdd44f43f4a8020582266cf5ac32d701281d2e88", + "version-semver": "1.0.0-beta.3", + "port-version": 0 + }, { "git-tree": "88712b0277f9501bbeab4d9244338fd5411eef93", "version-semver": "1.0.0-beta.2", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index 70a06f338db7b3..a55a42a6f8d4af 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "5f406f6bf6084c74a6a234f35bc6e232fae15cae", + "version-semver": "1.10.2", + "port-version": 5 + }, + { + "git-tree": "dc5ce5e0d496bbae8d2cd2f8908f7a01b5cfbc48", + "version-semver": "1.10.2", + "port-version": 4 + }, + { + "git-tree": "371ce124f91e0b9d64a44e47b573b5a3f4602498", + "version-semver": "1.10.2", + "port-version": 3 + }, + { + "git-tree": "0988f8606d4a1ee55446b680b6ea134cfae20569", + "version-semver": "1.10.2", + "port-version": 2 + }, { "git-tree": "bfb8b85899d4e6783f93392104d7ee80c8d0a89c", "version-semver": "1.10.2", diff --git a/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json index 9c465dd2734574..40978a276573d1 100644 --- a/versions/a-/azure-core-tracing-opentelemetry-cpp.json +++ b/versions/a-/azure-core-tracing-opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "001d1fc3f1ecbaa77894355634624bc5a7c7d7f2", + "version-semver": "1.0.0-beta.4", + "port-version": 1 + }, { "git-tree": "a17fe14abb083b59b9ef5d25157a6cd85acb3ee9", "version-semver": "1.0.0-beta.4", diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json index 07a947a7da9944..ba3078ee05fd6d 100644 --- a/versions/a-/azure-identity-cpp.json +++ b/versions/a-/azure-identity-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fd04f09c1fc0efef3008e8407828b368d75ee5d", + "version-semver": "1.5.1", + "port-version": 1 + }, { "git-tree": "2855fbb155aacc587ca1e2d518ab2e8369e6d8c0", "version-semver": "1.5.1", diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json index 8a589fa677852e..dd1e776927b38e 100644 --- a/versions/a-/azure-messaging-eventhubs-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2e4e38f8b37bd9c3c6af8bd95887d9108ba1ca67", + "version-semver": "1.0.0-beta.2", + "port-version": 1 + }, + { + "git-tree": "983c9c2a6615afc22cd76bdbbef3f403a608bbbf", + "version-semver": "1.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "d749c9b65d616fc776e8c71e352890d84ddd6c1c", "version-semver": "1.0.0-beta.1", diff --git a/versions/a-/azure-security-attestation-cpp.json b/versions/a-/azure-security-attestation-cpp.json index 9b29c2e0aab3dd..7ac326180f3a7f 100644 --- a/versions/a-/azure-security-attestation-cpp.json +++ b/versions/a-/azure-security-attestation-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "812294d664f9765544343cfc8b5265edfb88d061", + "version-semver": "1.1.0", + "port-version": 1 + }, { "git-tree": "11cd3682ae481f52a58478f4379bc21e627ed5f8", "version-semver": "1.1.0", diff --git a/versions/a-/azure-security-keyvault-administration-cpp.json b/versions/a-/azure-security-keyvault-administration-cpp.json index 2a41b8402af184..c10aff06de478b 100644 --- a/versions/a-/azure-security-keyvault-administration-cpp.json +++ b/versions/a-/azure-security-keyvault-administration-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "478811ebfa9d552d2b1fcf03e1721cc9175b17bf", + "version-semver": "4.0.0-beta.3", + "port-version": 1 + }, { "git-tree": "6c7bbcafaacfef51314e05b648c3634a3d324916", "version-semver": "4.0.0-beta.3", diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json index d5da42e8d65de5..df7c006d2ae72f 100644 --- a/versions/a-/azure-security-keyvault-certificates-cpp.json +++ b/versions/a-/azure-security-keyvault-certificates-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0dd2ae87c69a4637e82ea188db1ee1e2624ac2c", + "version-semver": "4.2.0", + "port-version": 1 + }, { "git-tree": "6f480f2686c90dc9985e9c827ecc2f3c086985f0", "version-semver": "4.2.0", diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index 0e151e398859f8..947631e9c7af94 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e455823cb2d81cf79f550f26d1fa3b9cff61e86", + "version-semver": "4.4.0", + "port-version": 1 + }, { "git-tree": "404efdca4682f39039fe7e76541db56b6cab3e3e", "version-semver": "4.4.0", diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json index c15689d0f38243..f35b728831909c 100644 --- a/versions/a-/azure-security-keyvault-secrets-cpp.json +++ b/versions/a-/azure-security-keyvault-secrets-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c41c5b32fe02aeb4ab47a5ddaa19df33fac9ee7", + "version-semver": "4.2.0", + "port-version": 1 + }, { "git-tree": "a795e3eddbe6ced53ba732f9793679e78d79d359", "version-semver": "4.2.0", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 29d294da7fc276..d2b76b365f6898 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "83ac6004707e784a7a57a72574548579a9ab79d0", + "version-semver": "12.9.0", + "port-version": 1 + }, + { + "git-tree": "b0699f9368ea7fbc2c6528711c29eb896c76d0a6", + "version-semver": "12.9.0", + "port-version": 0 + }, { "git-tree": "984b2a3258596a074a6a79be8b0d7c3128137981", "version-semver": "12.8.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index 51d7376da76720..ad6670f7c6b01c 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "973a9aaaa49d33f6afdac2337795bd2ee26bbf7e", + "version-semver": "12.4.0", + "port-version": 1 + }, + { + "git-tree": "041e401b3394eefc002af8a93bccbb7edc0732b5", + "version-semver": "12.4.0", + "port-version": 0 + }, { "git-tree": "b147e96bd4b49d4803cf8a3c4b5359bfe3bec275", "version-semver": "12.3.3", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index 1a0e6bb4e3c85b..7c828495cbd25f 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "980d78708b5b02d395f9bd7342c18dc35e48dcbd", + "version-semver": "12.8.0", + "port-version": 1 + }, + { + "git-tree": "0f289490671675363d6e2e07eb6277c569602878", + "version-semver": "12.8.0", + "port-version": 0 + }, { "git-tree": "ca459a11301918aa1296233d473a865032323673", "version-semver": "12.7.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index f128a0e541e62e..d691282b57663b 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7aad330cd95f2b69127ca9950d1c4295f5be937e", + "version-semver": "12.7.0", + "port-version": 1 + }, + { + "git-tree": "d1c2beb619e08e7c675312136c0cc427e3ee59e5", + "version-semver": "12.7.0", + "port-version": 0 + }, { "git-tree": "f51dca176615cce496b5fb2d869b467279c31e7c", "version-semver": "12.6.1", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json index bafb23a67ebe03..f5c3a66bf09211 100644 --- a/versions/a-/azure-storage-queues-cpp.json +++ b/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "116fd90e1af9c32dabd414ac99ef121d6bacf0bf", + "version-semver": "12.1.0", + "port-version": 1 + }, + { + "git-tree": "31256aaa2dbb1508ea777fc03cbec8ddbfd9ca18", + "version-semver": "12.1.0", + "port-version": 0 + }, { "git-tree": "a04f50e6f79e53d47d4721529709e8e1f02462e1", "version-semver": "12.0.0", diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json index bdc02a61743a0b..2d45ef1b5d30c4 100644 --- a/versions/b-/baresip-libre.json +++ b/versions/b-/baresip-libre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ece07432ef22395a14fe6cbdf5026d4b0f49872a", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "8eba692c2b454a491269fec62a993c0b08b24d34", "version": "3.2.0", diff --git a/versions/b-/bde.json b/versions/b-/bde.json index 0bef8a8678bda3..ca9e153ec46def 100644 --- a/versions/b-/bde.json +++ b/versions/b-/bde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71df70f3716434e8069b394593ba8859b6556959", + "version": "3.123.0.0", + "port-version": 0 + }, { "git-tree": "a8fc4329574711907399309f06012a486d373c64", "version": "3.117.0.0", diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json index b434fa52ae2982..b8fb42fe1021ec 100644 --- a/versions/b-/behaviortree-cpp.json +++ b/versions/b-/behaviortree-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cacd1d5f1a465b3ca9d23ebb0b9b4626a26db63", + "version": "4.3.7", + "port-version": 0 + }, { "git-tree": "66a97129b31a5e70e45a40c767ea96b1e0477a93", "version": "4.1.1", diff --git a/versions/b-/benchmark.json b/versions/b-/benchmark.json index 3cf8af5c483f11..a8b9600248d13a 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc61bd374495cb30bb9c58c6e9d0d4568898f0c8", + "version-semver": "1.8.3", + "port-version": 0 + }, { "git-tree": "54f61ab31bcb486a12c859c33db17905f397cc0c", "version-semver": "1.8.2", diff --git a/versions/b-/bento4.json b/versions/b-/bento4.json index d56f926704d438..9fb69538b5c3df 100644 --- a/versions/b-/bento4.json +++ b/versions/b-/bento4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06b152ff36998df474bd8cf0fa61435d1315b609", + "version": "1.6.0-640", + "port-version": 0 + }, { "git-tree": "4da8906f31697785969422135a52cb2d0861fe53", "version": "1.6.0-639", diff --git a/versions/b-/bext-sml2.json b/versions/b-/bext-sml2.json new file mode 100644 index 00000000000000..1129ba807fed69 --- /dev/null +++ b/versions/b-/bext-sml2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b61fcb31fd93d5b99b7f039aa2c1bab7b5eec83a", + "version-date": "2023-09-20", + "port-version": 0 + } + ] +} diff --git a/versions/b-/bitmagic.json b/versions/b-/bitmagic.json index b086c0a2d5616f..8c426f4edd3d0e 100644 --- a/versions/b-/bitmagic.json +++ b/versions/b-/bitmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98fb920eba690a2a64666a6a76e16af95a797ae8", + "version": "7.13.4", + "port-version": 0 + }, { "git-tree": "d8f4a3a305e2872a295f493450a96b093ad39ef7", "version": "7.12.3", diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index 82aaa60e2ace6a..813a818a56578d 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e942a227c05c00b773fa341f08ed56e360fbd45e", + "version": "0.65", + "port-version": 0 + }, { "git-tree": "8f6f0ca62f24edb91a4b605b045f46653442d1d5", "version": "0.50", diff --git a/versions/b-/blake3.json b/versions/b-/blake3.json index 4b6a259b1bc74e..cae5fef2e1ac81 100644 --- a/versions/b-/blake3.json +++ b/versions/b-/blake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d62ef88b0bacbb197e9bb921b8b7d0fea336f1d", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "a198a87b5478bee28b2e4d35ed9787cf3950faef", "version": "1.4.0", diff --git a/versions/b-/blend2d.json b/versions/b-/blend2d.json index 91f7c26ec92825..1b5ba71ad75069 100644 --- a/versions/b-/blend2d.json +++ b/versions/b-/blend2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5440e80d03f5d70356c3295281949898811ff97", + "version-date": "2023-06-16", + "port-version": 1 + }, { "git-tree": "7e16be134e98cabefdf318161ef7f74d83b0512d", "version-date": "2023-06-16", @@ -60,16 +65,6 @@ "version-string": "beta_2020-08-24", "port-version": 0 }, - { - "git-tree": "ffce764b880d8cc24e3b00328aa3861f15bae91d", - "version-string": "beta_2020-07-31", - "port-version": 0 - }, - { - "git-tree": "03a43f03eb0cab95aac27a77b71273fc4aa2e94d", - "version-string": "beta_2020-07-09", - "port-version": 0 - }, { "git-tree": "4b67e6ac18485e7209ec86219d16ce3659446e8a", "version-string": "beta_2020-06-01", diff --git a/versions/b-/blosc.json b/versions/b-/blosc.json index af1083339f2412..db75f6608d4281 100644 --- a/versions/b-/blosc.json +++ b/versions/b-/blosc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c0e6152db6058a53ff21fc8037e5c9e685a0fe8", + "version": "1.21.5", + "port-version": 0 + }, { "git-tree": "08be7493a8b0644853e545f50d243680b1d13fd9", "version": "1.21.3", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index e28e932c6cf5c6..82f8ed56692f01 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1108b5895433bd23e8a9d6b8695adf85438382c2", + "version": "7.24.1", + "port-version": 0 + }, { "git-tree": "a90973a47e6ea052123787fd347b6dc68c8f77de", "version": "7.22.2", diff --git a/versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json index c0202d0e6fb2bf..17a795b7fc381e 100644 --- a/versions/b-/boost-accumulators.json +++ b/versions/b-/boost-accumulators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbc8e739bd519a5da1db826cb1cd6b14c0072533", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "fcd575a4e482f3a331107dcbad72468cb9c14e50", "version": "1.82.0", diff --git a/versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json index 03c7f48d0aee7e..090d6e88b03b01 100644 --- a/versions/b-/boost-algorithm.json +++ b/versions/b-/boost-algorithm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "064c9bd0deddb764f57008b07c0d42af035c1a50", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "1fbb6d9a02e64aaa4c3f61605b2fac87f8dd8347", "version": "1.82.0", diff --git a/versions/b-/boost-align.json b/versions/b-/boost-align.json index 36c08583639594..f8f866f69f3bff 100644 --- a/versions/b-/boost-align.json +++ b/versions/b-/boost-align.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6312ca6cedb77e48b123aa19e7ef98f5401b4020", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "b1e1ddf5d00f6698be329c809d1a29e59742a7e2", "version": "1.82.0", diff --git a/versions/b-/boost-any.json b/versions/b-/boost-any.json index e7ff292ff77e0b..f33d332151c714 100644 --- a/versions/b-/boost-any.json +++ b/versions/b-/boost-any.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8995a49c0eb70b1e306323f70d79dc5b6343bd6b", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "e1ee12b057e7762b98a5bd7fdd190480e1f51b0f", "version": "1.82.0", diff --git a/versions/b-/boost-array.json b/versions/b-/boost-array.json index 11ed1ef2d1ff61..a9f1df129c2faa 100644 --- a/versions/b-/boost-array.json +++ b/versions/b-/boost-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98d20d502bbd77d5a4312254bd47d83c55b4bbac", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "58b11354551eb994ef8636b3ade5447ae6524a3c", "version": "1.82.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index 1321e4ae80b672..5ae6107ad00ba1 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d4a6f6c528811c3c79ac046e738e5bab3db995f", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "2ae81c27afef052cdab26f3bbadb1154905cfecc", "version": "1.82.0", diff --git a/versions/b-/boost-assert.json b/versions/b-/boost-assert.json index 388cd63ffa3ad0..99a9fd364b265f 100644 --- a/versions/b-/boost-assert.json +++ b/versions/b-/boost-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "058c55df927f8a8180003c576bb4b536a46cf3e8", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "9ab1404e2abab757e8c136c9fcd89fbca14e3696", "version": "1.82.0", diff --git a/versions/b-/boost-assign.json b/versions/b-/boost-assign.json index eeb1b7e2b601c9..cf1efe84c60286 100644 --- a/versions/b-/boost-assign.json +++ b/versions/b-/boost-assign.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ba196ef5fe0c4127c48503b32b1107c3d2575e6", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "393709d7b07cf6b886f9491aff50cbf1338ec6ce", "version": "1.82.0", diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index 48f380dfc66361..e6b4389eca5069 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c51cf6bc71c21154cca513d51d62a8f31ad3dd81", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "05f82c6b7fe3a31ffb4f16f25eb98473131f201a", "version": "1.82.0", diff --git a/versions/b-/boost-beast.json b/versions/b-/boost-beast.json index 129fd4394a1d09..abfcb1552833a6 100644 --- a/versions/b-/boost-beast.json +++ b/versions/b-/boost-beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf5be95a5b8d706f46ad14f219b940a3fb0c3ef4", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "6fdb6d58154d59554f7f6f3456f715f847dcdf12", "version": "1.82.0", diff --git a/versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json index f2e59601eacf4f..8b63b437c3a9f8 100644 --- a/versions/b-/boost-bimap.json +++ b/versions/b-/boost-bimap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c07fcb928615b411a23ca3676e62494c3304f31", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "630d6888f373108130d81a96b7a406387f8cd96f", "version": "1.82.0", diff --git a/versions/b-/boost-bind.json b/versions/b-/boost-bind.json index 1bb6dbff4f91e5..161b65f8ad4822 100644 --- a/versions/b-/boost-bind.json +++ b/versions/b-/boost-bind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b846d10f5df5d2d6f27bd2fe13170cf3c09d8cbf", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "9c07d5ea417668fe7606ace4749f1577c7c2a8c1", "version": "1.82.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index 434a99dcf0df7a..5c97841e60b303 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd9d972c221f9e5bdd839246960791cdcfe80524", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "c9cbed98f75a402e9f61689754e78e237f44988e", "version": "1.82.0", diff --git a/versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json index cba49fe632e07d..d052c55284200e 100644 --- a/versions/b-/boost-callable-traits.json +++ b/versions/b-/boost-callable-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0558d1c063b8c2137f5e44644bc4c47180f30da1", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "3d9d1716d512c7c972cf109e2d27a3c3cf4f0054", "version": "1.82.0", diff --git a/versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json index 445def4cf86d33..bec8e2ff233fb8 100644 --- a/versions/b-/boost-chrono.json +++ b/versions/b-/boost-chrono.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b291334ee942d090c037f8ce5cb53874af9f3f8a", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "6e35fba1cfd226e9ae4e4a4b54a5b88c4103e440", "version": "1.82.0", diff --git a/versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json index d45b95ade64ccc..30830dd42c9750 100644 --- a/versions/b-/boost-circular-buffer.json +++ b/versions/b-/boost-circular-buffer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4df4c980c22d3b54856d81430343e6ce70a18521", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "9a08e079bd1986adeb839ac17690dbd1b0c0cbf5", "version": "1.82.0", diff --git a/versions/b-/boost-compat.json b/versions/b-/boost-compat.json new file mode 100644 index 00000000000000..1a92ad60fc68d2 --- /dev/null +++ b/versions/b-/boost-compat.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "790894b29260c3cb8b2bd6be3bd2822e3118789e", + "version": "1.83.0", + "port-version": 0 + } + ] +} diff --git a/versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json index 63dd6202a71595..a660e99c57135e 100644 --- a/versions/b-/boost-compatibility.json +++ b/versions/b-/boost-compatibility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f503e07b29b61e3679b9efd9986ac64503808dea", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "8e3c4c3602abf9d5417317f7461393eb801864cc", "version": "1.82.0", diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json index bbc728ebd4e427..04a12f6687b96e 100644 --- a/versions/b-/boost-compute.json +++ b/versions/b-/boost-compute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e4c8cd7be193c46ac0e3633dd63b723dac6f363", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "b303d9b14bc148147d90600791358321c8f95c3f", "version": "1.82.0", diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index 6ab5085ee41236..1bf34f17499750 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec7a65ff7072399f9a926316cac0b1c6162d4ee5", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "e3db560953c33956f9ba0b19303f99e37d2c6486", "version": "1.82.0", diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index 7f9e25e3220ba6..073d0b0a42a68d 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26e9082aeb3829b11d9f0ea82de37db9a93b6620", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "b4dcdf4527bb037a6b6d2973176e4a662c9853e6", "version": "1.82.0", diff --git a/versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json index 821afe667286a3..450b58ff84ff35 100644 --- a/versions/b-/boost-container-hash.json +++ b/versions/b-/boost-container-hash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "058bb680534a2375ec78dd366d9969967bd7570e", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "ce9e91e833ca8eb5ddb0a19df8eb7fa5c809359c", "version": "1.82.0", diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json index 8998a5c8a9aa3b..7169a72246876f 100644 --- a/versions/b-/boost-container.json +++ b/versions/b-/boost-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06dc49b47f365371fd98d0373e46369bb97056c8", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "7d7b26fb8d896742162db28bca0f3aa2c4bf5fa5", "version": "1.82.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index 4c05a6edf2f772..9739301087e0d8 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c0ccde97a196bd6c78f0fbb52ae9c8b33a525b5", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "b57cef3d65241ee8769759b0c4d4f54adea12f12", "version": "1.82.0", diff --git a/versions/b-/boost-contract.json b/versions/b-/boost-contract.json index a1f587720f651b..78851b4ad050a8 100644 --- a/versions/b-/boost-contract.json +++ b/versions/b-/boost-contract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c3cb8d14edbf7d1f72bcb9604c134828c52db92", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "128a5459bfe24ef077e6c55f9048115d5b62119f", "version": "1.82.0", diff --git a/versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json index ac7b162ac5206b..7193f9abd5498a 100644 --- a/versions/b-/boost-conversion.json +++ b/versions/b-/boost-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45d1d99389896f68454518ac9e7d516c88598fcd", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "42db7c7d2cd967a8602ccbecd50d17ecc45c0f9b", "version": "1.82.0", diff --git a/versions/b-/boost-convert.json b/versions/b-/boost-convert.json index 6d8f77b05ef85b..8a43ce98e1eee6 100644 --- a/versions/b-/boost-convert.json +++ b/versions/b-/boost-convert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b29caca0f13ed5f5c083216a177a43984cab5fb", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "2d1a4418e25c86642d9382f57d1d5b2713bdd12c", "version": "1.82.0", diff --git a/versions/b-/boost-core.json b/versions/b-/boost-core.json index 23605dec7fa16f..b957bf0b4b11d0 100644 --- a/versions/b-/boost-core.json +++ b/versions/b-/boost-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "736b9319578faba560f1bccd62ae53421c290ac4", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "fc2d558e972d703d21819dc33f5178d6bf529a22", "version": "1.82.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index 77d4596aafa364..2746cba494e01d 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8a5c2cff3de497580fc8dc363ebc3e8ec0c9a1d", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "6a7abe4f1fe4283093d5eadbbfd76b9b37d188b0", "version": "1.82.0", diff --git a/versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json index 8a4bed9045a376..a787d9ee14d197 100644 --- a/versions/b-/boost-coroutine2.json +++ b/versions/b-/boost-coroutine2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07cd3acf80575853ec41795a24803f75605f9c9b", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "dba0f9beca895b21c5059b07c9f173e007ee3cd8", "version": "1.82.0", diff --git a/versions/b-/boost-crc.json b/versions/b-/boost-crc.json index 11a58d0fe7b2d9..b6b84b91c471db 100644 --- a/versions/b-/boost-crc.json +++ b/versions/b-/boost-crc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0f11a830b77b6a039d0d008a18b066d99a87672", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "04d885f67c14d286734f0904d56d57338a5e9d8e", "version": "1.82.0", diff --git a/versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json index 6f9d3af20bd36f..fac04645849ae1 100644 --- a/versions/b-/boost-date-time.json +++ b/versions/b-/boost-date-time.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d56b06972d62749f2f7c9c9950b275d4d4668bcb", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "6deadcbe773d183966325ed291aecaba15da86dc", "version": "1.82.0", diff --git a/versions/b-/boost-describe.json b/versions/b-/boost-describe.json index 39c0d10a841898..774e2a8872c9c4 100644 --- a/versions/b-/boost-describe.json +++ b/versions/b-/boost-describe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5287728efcb90f341cbdbf3e40edd2568baa3d98", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "57b9e703cb64af9391eb2410ef649a94cb34e4fb", "version": "1.82.0", diff --git a/versions/b-/boost-detail.json b/versions/b-/boost-detail.json index 60f1a1a269e0bc..a1d5ddc74d03ad 100644 --- a/versions/b-/boost-detail.json +++ b/versions/b-/boost-detail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a596ae27e05912ce6ac9430ad0a2c60b0874517", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "e6869735032c72f50cd3e5cfdfd08a317fbe1efd", "version": "1.82.0", diff --git a/versions/b-/boost-dll.json b/versions/b-/boost-dll.json index adc7543fbeb8f2..0aa4a386741065 100644 --- a/versions/b-/boost-dll.json +++ b/versions/b-/boost-dll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9458e313715bc4132ded9a04a5d991f9993dcafb", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "92417614fbe01c2ebdf9e5c57dca684fb899f9b4", "version": "1.82.0", diff --git a/versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json index dee917e4436c5a..d620a5928bde94 100644 --- a/versions/b-/boost-dynamic-bitset.json +++ b/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "783e8e0c0387114a445ad62dacbbb2f2ce910cd2", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "5ef863abb9f1f4ca201881743fffe4f47930b472", "version": "1.82.0", diff --git a/versions/b-/boost-endian.json b/versions/b-/boost-endian.json index 49b3fd26a3f784..164cbc05a2bc93 100644 --- a/versions/b-/boost-endian.json +++ b/versions/b-/boost-endian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5321b25b38e55ebe1bbeb54242c104e208b643f8", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "02c550779838f584656e52ce62aa84913040be26", "version": "1.82.0", diff --git a/versions/b-/boost-exception.json b/versions/b-/boost-exception.json index 4b9220bfb813ff..f89088823e5a3a 100644 --- a/versions/b-/boost-exception.json +++ b/versions/b-/boost-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dce130433b2a5fc44ee576f9b39bb97d916661e", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "8eb353034a1a470c5168e00c6d97e5912f7c4cdf", "version": "1.82.0", diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index d230dbb106938a..d4d7cd4678d951 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7eadb0ddae816cfed4358cb08ef2bc90c5c0bfa5", + "version": "1.83.0", + "port-version": 1 + }, + { + "git-tree": "b90277a937de15b5f0701db9933e8af38c399fc2", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "d474f76c374b4e212ba4e855c8c91c97a76c9dbc", "version": "1.82.0", diff --git a/versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json index ae473b94a7a7aa..d8b6e2a26a1036 100644 --- a/versions/b-/boost-filesystem.json +++ b/versions/b-/boost-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6419d12dfeb0010846e425acd9e5b27772e1ac9", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "0ce33f60fe1f1bca7cabdf40085a6f9fc50d7609", "version": "1.82.0", diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json index 011b6c799723e7..3bf29c41f8dc8e 100644 --- a/versions/b-/boost-flyweight.json +++ b/versions/b-/boost-flyweight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef75501a5a95e34a23f190e5d41792311f4b29fe", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "8ae93d92af918047cdbce0acb4e28bfe8b3917a4", "version": "1.82.0", diff --git a/versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json index d09a92dac9e12c..fad811fce04845 100644 --- a/versions/b-/boost-foreach.json +++ b/versions/b-/boost-foreach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10ddba1bb2b7513dc1459166eed1f4f1b25aa49d", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "72825aa9cfe566882f23cb67085eb649be57ab57", "version": "1.82.0", diff --git a/versions/b-/boost-format.json b/versions/b-/boost-format.json index be0e3f4e0a4e81..b635e272055ab6 100644 --- a/versions/b-/boost-format.json +++ b/versions/b-/boost-format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b4697f0c1e3cc49f4bf08c12b748544c132db48", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "82fdf64c7a6daccebb04097c2264eccd4b753447", "version": "1.82.0", diff --git a/versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json index 50238de7eca3ef..01291ea3948edf 100644 --- a/versions/b-/boost-function-types.json +++ b/versions/b-/boost-function-types.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77f27d230b3784277075862bba2c282977ea1f0a", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "bf2f0ad26a4cfe85854392e5579bc75d7a4a60d3", "version": "1.82.0", diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index 367555bcae2f9c..e6805db3d5e1e7 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f066c30c0481a6f75452d3a1372ea3425adea156", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "9dec477afa8d43d2a95ff257974e703a5fe7835d", "version": "1.82.0", diff --git a/versions/b-/boost-functional.json b/versions/b-/boost-functional.json index 6933a627f26774..3b1cd8c4a7d9f8 100644 --- a/versions/b-/boost-functional.json +++ b/versions/b-/boost-functional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aba27201e0794309bf68a44e8727378345927b38", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "fd5a2fb579f798abd7b8b0c118543c92ee0f0774", "version": "1.82.0", diff --git a/versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json index 888bdac5378164..c0140dda5643b6 100644 --- a/versions/b-/boost-fusion.json +++ b/versions/b-/boost-fusion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0475f7220a08b37bfbea03b873211f9ea76fac08", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "b150ab085d5b818a169fc105e3b096bf7493e5b0", "version": "1.82.0", diff --git a/versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json index ab9b48d8132dfa..28711638f2f613 100644 --- a/versions/b-/boost-geometry.json +++ b/versions/b-/boost-geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24efcc4edf764482c058e70a2ce8ab500d40d1c2", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "d4067f77462e9b8846d9a00471584a4d8ffbb857", "version": "1.82.0", diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index 576eb925ebe097..5f084408f3353b 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a3fb8c8c6ef3abbe51fb887be13d94d8c4bb983", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "f8dd74ecbae93b5f746fbe67d895a00cfeb9d231", "version": "1.82.0", diff --git a/versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json index 982c68db55a0eb..5bc8e34ede9443 100644 --- a/versions/b-/boost-graph-parallel.json +++ b/versions/b-/boost-graph-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbc5095f32aeabbce7ade0bc7708f44f6cd65718", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "f43ba5b79672a46bbf62a53ad000a7e7d14c041b", "version": "1.82.0", diff --git a/versions/b-/boost-graph.json b/versions/b-/boost-graph.json index 4dcd459e6122c8..7449f411f1651e 100644 --- a/versions/b-/boost-graph.json +++ b/versions/b-/boost-graph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6647f8f09420268c0381bf2416492cedcc348c73", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "1eb9dc73511a762ae15c9a114f1ccf8e43c73bf9", "version": "1.82.0", diff --git a/versions/b-/boost-hana.json b/versions/b-/boost-hana.json index d1659de464b263..db31d0dce3c513 100644 --- a/versions/b-/boost-hana.json +++ b/versions/b-/boost-hana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75994d0511e21fcd96453070b4bfe104c76e8a21", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "5d7127090cf4379d6bd5cb94f6c24567b25d5213", "version": "1.82.0", diff --git a/versions/b-/boost-heap.json b/versions/b-/boost-heap.json index 7e5408caa1c7d4..324284fb8d0b57 100644 --- a/versions/b-/boost-heap.json +++ b/versions/b-/boost-heap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7dc9b45d83570bc364f2eec2caa556ca1cbb5a3", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "910fd038954c6cf54b603c02fca5fb21802a1758", "version": "1.82.0", diff --git a/versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json index 3df54bfd80716b..ff46a9a80f2a0f 100644 --- a/versions/b-/boost-histogram.json +++ b/versions/b-/boost-histogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfb8451fad642630b3bd4072178d9ac1b318d705", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "7a09aa03b51de15b9544589aea569de877eeed1d", "version": "1.82.0", diff --git a/versions/b-/boost-hof.json b/versions/b-/boost-hof.json index c8c1317ddfb281..47474548a7b246 100644 --- a/versions/b-/boost-hof.json +++ b/versions/b-/boost-hof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56156c027ebd8af07a502ea9b5fc58fee6cc0b64", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "f1277a21ad4a01b42013c1e4324a5ad47004bff9", "version": "1.82.0", diff --git a/versions/b-/boost-icl.json b/versions/b-/boost-icl.json index 2407bad3a126ba..4b3ad5dc40b7b4 100644 --- a/versions/b-/boost-icl.json +++ b/versions/b-/boost-icl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8cf7df44d1c0d7579411af9d8c0decdf498475d", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "5d24993000e79436df3c10f8424df464e20da8bd", "version": "1.82.0", diff --git a/versions/b-/boost-integer.json b/versions/b-/boost-integer.json index 1038ae9a652a7a..2387a507a3625a 100644 --- a/versions/b-/boost-integer.json +++ b/versions/b-/boost-integer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f70c3d065ad54b0b64e16541cfdd86aceec513f3", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "46935203002bae9d52b70d217abde7758c21d2ba", "version": "1.82.0", diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json index 49c4dc8c54152c..b6c467afb835a1 100644 --- a/versions/b-/boost-interprocess.json +++ b/versions/b-/boost-interprocess.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "685634ef2e0b7c514fc454d668e27c17937dc005", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "ae2d2c05c7433c83dc9eed47f7cd13b6a4c6c46f", "version": "1.82.0", diff --git a/versions/b-/boost-interval.json b/versions/b-/boost-interval.json index daa7c46a9328bc..1b643b131167c6 100644 --- a/versions/b-/boost-interval.json +++ b/versions/b-/boost-interval.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3eb772da1f0b5a2fe86601716b0fa8fc8aae645", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "10e93bc8db9627499e8681ccbac7f42e5869b75b", "version": "1.82.0", diff --git a/versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json index 3decdf7a5d5062..c77e348124d814 100644 --- a/versions/b-/boost-intrusive.json +++ b/versions/b-/boost-intrusive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05886d36db2ae6ecb44cf3b964c2d0a4d486c129", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "9c1632e270e737c9f035585137c26841952c337f", "version": "1.82.0", diff --git a/versions/b-/boost-io.json b/versions/b-/boost-io.json index bd70ddffe4cc38..faa5cf0f645006 100644 --- a/versions/b-/boost-io.json +++ b/versions/b-/boost-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5d84659eada088f612945a42ae940ee7dcc37be", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "2e824cb312fdf8d4b782b625053595e9bb13dc3c", "version": "1.82.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index b4b465de78d5f1..6539dc598295c7 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da8972f0e4c59981021913e4ef16a39a9ff8d491", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "ac82b98be4e5ba2e754a532ba2754ae4f0496469", "version": "1.82.0", diff --git a/versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json index 8e49624f4ece9b..1d179b0c46a45e 100644 --- a/versions/b-/boost-iterator.json +++ b/versions/b-/boost-iterator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8870bee36b1dee543b554c3e0264e6871a6ad6e2", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "32b20eaa8ec0539f484ba8dc1a08fd163757d48d", "version": "1.82.0", diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json index cc779270fbe6fe..44db49ec43cb3f 100644 --- a/versions/b-/boost-json.json +++ b/versions/b-/boost-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf515b1083df1c9d11c17713ea9cd22ad8deee20", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "a88bb521a85cb7e8577f49eed059f656b0d81d07", "version": "1.82.0", diff --git a/versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json index 66e182b7635a68..07e08cc4bc0c03 100644 --- a/versions/b-/boost-lambda.json +++ b/versions/b-/boost-lambda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f5b545dcb43d7901ce68b14f598605e86b2711a", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "4fe41ac7e3024b92d857b855f8833f83d4abd11e", "version": "1.82.0", diff --git a/versions/b-/boost-lambda2.json b/versions/b-/boost-lambda2.json index 8dd8edd524d5c9..02903d529863c7 100644 --- a/versions/b-/boost-lambda2.json +++ b/versions/b-/boost-lambda2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "399a7528e08b7a9e7a888cbb7d4a60c3212d3fc4", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "0594208903bfe03699a0b1c4a549156425bc0bdd", "version": "1.82.0", diff --git a/versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json index 335978aa80d42e..490fab49d579f6 100644 --- a/versions/b-/boost-leaf.json +++ b/versions/b-/boost-leaf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c5d7bf52009af1e4fa9ab2bf88a8592a3f9c2f0", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "cb036779325e545fd6138cfbaa0703d729aa401b", "version": "1.82.0", diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json index 7cf1f1cf62da7b..8a857622813a6c 100644 --- a/versions/b-/boost-lexical-cast.json +++ b/versions/b-/boost-lexical-cast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dde0974bedf5d7539835eeadb3183b72d0df75f0", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "27cd4bbb12ad5a785f7e32723dbb72c4e4bf023a", "version": "1.82.0", diff --git a/versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json index 5c0c2a8316e7a4..3167b96dd9f4a8 100644 --- a/versions/b-/boost-local-function.json +++ b/versions/b-/boost-local-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f059d8e9dc60d429ca4910eb0603b7ad768339b1", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "51ae33edcf3e425aa42f2cfbdcc926ef3996ce6d", "version": "1.82.0", diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index 245f66f53cac21..4ced409ad3460e 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41e9801248d577c58c9827d2177ec7a88719b116", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "3ed08854668287984c74498fb95f081740459048", "version": "1.82.0", diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json index e8f1d91ac43033..4fe5f3bd5e81c0 100644 --- a/versions/b-/boost-lockfree.json +++ b/versions/b-/boost-lockfree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db32f8262d243ce50d3dd2b67e9f13ce9fb584f0", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "4e5234382d1b899deef16bbbeb58b19bcf5661dd", "version": "1.82.0", diff --git a/versions/b-/boost-log.json b/versions/b-/boost-log.json index 7724d8a8ee3a88..040848a65e075a 100644 --- a/versions/b-/boost-log.json +++ b/versions/b-/boost-log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9fc311a8361a136d6723b2a45e98af511749e7d", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "486c465bb29be1d743d50fd66134aafc9ff6f820", "version": "1.82.0", diff --git a/versions/b-/boost-logic.json b/versions/b-/boost-logic.json index c3b9dc661e7cf7..804a8909e05815 100644 --- a/versions/b-/boost-logic.json +++ b/versions/b-/boost-logic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4caeef24d5d621a2a42819bdcea2ee90b4414f5a", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "99d96e2a54223f8db7b94429392de363cd69ee61", "version": "1.82.0", diff --git a/versions/b-/boost-math.json b/versions/b-/boost-math.json index 6dd720c4e73e20..16243e9f341652 100644 --- a/versions/b-/boost-math.json +++ b/versions/b-/boost-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2b21d46b8da00d788266ec6b386602f345659c1", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "7c52621d3f785a3aee44d5a741597a0a4ffd8912", "version": "1.82.0", diff --git a/versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json index 4e115439fc8411..f8dbfa273177c1 100644 --- a/versions/b-/boost-metaparse.json +++ b/versions/b-/boost-metaparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5994a689a2da98a3effa716ab52de1b13266fe13", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "c34b7fa72446bdd3037f8986d0e653dee79d5df5", "version": "1.82.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index c47643d215c3cb..68804de4b1f6b1 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "95d209e069cf1a82d48fa32cef7a7c39edc33c22", + "version": "1.83.0", + "port-version": 1 + }, + { + "git-tree": "843c4331dc1453c80f99e25be4513c99074c5cf2", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "2d374869ba7aa60ab439300ed4d032f95c9b88a7", "version": "1.82.0", diff --git a/versions/b-/boost-move.json b/versions/b-/boost-move.json index f58a8959593573..a91e420952a00d 100644 --- a/versions/b-/boost-move.json +++ b/versions/b-/boost-move.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f4770bf9904c733be328e32d4017a0ed1157d2d", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "bda03863857c818ffb310f45d2d148553a5de381", "version": "1.82.0", diff --git a/versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json index 8f7ec1d94b37ee..1002cf41d58fb3 100644 --- a/versions/b-/boost-mp11.json +++ b/versions/b-/boost-mp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68c2556b43afbb853b5e724eb0fd5269a92088f1", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "a90f12d1eca80483d10bbd93deccf5439f904e04", "version": "1.82.0", diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json index d3dfd613e31a16..d9f6786f366207 100644 --- a/versions/b-/boost-mpi.json +++ b/versions/b-/boost-mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9f0ba74af84204dab8f9a68f2eab345ed493295", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "f67b743f8b04e8d1e7135745b3a18abe62a4eb5c", "version": "1.82.0", diff --git a/versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json index 43d0adfde20ab7..d393c8087e6b3b 100644 --- a/versions/b-/boost-mpl.json +++ b/versions/b-/boost-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfcb80d8d1b767426e6714d6ba1b6a1473c0cc23", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "f2d9b906b09ffd6317c9de5f97537688cde482bd", "version": "1.82.0", diff --git a/versions/b-/boost-msm.json b/versions/b-/boost-msm.json index 83a53e25c1f6a4..9e1d13d3faf1a0 100644 --- a/versions/b-/boost-msm.json +++ b/versions/b-/boost-msm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e6c265d4b9681f5da0f23cb3a3912498fe4fbb2", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "8536dd1583d433e00586c1cae10d6e8d6e02e330", "version": "1.82.0", diff --git a/versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json index c66f3d39909bfc..1c83661529e34c 100644 --- a/versions/b-/boost-multi-array.json +++ b/versions/b-/boost-multi-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7c1d6533820072446bd68c928c72964501def1e", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "2a850ad389c07479589bfc617aff5b03a2b98c17", "version": "1.82.0", diff --git a/versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json index 5c0e8761382629..c2bed56b87ac9c 100644 --- a/versions/b-/boost-multi-index.json +++ b/versions/b-/boost-multi-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d40ee58c3e54b9c841abc6dd57033366218f064", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "6fe88d1349bd1ddf78ded3e786a539514d285835", "version": "1.82.0", diff --git a/versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json index 511386b2361d4f..8be6d3969b2953 100644 --- a/versions/b-/boost-multiprecision.json +++ b/versions/b-/boost-multiprecision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5c0acb2f8f25475a0a69d41460e377e6ce66749", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "d678e2c33ccdd2e64aa71ea623e1b89109502482", "version": "1.82.0", diff --git a/versions/b-/boost-mysql.json b/versions/b-/boost-mysql.json index 31ac136953199e..b401e05e52f5e6 100644 --- a/versions/b-/boost-mysql.json +++ b/versions/b-/boost-mysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0acda793061ac85e68029b15c6fa6919a2f87e8d", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "d85c256826e13a62169b1f38bf7c3f8288a697c0", "version": "1.82.0", diff --git a/versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json index afa90f5fa609ec..5d62f2cfcfc7ad 100644 --- a/versions/b-/boost-nowide.json +++ b/versions/b-/boost-nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4c07fcec5ae6b5f94811dbd50ee720884d65752", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "ea86cbf24b6f2bf242d24bd8047699cbe644b68a", "version": "1.82.0", diff --git a/versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json index d086d0a33a1fa0..342ce89da4810f 100644 --- a/versions/b-/boost-numeric-conversion.json +++ b/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3a65f3521df33b8a76605097a3046795f1107e7", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "00e6f269cd4fab6986205b397e46394795941f31", "version": "1.82.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index 3419e9b67f34eb..fbc90b7a125c7b 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f65beca22b3663038f2d5da292a1dd7f63c1fc23", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "70ec7a68fae7d61cd0fb694743e84f327ba34272", "version": "1.82.0", diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json index c91aa7cc4b33ef..64fef5ea7b2e39 100644 --- a/versions/b-/boost-optional.json +++ b/versions/b-/boost-optional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "145809a6e99a8ba579c3c0bef2c48969555a2bd5", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "26a359b912dd2fb42978ddf8ae39fbbccc1e34bb", "version": "1.82.0", diff --git a/versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json index 6ea25478ce0f35..97cd92b1f1a354 100644 --- a/versions/b-/boost-outcome.json +++ b/versions/b-/boost-outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4f9214c118d7d3ee45f5c2624f8383ff596fa14", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "089f7ec14f71ee4d59db5bcc795551da347f63df", "version": "1.82.0", diff --git a/versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json index 557b348600b355..c2a1d37b1f86d3 100644 --- a/versions/b-/boost-parameter-python.json +++ b/versions/b-/boost-parameter-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3894f883ee35b2bae2f102c520e81deca80f6643", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "ce2b59b01e836bb57415dd89d2895e52efa67970", "version": "1.82.0", diff --git a/versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json index abe8547c7713c4..4bb944dbe2758d 100644 --- a/versions/b-/boost-parameter.json +++ b/versions/b-/boost-parameter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1dce1428072cad1f8bc7b6c02f14cc6ba12da3fd", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "ba542be6ce0920e0fbc12d2fe1d3fd4edb02c4ec", "version": "1.82.0", diff --git a/versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json index ac6087f831d765..0f1efeac8e289f 100644 --- a/versions/b-/boost-pfr.json +++ b/versions/b-/boost-pfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a38c23f0ff2226b879e1ef04aefd19f479bc5a6", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "84e8832ae82979a2748d319fca9f8e5fb397e1b9", "version": "1.82.0", diff --git a/versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json index 76e70897674c88..1fbce2e3ea3a03 100644 --- a/versions/b-/boost-phoenix.json +++ b/versions/b-/boost-phoenix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4c5832e8ebf68cd4f2ee601a10aa7adfc12e6e9", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "c68391dd87698c5d288e7e6f937d72597e0e749f", "version": "1.82.0", diff --git a/versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json index 38e92b91caa5c1..f3397c555da9cd 100644 --- a/versions/b-/boost-poly-collection.json +++ b/versions/b-/boost-poly-collection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28e876df1967c012343839a6258191ce5107e5f7", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "3a905d35b62d85eb36ef4a2748fde453ffa8ac2f", "version": "1.82.0", diff --git a/versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json index 3190335fd9457d..70a32f605d0c90 100644 --- a/versions/b-/boost-polygon.json +++ b/versions/b-/boost-polygon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2cd356928aae40e3ed8a5764f868de84dde981d", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "ff0451ec470d4d15f7eb41a37fb9aa5b960b7348", "version": "1.82.0", diff --git a/versions/b-/boost-pool.json b/versions/b-/boost-pool.json index cf01005e3df991..fcfd72741b0c3f 100644 --- a/versions/b-/boost-pool.json +++ b/versions/b-/boost-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5c81fe62cb0da4fdc940d21d87837678a2e67cf", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "f31154b251747a951b5100f83cff4c065eb1295f", "version": "1.82.0", diff --git a/versions/b-/boost-predef.json b/versions/b-/boost-predef.json index 1f305cb5c45d66..f7ee535ac67f6c 100644 --- a/versions/b-/boost-predef.json +++ b/versions/b-/boost-predef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e76add266584a1177e9a0f2c59c43a78d88e578", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "a7efd1a99c14c79b469d86bbf9d39898ffde1858", "version": "1.82.0", diff --git a/versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json index d0a831b2303d58..4890b2b5dc2086 100644 --- a/versions/b-/boost-preprocessor.json +++ b/versions/b-/boost-preprocessor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07609446e5cce5a0d9afed4570e0664708444b54", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "11fa54ebde61dcf9ca2e18a42aa7445b76ce9400", "version": "1.82.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index 4732f484ef6fbd..5f382e92142d46 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0426afce7bf4a50b9928232515951043a59bcd3", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "2c4af3d39b6e980d59ecc1baa8f07f9aac97eca2", "version": "1.82.0", diff --git a/versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json index 3204588cb11d5f..34d0b5472af5c4 100644 --- a/versions/b-/boost-program-options.json +++ b/versions/b-/boost-program-options.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce15d2fa5ea81e6da9f8ec078cfe466f4d4e0339", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "b15733a9444492f8882068981b01f270d301b994", "version": "1.82.0", diff --git a/versions/b-/boost-property-map-parallel.json b/versions/b-/boost-property-map-parallel.json index d54b85e6af7edf..afab71f76f318a 100644 --- a/versions/b-/boost-property-map-parallel.json +++ b/versions/b-/boost-property-map-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "715673e9e1beb9a6dba4422f317f4778b98b1bf2", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "35b35b75e5be38fcdd1d0f2ea49403a3d168bbca", "version": "1.82.0", diff --git a/versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json index 2f6ccd825ac020..d81c03293b440a 100644 --- a/versions/b-/boost-property-map.json +++ b/versions/b-/boost-property-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b4cf346ccedc4c90c63a8676b0115554301a62c", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "2fb0d2bae69811fc5b3aec9cae898cddc6177cbc", "version": "1.82.0", diff --git a/versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json index f4c065a709b41e..cdd2c05cb1dcee 100644 --- a/versions/b-/boost-property-tree.json +++ b/versions/b-/boost-property-tree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "caa9ef5866c4dcf2869fca47fb3a478f74e07f7a", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "ba292d3a56bdcbc9be58eba676f68c604e16e6ea", "version": "1.82.0", diff --git a/versions/b-/boost-proto.json b/versions/b-/boost-proto.json index 2defac69cbe157..9dac8fa4c76790 100644 --- a/versions/b-/boost-proto.json +++ b/versions/b-/boost-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bb3591b035347ce419b85ae321c0e1b6c71084a", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "a88c491de292efd0f32b41b78f69d5da1baf53f7", "version": "1.82.0", diff --git a/versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json index 40eb19ac5cca70..1e9335407c00aa 100644 --- a/versions/b-/boost-ptr-container.json +++ b/versions/b-/boost-ptr-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b926ddc4f1044a202ed6b5a052fab6d6578f051", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "623acfd1039e24498326d202bc3aac4aed87e91c", "version": "1.82.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index c64e30e0049ef2..04baa79c95dec5 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e89ec0e4997ffd54bfbbd891df39df068d84fc7", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "b408c26dbce69d97b4ec2bac833c18284c06979d", "version": "1.82.0", diff --git a/versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json index 2a24a86aa58afe..693f2c2481c443 100644 --- a/versions/b-/boost-qvm.json +++ b/versions/b-/boost-qvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f023cb85fbc266b836aabc8f0b66d55332869d6", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "01f2e32794bd62e7f6409a14bd7c1126ef335d46", "version": "1.82.0", diff --git a/versions/b-/boost-random.json b/versions/b-/boost-random.json index 3e8ebc534e792e..a08fb236c1647a 100644 --- a/versions/b-/boost-random.json +++ b/versions/b-/boost-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "045960cb6d4295d363e1748931ea56fc245f7c09", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "c440ed1d17008e8a77ff3cdcc495af47103f05be", "version": "1.82.0", diff --git a/versions/b-/boost-range.json b/versions/b-/boost-range.json index bbd9f9e20e8243..16534d941f4462 100644 --- a/versions/b-/boost-range.json +++ b/versions/b-/boost-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d5d869d86b0abdd19022ee0b0c5f24192769291", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "1b034bcdf929c6bc7cfd900580907fd1ca6620fd", "version": "1.82.0", diff --git a/versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json index 3ffc84f5cf1bbf..13e96ded9bdd78 100644 --- a/versions/b-/boost-ratio.json +++ b/versions/b-/boost-ratio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fafb812427bea7d49dd318f3e72778149f443ab", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "fb8691f0340e091213aff8763edb106d19d132c4", "version": "1.82.0", diff --git a/versions/b-/boost-rational.json b/versions/b-/boost-rational.json index f12097ebff5e0c..1562fa28f03740 100644 --- a/versions/b-/boost-rational.json +++ b/versions/b-/boost-rational.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55ec23b1953b2e44dc43fda4547cf0b96bfe140f", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "27a8384584574ad32bd6daed2a7454bd0d3c6fcb", "version": "1.82.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index 4f20a9e20b01f5..744764484fa688 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "423f035001a6e046e2f94dc3ac68201a4a3d0307", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "fc3fcb5815c297112283b9fd5eabab3106f6e93e", "version": "1.82.0", diff --git a/versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json index f9d09a77a492e8..f04cf4964a9ca2 100644 --- a/versions/b-/boost-safe-numerics.json +++ b/versions/b-/boost-safe-numerics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ddd605460c8155173f242e5ec867b8baf9d0ec2", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "13e759cd59d56323d9c3079a28502a8d6814c6d3", "version": "1.82.0", diff --git a/versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json index 112f6d11b90b38..335d61fc17c495 100644 --- a/versions/b-/boost-scope-exit.json +++ b/versions/b-/boost-scope-exit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "735ee02b2601c7a8777fbe1d421d8e6933f7c40b", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "8b1854be566e473fe24ae03d88e2312764dd1917", "version": "1.82.0", diff --git a/versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json index 685c621deed97b..d81bb8e293b289 100644 --- a/versions/b-/boost-serialization.json +++ b/versions/b-/boost-serialization.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ebe53455e9721a76ebe14c651a2deafbcb758b8", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "13b68c431b9c906d036a83aa17358f0778de6a97", "version": "1.82.0", diff --git a/versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json index 59449582d05726..9f81d49a4e20ea 100644 --- a/versions/b-/boost-signals2.json +++ b/versions/b-/boost-signals2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41fa1cbba1b311066df31c154e0926fe003039df", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "f6f60c82002c81f4e03209ebffe7f410b926d64d", "version": "1.82.0", diff --git a/versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json index 02df0092a700fe..16854529711c5c 100644 --- a/versions/b-/boost-smart-ptr.json +++ b/versions/b-/boost-smart-ptr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81506ee1238bf93218cef84de86dca96dd0b3682", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "890abd9cae8fc0c9a3a6f9a6b67a4cfab375a775", "version": "1.82.0", diff --git a/versions/b-/boost-sort.json b/versions/b-/boost-sort.json index bec95df3fe5c6c..08127ed8f4b94c 100644 --- a/versions/b-/boost-sort.json +++ b/versions/b-/boost-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71805d53be199c5d3b2566456b9ae7cff9a8a94a", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "5fd7339a68a26cae5e7f10dc5fc7b01a7763e5bb", "version": "1.82.0", diff --git a/versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json index 1943ab562050bd..9fd97b2a616d83 100644 --- a/versions/b-/boost-spirit.json +++ b/versions/b-/boost-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2ebc2bcf72d8ae953ac54163a7c5b43f17396f0", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "292c5391f0b78b7009740961762e199aa33d5a0a", "version": "1.82.0", diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index 4b2145e9d5b86e..835a5c3044ac1a 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9fe043e8398589eaa7c319295a87114acb55538", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "d9ec91eb7e104db3c699004fee94ffecbb09a827", "version": "1.82.0", diff --git a/versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json index c17d8a27e03876..bf596e3e54e628 100644 --- a/versions/b-/boost-statechart.json +++ b/versions/b-/boost-statechart.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d2243b3611cb12d9317e672fb7fbc296e87494c", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "2664cfe208b1eff1257e2de86a72ba359ed3e3f4", "version": "1.82.0", diff --git a/versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json index 7782833845f71f..5924655a7073d5 100644 --- a/versions/b-/boost-static-assert.json +++ b/versions/b-/boost-static-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50eac53fdc886f9de87fc06717a4ae3a939b28e9", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "bb7f6ee1209b0760b458727da129653965e7e98a", "version": "1.82.0", diff --git a/versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json index 3542485a752da8..c99453fa2935b8 100644 --- a/versions/b-/boost-static-string.json +++ b/versions/b-/boost-static-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dba046b1b41f91b5927d8f4198157bc135d6a705", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "b01da85ea910c32e62403ec6e7d7749750e6809b", "version": "1.82.0", diff --git a/versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json index 014ec96a98c019..1f9f92becb9ff9 100644 --- a/versions/b-/boost-stl-interfaces.json +++ b/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c11bab85b94163499bbc4e7931ef1270fb64213d", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "2c8e63f22b9a633855cb9be3712ae8010cf0dda7", "version": "1.82.0", diff --git a/versions/b-/boost-system.json b/versions/b-/boost-system.json index 2d79f47849db59..455084e0563e73 100644 --- a/versions/b-/boost-system.json +++ b/versions/b-/boost-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0090d008796452ba40264bb11437e0122a325e23", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "b1bea82cc5898b04f9f797eb47026b667a03de00", "version": "1.82.0", diff --git a/versions/b-/boost-test.json b/versions/b-/boost-test.json index 9a0e4276aceb0b..bc46cbde8bb76d 100644 --- a/versions/b-/boost-test.json +++ b/versions/b-/boost-test.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e21f61b617327941161649451b4a022747fbc1e", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "b6d22c3109a795ff79ca53f0b07afbe683d83558", "version": "1.82.0", diff --git a/versions/b-/boost-thread.json b/versions/b-/boost-thread.json index 537440cfe0ca4c..e097f186d62ba3 100644 --- a/versions/b-/boost-thread.json +++ b/versions/b-/boost-thread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2f50fecd4338161565a0425c3e9b55fdbe68424", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "183d7fba1820b773404a6ea7351f4da539612367", "version": "1.82.0", diff --git a/versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json index 80240238c85ebf..083145ac7ca738 100644 --- a/versions/b-/boost-throw-exception.json +++ b/versions/b-/boost-throw-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22bf09f8d91024cc1e74b19bb6333baeea262b69", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "3416e3ed72a0b469169cc290cafeabafe2bc4859", "version": "1.82.0", diff --git a/versions/b-/boost-timer.json b/versions/b-/boost-timer.json index 625e3d6c9a4d3c..734d6c4dd38932 100644 --- a/versions/b-/boost-timer.json +++ b/versions/b-/boost-timer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c143993e19cd4999f4199d79190b48058bd13a1a", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "161c4be7bd7c9021a41bd62b3b5d06ded0f1bae4", "version": "1.82.0", diff --git a/versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json index 52b39d64abf136..31c4a246c74be4 100644 --- a/versions/b-/boost-tokenizer.json +++ b/versions/b-/boost-tokenizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05ada2a1cc63fe9b4f5b4e9ac1d6ec63961e281b", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "8d3578a014b8545ce2e4be7e6243c50e3fe2f41b", "version": "1.82.0", diff --git a/versions/b-/boost-tti.json b/versions/b-/boost-tti.json index f48d10495a8168..4a0e7d2a476047 100644 --- a/versions/b-/boost-tti.json +++ b/versions/b-/boost-tti.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06c466d2662d638138c5318e4ad3a165974de862", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "6fbbc2a47d406102ec479ff755beab26984a20be", "version": "1.82.0", diff --git a/versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json index 7809eabe307fc1..06d9fbd3ff82dc 100644 --- a/versions/b-/boost-tuple.json +++ b/versions/b-/boost-tuple.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5a7d3cf0427278418ddc0e91a3858218535c8a9", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "005084a92857215f3e0db64c3a7a1d1d70c91850", "version": "1.82.0", diff --git a/versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json index 09bf7008dabb57..f0f58f79ea8a6d 100644 --- a/versions/b-/boost-type-erasure.json +++ b/versions/b-/boost-type-erasure.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9897b32081b334c6519a7252247d7dd292414e5d", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "8672547278454bfc8a842f788ed797c834ca050a", "version": "1.82.0", diff --git a/versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json index b8f712db463356..f9b1309fcc8194 100644 --- a/versions/b-/boost-type-index.json +++ b/versions/b-/boost-type-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58d41ff7ca046c8997ddd3f6c8ab801291edd9c4", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "af9dcc786a5ca7717b4d2d04471b7ee12288080c", "version": "1.82.0", diff --git a/versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json index aa7aed2c53208e..d6cb5846df7617 100644 --- a/versions/b-/boost-type-traits.json +++ b/versions/b-/boost-type-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6595fdcc50c1d1d5587ade48484a0b074ddb079b", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "16673cfc230fda05b63868f9cbf21d0e0a206b53", "version": "1.82.0", diff --git a/versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json index ade95410ed365a..f15aaf2d576103 100644 --- a/versions/b-/boost-typeof.json +++ b/versions/b-/boost-typeof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec85052de49f1335b474cee0689971b9ad4df92c", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "3a15a938616612d49b404940a26fbf8f518816d8", "version": "1.82.0", diff --git a/versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json index f970011eb8e464..95ee95b2f981f4 100644 --- a/versions/b-/boost-ublas.json +++ b/versions/b-/boost-ublas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a77eac23b724a17117bf6b25d8a40482d805b5f", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "08ca3e3e8708563241aa02fdb7d6c6e406ae30e6", "version": "1.82.0", diff --git a/versions/b-/boost-uninstall.json b/versions/b-/boost-uninstall.json index 9a2ee8c15fe0d5..adc4abd69ad183 100644 --- a/versions/b-/boost-uninstall.json +++ b/versions/b-/boost-uninstall.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1dfbff4a218e77e371ebc397f0573859136c7c92", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "dcca7487581acb01e55bddd3ec306ff543c24ce6", "version": "1.82.0", diff --git a/versions/b-/boost-units.json b/versions/b-/boost-units.json index f21a5f56208334..b8c840195e553d 100644 --- a/versions/b-/boost-units.json +++ b/versions/b-/boost-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9dffd7cd1fdc999f543b7d140f119f962ae076c", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "5a76707af8205f16c15f69fa930aa39e7763472d", "version": "1.82.0", diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json index 3c9742d6e5d32b..4b81cce8962cee 100644 --- a/versions/b-/boost-unordered.json +++ b/versions/b-/boost-unordered.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d78bed13cd960d7723ac5b0c82d2223c321ee0a9", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "53a764549e3664798aad8a1cb9bc3e74669c7f6a", "version": "1.82.0", diff --git a/versions/b-/boost-url.json b/versions/b-/boost-url.json index 35bdc08d289aff..507650ed1d6248 100644 --- a/versions/b-/boost-url.json +++ b/versions/b-/boost-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cfc398b72ab925f876eb071d9577cbf9a84f33d", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "0bb3a49bd4739d46d1b09bf657a172bdd91deca9", "version": "1.82.0", diff --git a/versions/b-/boost-utility.json b/versions/b-/boost-utility.json index 0c46df30ec67d2..6a7587ee52e765 100644 --- a/versions/b-/boost-utility.json +++ b/versions/b-/boost-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "175e91f86d24ff49330e7f5f95db441ceb85886e", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "353c3edd45cc926548492197f73164d5831728f0", "version": "1.82.0", diff --git a/versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json index e66a63c31fb57d..8bed8207da6693 100644 --- a/versions/b-/boost-uuid.json +++ b/versions/b-/boost-uuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f87e5dc08c5466a56e32d055878d39dbdbdc18d4", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "d98133d8840363483b9f34baeec1b32696bbbd8b", "version": "1.82.0", diff --git a/versions/b-/boost-variant.json b/versions/b-/boost-variant.json index 48647bc5823987..6d5f9c66b3af9c 100644 --- a/versions/b-/boost-variant.json +++ b/versions/b-/boost-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60ca10585ea590b82692a0f715cfcc596d4799db", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "7951625567bf2413827f614a1ee917035a5e59ec", "version": "1.82.0", diff --git a/versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json index ef1540d8c7e5ce..f74801611f0340 100644 --- a/versions/b-/boost-variant2.json +++ b/versions/b-/boost-variant2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a249f8469b4c3ccb2aee3ece628d69a71d54b35f", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "dd3e6bcf37179efe2425ffb104be151a9f1133f8", "version": "1.82.0", diff --git a/versions/b-/boost-vcpkg-helpers.json b/versions/b-/boost-vcpkg-helpers.json index 56d602d959e6ec..91f0086e1909d5 100644 --- a/versions/b-/boost-vcpkg-helpers.json +++ b/versions/b-/boost-vcpkg-helpers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18a50fedd4344db5ce1f82546be1889215381f78", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "9a0f2ba2f59ce1040abe835b1e5adcd0a6dbc8af", "version": "1.82.0", diff --git a/versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json index 5fe278ed68e133..aa60242971a115 100644 --- a/versions/b-/boost-vmd.json +++ b/versions/b-/boost-vmd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eaa0b491a87169b97213b923582836a9d3cd88ed", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "01fa69ff11a1e1e086b621a92ca334d99483a040", "version": "1.82.0", diff --git a/versions/b-/boost-wave.json b/versions/b-/boost-wave.json index 3a4149ca4a054f..79ea1dc84e5c46 100644 --- a/versions/b-/boost-wave.json +++ b/versions/b-/boost-wave.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "298ef29ed61665419dfb1f05e4823f63086afb14", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "c04f5117190e977f1a7a7067ce483ae581dcf111", "version": "1.82.0", diff --git a/versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json index 280599eb3cc12c..d01537e7982555 100644 --- a/versions/b-/boost-winapi.json +++ b/versions/b-/boost-winapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfd68f543033ed6b8cee9235ef287b7fd4f8709a", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "4fb732247dac823b0563bd50e4fc518c25eb9334", "version": "1.82.0", diff --git a/versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json index fd8c35a9266486..322e58715abf94 100644 --- a/versions/b-/boost-xpressive.json +++ b/versions/b-/boost-xpressive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55de0dfb037123cd093c56acf61b22948e98295b", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "55106712d15cf7092591e0e6a36681274e8f0401", "version": "1.82.0", diff --git a/versions/b-/boost-yap.json b/versions/b-/boost-yap.json index 60d089fd8df93e..341860a078f4cf 100644 --- a/versions/b-/boost-yap.json +++ b/versions/b-/boost-yap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a0f05ec51176c56f01c9edd8888358ae74eabec", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "bdad26185e13b995615f4979050d3fd47db4fa32", "version": "1.82.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index e0ace2e8d1ca06..6a0fd20fddb76f 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "315139e076ff5ea5672a158688934b04d2b7a815", + "version": "1.83.0", + "port-version": 1 + }, + { + "git-tree": "d8d71d69890583a886663db2d2ac45ddf3fd9835", + "version": "1.83.0", + "port-version": 0 + }, { "git-tree": "ef99d3992511da66e8f354441fb291ed0cac08f9", "version": "1.82.0", diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json index 8f279f02c2275b..29f4edb13c3045 100644 --- a/versions/b-/boringssl.json +++ b/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f833bab8ecfc28f45a9034291e79f8cd126ad01", + "version-date": "2023-09-25", + "port-version": 0 + }, { "git-tree": "01164d48fa5667c3e6885d010cb110b84b6f2e78", "version-date": "2021-06-23", diff --git a/versions/b-/brotli.json b/versions/b-/brotli.json index cc5a71320e6c2f..0a3da5eb0ae9e8 100644 --- a/versions/b-/brotli.json +++ b/versions/b-/brotli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4156ea7744047f9ace2769b857d97d11154de28f", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "32ea6c4b0d18fa3172ad52147599983acc71d748", "version": "1.0.9", diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json index e7780cc9707e82..217497cc684074 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2cedfb3411d57def85e6337b08570e518c2f992", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "8c3039a58b23207cc87a0a938dbd943ef521b235", "version": "1.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8e024dcd79e63a..b7d4d91c655cc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5,8 +5,8 @@ "port-version": 4 }, "7zip": { - "baseline": "22.01", - "port-version": 1 + "baseline": "23.01", + "port-version": 0 }, "ableton": { "baseline": "3.0.6", @@ -14,10 +14,10 @@ }, "ableton-link": { "baseline": "3.0.6", - "port-version": 0 + "port-version": 1 }, "abseil": { - "baseline": "20230802.0", + "baseline": "20230802.1", "port-version": 0 }, "absent": { @@ -26,7 +26,7 @@ }, "ace": { "baseline": "7.1.1", - "port-version": 1 + "port-version": 2 }, "acl": { "baseline": "2.3.1", @@ -37,11 +37,11 @@ "port-version": 15 }, "ada-url": { - "baseline": "2.6.0", + "baseline": "2.6.8", "port-version": 0 }, "ade": { - "baseline": "0.1.2", + "baseline": "0.1.2c", "port-version": 0 }, "adios2": { @@ -73,7 +73,7 @@ "port-version": 7 }, "alembic": { - "baseline": "1.8.5", + "baseline": "1.8.6", "port-version": 0 }, "aliyun-oss-c-sdk": { @@ -93,8 +93,8 @@ "port-version": 1 }, "alsa": { - "baseline": "1.2.8", - "port-version": 1 + "baseline": "1.2.10", + "port-version": 0 }, "amd-adl-sdk": { "baseline": "17.1", @@ -116,6 +116,10 @@ "baseline": "4.3.23", "port-version": 0 }, + "anari": { + "baseline": "0.7.0", + "port-version": 1 + }, "anax": { "baseline": "2.1.0", "port-version": 8 @@ -133,7 +137,7 @@ "port-version": 0 }, "antlr4": { - "baseline": "4.13.0", + "baseline": "4.13.1", "port-version": 0 }, "any-lite": { @@ -157,16 +161,16 @@ "port-version": 0 }, "apr": { - "baseline": "1.7.2", - "port-version": 1 + "baseline": "1.7.4", + "port-version": 0 }, "apr-util": { - "baseline": "1.6.1", - "port-version": 10 + "baseline": "1.6.3", + "port-version": 0 }, "apsi": { "baseline": "0.9.0", - "port-version": 1 + "port-version": 2 }, "arb": { "baseline": "2.21.1", @@ -181,8 +185,8 @@ "port-version": 0 }, "argagg": { - "baseline": "0.4.6", - "port-version": 3 + "baseline": "0.4.7", + "port-version": 0 }, "argh": { "baseline": "1.3.2", @@ -205,8 +209,8 @@ "port-version": 10 }, "argtable3": { - "baseline": "3.2.1", - "port-version": 3 + "baseline": "3.2.2.f25c624", + "port-version": 0 }, "argumentum": { "baseline": "0.3.2", @@ -229,8 +233,8 @@ "port-version": 5 }, "arrow": { - "baseline": "12.0.1", - "port-version": 0 + "baseline": "13.0.0", + "port-version": 1 }, "arsenalgear": { "baseline": "2.1.0", @@ -241,8 +245,8 @@ "port-version": 0 }, "asio": { - "baseline": "1.28.0", - "port-version": 1 + "baseline": "1.28.1", + "port-version": 0 }, "asio-grpc": { "baseline": "2.6.0", @@ -261,11 +265,11 @@ "port-version": 1 }, "assimp": { - "baseline": "5.2.5", + "baseline": "5.3.1", "port-version": 0 }, "async-mqtt": { - "baseline": "1.0.9", + "baseline": "2.0.0", "port-version": 0 }, "asynch": { @@ -286,7 +290,7 @@ }, "atk": { "baseline": "2.38.0", - "port-version": 7 + "port-version": 8 }, "atkmm": { "baseline": "2.36.1", @@ -322,7 +326,7 @@ }, "autodock-vina": { "baseline": "1.2.5", - "port-version": 0 + "port-version": 1 }, "avcpp": { "baseline": "2.1.0", @@ -337,19 +341,19 @@ "port-version": 3 }, "avro-cpp": { - "baseline": "2022-11-07", - "port-version": 1 + "baseline": "1.11.3", + "port-version": 0 }, "aws-c-auth": { - "baseline": "0.7.0", + "baseline": "0.7.4", "port-version": 0 }, "aws-c-cal": { - "baseline": "0.6.0", - "port-version": 0 + "baseline": "0.6.2", + "port-version": 1 }, "aws-c-common": { - "baseline": "0.8.23", + "baseline": "0.9.4", "port-version": 0 }, "aws-c-compression": { @@ -357,35 +361,35 @@ "port-version": 0 }, "aws-c-event-stream": { - "baseline": "0.3.1", + "baseline": "0.3.2", "port-version": 0 }, "aws-c-http": { - "baseline": "0.7.10", + "baseline": "0.7.13", "port-version": 0 }, "aws-c-io": { - "baseline": "0.13.27", + "baseline": "0.13.32", "port-version": 0 }, "aws-c-mqtt": { - "baseline": "0.8.14", + "baseline": "0.9.6", "port-version": 0 }, "aws-c-s3": { - "baseline": "0.3.12", + "baseline": "0.3.17", "port-version": 0 }, "aws-c-sdkutils": { - "baseline": "0.1.11", + "baseline": "0.1.12", "port-version": 0 }, "aws-checksums": { - "baseline": "0.1.16", + "baseline": "0.1.17", "port-version": 0 }, "aws-crt-cpp": { - "baseline": "0.20.3", + "baseline": "0.23.1", "port-version": 0 }, "aws-lambda-cpp": { @@ -393,11 +397,11 @@ "port-version": 1 }, "aws-sdk-cpp": { - "baseline": "1.11.132", + "baseline": "1.11.169", "port-version": 0 }, "azmq": { - "baseline": "1.0.3", + "baseline": "2023-03-23", "port-version": 0 }, "azure-c-shared-utility": { @@ -405,20 +409,20 @@ "port-version": 0 }, "azure-core-amqp-cpp": { - "baseline": "1.0.0-beta.2", + "baseline": "1.0.0-beta.3", "port-version": 1 }, "azure-core-cpp": { "baseline": "1.10.2", - "port-version": 1 + "port-version": 5 }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.4", - "port-version": 0 + "port-version": 1 }, "azure-identity-cpp": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "azure-iot-sdk-c": { "baseline": "2023-08-07", @@ -433,52 +437,52 @@ "port-version": 1 }, "azure-messaging-eventhubs-cpp": { - "baseline": "1.0.0-beta.1", - "port-version": 0 + "baseline": "1.0.0-beta.2", + "port-version": 1 }, "azure-security-attestation-cpp": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "azure-security-keyvault-administration-cpp": { "baseline": "4.0.0-beta.3", - "port-version": 0 + "port-version": 1 }, "azure-security-keyvault-certificates-cpp": { "baseline": "4.2.0", - "port-version": 0 + "port-version": 1 }, "azure-security-keyvault-keys-cpp": { "baseline": "4.4.0", - "port-version": 0 + "port-version": 1 }, "azure-security-keyvault-secrets-cpp": { "baseline": "4.2.0", - "port-version": 0 + "port-version": 1 }, "azure-storage-blobs-cpp": { - "baseline": "12.8.0", - "port-version": 0 + "baseline": "12.9.0", + "port-version": 1 }, "azure-storage-common-cpp": { - "baseline": "12.3.3", - "port-version": 0 + "baseline": "12.4.0", + "port-version": 1 }, "azure-storage-cpp": { "baseline": "7.5.0", "port-version": 6 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.7.0", - "port-version": 0 + "baseline": "12.8.0", + "port-version": 1 }, "azure-storage-files-shares-cpp": { - "baseline": "12.6.1", - "port-version": 0 + "baseline": "12.7.0", + "port-version": 1 }, "azure-storage-queues-cpp": { - "baseline": "12.0.0", - "port-version": 0 + "baseline": "12.1.0", + "port-version": 1 }, "azure-uamqp-c": { "baseline": "2023-08-07", @@ -501,8 +505,8 @@ "port-version": 1 }, "baresip-libre": { - "baseline": "3.2.0", - "port-version": 2 + "baseline": "3.3.0", + "port-version": 0 }, "basisu": { "baseline": "1.11", @@ -517,7 +521,7 @@ "port-version": 0 }, "bde": { - "baseline": "3.117.0.0", + "baseline": "3.123.0.0", "port-version": 0 }, "bdwgc": { @@ -529,16 +533,16 @@ "port-version": 2 }, "behaviortree-cpp": { - "baseline": "4.1.1", + "baseline": "4.3.7", "port-version": 0 }, "benchmark": { - "baseline": "1.8.2", + "baseline": "1.8.3", "port-version": 0 }, "bento4": { - "baseline": "1.6.0-639", - "port-version": 1 + "baseline": "1.6.0-640", + "port-version": 0 }, "berkeleydb": { "baseline": "4.8.30", @@ -552,6 +556,10 @@ "baseline": "1.1.5", "port-version": 0 }, + "bext-sml2": { + "baseline": "2023-09-20", + "port-version": 0 + }, "bext-ut": { "baseline": "1.1.9", "port-version": 2 @@ -581,11 +589,11 @@ "port-version": 3 }, "bitmagic": { - "baseline": "7.12.3", + "baseline": "7.13.4", "port-version": 0 }, "bitserializer": { - "baseline": "0.50", + "baseline": "0.65", "port-version": 0 }, "bitserializer-cpprestjson": { @@ -609,7 +617,7 @@ "port-version": 0 }, "blake3": { - "baseline": "1.4.0", + "baseline": "1.5.0", "port-version": 0 }, "blas": { @@ -622,7 +630,7 @@ }, "blend2d": { "baseline": "2023-06-16", - "port-version": 0 + "port-version": 1 }, "blingfire": { "baseline": "0.1.8.1", @@ -633,7 +641,7 @@ "port-version": 5 }, "blosc": { - "baseline": "1.21.3", + "baseline": "1.21.5", "port-version": 0 }, "blpapi": { @@ -641,8 +649,8 @@ "port-version": 0 }, "boinc": { - "baseline": "7.22.2", - "port-version": 2 + "baseline": "7.24.1", + "port-version": 0 }, "bond": { "baseline": "10.0.0", @@ -653,620 +661,620 @@ "port-version": 0 }, "boost": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 1 }, "boost-accumulators": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-algorithm": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-align": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-any": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-array": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-asio": { - "baseline": "1.82.0", - "port-version": 3 + "baseline": "1.83.0", + "port-version": 0 }, "boost-assert": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-assign": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-atomic": { - "baseline": "1.82.0", - "port-version": 3 + "baseline": "1.83.0", + "port-version": 0 }, "boost-beast": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-bimap": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-bind": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-build": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-callable-traits": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-chrono": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-circular-buffer": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 + }, + "boost-compat": { + "baseline": "1.83.0", + "port-version": 0 }, "boost-compatibility": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-compute": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-concept-check": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-config": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-container": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-container-hash": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-context": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-contract": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-conversion": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-convert": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-core": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-coroutine": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-coroutine2": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-crc": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-date-time": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-describe": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-detail": { - "baseline": "1.82.0", - "port-version": 2 - }, - "boost-di": { - "baseline": "1.2.0", + "baseline": "1.83.0", "port-version": 0 }, "boost-dll": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-dynamic-bitset": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-endian": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-exception": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-fiber": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 1 }, "boost-filesystem": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-flyweight": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-foreach": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-format": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-function": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-function-types": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-functional": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-fusion": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-geometry": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-gil": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-graph": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-graph-parallel": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-hana": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-heap": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-histogram": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-hof": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-icl": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-integer": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-interprocess": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-interval": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-intrusive": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-io": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-iostreams": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-iterator": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-json": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-lambda": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-lambda2": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-leaf": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-lexical-cast": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-local-function": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-locale": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-lockfree": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-log": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-logic": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-math": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-metaparse": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-modular-build-helper": { - "baseline": "1.82.0", - "port-version": 4 + "baseline": "1.83.0", + "port-version": 1 }, "boost-move": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-mp11": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-mpi": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-mpl": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-msm": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-multi-array": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-multi-index": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-multiprecision": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-mysql": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-nowide": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-numeric-conversion": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-odeint": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-optional": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-outcome": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-parameter": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-parameter-python": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-pfr": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-phoenix": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-poly-collection": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-polygon": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-pool": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-predef": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-preprocessor": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-process": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-program-options": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-property-map": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-property-map-parallel": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-property-tree": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-proto": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-ptr-container": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-python": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-qvm": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-random": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-range": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-ratio": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-rational": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-regex": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-safe-numerics": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-scope-exit": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-serialization": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-signals2": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-smart-ptr": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-sort": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-spirit": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-stacktrace": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-statechart": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-static-assert": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-static-string": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-stl-interfaces": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-system": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-test": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-thread": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-throw-exception": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-timer": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-tokenizer": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-tti": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-tuple": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-type-erasure": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-type-index": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-type-traits": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-typeof": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-ublas": { - "baseline": "1.82.0", - "port-version": 3 + "baseline": "1.83.0", + "port-version": 0 }, "boost-uninstall": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-units": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-unordered": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-url": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-utility": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-uuid": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-variant": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-variant2": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-vcpkg-helpers": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-vmd": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-wave": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-winapi": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-xpressive": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boost-yap": { - "baseline": "1.82.0", - "port-version": 2 + "baseline": "1.83.0", + "port-version": 0 }, "boringssl": { - "baseline": "2021-06-23", - "port-version": 4 + "baseline": "2023-09-25", + "port-version": 0 }, "botan": { "baseline": "2.19.3", @@ -1288,12 +1296,12 @@ "baseline": "1.3.0", "port-version": 3 }, - "brotli": { - "baseline": "1.0.9", - "port-version": 5 + "brotli": { + "baseline": "1.1.0", + "port-version": 0 }, "brpc": { - "baseline": "1.5.0", + "baseline": "1.6.0", "port-version": 0 }, "brunocodutra-metal": { @@ -1382,11 +1390,11 @@ }, "cairo": { "baseline": "1.17.8", - "port-version": 3 + "port-version": 4 }, "cairomm": { "baseline": "1.17.1", - "port-version": 0 + "port-version": 1 }, "calceph": { "baseline": "3.5.2", @@ -1397,12 +1405,12 @@ "port-version": 0 }, "capnproto": { - "baseline": "0.10.3", + "baseline": "1.0.1", "port-version": 0 }, "capstone": { - "baseline": "5.0.0-rc2", - "port-version": 2 + "baseline": "5.0.1", + "port-version": 0 }, "cargs": { "baseline": "1.0.3", @@ -1442,18 +1450,18 @@ }, "cctag": { "baseline": "1.0.2", - "port-version": 4 + "port-version": 5 }, "cctz": { "baseline": "2.3", - "port-version": 5 + "port-version": 6 }, "cdt": { "baseline": "1.3.0", "port-version": 0 }, "celero": { - "baseline": "2.8.5", + "baseline": "2.9.0", "port-version": 0 }, "cello": { @@ -1470,7 +1478,7 @@ }, "cfitsio": { "baseline": "3.49", - "port-version": 3 + "port-version": 4 }, "cgal": { "baseline": "5.6", @@ -1480,12 +1488,8 @@ "baseline": "3.2.19", "port-version": 7 }, - "cgl": { - "baseline": "0.60.3", - "port-version": 0 - }, "cglm": { - "baseline": "0.8.8", + "baseline": "0.9.1", "port-version": 0 }, "cgltf": { @@ -1493,8 +1497,8 @@ "port-version": 0 }, "cgns": { - "baseline": "4.3.0", - "port-version": 4 + "baseline": "4.4.0", + "port-version": 0 }, "chaiscript": { "baseline": "6.1.0", @@ -1502,7 +1506,7 @@ }, "chakracore": { "baseline": "2022-11-09", - "port-version": 3 + "port-version": 4 }, "charls": { "baseline": "2.4.2", @@ -1525,8 +1529,8 @@ "port-version": 7 }, "chromaprint": { - "baseline": "1.5.0", - "port-version": 3 + "baseline": "1.5.1", + "port-version": 0 }, "chromium-base": { "baseline": "86.0.4199.1", @@ -1545,20 +1549,20 @@ "port-version": 0 }, "cista": { - "baseline": "0.11", + "baseline": "0.14", "port-version": 0 }, "cityhash": { "baseline": "2013-01-08", - "port-version": 2 + "port-version": 3 }, "civetweb": { - "baseline": "1.15", - "port-version": 2 + "baseline": "1.16", + "port-version": 0 }, "cjson": { - "baseline": "1.7.15", - "port-version": 2 + "baseline": "1.7.16", + "port-version": 0 }, "clamav": { "baseline": "0.103.0", @@ -1577,8 +1581,8 @@ "port-version": 7 }, "clblast": { - "baseline": "1.5.2", - "port-version": 3 + "baseline": "1.6.1", + "port-version": 0 }, "clfft": { "baseline": "2.12.2", @@ -1606,16 +1610,12 @@ }, "clipper2": { "baseline": "1.2.2", - "port-version": 0 + "port-version": 1 }, "clockutils": { "baseline": "1.1.1", "port-version": 1 }, - "clp": { - "baseline": "1.17.6", - "port-version": 1 - }, "clrng": { "baseline": "2020-12-01", "port-version": 3 @@ -1629,7 +1629,7 @@ "port-version": 0 }, "cmark": { - "baseline": "0.30.1", + "baseline": "0.30.3", "port-version": 0 }, "cmcstl2": { @@ -1745,7 +1745,7 @@ "port-version": 3 }, "continuable": { - "baseline": "4.2.0", + "baseline": "4.2.2", "port-version": 0 }, "convectionkernels": { @@ -1762,7 +1762,7 @@ }, "corrade": { "baseline": "2020.06", - "port-version": 5 + "port-version": 6 }, "cpp-async": { "baseline": "1.0.1", @@ -1773,7 +1773,7 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.13.3", + "baseline": "0.14.0", "port-version": 0 }, "cpp-ipc": { @@ -1786,10 +1786,10 @@ }, "cpp-netlib": { "baseline": "0.13.0", - "port-version": 8 + "port-version": 9 }, "cpp-peglib": { - "baseline": "1.3.10", + "baseline": "1.8.5", "port-version": 0 }, "cpp-redis": { @@ -1837,15 +1837,15 @@ "port-version": 0 }, "cppmicroservices": { - "baseline": "3.6.0", - "port-version": 1 + "baseline": "3.7.6", + "port-version": 0 }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 3 + "port-version": 4 }, "cppslippi": { - "baseline": "1.0.3.14", + "baseline": "1.1.3.14", "port-version": 0 }, "cpptoml": { @@ -1869,15 +1869,15 @@ "port-version": 1 }, "cppzmq": { - "baseline": "4.9.0", - "port-version": 1 + "baseline": "4.10.0", + "port-version": 0 }, "cpr": { "baseline": "1.10.2+3", "port-version": 0 }, "cpu-features": { - "baseline": "0.7.0", + "baseline": "0.9.0", "port-version": 0 }, "cpuid": { @@ -1886,7 +1886,7 @@ }, "cpuinfo": { "baseline": "2022-07-19", - "port-version": 2 + "port-version": 3 }, "cr": { "baseline": "2020-04-26", @@ -1953,7 +1953,7 @@ "port-version": 2 }, "ctre": { - "baseline": "3.7.2", + "baseline": "3.8", "port-version": 0 }, "cub": { @@ -1961,7 +1961,7 @@ "port-version": 0 }, "cubeb": { - "baseline": "2022-07-22", + "baseline": "2023-09-26", "port-version": 0 }, "cuda": { @@ -1977,7 +1977,7 @@ "port-version": 8 }, "curl": { - "baseline": "8.2.1", + "baseline": "8.3.0", "port-version": 0 }, "curlpp": { @@ -1993,7 +1993,7 @@ "port-version": 2 }, "cwalk": { - "baseline": "1.2.6", + "baseline": "1.2.7", "port-version": 0 }, "cxxgraph": { @@ -2014,11 +2014,11 @@ }, "czmq": { "baseline": "4.2.1", - "port-version": 2 + "port-version": 3 }, "d3d12-memory-allocator": { "baseline": "2021-05-05", - "port-version": 0 + "port-version": 1 }, "d3dx12": { "baseline": "may2021", @@ -2042,18 +2042,18 @@ }, "date": { "baseline": "3.0.1", - "port-version": 4 + "port-version": 5 }, "dav1d": { "baseline": "1.2.1", "port-version": 0 }, "daw-header-libraries": { - "baseline": "2.93.1", + "baseline": "2.96.1", "port-version": 0 }, "daw-json-link": { - "baseline": "3.19.0", + "baseline": "3.20.1", "port-version": 0 }, "daw-utf-range": { @@ -2061,11 +2061,11 @@ "port-version": 0 }, "daxa": { - "baseline": "1.0.0", + "baseline": "2.0.0", "port-version": 0 }, "dbg-macro": { - "baseline": "0.5.0", + "baseline": "0.5.1", "port-version": 0 }, "dbghelp": { @@ -2081,7 +2081,7 @@ "port-version": 3 }, "dbus": { - "baseline": "1.15.2", + "baseline": "1.15.8", "port-version": 0 }, "dcmtk": { @@ -2106,15 +2106,15 @@ }, "devil": { "baseline": "1.8.0", - "port-version": 10 + "port-version": 11 }, "dimcli": { "baseline": "7.1.0", "port-version": 0 }, "directx-dxc": { - "baseline": "2023-03-01", - "port-version": 2 + "baseline": "2023-08-14", + "port-version": 0 }, "directx-headers": { "baseline": "1.610.2", @@ -2133,16 +2133,16 @@ "port-version": 7 }, "directxtex": { - "baseline": "2023-06-13", - "port-version": 1 + "baseline": "2023-09-01", + "port-version": 0 }, "directxtk": { - "baseline": "2023-06-13", - "port-version": 0 + "baseline": "2023-09-01", + "port-version": 1 }, "directxtk12": { - "baseline": "2023-06-13", - "port-version": 0 + "baseline": "2023-09-01", + "port-version": 1 }, "dirent": { "baseline": "1.23.2", @@ -2157,12 +2157,12 @@ "port-version": 3 }, "discordcoreapi": { - "baseline": "1.70", + "baseline": "2.0", "port-version": 0 }, "discount": { - "baseline": "2.2.6", - "port-version": 3 + "baseline": "3.0.0a", + "port-version": 0 }, "discreture": { "baseline": "2020-01-29", @@ -2173,8 +2173,8 @@ "port-version": 0 }, "dlfcn-win32": { - "baseline": "1.3.1", - "port-version": 1 + "baseline": "1.4.1", + "port-version": 0 }, "dlib": { "baseline": "19.24", @@ -2193,8 +2193,8 @@ "port-version": 0 }, "double-conversion": { - "baseline": "3.2.1", - "port-version": 1 + "baseline": "3.3.0", + "port-version": 0 }, "dp-thread-pool": { "baseline": "0.6.2", @@ -2205,7 +2205,7 @@ "port-version": 1 }, "dpp": { - "baseline": "10.0.24", + "baseline": "10.0.26", "port-version": 0 }, "draco": { @@ -2213,12 +2213,12 @@ "port-version": 0 }, "drlibs": { - "baseline": "2022-09-26", + "baseline": "2023-08-16", "port-version": 0 }, "drogon": { - "baseline": "1.8.4", - "port-version": 4 + "baseline": "1.8.7", + "port-version": 0 }, "dstorage": { "baseline": "1.2.0", @@ -2236,17 +2236,21 @@ "baseline": "2019-04-28", "port-version": 5 }, + "dukglue": { + "baseline": "2022-11-08", + "port-version": 0 + }, "duktape": { - "baseline": "2.5.0", - "port-version": 4 + "baseline": "2.7.0", + "port-version": 0 }, "dumb": { "baseline": "2.0.3", "port-version": 0 }, "dv-processing": { - "baseline": "1.7.8", - "port-version": 1 + "baseline": "1.7.9", + "port-version": 0 }, "dx": { "baseline": "1.0.1", @@ -2269,8 +2273,8 @@ "port-version": 0 }, "eastl": { - "baseline": "3.18.00", - "port-version": 3 + "baseline": "3.21.12", + "port-version": 0 }, "easycl": { "baseline": "0.3", @@ -2285,8 +2289,8 @@ "port-version": 7 }, "easyloggingpp": { - "baseline": "9.97.0", - "port-version": 3 + "baseline": "9.97.1", + "port-version": 0 }, "eathread": { "baseline": "1.32.09", @@ -2296,13 +2300,17 @@ "baseline": "1.4.4", "port-version": 1 }, + "ecal": { + "baseline": "5.12.0", + "port-version": 0 + }, "ecm": { "baseline": "5.98.0", "port-version": 0 }, "ecos": { - "baseline": "2.0.8", - "port-version": 3 + "baseline": "2.0.10", + "port-version": 0 }, "ecsutil": { "baseline": "1.0.7.15", @@ -2321,7 +2329,7 @@ "port-version": 3 }, "effolkronium-random": { - "baseline": "1.4.1", + "baseline": "1.5.0", "port-version": 0 }, "efsw": { @@ -2345,7 +2353,7 @@ "port-version": 0 }, "elfio": { - "baseline": "3.11", + "baseline": "3.12", "port-version": 0 }, "elfutils": { @@ -2361,7 +2369,7 @@ "port-version": 2 }, "ensmallen": { - "baseline": "2.19.0", + "baseline": "2.19.1", "port-version": 0 }, "entityx": { @@ -2389,7 +2397,7 @@ "port-version": 0 }, "etl": { - "baseline": "20.35.4", + "baseline": "20.38.0", "port-version": 0 }, "eve": { @@ -2397,7 +2405,7 @@ "port-version": 0 }, "eventpp": { - "baseline": "0.1.2", + "baseline": "0.1.3", "port-version": 0 }, "evpp": { @@ -2405,8 +2413,8 @@ "port-version": 7 }, "exiv2": { - "baseline": "0.27.6", - "port-version": 3 + "baseline": "0.28.0", + "port-version": 1 }, "expat": { "baseline": "2.5.0", @@ -2441,7 +2449,11 @@ "port-version": 0 }, "fakeit": { - "baseline": "2.3.0", + "baseline": "2.4.0", + "port-version": 0 + }, + "fameta-counter": { + "baseline": "2021-02-13", "port-version": 0 }, "fann": { @@ -2450,18 +2462,18 @@ }, "farmhash": { "baseline": "1.1", - "port-version": 5 + "port-version": 6 }, "fast-cpp-csv-parser": { "baseline": "2021-01-03", "port-version": 2 }, "fast-float": { - "baseline": "4.0.0", + "baseline": "5.2.0", "port-version": 0 }, "fastcdr": { - "baseline": "1.0.26", + "baseline": "1.1.0", "port-version": 0 }, "fastcgi": { @@ -2490,7 +2502,7 @@ }, "fastrtps": { "baseline": "2.7.0", - "port-version": 2 + "port-version": 3 }, "fawdlstty-libfv": { "baseline": "0.0.8", @@ -2501,7 +2513,7 @@ "port-version": 0 }, "fbthrift": { - "baseline": "2023.07.03.00", + "baseline": "2023.10.02.00", "port-version": 0 }, "fcl": { @@ -2517,12 +2529,12 @@ "port-version": 7 }, "ffmpeg": { - "baseline": "5.1.2", - "port-version": 7 + "baseline": "6.0", + "port-version": 0 }, "ffnvcodec": { - "baseline": "11.1.5.0", - "port-version": 1 + "baseline": "11.1.5.2", + "port-version": 0 }, "fftw3": { "baseline": "3.3.10", @@ -2545,7 +2557,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2023.07.03.00", + "baseline": "2023.10.02.00", "port-version": 0 }, "flann": { @@ -2585,12 +2597,12 @@ "port-version": 0 }, "flecs": { - "baseline": "3.2.4", + "baseline": "3.2.7", "port-version": 0 }, "flint": { - "baseline": "2.8.0", - "port-version": 2 + "baseline": "2.9.0", + "port-version": 0 }, "fltk": { "baseline": "1.3.8", @@ -2601,7 +2613,11 @@ "port-version": 0 }, "fluidsynth": { - "baseline": "2.3.3", + "baseline": "2.3.4", + "port-version": 0 + }, + "flux": { + "baseline": "2023-08-25", "port-version": 0 }, "fmem": { @@ -2617,11 +2633,11 @@ "port-version": 2 }, "fmt": { - "baseline": "10.0.0", + "baseline": "10.1.1", "port-version": 0 }, "folly": { - "baseline": "2023.07.03.00", + "baseline": "2023.10.02.00", "port-version": 0 }, "font-chef": { @@ -2629,8 +2645,8 @@ "port-version": 0 }, "font-util": { - "baseline": "1.3.2", - "port-version": 1 + "baseline": "1.4.1", + "port-version": 0 }, "fontconfig": { "baseline": "2.14.2", @@ -2642,11 +2658,7 @@ }, "foonathan-memory": { "baseline": "0.7.3", - "port-version": 0 - }, - "forest": { - "baseline": "12.1.0", - "port-version": 0 + "port-version": 1 }, "forge": { "baseline": "1.0.8", @@ -2661,7 +2673,7 @@ "port-version": 2 }, "fplus": { - "baseline": "0.2.18-p0", + "baseline": "0.2.20-p0", "port-version": 0 }, "freealut": { @@ -2681,7 +2693,7 @@ "port-version": 7 }, "freerdp": { - "baseline": "2.10.0", + "baseline": "2.11.2", "port-version": 0 }, "freetds": { @@ -2690,15 +2702,15 @@ }, "freetype": { "baseline": "2.12.1", - "port-version": 3 + "port-version": 4 }, "freetype-gl": { "baseline": "2022-01-17", "port-version": 2 }, "freexl": { - "baseline": "1.0.6", - "port-version": 2 + "baseline": "2.0.0", + "port-version": 0 }, "fribidi": { "baseline": "1.0.12", @@ -2709,11 +2721,11 @@ "port-version": 0 }, "frugally-deep": { - "baseline": "0.15.19-p0", + "baseline": "0.15.24", "port-version": 0 }, "fruit": { - "baseline": "3.7.0", + "baseline": "3.7.1", "port-version": 0 }, "ftgl": { @@ -2721,16 +2733,16 @@ "port-version": 1 }, "ftxui": { - "baseline": "4.1.1", + "baseline": "5.0.0", "port-version": 0 }, "function2": { - "baseline": "4.2.2", + "baseline": "4.2.3", "port-version": 0 }, "functions-framework-cpp": { - "baseline": "1.1.0", - "port-version": 4 + "baseline": "1.2.0", + "port-version": 0 }, "fuzzylite": { "baseline": "6.0", @@ -2773,20 +2785,20 @@ "port-version": 4 }, "gaussianlib": { - "baseline": "2019-08-04", - "port-version": 2 + "baseline": "2023-02-17", + "port-version": 0 }, "gazebo": { "baseline": "2022-01-20", - "port-version": 4 + "port-version": 5 }, "gcem": { - "baseline": "1.16.0", + "baseline": "1.17.0", "port-version": 0 }, "gdal": { - "baseline": "3.7.1", - "port-version": 1 + "baseline": "3.7.2", + "port-version": 0 }, "gdcm": { "baseline": "3.0.22", @@ -2798,7 +2810,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.10", - "port-version": 1 + "port-version": 2 }, "gemmlowp": { "baseline": "2021-09-28", @@ -2833,12 +2845,12 @@ "port-version": 3 }, "getopt-win32": { - "baseline": "0.1", - "port-version": 7 + "baseline": "1.1.0.20220925", + "port-version": 0 }, "gettext": { "baseline": "0.21.1", - "port-version": 2 + "port-version": 3 }, "gettext-libintl": { "baseline": "0.21.1", @@ -2866,7 +2878,7 @@ }, "ginkgo": { "baseline": "1.4.0", - "port-version": 1 + "port-version": 2 }, "gklib": { "baseline": "2022-07-27", @@ -2885,8 +2897,8 @@ "port-version": 0 }, "glaze": { - "baseline": "1.3.3", - "port-version": 1 + "baseline": "1.5.1", + "port-version": 0 }, "glbinding": { "baseline": "3.1.0", @@ -2905,16 +2917,16 @@ "port-version": 2 }, "glib": { - "baseline": "2.76.3", - "port-version": 2 + "baseline": "2.76.5", + "port-version": 0 }, "glibmm": { "baseline": "2.76.0", "port-version": 1 }, "glm": { - "baseline": "0.9.9.8", - "port-version": 2 + "baseline": "2023-06-08", + "port-version": 0 }, "globjects": { "baseline": "1.1.0", @@ -2933,8 +2945,8 @@ "port-version": 2 }, "glslang": { - "baseline": "12.2.0", - "port-version": 1 + "baseline": "13.0.0", + "port-version": 0 }, "glui": { "baseline": "2019-11-30", @@ -2945,24 +2957,24 @@ "port-version": 6 }, "gmmlib": { - "baseline": "21.3.2", - "port-version": 1 + "baseline": "22.3.12", + "port-version": 0 }, "gmp": { "baseline": "6.2.1", "port-version": 21 }, "gmsh": { - "baseline": "4.9.0", + "baseline": "4.11.1", "port-version": 0 }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 4 + "port-version": 5 }, "google-cloud-cpp": { - "baseline": "2.14.0", - "port-version": 1 + "baseline": "2.15.1", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", @@ -2982,7 +2994,7 @@ }, "gperftools": { "baseline": "2.10", - "port-version": 0 + "port-version": 1 }, "gpgme": { "baseline": "1.18.0", @@ -3005,8 +3017,8 @@ "port-version": 2 }, "graphicsmagick": { - "baseline": "1.3.37", - "port-version": 3 + "baseline": "1.3.41", + "port-version": 0 }, "graphite2": { "baseline": "1.3.14", @@ -3017,8 +3029,8 @@ "port-version": 4 }, "graphviz": { - "baseline": "7.0.0", - "port-version": 2 + "baseline": "9.0.0", + "port-version": 1 }, "greatest": { "baseline": "1.5.0", @@ -3026,7 +3038,7 @@ }, "grpc": { "baseline": "1.51.1", - "port-version": 0 + "port-version": 1 }, "grppi": { "baseline": "0.4.0", @@ -3042,27 +3054,27 @@ }, "gsoap": { "baseline": "2.8.112", - "port-version": 1 + "port-version": 2 }, "gst-rtsp-server": { "baseline": "1.20.5", "port-version": 2 }, "gstreamer": { - "baseline": "1.20.5", - "port-version": 11 + "baseline": "1.22.5", + "port-version": 1 }, "gtest": { - "baseline": "1.13.0", + "baseline": "1.14.0", "port-version": 0 }, "gtk": { - "baseline": "4.10.4", + "baseline": "4.10.5", "port-version": 1 }, "gtk3": { "baseline": "3.24.38", - "port-version": 0 + "port-version": 1 }, "gtkmm": { "baseline": "4.10.0", @@ -3104,14 +3116,34 @@ "baseline": "3.0.1", "port-version": 0 }, + "gz-common5": { + "baseline": "5.4.1", + "port-version": 0 + }, + "gz-fuel-tools8": { + "baseline": "8.1.0", + "port-version": 0 + }, "gz-math7": { "baseline": "7.0.2", "port-version": 1 }, + "gz-msgs9": { + "baseline": "9.5.0", + "port-version": 0 + }, + "gz-plugin2": { + "baseline": "2.0.1", + "port-version": 0 + }, "gz-tools2": { "baseline": "2.0.0", "port-version": 1 }, + "gz-transport12": { + "baseline": "12.2.0", + "port-version": 0 + }, "gz-utils2": { "baseline": "2.0.0", "port-version": 0 @@ -3141,7 +3173,7 @@ "port-version": 1 }, "harfbuzz": { - "baseline": "8.1.1", + "baseline": "8.2.1", "port-version": 0 }, "hash-library": { @@ -3177,7 +3209,7 @@ "port-version": 0 }, "hffix": { - "baseline": "1.2.1", + "baseline": "1.3.0", "port-version": 0 }, "hfsm2": { @@ -3189,19 +3221,19 @@ "port-version": 0 }, "highfive": { - "baseline": "2.6.2", - "port-version": 2 + "baseline": "2.7.1", + "port-version": 0 }, "highs": { - "baseline": "1.5.1", + "baseline": "1.6.0", "port-version": 0 }, "highway": { - "baseline": "1.0.6", + "baseline": "1.0.7", "port-version": 0 }, "hikogui": { - "baseline": "0.7.0", + "baseline": "0.8.1", "port-version": 0 }, "hiredis": { @@ -3217,7 +3249,7 @@ "port-version": 0 }, "hpx": { - "baseline": "1.8.1", + "baseline": "1.9.1", "port-version": 0 }, "http-parser": { @@ -3229,11 +3261,11 @@ "port-version": 3 }, "hunspell": { - "baseline": "1.7.1", - "port-version": 4 + "baseline": "1.7.2", + "port-version": 0 }, "hwloc": { - "baseline": "2.9.0", + "baseline": "2.9.3", "port-version": 0 }, "hyperscan": { @@ -3245,7 +3277,7 @@ "port-version": 0 }, "hypre": { - "baseline": "2.23.0", + "baseline": "2.29.0", "port-version": 0 }, "iceoryx": { @@ -3257,12 +3289,12 @@ "port-version": 0 }, "ideviceinstaller": { - "baseline": "1.1.2.23", - "port-version": 6 + "baseline": "2023-07-21", + "port-version": 0 }, "idevicerestore": { - "baseline": "1.0.12", - "port-version": 7 + "baseline": "2023-05-23", + "port-version": 0 }, "idyntree": { "baseline": "9.0.0", @@ -3289,7 +3321,7 @@ "port-version": 3 }, "ignition-common3": { - "baseline": "3.14.1", + "baseline": "3.16.0", "port-version": 0 }, "ignition-fuel-tools1": { @@ -3349,7 +3381,7 @@ "port-version": 0 }, "igraph": { - "baseline": "0.10.6", + "baseline": "0.10.7", "port-version": 0 }, "iir1": { @@ -3374,15 +3406,19 @@ }, "imath": { "baseline": "3.1.9", - "port-version": 0 + "port-version": 1 }, "imgui": { - "baseline": "1.89.7", + "baseline": "1.89.9", + "port-version": 0 + }, + "imgui-node-editor": { + "baseline": "0.9.2", "port-version": 0 }, "imgui-sfml": { - "baseline": "2.5", - "port-version": 4 + "baseline": "2.6", + "port-version": 0 }, "imguizmo": { "baseline": "1.83", @@ -3393,8 +3429,8 @@ "port-version": 1 }, "implot": { - "baseline": "0.15", - "port-version": 1 + "baseline": "0.16", + "port-version": 0 }, "indicators": { "baseline": "2.3", @@ -3406,7 +3442,7 @@ }, "influxdb-cxx": { "baseline": "0.7.1", - "port-version": 0 + "port-version": 1 }, "infoware": { "baseline": "2023-04-12", @@ -3434,7 +3470,7 @@ }, "intel-mkl": { "baseline": "2023.0.0", - "port-version": 2 + "port-version": 3 }, "intelrdfpmathlib": { "baseline": "20U2", @@ -3458,7 +3494,7 @@ }, "ismrmrd": { "baseline": "1.13.2", - "port-version": 0 + "port-version": 1 }, "itk": { "baseline": "5.2.1", @@ -3470,10 +3506,10 @@ }, "ixwebsocket": { "baseline": "11.4.4", - "port-version": 0 + "port-version": 2 }, "jack2": { - "baseline": "1.9.21", + "baseline": "1.9.22", "port-version": 0 }, "jaeger-client-cpp": { @@ -3489,8 +3525,8 @@ "port-version": 2 }, "jbig2dec": { - "baseline": "0.19", - "port-version": 3 + "baseline": "0.20", + "port-version": 0 }, "jbigkit": { "baseline": "2.1", @@ -3506,7 +3542,7 @@ }, "joltphysics": { "baseline": "3.0.1", - "port-version": 0 + "port-version": 1 }, "josuttis-jthread": { "baseline": "2020-07-21", @@ -3524,6 +3560,10 @@ "baseline": "0.3.1", "port-version": 0 }, + "json-rpc-cxx": { + "baseline": "0.3.1", + "port-version": 0 + }, "json-schema-validator": { "baseline": "2.2.0", "port-version": 0 @@ -3541,7 +3581,7 @@ "port-version": 5 }, "jsoncons": { - "baseline": "0.170.2", + "baseline": "0.171.0", "port-version": 0 }, "jsoncpp": { @@ -3549,12 +3589,12 @@ "port-version": 0 }, "jsonifier": { - "baseline": "0.9.5", + "baseline": "0.9.8", "port-version": 0 }, "jsonnet": { - "baseline": "0.18.0", - "port-version": 1 + "baseline": "0.20.0", + "port-version": 0 }, "jwt-cpp": { "baseline": "0.6.0", @@ -3585,7 +3625,7 @@ "port-version": 0 }, "kdbindings": { - "baseline": "1.0.0", + "baseline": "1.0.3", "port-version": 0 }, "kddockwidgets": { @@ -3722,7 +3762,7 @@ }, "kf5solid": { "baseline": "5.98.0", - "port-version": 1 + "port-version": 3 }, "kf5sonnet": { "baseline": "5.98.0", @@ -3758,11 +3798,11 @@ }, "kinectsdk1": { "baseline": "1.8", - "port-version": 7 + "port-version": 8 }, "kinectsdk2": { "baseline": "2.0", - "port-version": 6 + "port-version": 7 }, "kissfft": { "baseline": "131.1.0", @@ -3781,8 +3821,8 @@ "port-version": 1 }, "krabsetw": { - "baseline": "4.1.18", - "port-version": 1 + "baseline": "4.3.1", + "port-version": 0 }, "ktx": { "baseline": "4.1.0", @@ -3830,10 +3870,10 @@ }, "launch-darkly-server": { "baseline": "2.8.6", - "port-version": 0 + "port-version": 1 }, "lazy-importer": { - "baseline": "2022-02-09", + "baseline": "2023-08-03", "port-version": 0 }, "lcm": { @@ -3869,8 +3909,8 @@ "port-version": 3 }, "leveldb": { - "baseline": "1.22", - "port-version": 6 + "baseline": "1.23", + "port-version": 0 }, "levmar": { "baseline": "2.6", @@ -3922,7 +3962,7 @@ }, "libavif": { "baseline": "0.11.1", - "port-version": 1 + "port-version": 2 }, "libb2": { "baseline": "0.98.1", @@ -3937,7 +3977,7 @@ "port-version": 4 }, "libbson": { - "baseline": "1.22.2", + "baseline": "1.24.3", "port-version": 0 }, "libcaer": { @@ -3948,6 +3988,10 @@ "baseline": "0.30", "port-version": 4 }, + "libcap": { + "baseline": "2.69", + "port-version": 1 + }, "libcbor": { "baseline": "0.10.2", "port-version": 0 @@ -3972,6 +4016,10 @@ "baseline": "2.2.0", "port-version": 0 }, + "libcoro": { + "baseline": "0.9", + "port-version": 0 + }, "libcorrect": { "baseline": "2018-10-11", "port-version": 0 @@ -3986,7 +4034,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 5 + "port-version": 6 }, "libcsv": { "baseline": "3.0.3", @@ -4001,7 +4049,7 @@ "port-version": 0 }, "libdatachannel": { - "baseline": "0.18.2", + "baseline": "0.18.6", "port-version": 2 }, "libdatrie": { @@ -4017,7 +4065,7 @@ "port-version": 2 }, "libdeflate": { - "baseline": "1.17", + "baseline": "1.19", "port-version": 0 }, "libdisasm": { @@ -4029,7 +4077,7 @@ "port-version": 1 }, "libdjinterop": { - "baseline": "0.19.2", + "baseline": "0.20.1", "port-version": 0 }, "libdmx": { @@ -4086,18 +4134,18 @@ }, "libfabric": { "baseline": "1.13.2", - "port-version": 1 + "port-version": 2 }, "libffi": { "baseline": "3.4.4", - "port-version": 2 + "port-version": 5 }, "libfido2": { "baseline": "1.13.0", "port-version": 0 }, "libflac": { - "baseline": "1.4.2", + "baseline": "1.4.3", "port-version": 0 }, "libfontenc": { @@ -4145,7 +4193,7 @@ "port-version": 0 }, "libgnutls": { - "baseline": "3.7.8", + "baseline": "3.8.1", "port-version": 0 }, "libgo": { @@ -4221,8 +4269,8 @@ "port-version": 0 }, "libideviceactivation": { - "baseline": "1.3.17", - "port-version": 0 + "baseline": "2023-05-01", + "port-version": 1 }, "libidn2": { "baseline": "2.3.4", @@ -4237,15 +4285,19 @@ "port-version": 0 }, "libimobiledevice": { - "baseline": "1.3.17", - "port-version": 4 + "baseline": "2023-07-05", + "port-version": 1 + }, + "libimobiledevice-glue": { + "baseline": "2023-05-13", + "port-version": 0 }, "libirecovery": { - "baseline": "1.0.25", - "port-version": 7 + "baseline": "2023-05-13", + "port-version": 1 }, "libjpeg-turbo": { - "baseline": "2.1.5.1", + "baseline": "3.0.0", "port-version": 2 }, "libjuice": { @@ -4254,7 +4306,7 @@ }, "libjxl": { "baseline": "0.8.2", - "port-version": 0 + "port-version": 1 }, "libkeyfinder": { "baseline": "2.2.6", @@ -4262,7 +4314,7 @@ }, "libkml": { "baseline": "1.3.0", - "port-version": 12 + "port-version": 13 }, "liblas": { "baseline": "1.8.1", @@ -4306,7 +4358,7 @@ }, "libmad": { "baseline": "0.15.1", - "port-version": 12 + "port-version": 13 }, "libmagic": { "baseline": "5.40", @@ -4326,23 +4378,23 @@ }, "libmesh": { "baseline": "1.5.0", - "port-version": 5 + "port-version": 6 }, "libmicrodns": { "baseline": "0.2.0", - "port-version": 1 + "port-version": 2 }, "libmicrohttpd": { "baseline": "0.9.77", - "port-version": 0 + "port-version": 2 }, "libmikmod": { "baseline": "3.3.11.1", "port-version": 12 }, "libmodbus": { - "baseline": "3.1.6", - "port-version": 5 + "baseline": "3.1.10", + "port-version": 0 }, "libmodman": { "baseline": "2.0.1", @@ -4442,10 +4494,10 @@ }, "libosip2": { "baseline": "5.2.0", - "port-version": 3 + "port-version": 4 }, "libosmium": { - "baseline": "2.19.0", + "baseline": "2.20.0", "port-version": 0 }, "libosmscout": { @@ -4473,8 +4525,8 @@ "port-version": 0 }, "libplist": { - "baseline": "1.3.6", - "port-version": 2 + "baseline": "2023-06-15", + "port-version": 1 }, "libpmemobj-cpp": { "baseline": "1.13.0", @@ -4490,7 +4542,7 @@ }, "libpq": { "baseline": "15.3", - "port-version": 1 + "port-version": 2 }, "libpqxx": { "baseline": "7.7.4", @@ -4536,13 +4588,17 @@ "baseline": "0.12.5.5178", "port-version": 1 }, + "libremidi": { + "baseline": "4.1.0", + "port-version": 0 + }, "libressl": { "baseline": "3.6.2", "port-version": 1 }, "librsvg": { "baseline": "2.40.20", - "port-version": 9 + "port-version": 10 }, "librsync": { "baseline": "2.3.2", @@ -4629,8 +4685,8 @@ "port-version": 3 }, "libspatialite": { - "baseline": "5.0.1", - "port-version": 12 + "baseline": "5.1.0", + "port-version": 0 }, "libspnav": { "baseline": "0.2.3", @@ -4645,8 +4701,8 @@ "port-version": 3 }, "libsrtp": { - "baseline": "2.4.2", - "port-version": 3 + "baseline": "2.5.0", + "port-version": 0 }, "libssh": { "baseline": "0.10.5", @@ -4666,6 +4722,10 @@ }, "libsvm": { "baseline": "3.25", + "port-version": 1 + }, + "libsystemd": { + "baseline": "254", "port-version": 0 }, "libtar": { @@ -4748,9 +4808,13 @@ "baseline": "1.1", "port-version": 3 }, + "libunwind": { + "baseline": "1.7.2", + "port-version": 0 + }, "liburing": { - "baseline": "2.3", - "port-version": 1 + "baseline": "2.4", + "port-version": 0 }, "libusb": { "baseline": "1.0.26.11791", @@ -4761,8 +4825,8 @@ "port-version": 10 }, "libusbmuxd": { - "baseline": "1.2.219", - "port-version": 3 + "baseline": "2023-06-21", + "port-version": 1 }, "libuuid": { "baseline": "1.0.3", @@ -4781,8 +4845,8 @@ "port-version": 0 }, "libvmdk": { - "baseline": "20200926", - "port-version": 4 + "baseline": "20221124", + "port-version": 0 }, "libvorbis": { "baseline": "1.3.7", @@ -4790,7 +4854,7 @@ }, "libvpx": { "baseline": "1.12.0", - "port-version": 1 + "port-version": 2 }, "libwandio": { "baseline": "4.2.1", @@ -4801,8 +4865,8 @@ "port-version": 1 }, "libwebp": { - "baseline": "1.3.1", - "port-version": 1 + "baseline": "1.3.2", + "port-version": 0 }, "libwebsockets": { "baseline": "4.3.2", @@ -4824,6 +4888,10 @@ "baseline": "0.4.5", "port-version": 0 }, + "libxcrypt": { + "baseline": "4.4.36", + "port-version": 0 + }, "libxcvt": { "baseline": "0.1.2", "port-version": 0 @@ -4881,7 +4949,7 @@ "port-version": 2 }, "libxml2": { - "baseline": "2.10.3", + "baseline": "2.11.5", "port-version": 1 }, "libxmlmm": { @@ -4901,7 +4969,7 @@ "port-version": 1 }, "libxpm": { - "baseline": "3.5.14", + "baseline": "3.5.16", "port-version": 0 }, "libxpresent": { @@ -4962,10 +5030,10 @@ }, "libzip": { "baseline": "1.9.2", - "port-version": 1 + "port-version": 2 }, "libzippp": { - "baseline": "6.1-1.9.2", + "baseline": "7.0-1.10.1", "port-version": 0 }, "licensepp": { @@ -5001,7 +5069,7 @@ "port-version": 2 }, "live555": { - "baseline": "2023-06-20", + "baseline": "2023-07-24", "port-version": 0 }, "llfio": { @@ -5013,16 +5081,16 @@ "port-version": 0 }, "llhttp": { - "baseline": "8.1.0", - "port-version": 1 + "baseline": "9.1.2", + "port-version": 0 }, "llvm": { "baseline": "15.0.7", - "port-version": 3 + "port-version": 6 }, "lmdb": { - "baseline": "0.9.29", - "port-version": 2 + "baseline": "0.9.31", + "port-version": 0 }, "lockpp": { "baseline": "1.0.2", @@ -5045,7 +5113,7 @@ "port-version": 0 }, "log4cxx": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "loguru": { @@ -5102,7 +5170,7 @@ }, "luajit": { "baseline": "2023-01-04", - "port-version": 2 + "port-version": 4 }, "luasec": { "baseline": "1.3.1", @@ -5158,7 +5226,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 13 + "port-version": 14 }, "magnum-extras": { "baseline": "2020.06", @@ -5170,7 +5238,7 @@ }, "magnum-plugins": { "baseline": "2020.06", - "port-version": 10 + "port-version": 11 }, "mailio": { "baseline": "0.21.0", @@ -5210,7 +5278,7 @@ }, "mapnik": { "baseline": "2023-06-12", - "port-version": 1 + "port-version": 2 }, "marble": { "baseline": "22.04.0", @@ -5254,7 +5322,7 @@ }, "matroska": { "baseline": "1.7.1", - "port-version": 1 + "port-version": 2 }, "mbedtls": { "baseline": "2.28.1", @@ -5270,7 +5338,7 @@ }, "mdl-sdk": { "baseline": "2021.1.2", - "port-version": 2 + "port-version": 3 }, "mdns": { "baseline": "1.4.2", @@ -5278,7 +5346,7 @@ }, "mdnsresponder": { "baseline": "1557.140.5.0.1", - "port-version": 0 + "port-version": 1 }, "mdspan": { "baseline": "0.6.0", @@ -5286,7 +5354,7 @@ }, "mecab": { "baseline": "2019-09-25", - "port-version": 4 + "port-version": 5 }, "memorymodule": { "baseline": "2019-12-31", @@ -5294,14 +5362,14 @@ }, "mesa": { "baseline": "23.0.1", - "port-version": 1 + "port-version": 2 }, "meschach": { "baseline": "1.2b", "port-version": 6 }, "meshoptimizer": { - "baseline": "0.18", + "baseline": "0.19", "port-version": 1 }, "metis": { @@ -5318,7 +5386,7 @@ }, "mfx-dispatch": { "baseline": "1.35.1", - "port-version": 1 + "port-version": 3 }, "mgnlibs": { "baseline": "2019-09-29", @@ -5330,7 +5398,7 @@ }, "microsoft-signalr": { "baseline": "0.1.0-alpha4", - "port-version": 7 + "port-version": 8 }, "mikktspace": { "baseline": "2020-10-06", @@ -5350,7 +5418,7 @@ }, "minhook": { "baseline": "1.3.3", - "port-version": 3 + "port-version": 4 }, "miniaudio": { "baseline": "0.11.14", @@ -5381,20 +5449,20 @@ "port-version": 0 }, "miniupnpc": { - "baseline": "2.1", - "port-version": 4 + "baseline": "2.2.5", + "port-version": 0 }, "miniz": { "baseline": "3.0.2", "port-version": 0 }, "minizip": { - "baseline": "1.2.13", - "port-version": 2 + "baseline": "1.3", + "port-version": 1 }, "minizip-ng": { "baseline": "4.0.0", - "port-version": 1 + "port-version": 4 }, "mio": { "baseline": "2023-03-03", @@ -5410,7 +5478,7 @@ }, "mmloader": { "baseline": "1.0.1", - "port-version": 2 + "port-version": 3 }, "mmx": { "baseline": "2022-03-27", @@ -5429,11 +5497,11 @@ "port-version": 2 }, "mongo-c-driver": { - "baseline": "1.22.2", + "baseline": "1.24.3", "port-version": 0 }, "mongo-cxx-driver": { - "baseline": "3.7.2", + "baseline": "3.8.0", "port-version": 0 }, "mongoose": { @@ -5442,7 +5510,7 @@ }, "monkeys-audio": { "baseline": "10.08", - "port-version": 0 + "port-version": 1 }, "moos-core": { "baseline": "10.4.0", @@ -5469,24 +5537,24 @@ "port-version": 0 }, "mp-units": { - "baseline": "0.8.0", + "baseline": "2.0.0", "port-version": 0 }, "mp3lame": { "baseline": "3.100", - "port-version": 10 + "port-version": 11 }, "mpark-variant": { "baseline": "1.4.0", "port-version": 3 }, "mpc": { - "baseline": "1.2.0", - "port-version": 3 + "baseline": "1.3.1", + "port-version": 0 }, "mpfr": { - "baseline": "4.2.0", - "port-version": 1 + "baseline": "4.2.1", + "port-version": 0 }, "mpg123": { "baseline": "1.31.3", @@ -5498,7 +5566,7 @@ }, "mpir": { "baseline": "2022-03-02", - "port-version": 1 + "port-version": 3 }, "mpmcqueue": { "baseline": "2021-12-01", @@ -5530,7 +5598,7 @@ }, "msdfgen": { "baseline": "1.10.0", - "port-version": 0 + "port-version": 1 }, "msgpack": { "baseline": "6.0.0", @@ -5578,15 +5646,15 @@ }, "murmurhash": { "baseline": "2016-01-09", - "port-version": 6 + "port-version": 7 }, "mvfst": { - "baseline": "2023-05-18", + "baseline": "2023.10.02.00", "port-version": 0 }, "mygui": { - "baseline": "3.4.1", - "port-version": 5 + "baseline": "3.4.2", + "port-version": 0 }, "mysql-connector-cpp": { "baseline": "8.0.32", @@ -5610,7 +5678,7 @@ }, "nanodbc": { "baseline": "2.13.0", - "port-version": 6 + "port-version": 7 }, "nanoflann": { "baseline": "1.5.0", @@ -5626,7 +5694,7 @@ }, "nanopb": { "baseline": "0.4.7", - "port-version": 1 + "port-version": 2 }, "nanoprintf": { "baseline": "0.3.4", @@ -5668,6 +5736,10 @@ "baseline": "6.4", "port-version": 1 }, + "ndis-driver-library": { + "baseline": "1.2.0", + "port-version": 0 + }, "neargye-semver": { "baseline": "0.3.0", "port-version": 1 @@ -5701,7 +5773,7 @@ "port-version": 4 }, "nghttp2": { - "baseline": "1.55.1", + "baseline": "1.56.0", "port-version": 0 }, "nghttp2-asio": { @@ -5709,15 +5781,15 @@ "port-version": 1 }, "nghttp3": { - "baseline": "0.14.0", + "baseline": "0.15.0", "port-version": 0 }, "ngspice": { - "baseline": "39", + "baseline": "41", "port-version": 0 }, "ngtcp2": { - "baseline": "0.18.0", + "baseline": "0.19.1", "port-version": 0 }, "nifly": { @@ -5742,7 +5814,7 @@ }, "nmap": { "baseline": "7.70", - "port-version": 9 + "port-version": 10 }, "nmslib": { "baseline": "2.1.1", @@ -5800,6 +5872,10 @@ "baseline": "2019-08-10", "port-version": 3 }, + "ntf-core": { + "baseline": "2.1.0", + "port-version": 1 + }, "nu-book-zxing-cpp": { "baseline": "2.1.0", "port-version": 0 @@ -5813,7 +5889,7 @@ "port-version": 1 }, "numcpp": { - "baseline": "2.10.1", + "baseline": "2.11.0", "port-version": 0 }, "nuspell": { @@ -5824,9 +5900,13 @@ "baseline": "2.1.2", "port-version": 8 }, + "nyan-lang": { + "baseline": "0.3", + "port-version": 0 + }, "oatpp": { "baseline": "1.3.0", - "port-version": 1 + "port-version": 2 }, "oatpp-consul": { "baseline": "1.3.0", @@ -5874,19 +5954,19 @@ }, "oatpp-zlib": { "baseline": "1.3.0", - "port-version": 1 + "port-version": 2 }, "observer-ptr-lite": { "baseline": "0.4.0", "port-version": 3 }, "ocilib": { - "baseline": "4.7.5", - "port-version": 2 + "baseline": "4.7.6", + "port-version": 0 }, "octomap": { "baseline": "1.9.6", - "port-version": 0 + "port-version": 1 }, "ode": { "baseline": "0.16.3", @@ -5902,11 +5982,11 @@ }, "ogre": { "baseline": "14.0.1", - "port-version": 0 + "port-version": 1 }, "ogre-next": { "baseline": "2.3.1", - "port-version": 0 + "port-version": 2 }, "ois": { "baseline": "1.5.1", @@ -5941,8 +6021,8 @@ "port-version": 0 }, "onnxruntime-gpu": { - "baseline": "1.14.1", - "port-version": 1 + "baseline": "1.15.1", + "port-version": 0 }, "oof": { "baseline": "2021-11-23", @@ -5961,12 +6041,12 @@ "port-version": 0 }, "openblas": { - "baseline": "0.3.23", - "port-version": 1 + "baseline": "0.3.24", + "port-version": 0 }, "opencascade": { - "baseline": "7.6.2", - "port-version": 6 + "baseline": "7.7.2", + "port-version": 1 }, "opencc": { "baseline": "1.1.6", @@ -5981,12 +6061,8 @@ "port-version": 2 }, "opencolorio": { - "baseline": "2.1.2", - "port-version": 0 - }, - "opencolorio-tools": { - "baseline": "1.1.1", - "port-version": 0 + "baseline": "2.2.1", + "port-version": 1 }, "opencsg": { "baseline": "1.4.2", @@ -6002,15 +6078,15 @@ }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 18 + "port-version": 19 }, "opencv3": { "baseline": "3.4.18", - "port-version": 10 + "port-version": 11 }, "opencv4": { "baseline": "4.8.0", - "port-version": 0 + "port-version": 7 }, "opendnp3": { "baseline": "3.1.1", @@ -6041,12 +6117,12 @@ "port-version": 4 }, "openimageio": { - "baseline": "2.4.13.0", - "port-version": 0 + "baseline": "2.4.14.0", + "port-version": 1 }, "openjpeg": { "baseline": "2.5.0", - "port-version": 0 + "port-version": 1 }, "openldap": { "baseline": "2.5.13", @@ -6070,11 +6146,11 @@ }, "openmvs": { "baseline": "2.1.0", - "port-version": 1 + "port-version": 2 }, "openni2": { "baseline": "2.2.0.33", - "port-version": 14 + "port-version": 15 }, "openscap": { "baseline": "1.3.7", @@ -6085,8 +6161,8 @@ "port-version": 3 }, "openssl": { - "baseline": "3.1.2", - "port-version": 1 + "baseline": "3.1.3", + "port-version": 0 }, "openssl-unix": { "baseline": "deprecated", @@ -6106,7 +6182,7 @@ }, "opentelemetry-cpp": { "baseline": "1.9.1", - "port-version": 0 + "port-version": 1 }, "opentelemetry-fluentd": { "baseline": "2.0.0", @@ -6122,11 +6198,11 @@ }, "openvdb": { "baseline": "10.0.0", - "port-version": 3 + "port-version": 5 }, "openvino": { - "baseline": "2023-06-11", - "port-version": 5 + "baseline": "2023.1.0", + "port-version": 3 }, "openvpn3": { "baseline": "3.7.0", @@ -6161,7 +6237,7 @@ "port-version": 1 }, "orc": { - "baseline": "1.9.0", + "baseline": "1.9.1", "port-version": 0 }, "orocos-kdl": { @@ -6170,7 +6246,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 20 + "port-version": 22 }, "osg-qt": { "baseline": "Qt5", @@ -6180,10 +6256,6 @@ "baseline": "3.4", "port-version": 1 }, - "osi": { - "baseline": "0.108.6", - "port-version": 1 - }, "osmanip": { "baseline": "4.6.1", "port-version": 0 @@ -6222,7 +6294,7 @@ }, "pango": { "baseline": "1.50.14", - "port-version": 3 + "port-version": 4 }, "pangolin": { "baseline": "0.8", @@ -6242,7 +6314,7 @@ }, "paraview": { "baseline": "5.11.0", - "port-version": 3 + "port-version": 4 }, "parmetis": { "baseline": "2022-07-27", @@ -6258,7 +6330,7 @@ }, "pbc": { "baseline": "0.5.14", - "port-version": 7 + "port-version": 9 }, "pcapplusplus": { "baseline": "22.11", @@ -6274,7 +6346,7 @@ }, "pcl": { "baseline": "1.13.1", - "port-version": 0 + "port-version": 1 }, "pcre": { "baseline": "8.45", @@ -6282,11 +6354,11 @@ }, "pcre2": { "baseline": "10.42", - "port-version": 0 + "port-version": 1 }, "pdal": { "baseline": "2.5.3", - "port-version": 2 + "port-version": 3 }, "pdal-c": { "baseline": "2.2.0", @@ -6337,7 +6409,7 @@ "port-version": 1 }, "physx": { - "baseline": "5.2.1", + "baseline": "5.3.0", "port-version": 0 }, "picojson": { @@ -6381,7 +6453,7 @@ "port-version": 1 }, "plf-colony": { - "baseline": "6.33", + "baseline": "7.3.1", "port-version": 0 }, "plf-hive": { @@ -6422,7 +6494,7 @@ }, "pmdk": { "baseline": "1.12.0", - "port-version": 0 + "port-version": 2 }, "pngpp": { "baseline": "0.2.10", @@ -6437,8 +6509,8 @@ "port-version": 4 }, "podofo": { - "baseline": "0.10.0", - "port-version": 2 + "baseline": "0.10.1", + "port-version": 0 }, "poissonrecon": { "baseline": "2021-09-26", @@ -6453,8 +6525,8 @@ "port-version": 12 }, "polyhook2": { - "baseline": "2023-05-16", - "port-version": 1 + "baseline": "2023-08-11", + "port-version": 0 }, "polymorphic-value": { "baseline": "1.3.0", @@ -6513,7 +6585,7 @@ "port-version": 2 }, "proj": { - "baseline": "9.2.1", + "baseline": "9.3.0", "port-version": 1 }, "proj4": { @@ -6533,8 +6605,8 @@ "port-version": 0 }, "protobuf-c": { - "baseline": "1.4.0", - "port-version": 2 + "baseline": "1.4.1", + "port-version": 0 }, "protopuf": { "baseline": "2.2.1", @@ -6549,7 +6621,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2023.07.03.00", + "baseline": "2023.10.02.00", "port-version": 0 }, "psimd": { @@ -6557,7 +6629,7 @@ "port-version": 2 }, "ptc-print": { - "baseline": "1.4.0", + "baseline": "1.4.1", "port-version": 1 }, "ptex": { @@ -6588,9 +6660,13 @@ "baseline": "1.13.0", "port-version": 0 }, + "pulzed-mini": { + "baseline": "0.9.14", + "port-version": 0 + }, "pybind11": { - "baseline": "2.10.4", - "port-version": 1 + "baseline": "2.11.1", + "port-version": 0 }, "pystring": { "baseline": "1.1.4", @@ -6598,11 +6674,11 @@ }, "python2": { "baseline": "2.7.18", - "port-version": 6 + "port-version": 7 }, "python3": { - "baseline": "3.11.4", - "port-version": 2 + "baseline": "3.11.5", + "port-version": 0 }, "qca": { "baseline": "2.3.5", @@ -6641,7 +6717,7 @@ "port-version": 2 }, "qt": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qt-advanced-docking-system": { @@ -6649,7 +6725,7 @@ "port-version": 1 }, "qt3d": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qt5": { @@ -6658,7 +6734,7 @@ }, "qt5-3d": { "baseline": "5.15.10", - "port-version": 0 + "port-version": 1 }, "qt5-activeqt": { "baseline": "5.15.10", @@ -6670,7 +6746,7 @@ }, "qt5-base": { "baseline": "5.15.10", - "port-version": 5 + "port-version": 6 }, "qt5-canvas3d": { "baseline": "0", @@ -6825,115 +6901,111 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.5.2", - "port-version": 0 - }, - "qt6betablock": { - "baseline": "6.2.0-beta", + "baseline": "6.5.3", "port-version": 0 }, "qtactiveqt": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtbase": { - "baseline": "6.5.2", - "port-version": 1 + "baseline": "6.5.3", + "port-version": 0 }, "qtcharts": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtcoap": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtdoc": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtgrpc": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qthttpserver": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtimageformats": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtkeychain": { - "baseline": "0.13.2", - "port-version": 4 + "baseline": "0.14.1", + "port-version": 0 }, "qtkeychain-qt6": { - "baseline": "0.13.2", - "port-version": 1 + "baseline": "0.14.1", + "port-version": 0 }, "qtlanguageserver": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtlocation": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtlottie": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtmqtt": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtopcua": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtpositioning": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtquick3d": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtquick3dphysics": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtquickcontrols2": { @@ -6941,75 +7013,75 @@ "port-version": 0 }, "qtquickeffectmaker": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtscxml": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtsensors": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtserialbus": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtserialport": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtshadertools": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtspeech": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtsvg": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qttools": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qttranslations": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtwayland": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtwebengine": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "qtwebview": { - "baseline": "6.5.2", + "baseline": "6.5.3", "port-version": 0 }, "quadtree": { @@ -7037,7 +7109,7 @@ "port-version": 9 }, "quill": { - "baseline": "3.3.0", + "baseline": "3.3.1", "port-version": 0 }, "quirc": { @@ -7089,7 +7161,7 @@ "port-version": 0 }, "rapidfuzz": { - "baseline": "1.8.0", + "baseline": "2.0.0", "port-version": 0 }, "rapidjson": { @@ -7109,16 +7181,16 @@ "port-version": 4 }, "raygui": { - "baseline": "3.6", + "baseline": "4.0", "port-version": 0 }, "raylib": { "baseline": "4.5.0", - "port-version": 1 + "port-version": 2 }, "rbdl": { - "baseline": "3.2.0", - "port-version": 4 + "baseline": "3.3.0", + "port-version": 5 }, "rbdl-orb": { "baseline": "3.2.0", @@ -7138,7 +7210,7 @@ }, "readline": { "baseline": "0", - "port-version": 4 + "port-version": 5 }, "readline-osx": { "baseline": "2020-01-04", @@ -7146,11 +7218,11 @@ }, "readline-unix": { "baseline": "8.2", - "port-version": 0 + "port-version": 1 }, "readline-win32": { "baseline": "5.0", - "port-version": 5 + "port-version": 7 }, "readosm": { "baseline": "1.1.0a", @@ -7177,8 +7249,8 @@ "port-version": 0 }, "refl-cpp": { - "baseline": "0.12.3", - "port-version": 1 + "baseline": "0.12.4", + "port-version": 0 }, "refprop-headers": { "baseline": "2022-12-07", @@ -7213,7 +7285,7 @@ "port-version": 0 }, "restinio": { - "baseline": "0.6.18", + "baseline": "0.6.19", "port-version": 0 }, "rexo": { @@ -7221,8 +7293,8 @@ "port-version": 0 }, "rhash": { - "baseline": "1.4.2", - "port-version": 1 + "baseline": "1.4.4", + "port-version": 0 }, "rhasheq": { "baseline": "2023-06-17", @@ -7261,7 +7333,7 @@ "port-version": 0 }, "rocksdb": { - "baseline": "8.3.2", + "baseline": "8.5.3", "port-version": 0 }, "rpclib": { @@ -7274,7 +7346,7 @@ }, "rsasynccpp": { "baseline": "0.0.7", - "port-version": 2 + "port-version": 3 }, "rsig": { "baseline": "0.1.1", @@ -7285,7 +7357,7 @@ "port-version": 0 }, "rsm-bsa": { - "baseline": "4.0.3", + "baseline": "4.1.0", "port-version": 0 }, "rsm-mmio": { @@ -7298,7 +7370,7 @@ }, "rtabmap": { "baseline": "0.21.0", - "port-version": 1 + "port-version": 2 }, "rtaudio": { "baseline": "2021-11-16", @@ -7314,7 +7386,7 @@ }, "rtmidi": { "baseline": "5.0.0", - "port-version": 2 + "port-version": 3 }, "rttr": { "baseline": "0.9.6+20210811", @@ -7394,7 +7466,7 @@ }, "scintilla": { "baseline": "4.4.6", - "port-version": 2 + "port-version": 3 }, "sciplot": { "baseline": "0.3.1", @@ -7409,8 +7481,8 @@ "port-version": 0 }, "scnlib": { - "baseline": "1.0", - "port-version": 1 + "baseline": "1.1.2", + "port-version": 0 }, "scope-guard": { "baseline": "1.1.0", @@ -7432,6 +7504,10 @@ "baseline": "10.0.0", "port-version": 3 }, + "sdformat13": { + "baseline": "13.5.0", + "port-version": 1 + }, "sdformat6": { "baseline": "6.2.0", "port-version": 6 @@ -7442,7 +7518,7 @@ }, "sdl1": { "baseline": "1.2.15", - "port-version": 18 + "port-version": 19 }, "sdl1-mixer": { "baseline": "2023-03-25", @@ -7453,8 +7529,8 @@ "port-version": 6 }, "sdl2": { - "baseline": "2.26.5", - "port-version": 0 + "baseline": "2.28.3", + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -7492,6 +7568,10 @@ "baseline": "4.1.1", "port-version": 0 }, + "seasocks": { + "baseline": "1.4.6", + "port-version": 0 + }, "secp256k1": { "baseline": "2022-07-11", "port-version": 1 @@ -7538,7 +7618,7 @@ }, "sfml": { "baseline": "2.6.0", - "port-version": 18 + "port-version": 19 }, "sfsexp": { "baseline": "1.3.1", @@ -7584,6 +7664,14 @@ "baseline": "6.1.4", "port-version": 9 }, + "si": { + "baseline": "2.5.1", + "port-version": 0 + }, + "sigmatch": { + "baseline": "0.2.0", + "port-version": 0 + }, "signalrclient": { "baseline": "1.0.0-beta1-9", "port-version": 5 @@ -7628,6 +7716,10 @@ "baseline": "4.19", "port-version": 0 }, + "simsimd": { + "baseline": "1.4.0", + "port-version": 0 + }, "sjpeg": { "baseline": "2021-10-31", "port-version": 0 @@ -7638,7 +7730,7 @@ }, "skia": { "baseline": "0.36.0", - "port-version": 8 + "port-version": 10 }, "skyr-url": { "baseline": "1.13.0", @@ -7668,6 +7760,10 @@ "baseline": "2.0.0", "port-version": 10 }, + "snap7": { + "baseline": "1.4.2", + "port-version": 1 + }, "snappy": { "baseline": "1.1.10", "port-version": 0 @@ -7690,7 +7786,7 @@ }, "soci": { "baseline": "4.0.3", - "port-version": 0 + "port-version": 1 }, "socket-io-client": { "baseline": "2023-02-14", @@ -7710,7 +7806,7 @@ }, "soil2": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "sokol": { "baseline": "2019-09-09", @@ -7761,8 +7857,8 @@ "port-version": 4 }, "spatialite-tools": { - "baseline": "5.0.1", - "port-version": 4 + "baseline": "5.1.0-a", + "port-version": 0 }, "spdk": { "baseline": "19.01.1", @@ -7820,10 +7916,6 @@ "baseline": "2022.4", "port-version": 1 }, - "spix": { - "baseline": "0.5", - "port-version": 0 - }, "spout2": { "baseline": "2.007.010", "port-version": 0 @@ -7837,8 +7929,8 @@ "port-version": 3 }, "sqlcipher": { - "baseline": "4.5.3", - "port-version": 2 + "baseline": "4.5.4", + "port-version": 0 }, "sqlite-modern-cpp": { "baseline": "3.2-936cd0c8", @@ -7849,11 +7941,11 @@ "port-version": 0 }, "sqlite3": { - "baseline": "3.42.0", - "port-version": 1 + "baseline": "3.43.0", + "port-version": 0 }, "sqlitecpp": { - "baseline": "3.3.0", + "baseline": "3.3.1", "port-version": 0 }, "sqlpp11": { @@ -7917,7 +8009,7 @@ "port-version": 2 }, "stduuid": { - "baseline": "1.2.2", + "baseline": "1.2.3", "port-version": 0 }, "stftpitchshift": { @@ -7945,7 +8037,7 @@ "port-version": 1 }, "strong-type": { - "baseline": "8", + "baseline": "12", "port-version": 0 }, "stronk": { @@ -7982,7 +8074,7 @@ }, "symengine": { "baseline": "0.10.1", - "port-version": 0 + "port-version": 1 }, "systemc": { "baseline": "2.3.3", @@ -8001,8 +8093,8 @@ "port-version": 5 }, "taglib": { - "baseline": "1.13.0", - "port-version": 2 + "baseline": "1.13.1", + "port-version": 1 }, "taocpp-json": { "baseline": "2020-09-14", @@ -8022,7 +8114,7 @@ }, "tbb": { "baseline": "2021.10.0", - "port-version": 0 + "port-version": 2 }, "tcb-span": { "baseline": "2022-06-15", @@ -8030,7 +8122,7 @@ }, "tcl": { "baseline": "core-9-0-a1", - "port-version": 5 + "port-version": 6 }, "tclap": { "baseline": "1.2.5", @@ -8065,8 +8157,8 @@ "port-version": 0 }, "tesseract": { - "baseline": "5.3.1", - "port-version": 1 + "baseline": "5.3.2", + "port-version": 0 }, "tfhe": { "baseline": "1.0.1", @@ -8097,16 +8189,16 @@ "port-version": 0 }, "thorvg": { - "baseline": "0.10.0", - "port-version": 0 + "baseline": "0.10.1", + "port-version": 1 }, "threadpool": { "baseline": "0.2.5", "port-version": 3 }, "thrift": { - "baseline": "0.16.0", - "port-version": 1 + "baseline": "0.19.0", + "port-version": 0 }, "tidy-html5": { "baseline": "5.8.0", @@ -8253,7 +8345,7 @@ "port-version": 0 }, "tomlplusplus": { - "baseline": "3.1.0", + "baseline": "3.3.0", "port-version": 0 }, "torch-th": { @@ -8262,15 +8354,15 @@ }, "tracy": { "baseline": "0.9.1", - "port-version": 2 + "port-version": 3 }, "transwarp": { "baseline": "2.2.2", "port-version": 0 }, "trantor": { - "baseline": "1.5.11", - "port-version": 1 + "baseline": "1.5.14", + "port-version": 0 }, "tre": { "baseline": "0.8.0", @@ -8301,7 +8393,7 @@ "port-version": 5 }, "trompeloeil": { - "baseline": "43", + "baseline": "45", "port-version": 0 }, "tsl-hopscotch-map": { @@ -8361,7 +8453,7 @@ "port-version": 0 }, "unicorn": { - "baseline": "1.0.3", + "baseline": "2.0.1", "port-version": 0 }, "unicorn-lib": { @@ -8381,7 +8473,7 @@ "port-version": 2 }, "unordered-dense": { - "baseline": "4.0.1", + "baseline": "4.1.2", "port-version": 0 }, "unqlite": { @@ -8390,11 +8482,11 @@ }, "unrar": { "baseline": "6.1.7", - "port-version": 2 + "port-version": 3 }, "upb": { "baseline": "2022-06-21", - "port-version": 0 + "port-version": 1 }, "urdfdom": { "baseline": "3.1.1", @@ -8406,20 +8498,24 @@ }, "urho3d": { "baseline": "2021-03-01", - "port-version": 4 + "port-version": 5 }, "uriparser": { "baseline": "0.9.7", "port-version": 0 }, "usbmuxd": { - "baseline": "1.2.235", - "port-version": 4 + "baseline": "2023-07-21", + "port-version": 0 }, "usd": { "baseline": "23.5", "port-version": 3 }, + "usearch": { + "baseline": "2.3.2", + "port-version": 0 + }, "usockets": { "baseline": "0.8.6", "port-version": 1 @@ -8437,7 +8533,7 @@ "port-version": 1 }, "utfcpp": { - "baseline": "3.2.3", + "baseline": "3.2.5", "port-version": 0 }, "utfz": { @@ -8470,7 +8566,7 @@ }, "v8": { "baseline": "9.1.269.39", - "port-version": 5 + "port-version": 6 }, "valijson": { "baseline": "0.6", @@ -8525,7 +8621,7 @@ "port-version": 0 }, "vcpkg-pkgconfig-get-modules": { - "baseline": "2023-02-25", + "baseline": "2023-09-06", "port-version": 0 }, "vcpkg-qmake": { @@ -8558,7 +8654,7 @@ }, "vcpkg-tool-ninja": { "baseline": "2022-03-31", - "port-version": 1 + "port-version": 2 }, "vcpkg-tool-nodejs": { "baseline": "16.18.0", @@ -8602,7 +8698,7 @@ }, "vlpp": { "baseline": "1.1.0.0", - "port-version": 0 + "port-version": 1 }, "volk": { "baseline": "1.3.250", @@ -8617,12 +8713,16 @@ "port-version": 2 }, "vsg": { - "baseline": "1.0.6", + "baseline": "1.0.9", + "port-version": 0 + }, + "vsgxchange": { + "baseline": "1.0.5", "port-version": 0 }, "vtk": { "baseline": "9.2.0-pv5.11.0", - "port-version": 9 + "port-version": 10 }, "vtk-dicom": { "baseline": "0.8.14", @@ -8665,7 +8765,7 @@ "port-version": 5 }, "wangle": { - "baseline": "2023.07.03.00", + "baseline": "2023.10.02.00", "port-version": 0 }, "wasmedge": { @@ -8705,7 +8805,7 @@ "port-version": 3 }, "wg21-linear-algebra": { - "baseline": "0.7.2", + "baseline": "0.7.3", "port-version": 0 }, "wg21-sg14": { @@ -8713,7 +8813,7 @@ "port-version": 2 }, "wil": { - "baseline": "2023-04-11", + "baseline": "2023-08-24", "port-version": 0 }, "wildmidi": { @@ -8730,7 +8830,7 @@ }, "winpcap": { "baseline": "4.1.3", - "port-version": 10 + "port-version": 11 }, "winpty": { "baseline": "0.4.3", @@ -8758,7 +8858,7 @@ }, "woff2": { "baseline": "1.0.2", - "port-version": 3 + "port-version": 4 }, "wolfmqtt": { "baseline": "1.16.0", @@ -8766,7 +8866,7 @@ }, "wolfssl": { "baseline": "5.6.3", - "port-version": 0 + "port-version": 1 }, "wolftpm": { "baseline": "2.7.0", @@ -8781,8 +8881,8 @@ "port-version": 1 }, "wpilib": { - "baseline": "2020-03-02", - "port-version": 4 + "baseline": "2023-08-24", + "port-version": 0 }, "wren": { "baseline": "0.4.0", @@ -8822,7 +8922,7 @@ }, "x265": { "baseline": "3.4", - "port-version": 9 + "port-version": 10 }, "x86-simd-sort": { "baseline": "2023-03-04", @@ -8901,8 +9001,8 @@ "port-version": 0 }, "xmlsec": { - "baseline": "1.2.37", - "port-version": 2 + "baseline": "1.3.1", + "port-version": 1 }, "xnnpack": { "baseline": "2022-02-17", @@ -8938,7 +9038,7 @@ }, "xtensor": { "baseline": "0.24.6", - "port-version": 0 + "port-version": 1 }, "xtensor-blas": { "baseline": "0.20.0", @@ -9001,11 +9101,11 @@ "port-version": 0 }, "yomm2": { - "baseline": "1.3.1", - "port-version": 0 + "baseline": "1.4.0", + "port-version": 1 }, "yyjson": { - "baseline": "0.6.0", + "baseline": "0.8.0", "port-version": 0 }, "z3": { @@ -9022,7 +9122,7 @@ }, "zeroc-ice": { "baseline": "3.7.9", - "port-version": 0 + "port-version": 4 }, "zeromq": { "baseline": "2023-06-20", @@ -9041,11 +9141,11 @@ "port-version": 3 }, "zlib": { - "baseline": "1.2.13", + "baseline": "1.3", "port-version": 0 }, "zlib-ng": { - "baseline": "2.0.7", + "baseline": "2.1.3", "port-version": 0 }, "zlmediakit": { @@ -9070,7 +9170,7 @@ }, "zstd": { "baseline": "1.5.5", - "port-version": 0 + "port-version": 1 }, "zstr": { "baseline": "1.0.7", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index d47321464e5f7d..22aa06a6ac48b6 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "127eefeeba4725293adb6ea574b7bad98c845298", + "version": "1.17.8", + "port-version": 4 + }, { "git-tree": "e8fda1b05b3f6a99f08c23f8ad94ed43d4a69875", "version": "1.17.8", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 87ea1ad094007c..edf8821e5db002 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6f54756edc3cdf81b1fbac86522410f64bda856", + "version": "1.17.1", + "port-version": 1 + }, { "git-tree": "e8edc870e28366ad88709f1232d002ffd9810cf3", "version": "1.17.1", diff --git a/versions/c-/capnproto.json b/versions/c-/capnproto.json index e894e660912dd4..1dc7d22d437f9f 100644 --- a/versions/c-/capnproto.json +++ b/versions/c-/capnproto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a615543c6406b84fc52a931335d7fdb70037627", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "928a9a658c34e9a664531e0a6762a60408737e54", "version": "0.10.3", diff --git a/versions/c-/capstone.json b/versions/c-/capstone.json index 76acd9f7927adb..13ecc08a47878a 100644 --- a/versions/c-/capstone.json +++ b/versions/c-/capstone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c89ad8669fdc6aa946d13cfe053a64fa50f75a7", + "version": "5.0.1", + "port-version": 0 + }, { "git-tree": "3c9184889dd21d609401fe4ea34fa5320a9443a2", "version": "5.0.0-rc2", diff --git a/versions/c-/cctag.json b/versions/c-/cctag.json index 553ce2501b1058..54b350441eeb0e 100644 --- a/versions/c-/cctag.json +++ b/versions/c-/cctag.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4342449ae8be5c660e94cbb11588ea4649520cd", + "version-semver": "1.0.2", + "port-version": 5 + }, { "git-tree": "2827046cf8d7fe6c0d9003a927dcfc1f33d4469b", "version-semver": "1.0.2", diff --git a/versions/c-/cctz.json b/versions/c-/cctz.json index cd559c1617c00a..386c935057fc77 100644 --- a/versions/c-/cctz.json +++ b/versions/c-/cctz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02114f18edd1088204f039ab6bc662e23d2e4fcc", + "version": "2.3", + "port-version": 6 + }, { "git-tree": "4fb611037401f6c457c45f90d7a462fa13f6f1b1", "version": "2.3", diff --git a/versions/c-/celero.json b/versions/c-/celero.json index 4d584c927db739..94486f28fdb37b 100644 --- a/versions/c-/celero.json +++ b/versions/c-/celero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b4a2230664d3439e53d60370aa383ec540f6362", + "version": "2.9.0", + "port-version": 0 + }, { "git-tree": "cf7909a1c7934793bb36ecf3d70a7dade2dcf983", "version": "2.8.5", diff --git a/versions/c-/cfitsio.json b/versions/c-/cfitsio.json index af756dc2b5737b..5014d8acf632b3 100644 --- a/versions/c-/cfitsio.json +++ b/versions/c-/cfitsio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2df854891a5beda50e8cf8004a7af0766c5c5bc", + "version": "3.49", + "port-version": 4 + }, { "git-tree": "b3f1a4860fc51b43140dc7139dd262f93e4a949d", "version": "3.49", diff --git a/versions/c-/cglm.json b/versions/c-/cglm.json index 73e8e46b06bf0f..9c425f33e67999 100644 --- a/versions/c-/cglm.json +++ b/versions/c-/cglm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd33408300b3151706176a80ff4ef80bf6e10284", + "version-semver": "0.9.1", + "port-version": 0 + }, { "git-tree": "557e5a80c4a0ef39aa20af00929e2234794b3c3d", "version-semver": "0.8.8", diff --git a/versions/c-/cgns.json b/versions/c-/cgns.json index d89e2062e734ed..3965ff7278d783 100644 --- a/versions/c-/cgns.json +++ b/versions/c-/cgns.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3888323fcc200e6d78c882a04c0604acd8281084", + "version-semver": "4.4.0", + "port-version": 0 + }, + { + "git-tree": "9d4b2d4f75c71bf4a4b66a6cb8bf79e119be4dd7", + "version-semver": "4.3.0", + "port-version": 5 + }, { "git-tree": "98f56fa77d5ab2c24d5d8a9932129626feb65df5", "version-semver": "4.3.0", diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index 9c2e3feab26a40..aa917d32b8a4ad 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc06634190b18bc8003202b9490c6af7919821a3", + "version-date": "2022-11-09", + "port-version": 4 + }, { "git-tree": "0e3461099e02572100a3a6731b04fa0c3d12b223", "version-date": "2022-11-09", diff --git a/versions/c-/chromaprint.json b/versions/c-/chromaprint.json index 624ad16e4d0c8b..4d02a2d38b2961 100644 --- a/versions/c-/chromaprint.json +++ b/versions/c-/chromaprint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a33e3947df39a3ac4e7d434f7f3890d0bf80cf39", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "2186fe85098c877929c5e1a8916ae9d23fc0a540", "version": "1.5.0", diff --git a/versions/c-/cista.json b/versions/c-/cista.json index 8930728fcf3eba..7e38db6f9381a5 100644 --- a/versions/c-/cista.json +++ b/versions/c-/cista.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fa4647485a95f3a0c72bf81938a4307ef0fa694", + "version": "0.14", + "port-version": 0 + }, { "git-tree": "3d9245928fb19ec93b7c1e98bd5acc2e8e56faa3", "version": "0.11", diff --git a/versions/c-/cityhash.json b/versions/c-/cityhash.json index 8b55fa672a848b..8fb5a00903c701 100644 --- a/versions/c-/cityhash.json +++ b/versions/c-/cityhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ac425da00e37d679f49357b7871fff3f1c5f597", + "version-date": "2013-01-08", + "port-version": 3 + }, { "git-tree": "9c1b6eaaf15c06d436ce42331b84566abd931f53", "version-date": "2013-01-08", diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json index 07285a0c432152..323c526f176300 100644 --- a/versions/c-/civetweb.json +++ b/versions/c-/civetweb.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "46ba5309a5759827c0d729344e8f17cc5f3132b9", + "version": "1.16", + "port-version": 0 + }, + { + "git-tree": "10dad0fc40c4cb9fe210cabab019806d2b32230d", + "version": "1.15", + "port-version": 4 + }, + { + "git-tree": "a3847be52c382b4546939abf4ab3bf422bde1be3", + "version": "1.15", + "port-version": 3 + }, { "git-tree": "f5c4ed510288187d465737a301891b1101d6c373", "version": "1.15", diff --git a/versions/c-/cjson.json b/versions/c-/cjson.json index f2f67dd1a70b47..b7829c4431f7f4 100644 --- a/versions/c-/cjson.json +++ b/versions/c-/cjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54c20c07a3f92d176d53cbe908313d717f746f6b", + "version": "1.7.16", + "port-version": 0 + }, { "git-tree": "025e76be26389108c3e0cf79e5ed1ea589c7b90e", "version": "1.7.15", diff --git a/versions/c-/clblast.json b/versions/c-/clblast.json index 58ab898277eb3a..06b95e18eac4e6 100644 --- a/versions/c-/clblast.json +++ b/versions/c-/clblast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f514afe9163a9445befe8ddc91f8cd8f0105c9d", + "version": "1.6.1", + "port-version": 0 + }, { "git-tree": "5d3c066f06df46440c055d265aa2dee1c21a9971", "version": "1.5.2", diff --git a/versions/c-/clipper2.json b/versions/c-/clipper2.json index 826557e958820d..830615b1917a2e 100644 --- a/versions/c-/clipper2.json +++ b/versions/c-/clipper2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a78eeaf159608c707e8191ce0ae9aed946c2e45", + "version": "1.2.2", + "port-version": 1 + }, { "git-tree": "59bb15f5ddaeb1198a06437295f808d03669373f", "version": "1.2.2", diff --git a/versions/c-/cmark.json b/versions/c-/cmark.json index 2ae2ccef7e268a..58837197338bfe 100644 --- a/versions/c-/cmark.json +++ b/versions/c-/cmark.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "46de0e92eb13e52bb044f1d925a477483fe23c80", + "version-semver": "0.30.3", + "port-version": 0 + }, + { + "git-tree": "4225c9caf09938ef676f688bf246026bc26fef3f", + "version-semver": "0.30.1", + "port-version": 1 + }, { "git-tree": "63d8e9056589a885ec4a36ba739903199206fff1", "version-semver": "0.30.1", diff --git a/versions/c-/continuable.json b/versions/c-/continuable.json index a3eb44398bcd32..77cae9bf0ff202 100644 --- a/versions/c-/continuable.json +++ b/versions/c-/continuable.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00cab767f56ad46e53d6b140ab675fecfa0fb427", + "version": "4.2.2", + "port-version": 0 + }, { "git-tree": "9cb413050363e8549bbc5a5f50a7882441241416", "version": "4.2.0", diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json index a15500a6d89cae..8f81e374c7b140 100644 --- a/versions/c-/corrade.json +++ b/versions/c-/corrade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a278fdbd46715f454e366df7d06410ae2fc9747", + "version-string": "2020.06", + "port-version": 6 + }, { "git-tree": "fed547a7951672a5a7b1c430df8a9b179f674ac6", "version-string": "2020.06", diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index bf85c2f5af9ed5..db3998454a23cf 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ed5d9de6eeab399563ab93d52f73b7d4691d1cc", + "version": "0.14.0", + "port-version": 0 + }, { "git-tree": "e1a8cffe02efe8a9c92d1aa1e802f12a8d893aa8", "version": "0.13.3", diff --git a/versions/c-/cpp-netlib.json b/versions/c-/cpp-netlib.json index 372da8b4ac80c0..fae5f1a9c0c493 100644 --- a/versions/c-/cpp-netlib.json +++ b/versions/c-/cpp-netlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4a974a775695cdf6b1bcc82fc98c993f887b006", + "version": "0.13.0", + "port-version": 9 + }, { "git-tree": "ac3709aa4c5d5b70f38764f2fa7e0b8f8e891d96", "version": "0.13.0", diff --git a/versions/c-/cpp-peglib.json b/versions/c-/cpp-peglib.json index 9d631ff4260d34..07286a3578f820 100644 --- a/versions/c-/cpp-peglib.json +++ b/versions/c-/cpp-peglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1db90f789f11e0bcb31b569171d0fc3fda779dfc", + "version": "1.8.5", + "port-version": 0 + }, { "git-tree": "883e76f3473565fdd800411dfa980eae2e19a131", "version": "1.3.10", diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index ed5d72e5e7d5e0..647f576e655467 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3399e4ad64f4b4c0d32f4b5df723384a1bd98dbe", + "version": "3.7.6", + "port-version": 0 + }, { "git-tree": "4d97b6213a9f6a77e8f1062229ead80ffd4703a7", "version": "3.6.0", diff --git a/versions/c-/cpprestsdk.json b/versions/c-/cpprestsdk.json index 5a3094cff9b3dc..e06a1087274fa1 100644 --- a/versions/c-/cpprestsdk.json +++ b/versions/c-/cpprestsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e906f25fb64a3b11da4b1e551d63fe569fd300e3", + "version": "2.10.18", + "port-version": 4 + }, { "git-tree": "53f896a9d80f0fd51e2645ee7deccbc0c955859a", "version": "2.10.18", diff --git a/versions/c-/cppslippi.json b/versions/c-/cppslippi.json index d716ffb2d28a6d..bd601ad30d9a13 100644 --- a/versions/c-/cppslippi.json +++ b/versions/c-/cppslippi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0534d15dbe06459887eeddf859ebab443701c6d7", + "version": "1.1.3.14", + "port-version": 0 + }, { "git-tree": "3cb6381580bcf82551009114b87021b0b1bc9885", "version": "1.0.3.14", diff --git a/versions/c-/cppzmq.json b/versions/c-/cppzmq.json index 674c7104a3ffa7..a5d44495192fc3 100644 --- a/versions/c-/cppzmq.json +++ b/versions/c-/cppzmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e7a8ca62f55304268afb4ddd9220cc39d6b4831", + "version": "4.10.0", + "port-version": 0 + }, { "git-tree": "f50d93799a1982bbbdd22e88c7a784f9a7e38368", "version": "4.9.0", diff --git a/versions/c-/cpu-features.json b/versions/c-/cpu-features.json index 09591a646adada..a4c3236059218b 100644 --- a/versions/c-/cpu-features.json +++ b/versions/c-/cpu-features.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "dfa189c9350c179c90db6f7dfe4352ecddcd2b6a", + "version": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "5e090d7020fbfe7ca8a7c2f70b6cc3f4520f2fea", + "version": "0.8.0", + "port-version": 1 + }, + { + "git-tree": "b7b519ccb7eebe02086e062e34a6d3d6b0f54cde", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "389a30511ba8ab8c2891ee40ad9cc6ae89561739", "version": "0.7.0", diff --git a/versions/c-/cpuinfo.json b/versions/c-/cpuinfo.json index 8542dfde809254..d2a0178a0737c6 100644 --- a/versions/c-/cpuinfo.json +++ b/versions/c-/cpuinfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1b7e10e1de1dcd09118adc19c5bc831417dcc8c", + "version-date": "2022-07-19", + "port-version": 3 + }, { "git-tree": "b48fc0cf93034d06bb34c5f83da8be921006b283", "version-date": "2022-07-19", diff --git a/versions/c-/ctre.json b/versions/c-/ctre.json index afd8b6448d2923..8e745d7308f876 100644 --- a/versions/c-/ctre.json +++ b/versions/c-/ctre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70b866377c945c0c024c7379e0f06b00b898fcfb", + "version": "3.8", + "port-version": 0 + }, { "git-tree": "f1277ac9132e7a6c91bdfd6cc355eccedbb28732", "version-semver": "3.7.2", diff --git a/versions/c-/cubeb.json b/versions/c-/cubeb.json index 1c096d12756219..c6f400a1ee52f5 100644 --- a/versions/c-/cubeb.json +++ b/versions/c-/cubeb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "734318573d1aab99ec902221d209cd01940b37e7", + "version-date": "2023-09-26", + "port-version": 0 + }, { "git-tree": "7d7979530500923609dae0ce99dc4a63fea13056", "version-date": "2022-07-22", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index bef09f1406d0b8..e8b032195747e1 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11ef099083754220ca800477b81e5ea6e51730ff", + "version": "8.3.0", + "port-version": 0 + }, { "git-tree": "1e4df4c9590fb15d2d73014c66dbbc151b624b9b", "version": "8.2.1", diff --git a/versions/c-/cwalk.json b/versions/c-/cwalk.json index d6992311104b8a..d516ab722078f3 100644 --- a/versions/c-/cwalk.json +++ b/versions/c-/cwalk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "377300b55c1158f1eaa90ba492441adb12845fbb", + "version": "1.2.7", + "port-version": 0 + }, { "git-tree": "d538350d056fb42b77d28894f67a2bc9dbfe1403", "version": "1.2.6", diff --git a/versions/c-/czmq.json b/versions/c-/czmq.json index dfe25eb1a9b6e7..cdeb4e677b97ad 100644 --- a/versions/c-/czmq.json +++ b/versions/c-/czmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec9f27596e7ff9e8b8aa401f27525075abec28ea", + "version-semver": "4.2.1", + "port-version": 3 + }, { "git-tree": "5bebd4e3a17c277fc4813a24cbdde5d2a06ccc01", "version-semver": "4.2.1", diff --git a/versions/d-/d3d12-memory-allocator.json b/versions/d-/d3d12-memory-allocator.json index 0be166fc9ddeb8..38b67458f9bcfb 100644 --- a/versions/d-/d3d12-memory-allocator.json +++ b/versions/d-/d3d12-memory-allocator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ada5dd1ad2d93ae0c4d56924dfaea88f8fc0e55", + "version-date": "2021-05-05", + "port-version": 1 + }, { "git-tree": "988836f8b901c1a30f4b667ac37f81f1ef3bcdd8", "version-date": "2021-05-05", diff --git a/versions/d-/date.json b/versions/d-/date.json index 1d2cf0d75c6110..7a904c96403651 100644 --- a/versions/d-/date.json +++ b/versions/d-/date.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf7d19c233055e8ffa12b200af6afb894ed76447", + "version": "3.0.1", + "port-version": 5 + }, { "git-tree": "4f6b5d17f3cf8ffb0330963bf0b6d8efa9175e13", "version": "3.0.1", diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index c9156532ab7b20..ab5df0e004366a 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d22d6790c0b6ef8ae4ab570ff55882b410e52b4", + "version": "2.96.1", + "port-version": 0 + }, { "git-tree": "ff99cdb3f50ade01a8d2e56cf5bc3eb481e5c736", "version": "2.93.1", diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index 679031738bf0d1..803dcdf65c18c7 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d54d49c20629be977b5a3f07934d7edeb9f01f67", + "version": "3.20.1", + "port-version": 0 + }, { "git-tree": "c16b653b1f1d195aece3261bf4d244f444e7dabf", "version": "3.19.0", diff --git a/versions/d-/daxa.json b/versions/d-/daxa.json index 14c1adec60ffa8..c5a5643ef3baa7 100644 --- a/versions/d-/daxa.json +++ b/versions/d-/daxa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f57bd48f2c32dfad7e8a7dc51e167c9e0832848", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "25a96e0311836a1151731079225a381779fb3a4b", "version": "1.0.0", diff --git a/versions/d-/dbg-macro.json b/versions/d-/dbg-macro.json index c272f5d17045cf..b7fc1dd4e9762c 100644 --- a/versions/d-/dbg-macro.json +++ b/versions/d-/dbg-macro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2182df6402c97759e95b4b0f1f506e8df6e42fb", + "version": "0.5.1", + "port-version": 0 + }, { "git-tree": "7b6ca099516f914231ec442bea3e6c5f43a91e43", "version": "0.5.0", diff --git a/versions/d-/dbus.json b/versions/d-/dbus.json index d5541e518eeb8b..0494991edc706c 100644 --- a/versions/d-/dbus.json +++ b/versions/d-/dbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a49c03bc95822c2f376e3f3758ac3087a428ddec", + "version": "1.15.8", + "port-version": 0 + }, { "git-tree": "1805ee4cbe77b30b7e922f8854acbd7bd3733e83", "version": "1.15.2", diff --git a/versions/d-/devil.json b/versions/d-/devil.json index b6fba8b5c85816..515f850430ddd5 100644 --- a/versions/d-/devil.json +++ b/versions/d-/devil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03010167ad1849c5f1a8e5bc044115b3c84478a3", + "version": "1.8.0", + "port-version": 11 + }, { "git-tree": "ed3ecd6484dfd9737eee0c415817fdddffcc03e2", "version": "1.8.0", diff --git a/versions/d-/directx-dxc.json b/versions/d-/directx-dxc.json index b9cc5fe8ea6019..d021a9c112f873 100644 --- a/versions/d-/directx-dxc.json +++ b/versions/d-/directx-dxc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24aa8f49b169cce15400a6b90aec8f20b609ea24", + "version-date": "2023-08-14", + "port-version": 0 + }, { "git-tree": "bdf7371f02d10ea110ecef427916c0f3fd78cd4d", "version-date": "2023-03-01", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index b8d18c044eca95..007165ed46832e 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6f049027d47e20e719f6a0f3f888509b63befad", + "version-date": "2023-09-01", + "port-version": 0 + }, { "git-tree": "6b99ef3202ed870bad345dddc5e1fba67ff70281", "version-date": "2023-06-13", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 699c1cf757ac0a..269e9ec692571a 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "67b1d9a329c9e9d8d067359c18bb997148f4e84e", + "version-date": "2023-09-01", + "port-version": 1 + }, + { + "git-tree": "bf6287265ca9c166405069e8ed3d54e79388cf14", + "version-date": "2023-09-01", + "port-version": 0 + }, { "git-tree": "aeeec09ca589bb93e5ec21960e5c0e84bd1b94e3", "version-date": "2023-06-13", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index 7b89302e2b79d1..bf25258ba68a16 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "981fd27befe2b9d8afaab87f1b66c1f8c6f31c18", + "version-date": "2023-09-01", + "port-version": 1 + }, + { + "git-tree": "5e74058955f67b88369b4cc3f600dc6a65be1035", + "version-date": "2023-09-01", + "port-version": 0 + }, { "git-tree": "1a18359efb872f674283fb30d838cb014f74063c", "version-date": "2023-06-13", diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 7b633af0f3e48d..aaa0d2bc20b63c 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "374bc763a70ab0e9556a40bdea62ea9a9cf7d8bd", + "version": "2.0", + "port-version": 0 + }, + { + "git-tree": "0c13b373bc9e51c1e18062b280fe6edcbe104d5f", + "version": "1.90", + "port-version": 0 + }, + { + "git-tree": "789b50745e33c0e6eaa40302779200a613b44a08", + "version": "1.80", + "port-version": 0 + }, { "git-tree": "dfd9cf5247abe59fa2e2465e9768f4da42ae3508", "version": "1.70", diff --git a/versions/d-/discount.json b/versions/d-/discount.json index 827f509e4d27fb..af395e68262009 100644 --- a/versions/d-/discount.json +++ b/versions/d-/discount.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0964d0b7e61494ef8a5c81def6fe5070b3d60d4f", + "version-string": "3.0.0a", + "port-version": 0 + }, { "git-tree": "4cd434c2eb8785c098c1bedc33764a78291fbf2b", "version": "2.2.6", diff --git a/versions/d-/dlfcn-win32.json b/versions/d-/dlfcn-win32.json index 8252c743f84db4..0ac064faabd748 100644 --- a/versions/d-/dlfcn-win32.json +++ b/versions/d-/dlfcn-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eb1d5778fcb3bfa4d46ade382ae6b6e924d301f", + "version": "1.4.1", + "port-version": 0 + }, { "git-tree": "39fcef74b0e249a6e49b28eb8b4be8d1f6bc3d54", "version": "1.3.1", diff --git a/versions/d-/double-conversion.json b/versions/d-/double-conversion.json index 28cfb7f5b447d9..60ebfa7e22c01f 100644 --- a/versions/d-/double-conversion.json +++ b/versions/d-/double-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63037e8b38231f15de1dddb0593eebfb0bf32496", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "2c3184965fe6c2b602348a73c58752c2ef72bf9d", "version": "3.2.1", diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index 58f1cc79fdc057..67dd88adaa42ff 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bb85393fcea63ff5e643c3bb0cf15bbdad6d8a2e", + "version": "10.0.26", + "port-version": 0 + }, + { + "git-tree": "20fb1fc7a015ebb43e9d01ddbdcb10e351feeeb7", + "version": "10.0.25", + "port-version": 0 + }, { "git-tree": "8c631e7b3f93d40c4aea0d65e722e1ff1ac028ac", "version": "10.0.24", diff --git a/versions/d-/drlibs.json b/versions/d-/drlibs.json index 4862bb458f785f..c03686ca5a9850 100644 --- a/versions/d-/drlibs.json +++ b/versions/d-/drlibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54c4836e6d8403c42520823d58b89c4632201f61", + "version-date": "2023-08-16", + "port-version": 0 + }, { "git-tree": "2b4bfd32103ed7afb27e12281caf95c81930c955", "version-date": "2022-09-26", diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 758fc8a8aec5ba..65b8a2fa4f1aa3 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01b8dcf586886018269bc888cc651751d074d4c6", + "version": "1.8.7", + "port-version": 0 + }, { "git-tree": "7f8d8eadd014bf7d28bfff57e3e11e211fa8c4ae", "version": "1.8.4", diff --git a/versions/d-/dukglue.json b/versions/d-/dukglue.json new file mode 100644 index 00000000000000..795016b4489bc6 --- /dev/null +++ b/versions/d-/dukglue.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "449645283a2e3de0824c9e448135059f26d7626c", + "version-date": "2022-11-08", + "port-version": 0 + } + ] +} diff --git a/versions/d-/duktape.json b/versions/d-/duktape.json index 3849cc553e60c3..e0cbafb5f3e3a1 100644 --- a/versions/d-/duktape.json +++ b/versions/d-/duktape.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dddb2510d64d70d7c0cb632039123a1721857e72", + "version": "2.7.0", + "port-version": 0 + }, { "git-tree": "d5a2a59ce6d8477151b1bd30ad12e5a65ce86331", "version": "2.5.0", diff --git a/versions/d-/dv-processing.json b/versions/d-/dv-processing.json index 9b201c0688478f..f87690c9e166c7 100644 --- a/versions/d-/dv-processing.json +++ b/versions/d-/dv-processing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70c0ee933303903d8a550f89a138bba0541222dc", + "version": "1.7.9", + "port-version": 0 + }, { "git-tree": "8b60bb354ea9ab03a96d4ab7c0c51bca9580cf72", "version": "1.7.8", diff --git a/versions/e-/eastl.json b/versions/e-/eastl.json index e851e47cf8282e..87e144fbb657aa 100644 --- a/versions/e-/eastl.json +++ b/versions/e-/eastl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c5cde8f3324d5cdc8ee405da863177ca8aa7c52", + "version": "3.21.12", + "port-version": 0 + }, { "git-tree": "1e7b533fac097c3aa75f7b46630ea62f10980f87", "version-string": "3.18.00", diff --git a/versions/e-/easyloggingpp.json b/versions/e-/easyloggingpp.json index 535209398505dd..683e4e09d6aa03 100644 --- a/versions/e-/easyloggingpp.json +++ b/versions/e-/easyloggingpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "38a4e115b196ff65465edaf05ce8a89a2640128a", + "version": "9.97.1", + "port-version": 0 + }, + { + "git-tree": "89605d63db69f67c4dfaf9a5b2cc33650967e065", + "version": "9.97.0", + "port-version": 4 + }, { "git-tree": "69f6b238899967e671f818a164f21de0219546bc", "version": "9.97.0", diff --git a/versions/e-/ecal.json b/versions/e-/ecal.json new file mode 100644 index 00000000000000..da14ddb895ddd1 --- /dev/null +++ b/versions/e-/ecal.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cfba9f382140cce351a69ed174cc1b93d0c97483", + "version-semver": "5.12.0", + "port-version": 0 + } + ] +} diff --git a/versions/e-/ecos.json b/versions/e-/ecos.json index 479c91d505e110..900f9608c3b1c2 100644 --- a/versions/e-/ecos.json +++ b/versions/e-/ecos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27839500a8e0bfa142a3486e32410ea3c5c1de42", + "version": "2.0.10", + "port-version": 0 + }, { "git-tree": "78694a162b97c80fc2b0017c3dc13c9c7e79f9c2", "version": "2.0.8", diff --git a/versions/e-/effolkronium-random.json b/versions/e-/effolkronium-random.json index fd709ffc27309e..b907a839dac566 100644 --- a/versions/e-/effolkronium-random.json +++ b/versions/e-/effolkronium-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92d5b3e1b94743447e68f6c774bbbc56b3556461", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "2ffd6600668e6304e7e60f9ef447855efc89a0a0", "version": "1.4.1", diff --git a/versions/e-/elfio.json b/versions/e-/elfio.json index 0f5112d21c8216..c5a2e01444ca9e 100644 --- a/versions/e-/elfio.json +++ b/versions/e-/elfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96b9160e3d2440526fac5a7630d4fec4d26c49e5", + "version": "3.12", + "port-version": 0 + }, { "git-tree": "d5bb36bfbec63a059c47cd839da14a84719ae768", "version": "3.11", @@ -17,7 +22,7 @@ }, { "git-tree": "19659f0b36d05c1643f7ecb4b553341a942b1fd5", - "version": "3.8", + "version-string": "3.8", "port-version": 0 } ] diff --git a/versions/e-/ensmallen.json b/versions/e-/ensmallen.json index ba23af4c8f69a0..1a7e99375d3598 100644 --- a/versions/e-/ensmallen.json +++ b/versions/e-/ensmallen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cc70243efdfb4af7cc5e482a6e976d650487e86", + "version-semver": "2.19.1", + "port-version": 0 + }, { "git-tree": "00de3f8f709bd51bba23d6aa8f01636a1e99f298", "version-semver": "2.19.0", diff --git a/versions/e-/etl.json b/versions/e-/etl.json index 4a53819480251a..e1864678631c3b 100644 --- a/versions/e-/etl.json +++ b/versions/e-/etl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c192d31b7a1db34a2a2de4cab11ed949c54f35da", + "version": "20.38.0", + "port-version": 0 + }, { "git-tree": "4c71341c1081f0135ba14fcc8e1f5007264cdf92", "version": "20.35.4", diff --git a/versions/e-/eventpp.json b/versions/e-/eventpp.json index 4b723916d6f96c..24a65b661036cd 100644 --- a/versions/e-/eventpp.json +++ b/versions/e-/eventpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13f41aca93677fedad3baaf9ed698546434ae379", + "version-semver": "0.1.3", + "port-version": 0 + }, { "git-tree": "3f11cacc8b5a6f9f2951992d29cee39e52ef601f", "version-semver": "0.1.2", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index 08227c2b3f484c..443146396ed380 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "550a17385502e498859987df6696ffdccc55190d", + "version": "0.28.0", + "port-version": 1 + }, + { + "git-tree": "8d3de5f93cf2b1fa2e4a6c3b9ef5b6a30087bb22", + "version": "0.28.0", + "port-version": 0 + }, { "git-tree": "3966c9ebea089fea43d1730cc2b1b21bd5703d3e", "version": "0.27.6", diff --git a/versions/f-/fakeit.json b/versions/f-/fakeit.json index 473350b6275c2f..86fac0f3932955 100644 --- a/versions/f-/fakeit.json +++ b/versions/f-/fakeit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a226f1d679f9c3acf8c67d69d24086e236b67a29", + "version": "2.4.0", + "port-version": 0 + }, { "git-tree": "a167ae0c79d73a0c9802b41992c668a41209a390", "version": "2.3.0", diff --git a/versions/f-/fameta-counter.json b/versions/f-/fameta-counter.json new file mode 100644 index 00000000000000..6a6a92b583aa2a --- /dev/null +++ b/versions/f-/fameta-counter.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e830075f562957049cad7d3d3526e4707884ff0a", + "version-date": "2021-02-13", + "port-version": 0 + } + ] +} diff --git a/versions/f-/farmhash.json b/versions/f-/farmhash.json index e4083b973fd6ad..6fe2af7a8e9e87 100644 --- a/versions/f-/farmhash.json +++ b/versions/f-/farmhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c4cd2b5f5afa61f7192b3e1b175749317189eb9", + "version": "1.1", + "port-version": 6 + }, { "git-tree": "860c81df38a838331a4a2d7895427248d594e5c5", "version": "1.1", diff --git a/versions/f-/fast-float.json b/versions/f-/fast-float.json index 9ac6b5683aa2f8..e768766cb1df06 100644 --- a/versions/f-/fast-float.json +++ b/versions/f-/fast-float.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b78d9590504b99e64f96cdddac42bf67fed57feb", + "version": "5.2.0", + "port-version": 0 + }, { "git-tree": "4b3850e475298431083406c88bd1ced0a0c6e740", "version": "4.0.0", diff --git a/versions/f-/fastcdr.json b/versions/f-/fastcdr.json index fc462dc58f3146..f0a793ccf47f6a 100644 --- a/versions/f-/fastcdr.json +++ b/versions/f-/fastcdr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f8b9c01af9c5166bc7666ca9aac688747ff7a03", + "version-semver": "1.1.0", + "port-version": 0 + }, { "git-tree": "8ac25a2de2fa721da695d61b5346f05e93a51bf7", "version-semver": "1.0.26", diff --git a/versions/f-/fastrtps.json b/versions/f-/fastrtps.json index 06e449faafcffa..eb9a83aba1d1f2 100644 --- a/versions/f-/fastrtps.json +++ b/versions/f-/fastrtps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17e66e986b0296a09cf61691351f381bea310538", + "version": "2.7.0", + "port-version": 3 + }, { "git-tree": "443f550810af037dae538dc5555d7e069f2896ec", "version": "2.7.0", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 6ee27770436029..37e3d561a0a231 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80891c5a004015fd7a5c4334de145c92474f2cec", + "version-string": "2023.10.02.00", + "port-version": 0 + }, { "git-tree": "c2384982312ce0a1ee08ff0da69ff562e3690ffe", "version-string": "2023.07.03.00", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 21bd0e6ad12786..f2a4680e598c0b 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "515f4b8df7a66e74ef6bcde4eae3841d3a96038f", + "version": "6.0", + "port-version": 0 + }, + { + "git-tree": "713c943d5cce36c51128eea921489e0770c28857", + "version": "5.1.2", + "port-version": 10 + }, + { + "git-tree": "dfcd8db452a85e6e6a0ad751dd4610ff1b0e1662", + "version": "5.1.2", + "port-version": 9 + }, + { + "git-tree": "3ee8d10aa504c74cfef80d47e1901afa3289a544", + "version": "5.1.2", + "port-version": 8 + }, { "git-tree": "1fcd248f6f655e6aecb94976680b1c537da6d918", "version": "5.1.2", diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index dc6a492f982925..6cf12fd2600af2 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "129a409f9a9a143a3964c7d6cdb5fef51c777cc4", + "version": "11.1.5.2", + "port-version": 0 + }, { "git-tree": "9f49e200522747c711e28db563004ce1f5a2f816", "version": "11.1.5.0", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 6951cd7291f353..556d768a45a5a3 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d8026070e16e8f91275e5f97699bfd5452166d4", + "version-string": "2023.10.02.00", + "port-version": 0 + }, { "git-tree": "813216afa42f8549aac52519655ab62f8d552c64", "version-string": "2023.07.03.00", diff --git a/versions/f-/flashlight-text.json b/versions/f-/flashlight-text.json index d15068ac343b42..b9db5df589cccd 100644 --- a/versions/f-/flashlight-text.json +++ b/versions/f-/flashlight-text.json @@ -4,11 +4,6 @@ "git-tree": "fdf18ae36763962256b235eec31becbe02f2534d", "version": "0.0.4", "port-version": 0 - }, - { - "git-tree": "6386901fa48bce946fdc5775a1c1b784e0a97175", - "version": "0.0.3", - "port-version": 0 } ] } diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index 8a84797ea76945..ed9855b2a4d481 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac488e485debfb252900bb5e9b6129f19628032b", + "version": "3.2.7", + "port-version": 0 + }, { "git-tree": "df4249183060e697a375b85bc597932f93d47499", "version": "3.2.4", diff --git a/versions/f-/flint.json b/versions/f-/flint.json index 315b3b2209a36e..8653d031e30077 100644 --- a/versions/f-/flint.json +++ b/versions/f-/flint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "282413c373b7f2f2d2d38783fc9c9d8c4492de16", + "version-semver": "2.9.0", + "port-version": 0 + }, { "git-tree": "76d3f8bbb7b1b87a907a338070bfd83938c66986", "version-semver": "2.8.0", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 14ab2d687997fa..3f344caf6b0d4c 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3a06acfea8bc59c70ac08c3028f9afa40134852", + "version": "2.3.4", + "port-version": 0 + }, { "git-tree": "48d3e215031eef593ac67de67ad986d1cd094e9f", "version": "2.3.3", diff --git a/versions/f-/flux.json b/versions/f-/flux.json new file mode 100644 index 00000000000000..1241c2902ebe6b --- /dev/null +++ b/versions/f-/flux.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3be6cb846e140bc6b745f684bbd4141cae6c4dbd", + "version-date": "2023-08-25", + "port-version": 0 + } + ] +} diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index ed8f0bb0f2d06c..009a8810507334 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dfe9aa860f5a8317f341a21d317be1cf44e89f18", + "version": "10.1.1", + "port-version": 0 + }, + { + "git-tree": "d8209382ca192426861c6aa91d217ea8512bda46", + "version": "10.1.0", + "port-version": 0 + }, { "git-tree": "eedb31bb1318118ec6a2d1bec60ab12e484092fd", "version": "10.0.0", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 5779adc0833c4f..79366706fa5c61 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a909b9222ac4ded463976431d65b6b24fa486bd3", + "version-string": "2023.10.02.00", + "port-version": 0 + }, { "git-tree": "16c4e4b0e25b9eb99d5a4b17de525a42a1ecdf48", "version-string": "2023.07.03.00", diff --git a/versions/f-/font-util.json b/versions/f-/font-util.json index 0d765cf2eeff99..a46821bdedd402 100644 --- a/versions/f-/font-util.json +++ b/versions/f-/font-util.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13ebd42f06ed8e809382f48f36c729219e1182eb", + "version": "1.4.1", + "port-version": 0 + }, { "git-tree": "67faf30776c5600c8cfe00f9def5143b5e36eb08", "version": "1.3.2", diff --git a/versions/f-/foonathan-memory.json b/versions/f-/foonathan-memory.json index 3b7abd69e921d7..19312fcb7e115a 100644 --- a/versions/f-/foonathan-memory.json +++ b/versions/f-/foonathan-memory.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b259607933426427c0e9cac415275c1738a6f34", + "version": "0.7.3", + "port-version": 1 + }, { "git-tree": "e5d8f014667fd2e794d0e4dab67adc193731b246", "version": "0.7.3", diff --git a/versions/f-/fplus.json b/versions/f-/fplus.json index 13b59b4569a54a..47223115236f21 100644 --- a/versions/f-/fplus.json +++ b/versions/f-/fplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32f77339885e4a1a1b398c0be917880b991c95dc", + "version": "0.2.20-p0", + "port-version": 0 + }, { "git-tree": "e982e423baaf3d7728a2122368494d1c57c8e55e", "version": "0.2.18-p0", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index 0d7ab33d139523..f88b634cbcd6fc 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "90f838d8fb3b7d8d45b9d64f951486cee618ab8e", + "version": "2.11.2", + "port-version": 0 + }, + { + "git-tree": "43135a7f0ecf1e2fa292ea7f1fbe69dc0d2ec09d", + "version": "2.11.1", + "port-version": 0 + }, { "git-tree": "576db0702d3a36fbca154e4ee18030d28d0e05d0", "version": "2.10.0", diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json index 77d3ed64cedb2c..e93f019c42fd1a 100644 --- a/versions/f-/freetype.json +++ b/versions/f-/freetype.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e52babe5d382c3f9cdb1b8037874d78eceb3512", + "version": "2.12.1", + "port-version": 4 + }, { "git-tree": "db92ea87ff12339808263710675221df6a06ac15", "version": "2.12.1", diff --git a/versions/f-/freexl.json b/versions/f-/freexl.json index 27aa41217d5f81..610b6015fd479a 100644 --- a/versions/f-/freexl.json +++ b/versions/f-/freexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2f0c530b5cb259f17171cb8fc6b58e3642e9334", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "7ffd19cd7345be08a7b93d1d4c806d27b98a83ef", "version": "1.0.6", diff --git a/versions/f-/frugally-deep.json b/versions/f-/frugally-deep.json index 25d93e7aabb1e6..26b21ae044e872 100644 --- a/versions/f-/frugally-deep.json +++ b/versions/f-/frugally-deep.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d25ec18e137e21fcdd4e2770377e7a3e9c5434f1", + "version-semver": "0.15.24", + "port-version": 0 + }, { "git-tree": "c3100096175d535c2c9bc09e3d2195f5729203bc", "version-semver": "0.15.19-p0", diff --git a/versions/f-/fruit.json b/versions/f-/fruit.json index 286b7f39bb5fac..ea37c167813142 100644 --- a/versions/f-/fruit.json +++ b/versions/f-/fruit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f727757ffc9579175eb3e80ae6fee2bf176779b2", + "version": "3.7.1", + "port-version": 0 + }, { "git-tree": "3877043f08c074020d222a58e552523c15923b63", "version": "3.7.0", diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index 251f3791eb670c..36e539f34c2838 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "876ee1aa2ce39652ff1d759eead5a1552402b11d", + "version-semver": "5.0.0", + "port-version": 0 + }, { "git-tree": "e69be1052699ec7fee92c1aaf9b4c1e66f9d47ef", "version-semver": "4.1.1", diff --git a/versions/f-/function2.json b/versions/f-/function2.json index c4716152baa5db..cc68a89d551f2a 100644 --- a/versions/f-/function2.json +++ b/versions/f-/function2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dabfb1835fc765d2091deaae8d556ff300aea4a4", + "version-semver": "4.2.3", + "port-version": 0 + }, { "git-tree": "afa334fcb26a441121e2426e39e879c6574db698", "version-semver": "4.2.2", diff --git a/versions/f-/functions-framework-cpp.json b/versions/f-/functions-framework-cpp.json index 238f1da57a9302..78c450664a0c6f 100644 --- a/versions/f-/functions-framework-cpp.json +++ b/versions/f-/functions-framework-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcad4c80171c219e3f7ad02be34f1de48cf88889", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "e4ad257a93efebb34ffabde85fa4a548d5038706", "version": "1.1.0", diff --git a/versions/g-/gaussianlib.json b/versions/g-/gaussianlib.json index eab7a7d0d8c9ac..aebc510e63b519 100644 --- a/versions/g-/gaussianlib.json +++ b/versions/g-/gaussianlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "323865bad084941748ff0e99a25d7ef090d765f4", + "version-date": "2023-02-17", + "port-version": 0 + }, { "git-tree": "e3e4e44965a910829b7c5872bec340826e2c4559", "version-date": "2019-08-04", diff --git a/versions/g-/gazebo.json b/versions/g-/gazebo.json index 97ee3164a8b7a9..003ebba8fb3a74 100644 --- a/versions/g-/gazebo.json +++ b/versions/g-/gazebo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5ff2241343daba9b2e89620fc5502104b459476", + "version-date": "2022-01-20", + "port-version": 5 + }, { "git-tree": "b1f5088e196340aad31ea3700aceae72df1407ae", "version-date": "2022-01-20", diff --git a/versions/g-/gcem.json b/versions/g-/gcem.json index 8e3e15c996b5cf..8c98cb8e6bc937 100644 --- a/versions/g-/gcem.json +++ b/versions/g-/gcem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "789017cc9de9b4147df9ccdb2b6b156bf487df1a", + "version": "1.17.0", + "port-version": 0 + }, { "git-tree": "573f10694a3f7eb8fbc2ffdfbce1131a76253c3f", "version": "1.16.0", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 7216110a887eb2..bcf45a4a550432 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "d01864aaa21a85e1e8f7bb6748d607e953c52e77", + "version-semver": "3.7.2", + "port-version": 0 + }, + { + "git-tree": "eb6b9c542c7c01651906fee737d73fab64482700", + "version-semver": "3.7.1", + "port-version": 4 + }, + { + "git-tree": "1bffcf8c8f2b02ed041a099723115cbbd0c39b2c", + "version-semver": "3.7.1", + "port-version": 3 + }, + { + "git-tree": "fe574600c39e044d7aa3f4a0e58c1de47f95a430", + "version-semver": "3.7.1", + "port-version": 2 + }, { "git-tree": "80d4c30d98e502446c16c8f7665713916934aca3", "version-semver": "3.7.1", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index aa25b83634a626..8addc98cf40b61 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dc0bb4b0113c8043f2ed716694303d1bdc08d88", + "version": "2.42.10", + "port-version": 2 + }, { "git-tree": "ca75f73ba67cdacfd245b67e6dca8c45fb97ee93", "version": "2.42.10", diff --git a/versions/g-/getopt-win32.json b/versions/g-/getopt-win32.json index 79f9dcd1d2137c..cc974aa83701ba 100644 --- a/versions/g-/getopt-win32.json +++ b/versions/g-/getopt-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d735f424134507a2d87a4ab6d5a8d768ca555dbc", + "version": "1.1.0.20220925", + "port-version": 0 + }, { "git-tree": "28d4331693c8c94a354365fff55df5f5762b7be6", "version": "0.1", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index ad075d3d593418..97e763e29be3b2 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20e8e3535959bba6066d8887bb1c95e622d86f5a", + "version": "0.21.1", + "port-version": 3 + }, { "git-tree": "0915f060ea0fb91c5a2356f2171de0a714e79437", "version": "0.21.1", diff --git a/versions/g-/ginkgo.json b/versions/g-/ginkgo.json index 1c79cf259c3634..941d040ee5ad79 100644 --- a/versions/g-/ginkgo.json +++ b/versions/g-/ginkgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "779490458d51f75bc22ed324afceffe0c3b0ee12", + "version-semver": "1.4.0", + "port-version": 2 + }, { "git-tree": "8b8d35300c7b2bd3efcd7e645579df0a9e67d86d", "version-semver": "1.4.0", diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 1621c6475ff608..94149adb97d024 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "bfeb3e970fc4dd67fcf667cc5e50d3833a07561b", + "version": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "0364df0e7dfc35c4b82b73583cc259bd51580a80", + "version": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "88849c5a68d5bb707658928cb55d9b3fd24c6617", + "version": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "2ab2277d5f2a066a86c9c67d394b8449d3257c66", + "version": "1.3.5", + "port-version": 0 + }, { "git-tree": "6df476658691fa765546e70d6cc9530d0901bd83", "version": "1.3.3", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index be7b7ab01d4ca9..ee968bfb39b576 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4ae4475a91c8ec7f156e5904da9f0c3f02224cdc", + "version": "2.76.5", + "port-version": 0 + }, + { + "git-tree": "ac7af1a224e7dfe9c18e629bf8de7798a0cda932", + "version": "2.76.3", + "port-version": 3 + }, { "git-tree": "c4aa04cd3294219ddd4b43c2f02b95c100683156", "version": "2.76.3", diff --git a/versions/g-/glm.json b/versions/g-/glm.json index cdded4a40783e5..5f8b7654fc5655 100644 --- a/versions/g-/glm.json +++ b/versions/g-/glm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6687c48e237aab1c30cf4c589d08f698f73cf178", + "version-date": "2023-06-08", + "port-version": 0 + }, { "git-tree": "b940020b1f2958fcc468c615becec6ca5ad3bff5", "version": "0.9.9.8", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 6bd1621f1a55d7..98d60404ae19b0 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07a60a91ac63383677c203954125ba981d08f53b", + "version": "13.0.0", + "port-version": 0 + }, { "git-tree": "796a20fde44858a311783328a0555813894631bb", "version": "12.2.0", diff --git a/versions/g-/gmmlib.json b/versions/g-/gmmlib.json index 4f40f75e7c94be..7c0a4f4ab157e5 100644 --- a/versions/g-/gmmlib.json +++ b/versions/g-/gmmlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04bd253bdd2f2e7e02b69feb0d72854fd663d3fb", + "version": "22.3.12", + "port-version": 0 + }, { "git-tree": "d7dbf37aa324f038b12f99d697da82299d3ec9a0", "version": "21.3.2", diff --git a/versions/g-/gmsh.json b/versions/g-/gmsh.json index 1b357c663e8528..b381591bd65949 100644 --- a/versions/g-/gmsh.json +++ b/versions/g-/gmsh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b2ce12dd16815e31348c4dba93b40ec10e815f3", + "version": "4.11.1", + "port-version": 0 + }, { "git-tree": "d01377e2003c3ea5ef7a6b9fb215a086e5f75eed", "version": "4.9.0", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index 7c8c7a13b398e5..4081d456a3dcea 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a697a0e2fa6d441dc5008a6d128a9a8f3e2440ab", + "version": "1.72.0", + "port-version": 5 + }, { "git-tree": "097d9982b8667ff8d67107e9de262d3900e59631", "version": "1.72.0", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index d4ac906abba397..bd68d61b6f6b30 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6b622eca80c311ef081e80432d56f13d9c8f0d72", + "version": "2.15.1", + "port-version": 0 + }, + { + "git-tree": "abe57efc591eb204c5e39b2a78c5c1d6832fc236", + "version": "2.15.0", + "port-version": 0 + }, { "git-tree": "d32a3fa190564c35057874f3912f61ebf07852b7", "version": "2.14.0", diff --git a/versions/g-/gperftools.json b/versions/g-/gperftools.json index 8b3efd86fb9d36..778108dac18ab0 100644 --- a/versions/g-/gperftools.json +++ b/versions/g-/gperftools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebb8ef920067346d4633cc78ee176f7ed9bc89d4", + "version": "2.10", + "port-version": 1 + }, { "git-tree": "a3e7b08a6dcd261b62d0fee3d7f00de84c3b0094", "version": "2.10", diff --git a/versions/g-/graphicsmagick.json b/versions/g-/graphicsmagick.json index 034b473ce63261..edeba88a552fd2 100644 --- a/versions/g-/graphicsmagick.json +++ b/versions/g-/graphicsmagick.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bbaf421dd38787bf4bd5b335bc97417041838bd", + "version": "1.3.41", + "port-version": 0 + }, { "git-tree": "a4995e38b85cfc409f1a61561fde3bada483c23a", "version": "1.3.37", diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json index 2b6e2a2d0bf5e0..2c5bf547f06abb 100644 --- a/versions/g-/graphviz.json +++ b/versions/g-/graphviz.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ba712eb597e2f6b4cd9113689ccb72cb95025d6f", + "version-semver": "9.0.0", + "port-version": 1 + }, + { + "git-tree": "a1450baf722dffefe9e4e4c4b5939ed1933ba269", + "version-semver": "9.0.0", + "port-version": 0 + }, { "git-tree": "793ff2f4883ca15332814044876e57a9b0921c43", "version-semver": "7.0.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index cde4dede10e056..789caf91bfec85 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb74de57b43021aafda930876608035b03eb80a8", + "version-semver": "1.51.1", + "port-version": 1 + }, { "git-tree": "7c026ebb0835a3e342a5aad8e0c2674d3ec77a67", "version-semver": "1.51.1", diff --git a/versions/g-/gsoap.json b/versions/g-/gsoap.json index ec7cae019e5293..292dd993ec90a1 100644 --- a/versions/g-/gsoap.json +++ b/versions/g-/gsoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86dc8a8487c3f3dd327cc36c94e19fe371fa4c4f", + "version": "2.8.112", + "port-version": 2 + }, { "git-tree": "1fa5f6d124e48e4c9c80949c5b8e9c6d40dc2e43", "version": "2.8.112", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 93137f50abe812..90e1edd8925ad9 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7f37f12f5a39fa6eea841721c51bb591039c3251", + "version": "1.22.5", + "port-version": 1 + }, + { + "git-tree": "76183f0a0e77acbf09ac1ae73b1b2a27f986fcf6", + "version": "1.22.5", + "port-version": 0 + }, { "git-tree": "9ad3c702668f673319b620729150bce73d2181eb", "version": "1.20.5", diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index 3af261892344d5..8de53841d0b74a 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6dde67781b31b556e0868cc9f45f3eec59dc2a8", + "version-semver": "1.14.0", + "port-version": 0 + }, { "git-tree": "3f70f42192aacc5f8242c14d959d02a802f7559c", "version-semver": "1.13.0", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index d86b26204fb24c..055364a533a82a 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "814624705f6cc11a3468d9c3418bc20521b6b207", + "version": "4.10.5", + "port-version": 1 + }, + { + "git-tree": "1d2910bafafe5342d557621dfb784fab156ae169", + "version": "4.10.5", + "port-version": 0 + }, + { + "git-tree": "a0674344415ac7da9b123e4dedfe61160c4b6d6a", + "version": "4.10.4", + "port-version": 2 + }, { "git-tree": "a79d7945c3db191e81a4cc3367efb9972b8df29e", "version": "4.10.4", diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json index 45103fa371a34d..f725fc7e2d21d3 100644 --- a/versions/g-/gtk3.json +++ b/versions/g-/gtk3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1362bb3978886e043fd12c089f2c1337a4f1adf8", + "version": "3.24.38", + "port-version": 1 + }, { "git-tree": "63636acf7b77eead112fc9faa84680d1df97acd3", "version": "3.24.38", diff --git a/versions/g-/gz-common5.json b/versions/g-/gz-common5.json new file mode 100644 index 00000000000000..611ae1f287d2cb --- /dev/null +++ b/versions/g-/gz-common5.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ecb88cbb8c52027d083348a8d28705ef7fe861ca", + "version": "5.4.1", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gz-fuel-tools8.json b/versions/g-/gz-fuel-tools8.json new file mode 100644 index 00000000000000..acc0ad72a74900 --- /dev/null +++ b/versions/g-/gz-fuel-tools8.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8d0ee2efa09bb7debd7475b8cc7f8745b3f712aa", + "version": "8.1.0", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gz-msgs9.json b/versions/g-/gz-msgs9.json new file mode 100644 index 00000000000000..f9f78f24a1d9f2 --- /dev/null +++ b/versions/g-/gz-msgs9.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1eb43a446ea3b27c5d7f54505f6588c76f3ad210", + "version": "9.5.0", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gz-plugin2.json b/versions/g-/gz-plugin2.json new file mode 100644 index 00000000000000..2b46ff5d9b0315 --- /dev/null +++ b/versions/g-/gz-plugin2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "aa376761e8fe39c9ff89a989e18e798a831bf273", + "version": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gz-transport12.json b/versions/g-/gz-transport12.json new file mode 100644 index 00000000000000..64d23ddc669dd5 --- /dev/null +++ b/versions/g-/gz-transport12.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0cff2b97b9f6d2e46b5fea0158431fb2c3a92fba", + "version": "12.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 7cedfdc6c8fce9..2a9dc543686d43 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6894af0b171aea403718ebb131b454a60b0c961a", + "version": "8.2.1", + "port-version": 0 + }, + { + "git-tree": "053b71e591f5599aa5e887fbf6531c7baa58b23d", + "version": "8.2.0", + "port-version": 1 + }, + { + "git-tree": "d804324af44593c0877fdf035cda178123d9c87f", + "version": "8.2.0", + "port-version": 0 + }, { "git-tree": "458a6aee4457133d8ea6b97f1a18724fead35551", "version": "8.1.1", diff --git a/versions/h-/hffix.json b/versions/h-/hffix.json index 0b6f095fbe4546..dee2f129b25796 100644 --- a/versions/h-/hffix.json +++ b/versions/h-/hffix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3aab9fe5c85f6055d5df986ca8c6a8e67cd7014c", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "ae376d1e63858194fc64a2c32221d273d0e2d953", "version": "1.2.1", diff --git a/versions/h-/highfive.json b/versions/h-/highfive.json index cf55ddfb0c7df3..38d69a6cceaea3 100644 --- a/versions/h-/highfive.json +++ b/versions/h-/highfive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de97a368e21a37ade6556f064c16409a0a3132dd", + "version": "2.7.1", + "port-version": 0 + }, { "git-tree": "6139bdb8e7791f8cc8cf5a355dad303f277e2c6e", "version": "2.6.2", diff --git a/versions/h-/highs.json b/versions/h-/highs.json index 33084f2d72c37d..508cd5fc93b4c6 100644 --- a/versions/h-/highs.json +++ b/versions/h-/highs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf3c23e1f9f53ae9d35cd62b49a064556bf9ec13", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "0480e56032ae6758dd2e09528a02ab5bc175b537", "version": "1.5.1", diff --git a/versions/h-/highway.json b/versions/h-/highway.json index c1113e469d221d..2f93afb33d14ab 100644 --- a/versions/h-/highway.json +++ b/versions/h-/highway.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38d663dc2875706f01a199516d1c3ddef59296e7", + "version": "1.0.7", + "port-version": 0 + }, { "git-tree": "221bc90fda5b814132f77cac6e28750dc7525323", "version": "1.0.6", diff --git a/versions/h-/hikogui.json b/versions/h-/hikogui.json index 2bc102777e9ce3..f23b1bd3d5abfc 100644 --- a/versions/h-/hikogui.json +++ b/versions/h-/hikogui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92a9a5aedbc104981ec2fe41b097e8f2c65896f7", + "version": "0.8.1", + "port-version": 0 + }, { "git-tree": "3ed99f330c9de6be97e6e2e25c3ff55080fbbcd5", "version": "0.7.0", diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index 3e92852fef943b..0ae7c9f0eff9f9 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94d5f165d483752d4b7996bd1414497c5299208f", + "version": "1.9.1", + "port-version": 0 + }, { "git-tree": "2d21a35d6723060eccbe376e9e694991cadb90b2", "version": "1.8.1", diff --git a/versions/h-/hunspell.json b/versions/h-/hunspell.json index 1e1ac1b1b31c75..4ea29fa142cb97 100644 --- a/versions/h-/hunspell.json +++ b/versions/h-/hunspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "adbb8a9460f3c540d3d5719c519c32b97b3f5844", + "version": "1.7.2", + "port-version": 0 + }, { "git-tree": "661af60066452aeb627f9cf0675303b7ac677a02", "version": "1.7.1", diff --git a/versions/h-/hwloc.json b/versions/h-/hwloc.json index cff54c680fcdd1..0308b80e1a740f 100644 --- a/versions/h-/hwloc.json +++ b/versions/h-/hwloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c536aed23026d6f8a30f1815e47f30652112c22", + "version": "2.9.3", + "port-version": 0 + }, { "git-tree": "a5178039005718c78a3a9a0386fb4e6113797576", "version": "2.9.0", diff --git a/versions/h-/hypre.json b/versions/h-/hypre.json index 758633abb6cf97..39edafad89499d 100644 --- a/versions/h-/hypre.json +++ b/versions/h-/hypre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb61b149787c812f654a86f6863a6e4b8cb011cb", + "version": "2.29.0", + "port-version": 0 + }, { "git-tree": "8e59caf45e83417ef29aec09ecb532d5e39ef6b5", "version": "2.23.0", diff --git a/versions/i-/ideviceinstaller.json b/versions/i-/ideviceinstaller.json index 6ef3f5ba92fc94..b8f1d1fddb1369 100644 --- a/versions/i-/ideviceinstaller.json +++ b/versions/i-/ideviceinstaller.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "eff7fcd07b94280ed7c5517ac113b95b3b3bd6a3", + "version-date": "2023-07-21", + "port-version": 0 + }, + { + "git-tree": "7aba247c233ef7200fd22094b8a44c7c836a62d8", + "version": "1.1.2.23", + "port-version": 7 + }, { "git-tree": "7e90c045618ecd5001790b38c44567d47397801e", "version": "1.1.2.23", diff --git a/versions/i-/idevicerestore.json b/versions/i-/idevicerestore.json index 1db7a148e83b93..60f2555a6f9927 100644 --- a/versions/i-/idevicerestore.json +++ b/versions/i-/idevicerestore.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b2bbff840af200a3f2b21b5d19f95f223aca4428", + "version-date": "2023-05-23", + "port-version": 0 + }, + { + "git-tree": "6d1dcd84f69fa4a5006fd26741e2dfd6fbf38a16", + "version": "1.0.12", + "port-version": 8 + }, { "git-tree": "0269d10da20f4f0b8d1317f21b71a7e8cac0ff16", "version": "1.0.12", diff --git a/versions/i-/ignition-common3.json b/versions/i-/ignition-common3.json index 375f3e4324966e..bdd40778deea42 100644 --- a/versions/i-/ignition-common3.json +++ b/versions/i-/ignition-common3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae2e9feb5941cbe46f6aeaa757078c0074ed33fe", + "version": "3.16.0", + "port-version": 0 + }, { "git-tree": "f63b7872dccdd6f71e0a075ea4bbf677c679a9d8", "version": "3.14.1", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index 8fc3056a7f03a9..b9a57503a9a6a9 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebbf67005ba6625597ef12c78cccf2d67854701d", + "version": "0.10.7", + "port-version": 0 + }, { "git-tree": "9af4a5b0f4764e59cb3c107a55646b9c26555aaf", "version": "0.10.6", diff --git a/versions/i-/imath.json b/versions/i-/imath.json index ff451ccffac500..a04da5782798d0 100644 --- a/versions/i-/imath.json +++ b/versions/i-/imath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47c02f0c550c3639178d554a27475f376c2fdcbc", + "version": "3.1.9", + "port-version": 1 + }, { "git-tree": "1853273c56448fff5ec5e2c9133895922df682bd", "version": "3.1.9", diff --git a/versions/i-/imgui-node-editor.json b/versions/i-/imgui-node-editor.json new file mode 100644 index 00000000000000..be4fe961d4acd7 --- /dev/null +++ b/versions/i-/imgui-node-editor.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "26e2cf3260ea1e08e61912431635f49d24b6ea87", + "version": "0.9.2", + "port-version": 0 + } + ] +} diff --git a/versions/i-/imgui-sfml.json b/versions/i-/imgui-sfml.json index 7f866893345d1d..912d81d20fccd4 100644 --- a/versions/i-/imgui-sfml.json +++ b/versions/i-/imgui-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "534384362159db50f833348914cf01bd8c1fb648", + "version": "2.6", + "port-version": 0 + }, { "git-tree": "62fe2b504e6630d4d191ba92ffb288e109260835", "version": "2.5", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index f49ce3c2fa7f2a..7537260258b711 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "37d78911bfdf98548568771acd72f7e6a88d1e58", + "version": "1.89.9", + "port-version": 0 + }, + { + "git-tree": "5be94cd09a52d92e1ad194fa7f29846619529be2", + "version": "1.89.7", + "port-version": 1 + }, { "git-tree": "9b44fd53ec5a9aa2f9b272bab4a9a5d97e0aa82f", "version": "1.89.7", diff --git a/versions/i-/implot.json b/versions/i-/implot.json index 6f4f89b5a2110d..61f00acd7d050c 100644 --- a/versions/i-/implot.json +++ b/versions/i-/implot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "688b48b9fc371ad59a57d92b05d7fd3699c4a57e", + "version": "0.16", + "port-version": 0 + }, { "git-tree": "8cd7aca733072549426cfb1e309c4831340713b1", "version": "0.15", diff --git a/versions/i-/influxdb-cxx.json b/versions/i-/influxdb-cxx.json index 378898183f2eaf..a9b69f08006b55 100644 --- a/versions/i-/influxdb-cxx.json +++ b/versions/i-/influxdb-cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2b48983d5264e3524e619757f16eac814337ecb", + "version": "0.7.1", + "port-version": 1 + }, { "git-tree": "d03720b58912770380a8101fdbb729a57598a904", "version": "0.7.1", diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index 5117e181595b73..7045e4a98a8917 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dd3ebb16924351eed10c170704517f54a72f274", + "version": "2023.0.0", + "port-version": 3 + }, { "git-tree": "2d2adb8cb7c54dd3dc17a92c22db24204c638e72", "version": "2023.0.0", diff --git a/versions/i-/ismrmrd.json b/versions/i-/ismrmrd.json index b1faa991d83c66..1b739596c1ccc7 100644 --- a/versions/i-/ismrmrd.json +++ b/versions/i-/ismrmrd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b378ab76b7b723dd6b9091f897c87b5a99fc11b7", + "version": "1.13.2", + "port-version": 1 + }, { "git-tree": "f8f4bb483f585631015c8991706874b535628dec", "version": "1.13.2", diff --git a/versions/i-/ixwebsocket.json b/versions/i-/ixwebsocket.json index 2136d72f0b732c..f30b384472f6e9 100644 --- a/versions/i-/ixwebsocket.json +++ b/versions/i-/ixwebsocket.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f0154088c4d12066bd00f7794ccb90feaa1f3d92", + "version-semver": "11.4.4", + "port-version": 2 + }, + { + "git-tree": "5b7a553c76d49514bc70203959be6b7bd4981090", + "version-semver": "11.4.4", + "port-version": 1 + }, { "git-tree": "8831fc46f1465a5630978a28255c9edab0fed860", "version-semver": "11.4.4", diff --git a/versions/j-/jack2.json b/versions/j-/jack2.json index a3105dccdc5a93..69c82d98959b99 100644 --- a/versions/j-/jack2.json +++ b/versions/j-/jack2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c91c996f53c11dc1e5d4b3602e78355042f54382", + "version-semver": "1.9.22", + "port-version": 0 + }, + { + "git-tree": "a0a0853f6b57a72e4a8d33eb0dd5dd29716224ea", + "version-semver": "1.9.21", + "port-version": 1 + }, { "git-tree": "84f683fbf07cae4c021f1d0d5fd5cab7b58d991e", "version-semver": "1.9.21", diff --git a/versions/j-/jbig2dec.json b/versions/j-/jbig2dec.json index 346b12ab30c628..2f080b961409dc 100644 --- a/versions/j-/jbig2dec.json +++ b/versions/j-/jbig2dec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d34cf9e520c5866b3facce621e46e438eb1b31c5", + "version": "0.20", + "port-version": 0 + }, { "git-tree": "ff97df9b9703a6314f50e608b155efb780d6deb7", "version": "0.19", diff --git a/versions/j-/joltphysics.json b/versions/j-/joltphysics.json index 1041f77e1a99a5..0785b3f9b75610 100644 --- a/versions/j-/joltphysics.json +++ b/versions/j-/joltphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8fca568d1ae240c8d3ca23ae3b9a09f6fb518ba", + "version": "3.0.1", + "port-version": 1 + }, { "git-tree": "aa3834efa767ca95d2a0f7b367fe4f154101a35e", "version": "3.0.1", diff --git a/versions/j-/json-rpc-cxx.json b/versions/j-/json-rpc-cxx.json new file mode 100644 index 00000000000000..b28d568205e192 --- /dev/null +++ b/versions/j-/json-rpc-cxx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e5c4ccb3e679891167fa7d4b6a14ac5dbae14c40", + "version": "0.3.1", + "port-version": 0 + } + ] +} diff --git a/versions/j-/jsoncons.json b/versions/j-/jsoncons.json index 69c66685769454..605e6479e31513 100644 --- a/versions/j-/jsoncons.json +++ b/versions/j-/jsoncons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ac2b57ee5cadef41175e8b3e2a13b28751bfb2d", + "version": "0.171.0", + "port-version": 0 + }, { "git-tree": "281de10de972059292e2850f6f509eb6cb9b2c40", "version": "0.170.2", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index 434e63bd2e87dd..1ce6a7c736920e 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "3e076a2668e15aa6ad44ff29f45356467f745766", + "version": "0.9.8", + "port-version": 0 + }, + { + "git-tree": "3cd676f349ff8f3ee120d87428d06c8cf80560e9", + "version": "0.9.7", + "port-version": 0 + }, + { + "git-tree": "a7b70ee5b86b8dcecc7c0661491a4f1b84adc315", + "version": "0.9.6", + "port-version": 0 + }, { "git-tree": "fb8f713395cadfb17465e75f390763ae796b0a11", "version": "0.9.5", diff --git a/versions/j-/jsonnet.json b/versions/j-/jsonnet.json index 2eb4d1b35f74b0..87af791d673392 100644 --- a/versions/j-/jsonnet.json +++ b/versions/j-/jsonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d58bf2d0d8b29fbcd87bfa9bcc4725aaec9283ad", + "version": "0.20.0", + "port-version": 0 + }, { "git-tree": "d44312d784436a66ae779d4b644aa29e3ebe23e8", "version": "0.18.0", diff --git a/versions/k-/kdbindings.json b/versions/k-/kdbindings.json index fbcc9ef3c1ecfa..d084614bbbd005 100644 --- a/versions/k-/kdbindings.json +++ b/versions/k-/kdbindings.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0fb5ebfb45d90dd4a270978c49e490ffe5ea133", + "version": "1.0.3", + "port-version": 0 + }, { "git-tree": "5dc85351398a57c7b222ac7a57952849c327c18b", "version": "1.0.0", diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json index 4daa0f0f37d0a9..46e632f2bf6706 100644 --- a/versions/k-/kf5solid.json +++ b/versions/k-/kf5solid.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8c660cbdee5e0b076d034c774bdd4ac2e92d18eb", + "version": "5.98.0", + "port-version": 3 + }, + { + "git-tree": "3a95b547baf6f1c849928b20dfc319a2374f975f", + "version": "5.98.0", + "port-version": 2 + }, { "git-tree": "7b532dd98f6da51797e2f14681dfc859fb02d8de", "version": "5.98.0", diff --git a/versions/k-/kinectsdk1.json b/versions/k-/kinectsdk1.json index 3c12c23ce49af7..c0355d7cedda03 100644 --- a/versions/k-/kinectsdk1.json +++ b/versions/k-/kinectsdk1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13e4fb052326c67afb016cb1e4ad9de60dd15fe5", + "version": "1.8", + "port-version": 8 + }, { "git-tree": "95650640a3c97fff440182fb35e878cc0b3111de", "version": "1.8", diff --git a/versions/k-/kinectsdk2.json b/versions/k-/kinectsdk2.json index 805c9c7d6f717b..6e84e1c122ffba 100644 --- a/versions/k-/kinectsdk2.json +++ b/versions/k-/kinectsdk2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d794c2a74ee00c3ed932903f7d0587024fab247e", + "version": "2.0", + "port-version": 7 + }, { "git-tree": "e703f6797d85c9d99a150e4325c67bf7f3a7ea3f", "version": "2.0", diff --git a/versions/k-/krabsetw.json b/versions/k-/krabsetw.json index 101a631282aee3..eeced5017d3fc5 100644 --- a/versions/k-/krabsetw.json +++ b/versions/k-/krabsetw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "131b7ae7482a9c9eedcd0c819265d3ab39b0d4c5", + "version": "4.3.1", + "port-version": 0 + }, { "git-tree": "b1f3fa7092c3cb91e5891fcf8f0923dd1f604887", "version": "4.1.18", diff --git a/versions/l-/launch-darkly-server.json b/versions/l-/launch-darkly-server.json index 92e1c4fbcad732..5db0081827d2ab 100644 --- a/versions/l-/launch-darkly-server.json +++ b/versions/l-/launch-darkly-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2e41e5748cc5b77167205b83be64003e979e637", + "version": "2.8.6", + "port-version": 1 + }, { "git-tree": "1d45ebf10971a96ca975c36630545acfbc37b64b", "version": "2.8.6", diff --git a/versions/l-/lazy-importer.json b/versions/l-/lazy-importer.json index 85591f3cb07c31..bfb31e55115f53 100644 --- a/versions/l-/lazy-importer.json +++ b/versions/l-/lazy-importer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc2b18f5f193267ac091e6495ea097e67d60d33b", + "version-date": "2023-08-03", + "port-version": 0 + }, { "git-tree": "ba952940f6531135428e3827d0610d3596b683cb", "version-date": "2022-02-09", diff --git a/versions/l-/leveldb.json b/versions/l-/leveldb.json index ca60686d3c08f7..94917e8cff9005 100644 --- a/versions/l-/leveldb.json +++ b/versions/l-/leveldb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "893680e6d71d61d7bcf7c132c8a2263c0fa4c72a", + "version": "1.23", + "port-version": 0 + }, + { + "git-tree": "9eff4d1f18a28c13709e987d759a116a36a6a14a", + "version": "1.22", + "port-version": 7 + }, { "git-tree": "c7a1016e970ae104981e8a8fcc5069593bf716b3", "version": "1.22", diff --git a/versions/l-/libavif.json b/versions/l-/libavif.json index 29aee2f4e9ac38..8a8e94f6dae276 100644 --- a/versions/l-/libavif.json +++ b/versions/l-/libavif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "864c480bb39144c9905eb74976a59efd74224429", + "version-semver": "0.11.1", + "port-version": 2 + }, { "git-tree": "775b04db12d2353cc6e69d54faef89b857dd32eb", "version-semver": "0.11.1", diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index 2a8edfb47e29d9..0fe63b070037c3 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a3f08e9e91a77ee7b6b56f88d1e0013349c34e1", + "version": "1.24.3", + "port-version": 0 + }, { "git-tree": "c50f1bbb02e6ac4f6b6f928f4c931922017997d9", "version": "1.22.2", diff --git a/versions/l-/libcap.json b/versions/l-/libcap.json new file mode 100644 index 00000000000000..1fe3d4d68e66b7 --- /dev/null +++ b/versions/l-/libcap.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3f8091b1a094e5a0ab51652478289c040e98e7ca", + "version": "2.69", + "port-version": 1 + }, + { + "git-tree": "78c061106eac6df0a86b27df684998c780c70008", + "version": "2.69", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libcoro.json b/versions/l-/libcoro.json new file mode 100644 index 00000000000000..12ad22eb9c352a --- /dev/null +++ b/versions/l-/libcoro.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "36f9c61aa64e8be9670199b9efad6cec4e83b805", + "version": "0.9", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libcroco.json b/versions/l-/libcroco.json index 2a4f465f5a4ff3..7a5927adc4962e 100644 --- a/versions/l-/libcroco.json +++ b/versions/l-/libcroco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb00cde342d5aad9f925f36c471d4e047a1dca23", + "version": "0.6.13", + "port-version": 6 + }, { "git-tree": "c6962c2f97aca37a74b56870cc7ff032605cfba2", "version": "0.6.13", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 046e451e033952..4284fedbe7f4cf 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3552621ddd4919b86e0b0333bf6530cc1402ec6f", + "version-semver": "0.18.6", + "port-version": 2 + }, { "git-tree": "8b22ab8a6787704e52d3b715feb12e38522540ab", "version-semver": "0.18.2", diff --git a/versions/l-/libdeflate.json b/versions/l-/libdeflate.json index 92a1afdf67b6c2..6459b0a55fe851 100644 --- a/versions/l-/libdeflate.json +++ b/versions/l-/libdeflate.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "60231c270c3eca938a64b43dfb0b66846787a464", + "version": "1.19", + "port-version": 0 + }, + { + "git-tree": "6a0df33e92ed3be5674c6c0a4fd63faff93dea9d", + "version": "1.18", + "port-version": 0 + }, { "git-tree": "023c8297e1d45d680194366783974818522294bd", "version": "1.17", diff --git a/versions/l-/libdjinterop.json b/versions/l-/libdjinterop.json index dc54a7ad217763..75328ed522c8b6 100644 --- a/versions/l-/libdjinterop.json +++ b/versions/l-/libdjinterop.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2f886c676ab640fe3ab80c7caa4a1dce77d9400d", + "version": "0.20.1", + "port-version": 0 + }, + { + "git-tree": "33f7bc90315ef3a477504fcf9a9b42339bb963d5", + "version": "0.20.0", + "port-version": 0 + }, { "git-tree": "78aec7e730a45c7a576233e68ed1858d2e8a9cd7", "version": "0.19.2", diff --git a/versions/l-/libfabric.json b/versions/l-/libfabric.json index f12f77fad18d01..913c910632c407 100644 --- a/versions/l-/libfabric.json +++ b/versions/l-/libfabric.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19c6e0eeaef3d31e6a2f722a99d418bc03275f1a", + "version-semver": "1.13.2", + "port-version": 2 + }, { "git-tree": "d0a766bd1f01a742dcc12e13bafd741b94d7a3c0", "version-semver": "1.13.2", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index c8a9458b344b22..e675172fcb9dbb 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "db85488447cfda7bcc5e08452d8581ac0295b4c9", + "version": "3.4.4", + "port-version": 5 + }, + { + "git-tree": "d189744d6e4f29ab0a2f88f3c75f01d0c3719618", + "version": "3.4.4", + "port-version": 4 + }, + { + "git-tree": "5229da2e57e35c0ab7d043b27c19a29355e0a2c2", + "version": "3.4.4", + "port-version": 3 + }, { "git-tree": "df29b345dbd3f713c6bad15ca3d5f19ec961d79f", "version": "3.4.4", diff --git a/versions/l-/libflac.json b/versions/l-/libflac.json index 7ee0e0f54e3ad3..4881803176cae8 100644 --- a/versions/l-/libflac.json +++ b/versions/l-/libflac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b03480bcc5f27cdc9a5f51fef012f880f1b0bf8d", + "version": "1.4.3", + "port-version": 0 + }, { "git-tree": "d5f68de2a2c015247322b369a6b94052135df51a", "version": "1.4.2", diff --git a/versions/l-/libgnutls.json b/versions/l-/libgnutls.json index 74beeb3016c9b8..d8aa09978a5bc6 100644 --- a/versions/l-/libgnutls.json +++ b/versions/l-/libgnutls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7818d88f0b76ec5775b8bc6269ebf22d9aea466d", + "version": "3.8.1", + "port-version": 0 + }, { "git-tree": "93d9f1a3a919257ac3d518297d3ef4d34b5f5e3e", "version": "3.7.8", diff --git a/versions/l-/libideviceactivation.json b/versions/l-/libideviceactivation.json index 8d33991d9cc59d..29d1637dd56e5d 100644 --- a/versions/l-/libideviceactivation.json +++ b/versions/l-/libideviceactivation.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2926e108a78ecdd707c707720093af757292f800", + "version-date": "2023-05-01", + "port-version": 1 + }, + { + "git-tree": "5f8ea4177ba77bb2eb82284c8ee31504cb7dfbc7", + "version-date": "2023-05-01", + "port-version": 0 + }, { "git-tree": "5ff1d3dc1c70954efdb1b56ea38660c8e2817a68", "version": "1.3.17", diff --git a/versions/l-/libimobiledevice-glue.json b/versions/l-/libimobiledevice-glue.json new file mode 100644 index 00000000000000..0002b1799f452c --- /dev/null +++ b/versions/l-/libimobiledevice-glue.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8511a9380c2fc23a78609fd9aaf5a7dde1aef135", + "version-date": "2023-05-13", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libimobiledevice.json b/versions/l-/libimobiledevice.json index 3c840fbbe10a94..7704d200eb4561 100644 --- a/versions/l-/libimobiledevice.json +++ b/versions/l-/libimobiledevice.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cdbf91c1b491bd8230042a4c90a3cb3a5baa2e2e", + "version-date": "2023-07-05", + "port-version": 1 + }, + { + "git-tree": "b7b8456460bdd58cd90cd74a468c6e16a2053f36", + "version-date": "2023-07-05", + "port-version": 0 + }, { "git-tree": "7b950fc1c05e12ac6349b88de19d2df84e9393a7", "version": "1.3.17", diff --git a/versions/l-/libirecovery.json b/versions/l-/libirecovery.json index 3aef62a3867863..98cd10b21d1b81 100644 --- a/versions/l-/libirecovery.json +++ b/versions/l-/libirecovery.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "72b9637bc62e62eb478d09618545c419bf21ed48", + "version-date": "2023-05-13", + "port-version": 1 + }, + { + "git-tree": "0e9b8ce22a277344a7f29c62f38bf44458a129ba", + "version-date": "2023-05-13", + "port-version": 0 + }, + { + "git-tree": "d3d139450efc9411edc51dea49130dddf09a08d0", + "version": "1.0.25", + "port-version": 8 + }, { "git-tree": "bd02ed99ae380b71fb4bc55f98012c20e7d73bb8", "version": "1.0.25", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 67f670835a73a2..91026f6f0cfb64 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4510832adaa3f5f415a59d26f5520ca250a8ff77", + "version": "3.0.0", + "port-version": 2 + }, + { + "git-tree": "91d431c26902a8c0b21e7956caa136093b7d7d6b", + "version": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "3cd08939c6dab1963ac5b309a4205b2f4534fb79", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "a54bb2bec4dfc177249e2c10b31a665c249c660c", "version": "2.1.5.1", diff --git a/versions/l-/libjxl.json b/versions/l-/libjxl.json index cec4a8082c1ba0..518d68885e5e9a 100644 --- a/versions/l-/libjxl.json +++ b/versions/l-/libjxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e8bdc34b806242bb7ed7fbabdf75d4781b3f7b7", + "version-semver": "0.8.2", + "port-version": 1 + }, { "git-tree": "f97d35060ccfc751fc3729988cef203437c5a0dc", "version-semver": "0.8.2", diff --git a/versions/l-/libkml.json b/versions/l-/libkml.json index b5da5963115026..2819edd6067b06 100644 --- a/versions/l-/libkml.json +++ b/versions/l-/libkml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "010ce552eaee999aaf220936eb3e46b5bb88a9fc", + "version": "1.3.0", + "port-version": 13 + }, { "git-tree": "84ea1bd884a5d5afee127b15e73ef5bb7ba638dc", "version": "1.3.0", diff --git a/versions/l-/libmad.json b/versions/l-/libmad.json index d2174b16ac02af..2efbed70eea9e9 100644 --- a/versions/l-/libmad.json +++ b/versions/l-/libmad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88e56333079029031e808b84c95ded6dd33a2bbd", + "version": "0.15.1", + "port-version": 13 + }, { "git-tree": "eaed142825775ca972204c5c2d7720043eef3c2b", "version": "0.15.1", diff --git a/versions/l-/libmesh.json b/versions/l-/libmesh.json index e7b3fb10271f9e..6aae1b7e5ae92b 100644 --- a/versions/l-/libmesh.json +++ b/versions/l-/libmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c6d096079002a5a867cccb4f6204f871eeaf2e1", + "version": "1.5.0", + "port-version": 6 + }, { "git-tree": "73d90f24859b402b05ffe0e27eea3db3ab58a2ea", "version": "1.5.0", diff --git a/versions/l-/libmicrodns.json b/versions/l-/libmicrodns.json index e6ac063ef05c36..753246036cc435 100644 --- a/versions/l-/libmicrodns.json +++ b/versions/l-/libmicrodns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7476d4e62a4bec9d779d445ae3222c505aa4babe", + "version": "0.2.0", + "port-version": 2 + }, { "git-tree": "6ea7d0ad7b306f0c554fff32499486c6c4758105", "version": "0.2.0", diff --git a/versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json index 33ff1494504c24..deb1c80615ce04 100644 --- a/versions/l-/libmicrohttpd.json +++ b/versions/l-/libmicrohttpd.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "528d4043cc7a0784b2f1e1ba77455a8559498b2e", + "version": "0.9.77", + "port-version": 2 + }, + { + "git-tree": "0adb976e126f21ec1db080fe45b8b6e084bbbd5b", + "version": "0.9.77", + "port-version": 1 + }, { "git-tree": "99533d05bd2e457102ebabc8c74a065bc62eb900", "version": "0.9.77", diff --git a/versions/l-/libmodbus.json b/versions/l-/libmodbus.json index 30f4d8df12e4de..8f80b0bcc688e9 100644 --- a/versions/l-/libmodbus.json +++ b/versions/l-/libmodbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5af2a746eeb644d4c228d03f4bb7854cf4f5691b", + "version": "3.1.10", + "port-version": 0 + }, { "git-tree": "803427a42499df9013b9e6a4dc3501384fc69760", "version": "3.1.6", diff --git a/versions/l-/libosip2.json b/versions/l-/libosip2.json index 971d5e550fd8ca..74d6a3bc4f3155 100644 --- a/versions/l-/libosip2.json +++ b/versions/l-/libosip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b3b93c2039a5369ddd07c5dfb482644ce18c961", + "version": "5.2.0", + "port-version": 4 + }, { "git-tree": "564b7ffdb88b7d1b1823d7ec1166325337ae3ec5", "version": "5.2.0", diff --git a/versions/l-/libosmium.json b/versions/l-/libosmium.json index da13b3936b116b..f3070b6cbf3ed2 100644 --- a/versions/l-/libosmium.json +++ b/versions/l-/libosmium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b77d6ee3568b3a3fedb7b00984ae085253e46506", + "version-semver": "2.20.0", + "port-version": 0 + }, { "git-tree": "e6b30515f2657f3623fa5f0f006a28d9891046ac", "version-semver": "2.19.0", diff --git a/versions/l-/libplist.json b/versions/l-/libplist.json index 5c5d1a0c59f247..d502fdd3737d73 100644 --- a/versions/l-/libplist.json +++ b/versions/l-/libplist.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c0550bd82aaa3f3ae23f9b481285c6cb9f92b44c", + "version-date": "2023-06-15", + "port-version": 1 + }, + { + "git-tree": "8a79aaf94792ae73eea5094eebac773fe6705b54", + "version-date": "2023-06-15", + "port-version": 0 + }, { "git-tree": "e18bc499ccc42a248f2d88c1f5614d4f4314f4eb", "version": "1.3.6", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index 25b1740628cc26..b4c4666cfe574f 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "859b43f8db33293c411c365d945ecd4ae2cc056b", + "version": "15.3", + "port-version": 2 + }, { "git-tree": "a62f65ad38aa981b6ff7474e16f739a3ffbc622b", "version": "15.3", diff --git a/versions/l-/libremidi.json b/versions/l-/libremidi.json new file mode 100644 index 00000000000000..ba6cc62e387e3f --- /dev/null +++ b/versions/l-/libremidi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4c1473e864943f0e6189d315c1eb09a77ce3a3f0", + "version": "4.1.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index 77031ecdba217a..e7346994f20930 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba6e6aad1557505c8ede7b320d554bd2cab6bb7d", + "version": "2.40.20", + "port-version": 10 + }, { "git-tree": "c75d4ca281d1bba78571abdb035e025ded217c00", "version": "2.40.20", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index 2db3b9903a404e..386712e5c87f92 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c988a575680cb06fded62a1f63d43426d683dfd", + "version": "5.1.0", + "port-version": 0 + }, { "git-tree": "ea959bb978266565d868fff1aed8641b56493131", "version": "5.0.1", diff --git a/versions/l-/libsrtp.json b/versions/l-/libsrtp.json index 8d751f5ffce53b..5ca8d8ec93bf88 100644 --- a/versions/l-/libsrtp.json +++ b/versions/l-/libsrtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27c325c9851b5c07e172e74e312e8070af7b9d0b", + "version": "2.5.0", + "port-version": 0 + }, { "git-tree": "d66d808ef040f2802ffa00ec6c4728d5603e76f9", "version": "2.4.2", diff --git a/versions/l-/libsvm.json b/versions/l-/libsvm.json index aba9aa6c2e58d0..e668294437c7d4 100644 --- a/versions/l-/libsvm.json +++ b/versions/l-/libsvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ee5de615b1449a216f61cb83ec2704e93a34495", + "version": "3.25", + "port-version": 1 + }, { "git-tree": "a5bcb4cdaf7906a6e12948dcb5b170f79fba900e", "version": "3.25", diff --git a/versions/l-/libsystemd.json b/versions/l-/libsystemd.json new file mode 100644 index 00000000000000..24e90f3bdc4c48 --- /dev/null +++ b/versions/l-/libsystemd.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bc87d660ee35fa2665c12cbd8cb80896f21f99af", + "version": "254", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libunwind.json b/versions/l-/libunwind.json new file mode 100644 index 00000000000000..b538e13db16aae --- /dev/null +++ b/versions/l-/libunwind.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "294a42641c25a25372ce73673ad0ec151ed50fac", + "version": "1.7.2", + "port-version": 0 + } + ] +} diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 0f0671d5b7f504..2797aff8c4b7ad 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "317cfa2c23f9e0e285b1c36140cdb54739ebf328", + "version": "2.4", + "port-version": 0 + }, { "git-tree": "c51f4ef4488799a1c1389216ea8f7cec8be14b62", "version": "2.3", diff --git a/versions/l-/libusbmuxd.json b/versions/l-/libusbmuxd.json index 520deb97c472d9..f040decbac8f81 100644 --- a/versions/l-/libusbmuxd.json +++ b/versions/l-/libusbmuxd.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ba5bfe9a2e679d22d3b3b520e432c493df3919e9", + "version-date": "2023-06-21", + "port-version": 1 + }, + { + "git-tree": "7a9145917e1df41e8820d26c2e167f3839d7a947", + "version-date": "2023-06-21", + "port-version": 0 + }, { "git-tree": "82278a08f20aabe20c5ba0981de631ad6f9df469", "version": "1.2.219", diff --git a/versions/l-/libvmdk.json b/versions/l-/libvmdk.json index fcbd863f139b28..e69c40ab703845 100644 --- a/versions/l-/libvmdk.json +++ b/versions/l-/libvmdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2065c045d5787d9fff6469d31fe6bbe2f925d367", + "version": "20221124", + "port-version": 0 + }, { "git-tree": "1e57cc839896d460f87ccf1a48562dcb876f7f6b", "version": "20200926", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index 10301e6b4dcc84..c1470a3736ee03 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "255c8c5ca6526bd7a0ac6f3a6a7838c77ee97e5e", + "version": "1.12.0", + "port-version": 2 + }, { "git-tree": "7b346f9dc851b8598c461ae9b856c11d222848ec", "version": "1.12.0", diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index 3c0d258022c6c1..f113c1c62864e8 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0b981028589375097039d5e39e7d87659cdfa824", + "version": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "ce9a702064516d77e0b1239edc29efd603ee323e", + "version": "1.3.1", + "port-version": 2 + }, { "git-tree": "42095edcaa6f9fb7a29822896d45b772f694a9cf", "version": "1.3.1", @@ -65,21 +75,6 @@ "version-string": "1.1.0", "port-version": 1 }, - { - "git-tree": "a05e0de81085231df86f6902aba1e0a364e2ca7b", - "version-string": "1.1.0", - "port-version": 0 - }, - { - "git-tree": "5066566c98bc1913b678347c4cbae0a6aff4cf2d", - "version-string": "1.0.3-1", - "port-version": 0 - }, - { - "git-tree": "6ff3a23b154fad821db2d8236bf9d0382f0229cf", - "version-string": "1.0.3", - "port-version": 0 - }, { "git-tree": "256b8e8b5d64cb6f66da47f1a361e5538d341023", "version-string": "1.0.2-8", diff --git a/versions/l-/libxcrypt.json b/versions/l-/libxcrypt.json new file mode 100644 index 00000000000000..c2b8418ba4a4ba --- /dev/null +++ b/versions/l-/libxcrypt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "85a0274aca1b0c7bf756cb41f77d9dbfc2b6fb78", + "version": "4.4.36", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 0dbc640222ad26..6f2b9ea2b9a1c6 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5ce0144d5c48f5140af55d0fbb58396b955d87a3", + "version": "2.11.5", + "port-version": 1 + }, + { + "git-tree": "a8c20b561ed09ee9bd274071751dafbf8c0825ed", + "version": "2.11.5", + "port-version": 0 + }, { "git-tree": "fd1e750ce7851d72bf39c0b6d30a4a8d1d717c45", "version": "2.10.3", diff --git a/versions/l-/libxpm.json b/versions/l-/libxpm.json index 60207c816ad01a..e969a79cce27a6 100644 --- a/versions/l-/libxpm.json +++ b/versions/l-/libxpm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab78e7ef1aa0fd25dfc94278d05e4c1f983aa71a", + "version": "3.5.16", + "port-version": 0 + }, { "git-tree": "6fb796fec0f4bcbf52d4da236bce4e3394c619e9", "version": "3.5.14", diff --git a/versions/l-/libzip.json b/versions/l-/libzip.json index fb39820f868fd0..11f6e351d69662 100644 --- a/versions/l-/libzip.json +++ b/versions/l-/libzip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59242c6974f6245813fa69d09f9c6df6c501b895", + "version": "1.9.2", + "port-version": 2 + }, { "git-tree": "42ad3093c3b335f0ae0bf54179faa30bd751d00c", "version": "1.9.2", diff --git a/versions/l-/libzippp.json b/versions/l-/libzippp.json index 9411d448d27609..5d2f23f4a033d3 100644 --- a/versions/l-/libzippp.json +++ b/versions/l-/libzippp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bde37380220a7418e4f0e461ebb02bfba83858d", + "version": "7.0-1.10.1", + "port-version": 0 + }, { "git-tree": "c15b10fa38a22c6ff395d7a87c3a4f02c5586add", "version": "6.1-1.9.2", diff --git a/versions/l-/live555.json b/versions/l-/live555.json index 1dd656796bf0e6..106dbb5981ecb9 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e83e021123610806240ac1742b68f25bcbc3ff7", + "version-date": "2023-07-24", + "port-version": 0 + }, { "git-tree": "3145196c0ec759988b77ab9ef787f426b0efc02d", "version-date": "2023-06-20", diff --git a/versions/l-/llhttp.json b/versions/l-/llhttp.json index 0b7b6dc5d8dfa5..f41cef35e11ea2 100644 --- a/versions/l-/llhttp.json +++ b/versions/l-/llhttp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3a46d3c8233039a700b07997705cc2a49d832e15", + "version": "9.1.2", + "port-version": 0 + }, + { + "git-tree": "02d4bf2e1a15712c39a825aa81791f032b06fd10", + "version": "8.1.0", + "port-version": 2 + }, { "git-tree": "655fdc5f25da19400df907e4d82fc0b148f02e9d", "version": "8.1.0", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 875d835dfc3cd8..1a224eb4e4e575 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "484d2a5abb5ffc10d18e18603adb20bd01854012", + "version": "15.0.7", + "port-version": 6 + }, + { + "git-tree": "ce05511c7bf08ffecc627b73ae566e1a1e7e6b20", + "version": "15.0.7", + "port-version": 5 + }, + { + "git-tree": "bd0b5a20abf736cc78645980e56569eae2e076ba", + "version": "15.0.7", + "port-version": 4 + }, { "git-tree": "1ba26e4d72f4d6112c483a09d9a2dd0aa42067f3", "version": "15.0.7", diff --git a/versions/l-/lmdb.json b/versions/l-/lmdb.json index d150fa7f195cd8..0c9880b1d4d785 100644 --- a/versions/l-/lmdb.json +++ b/versions/l-/lmdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a13501d369f479e4b9a5e14c3f75022c07a18dd", + "version": "0.9.31", + "port-version": 0 + }, { "git-tree": "1c94e6b90d91bc39a4307502116b20d7b38de413", "version": "0.9.29", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index f196519ecc039d..047d7ba6549e1c 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eca29ecb5127d26bd46aad143468b069a045d104", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "3f8391924df847ec08d25424cb7482be557c3d49", "version": "1.0.0", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index 68b517537ee739..88714d9b094a71 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "53de073fe6d5962408626e251fce79e2d5bb49bf", + "version-date": "2023-01-04", + "port-version": 4 + }, + { + "git-tree": "450f447cc860d3cc59b93304c13ad92637c6b63d", + "version-date": "2023-01-04", + "port-version": 3 + }, { "git-tree": "9b724aa5af80b253739609f1173da343d55251cd", "version-date": "2023-01-04", diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json index d48cd8e3a774ae..d912efa23eb2e4 100644 --- a/versions/m-/magnum-plugins.json +++ b/versions/m-/magnum-plugins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73324e7e695dd281c2813fc17b709af7cc2eed58", + "version-string": "2020.06", + "port-version": 11 + }, { "git-tree": "3f087961f6f29a588e562a66946d7738eb752129", "version-string": "2020.06", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index 9b91c79c404723..e18468736123d2 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9153bafdfb1c8f5ef113947611b1c916a3e472c3", + "version-string": "2020.06", + "port-version": 14 + }, { "git-tree": "d0adac5f186692119e9a2b9826ac5ed7357ed8a1", "version-string": "2020.06", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index a081556e954f8f..b4d21345323a27 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdb516de71b06cb77bb51196e59709278606e32a", + "version-date": "2023-06-12", + "port-version": 2 + }, { "git-tree": "64501290af397067ec972c69113abd28139efdcc", "version-date": "2023-06-12", diff --git a/versions/m-/matroska.json b/versions/m-/matroska.json index eceb5076ae0cfb..302eb64db6d6cf 100644 --- a/versions/m-/matroska.json +++ b/versions/m-/matroska.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d414c27a074d4262517bf3fe72571e8f16ccab0", + "version": "1.7.1", + "port-version": 2 + }, { "git-tree": "12137590eb6e5ec4e644e61b664d83a4ed6c8022", "version": "1.7.1", diff --git a/versions/m-/mdl-sdk.json b/versions/m-/mdl-sdk.json index c470ea7750e017..0cadd714931b1c 100644 --- a/versions/m-/mdl-sdk.json +++ b/versions/m-/mdl-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8fcd0cdebe6b073993485aba6fa0dd24445f9f5", + "version": "2021.1.2", + "port-version": 3 + }, { "git-tree": "04186cc5442b20b27d3a47f901dfd4c7eef16353", "version": "2021.1.2", diff --git a/versions/m-/mdnsresponder.json b/versions/m-/mdnsresponder.json index 93cc450873237d..3629c6dc2ed0b5 100644 --- a/versions/m-/mdnsresponder.json +++ b/versions/m-/mdnsresponder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c54f504ea29603c2a46be74893d406db0956336", + "version": "1557.140.5.0.1", + "port-version": 1 + }, { "git-tree": "da77ffdd863076ef906fa3d5b50e8190f1241a57", "version": "1557.140.5.0.1", diff --git a/versions/m-/mecab.json b/versions/m-/mecab.json index 6ab5b38ea3f24a..8c33858cbe5662 100644 --- a/versions/m-/mecab.json +++ b/versions/m-/mecab.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66081fbeecacd152e3964b0f64f25e0f0b10d461", + "version-date": "2019-09-25", + "port-version": 5 + }, { "git-tree": "d5f64d85fddc71ff872f675cda3ed8ee767193f1", "version-date": "2019-09-25", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index 4d9607091924cd..ac00c004c71ea4 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf9e52bbaf36ffdf540342ea090d8535ad7a883", + "version": "23.0.1", + "port-version": 2 + }, { "git-tree": "d76e69afa98f38f1b3102572a8a5516ce088b9ca", "version": "23.0.1", diff --git a/versions/m-/meshoptimizer.json b/versions/m-/meshoptimizer.json index e3456a136c5b1c..a84cf84462eb19 100644 --- a/versions/m-/meshoptimizer.json +++ b/versions/m-/meshoptimizer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4443e075e83187322a4323485d302fb52746a9e4", + "version": "0.19", + "port-version": 1 + }, + { + "git-tree": "c13ff2acc01518548a4d669e3d2976235c55780f", + "version": "0.19", + "port-version": 0 + }, { "git-tree": "82831888ef7242fd8d00cc2b9710d33d895d76f1", "version": "0.18", diff --git a/versions/m-/mfx-dispatch.json b/versions/m-/mfx-dispatch.json index 613e1f69d09942..2b6b68576788af 100644 --- a/versions/m-/mfx-dispatch.json +++ b/versions/m-/mfx-dispatch.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4372c27465a70b6b113adc8fb69ea86da3c21a3f", + "version": "1.35.1", + "port-version": 3 + }, + { + "git-tree": "07eb6cc5ee276c7e965868d1cb6de113d41e0e41", + "version": "1.35.1", + "port-version": 2 + }, { "git-tree": "5d0fd959ef687e9180ea230b8eea4d2f944423a4", "version": "1.35.1", diff --git a/versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json index 2f9d7fd6c00766..33f5c273946401 100644 --- a/versions/m-/microsoft-signalr.json +++ b/versions/m-/microsoft-signalr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31b63c815c4f6877e688b163a083df208d8ca133", + "version": "0.1.0-alpha4", + "port-version": 8 + }, { "git-tree": "777629bd31d9a4885b696623304b030c29b552c4", "version": "0.1.0-alpha4", diff --git a/versions/m-/minhook.json b/versions/m-/minhook.json index 6cab064681c58d..882ad36d165016 100644 --- a/versions/m-/minhook.json +++ b/versions/m-/minhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9751daba9242a47e7beb2e21a4211226aee316f", + "version": "1.3.3", + "port-version": 4 + }, { "git-tree": "fea414bee13115e201fe93699ba5b55c7ae031b8", "version": "1.3.3", diff --git a/versions/m-/miniupnpc.json b/versions/m-/miniupnpc.json index 95fae1f8d792e6..228b784462d2df 100644 --- a/versions/m-/miniupnpc.json +++ b/versions/m-/miniupnpc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4178b65263cd78046a728561065f5957d5f2f6ca", + "version": "2.2.5", + "port-version": 0 + }, + { + "git-tree": "7cf1368b7969b30d49c1666b690b8e18ab265ebc", + "version": "2.1", + "port-version": 5 + }, { "git-tree": "d63b7b18c08e0d968612093f1ada8f872c955688", "version": "2.1", diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json index 511750c2fdf74c..008e44fdd91132 100644 --- a/versions/m-/minizip-ng.json +++ b/versions/m-/minizip-ng.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "fb59eb8b735f74193a79326e33fb6f9abc66846a", + "version": "4.0.0", + "port-version": 4 + }, + { + "git-tree": "1483ef1293bbd3eea5edd9b5051bb4457eebfa2e", + "version": "4.0.0", + "port-version": 3 + }, + { + "git-tree": "89c9968274d731d513a3eadc259c73c95cfe058c", + "version": "4.0.0", + "port-version": 2 + }, { "git-tree": "1e55bf50acfd71d5f37f98bee270ff687f65219f", "version": "4.0.0", diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json index c9eeb9d1d78c6a..89fe43a2e9769a 100644 --- a/versions/m-/minizip.json +++ b/versions/m-/minizip.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "91fe1aaa8a5d696bda657a3d2b687fecfa92a7c3", + "version": "1.3", + "port-version": 1 + }, + { + "git-tree": "2295a5b26e2cbbbf59706f08dc1c5717da951bd1", + "version": "1.3", + "port-version": 0 + }, + { + "git-tree": "68d2e759e03b54cd9970328b1cede845ebccf7c2", + "version-semver": "1.2.13", + "port-version": 3 + }, { "git-tree": "48d519ab0025623c54756c482453f8405d2646bd", "version-semver": "1.2.13", diff --git a/versions/m-/mmloader.json b/versions/m-/mmloader.json index 3257087c7896ca..0a10695a62e834 100644 --- a/versions/m-/mmloader.json +++ b/versions/m-/mmloader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f73c54685c38e7d210174f134723badde70879d", + "version": "1.0.1", + "port-version": 3 + }, { "git-tree": "4b102ccdbd92919d2f3f62fff55b2a51839199ad", "version": "1.0.1", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index 6fd3feed836f67..f94ce8b967aaba 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9ddb78bc06cb779848d6afffa88938870ae8a7b", + "version": "1.24.3", + "port-version": 0 + }, { "git-tree": "b840350590e947daec430cfea1445d958ae6f5fa", "version": "1.22.2", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index 3c0b826398daae..8808aec2439b76 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8fc862744aad29acd0e6a0d947fc5b561d3f5f7", + "version": "3.8.0", + "port-version": 0 + }, { "git-tree": "00588be07af8844394ca81106324a42f5d29d684", "version": "3.7.2", diff --git a/versions/m-/monkeys-audio.json b/versions/m-/monkeys-audio.json index 5da142cbe9ba3e..75bb283bbde24f 100644 --- a/versions/m-/monkeys-audio.json +++ b/versions/m-/monkeys-audio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9334281a45f4a9a85f9a3fac1fac959b00201bab", + "version-string": "10.08", + "port-version": 1 + }, { "git-tree": "55e5b52ffc64a4b2604fa01522d8ebbe53accf56", "version-string": "10.08", diff --git a/versions/m-/mp-units.json b/versions/m-/mp-units.json index 5108f2833ad35e..0b0664eb299f3c 100644 --- a/versions/m-/mp-units.json +++ b/versions/m-/mp-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f410b971351069e2e9f1b140104a8e836b76c1b8", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "f26957340de86e12abc971d4db95b5a2a2cd7d37", "version": "0.8.0", diff --git a/versions/m-/mp3lame.json b/versions/m-/mp3lame.json index 7fee754ca2cea7..e368662e44e6ab 100644 --- a/versions/m-/mp3lame.json +++ b/versions/m-/mp3lame.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59014e1d1c1232612124cd30de2e73688713c295", + "version": "3.100", + "port-version": 11 + }, { "git-tree": "86d297de90265851ff47145e3aeb48738139a4d9", "version": "3.100", diff --git a/versions/m-/mpc.json b/versions/m-/mpc.json index c3a19e33708c42..dce036dacbe434 100644 --- a/versions/m-/mpc.json +++ b/versions/m-/mpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "741646f873002e3a712397c3f91b8e4f5b99ded4", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "ac9e33d7db3d83459eeadc2c47a6dea8d3358dc0", "version": "1.2.0", diff --git a/versions/m-/mpfr.json b/versions/m-/mpfr.json index 77f79088b5c64b..302ac9a54968f1 100644 --- a/versions/m-/mpfr.json +++ b/versions/m-/mpfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d612486f81111c3f56a2ac56727dde81fda96f8e", + "version": "4.2.1", + "port-version": 0 + }, { "git-tree": "a2163475ac427c02bc7a7c24142b45662d5993cc", "version": "4.2.0", diff --git a/versions/m-/mpir.json b/versions/m-/mpir.json index 8f7790807ec5c8..5b4626a44d3e31 100644 --- a/versions/m-/mpir.json +++ b/versions/m-/mpir.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "66630c57080280e1089146536f7d5d21c7504600", + "version-date": "2022-03-02", + "port-version": 3 + }, + { + "git-tree": "de9b5962358546e5cc0d7ac9b6dd9bfba95e1763", + "version-date": "2022-03-02", + "port-version": 2 + }, { "git-tree": "9191f07cfaade82121abb4d37cb652182c0e55f6", "version-date": "2022-03-02", diff --git a/versions/m-/msdfgen.json b/versions/m-/msdfgen.json index 0aa51d6aef3f83..3fb678ae2bd28f 100644 --- a/versions/m-/msdfgen.json +++ b/versions/m-/msdfgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22eb77c9256846ad9c1e01e6ffff25b02b5edbd5", + "version": "1.10.0", + "port-version": 1 + }, { "git-tree": "f03e46126dcb57f2ff08f5834eb6e84f84e14e2b", "version": "1.10.0", diff --git a/versions/m-/murmurhash.json b/versions/m-/murmurhash.json index 461ee4cfde627a..6147fe0dcf8325 100644 --- a/versions/m-/murmurhash.json +++ b/versions/m-/murmurhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53f2656ff91aeec6d11585b61c650390b23e6340", + "version-date": "2016-01-09", + "port-version": 7 + }, { "git-tree": "e5ec901e9cab9845f18d18276ddea5e4ad5d4538", "version-date": "2016-01-09", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index 8bc751dc5cd933..e7bd19a9b3dda6 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "082167d3253fd7af5973a5e970a407c117702841", + "version-string": "2023.10.02.00", + "port-version": 0 + }, { "git-tree": "345723d54eef6854daed66dedae0b9d4ead2f9a4", "version-date": "2023-05-18", diff --git a/versions/m-/mygui.json b/versions/m-/mygui.json index 2da841a720a881..91a534849edb6d 100644 --- a/versions/m-/mygui.json +++ b/versions/m-/mygui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc0449cfc21fca4e1ee5afda7c0919fffb9cd864", + "version": "3.4.2", + "port-version": 0 + }, { "git-tree": "4b68ea2f9e7d24c34d86ea4d45050adc7ac29663", "version": "3.4.1", diff --git a/versions/n-/nanodbc.json b/versions/n-/nanodbc.json index ef870e92744836..67f1d1b65bdb31 100644 --- a/versions/n-/nanodbc.json +++ b/versions/n-/nanodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b57473b86bc71733209e195206d253f1dd3658b2", + "version": "2.13.0", + "port-version": 7 + }, { "git-tree": "7de6296fc337f181517f8ed4c2e6ed35d749e414", "version": "2.13.0", diff --git a/versions/n-/nanopb.json b/versions/n-/nanopb.json index 27d3df147b2ff8..d77e89c698500a 100644 --- a/versions/n-/nanopb.json +++ b/versions/n-/nanopb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b27e85ab51605be4fee299a1dcb14f4fe0ac2429", + "version-semver": "0.4.7", + "port-version": 2 + }, { "git-tree": "4d78bf2dbff06f0540e971677c39641b9057dc57", "version-semver": "0.4.7", diff --git a/versions/n-/ndis-driver-library.json b/versions/n-/ndis-driver-library.json new file mode 100644 index 00000000000000..b03abd5fa2099c --- /dev/null +++ b/versions/n-/ndis-driver-library.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b86a9cee58f4826c91b9126e10edb311b3149dfe", + "version": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 638abc770c6ed6..9729be2cb7f030 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbaeb01777a225a56a3f29ea40db69711f06256f", + "version": "1.56.0", + "port-version": 0 + }, { "git-tree": "772366dba6fcdf37e0ca244d4539b2fd73faca2f", "version": "1.55.1", diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 43c5b521a893c6..0dc20e108f4c79 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc20ed3b2fc048cdcebb7f936b2614b42e66c286", + "version": "0.15.0", + "port-version": 0 + }, { "git-tree": "c3db373f95298070305be9546fa5b5676e0d717d", "version": "0.14.0", diff --git a/versions/n-/ngspice.json b/versions/n-/ngspice.json index fe57fa2a749bbd..24e9fd26af5fda 100644 --- a/versions/n-/ngspice.json +++ b/versions/n-/ngspice.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ae82af35f1dfb0ac52968de34d29a7de809cf575", + "version": "41", + "port-version": 0 + }, + { + "git-tree": "2810bbc81dca4d7c2cc27859dc4403b347e6e40d", + "version": "39", + "port-version": 1 + }, { "git-tree": "a0b81daaa09f8f109edf6870909050067ad5bd90", "version": "39", diff --git a/versions/n-/ngtcp2.json b/versions/n-/ngtcp2.json index 35c44afa6b32dc..ca65f6a8394074 100644 --- a/versions/n-/ngtcp2.json +++ b/versions/n-/ngtcp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05c0bba60ffa39b1368709bb4ef25102b4b74c7a", + "version": "0.19.1", + "port-version": 0 + }, { "git-tree": "4daeb8ad745feeafd60b7fcf856907745ed6e4d8", "version": "0.18.0", diff --git a/versions/n-/nmap.json b/versions/n-/nmap.json index b6ef96201bbcea..42f8154ba4e5b9 100644 --- a/versions/n-/nmap.json +++ b/versions/n-/nmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd1dcfaf73ff23b171247d76abdca50cd7f10f33", + "version": "7.70", + "port-version": 10 + }, { "git-tree": "6822fee19cc3071389e5a218c77e4ffadb963327", "version": "7.70", diff --git a/versions/n-/ntf-core.json b/versions/n-/ntf-core.json new file mode 100644 index 00000000000000..ce960fee531dcd --- /dev/null +++ b/versions/n-/ntf-core.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "version": "2.1.0", + "port-version": 1, + "git-tree": "1e517e2393650769e701f62317e905a3f1776367" + }, + { + "version": "2.1.0", + "port-version": 0, + "git-tree": "eabeb2b30205bef45e72e4a069f21d71797f3f5d" + } + ] +} diff --git a/versions/n-/numcpp.json b/versions/n-/numcpp.json index 11c11ca2614eed..219f6ed47b4286 100644 --- a/versions/n-/numcpp.json +++ b/versions/n-/numcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa42201ab3a189b38031fe0d912e3d62e9a44b8f", + "version": "2.11.0", + "port-version": 0 + }, { "git-tree": "99f0dc5efa2ee18b46af92901b34426516cf3390", "version": "2.10.1", diff --git a/versions/n-/nyan-lang.json b/versions/n-/nyan-lang.json new file mode 100644 index 00000000000000..d686edb3f1c10c --- /dev/null +++ b/versions/n-/nyan-lang.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "63356577d6522c8d99dd8bb9214d9808f7f115b6", + "version": "0.3", + "port-version": 0 + } + ] +} diff --git a/versions/o-/oatpp-zlib.json b/versions/o-/oatpp-zlib.json index a07cde70df3a67..cf9a15841ee053 100644 --- a/versions/o-/oatpp-zlib.json +++ b/versions/o-/oatpp-zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d73da3c88835636ace280c7a29fa13fbcde0b2d8", + "version": "1.3.0", + "port-version": 2 + }, { "git-tree": "0f40812d2446d50d41add9deba46e0baa042ac53", "version": "1.3.0", diff --git a/versions/o-/oatpp.json b/versions/o-/oatpp.json index aad89efa130bd6..ec85c0c1eac6f7 100644 --- a/versions/o-/oatpp.json +++ b/versions/o-/oatpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36f425ca9c764945b824bfe5ff506fe09a5361d8", + "version": "1.3.0", + "port-version": 2 + }, { "git-tree": "f3700f7d93bbb8922878c25705d0e00cd7049066", "version": "1.3.0", diff --git a/versions/o-/ocilib.json b/versions/o-/ocilib.json index cf3f6492720781..5538b2cfb4a3fb 100644 --- a/versions/o-/ocilib.json +++ b/versions/o-/ocilib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8b2fb9dbc546b1b9853f48e5bd9ed971d791c730", + "version": "4.7.6", + "port-version": 0 + }, + { + "git-tree": "1e3f69c5100f621f5d80f87ae669626be2f88e59", + "version": "4.7.5", + "port-version": 3 + }, { "git-tree": "2e11027c9b427b4c46e47227da9ce270119f6ea1", "version": "4.7.5", diff --git a/versions/o-/octomap.json b/versions/o-/octomap.json index b126608577332c..c5a074b928cb4d 100644 --- a/versions/o-/octomap.json +++ b/versions/o-/octomap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b778b0aef20fee697a18865995fff021501e8509", + "version": "1.9.6", + "port-version": 1 + }, { "git-tree": "b6146ecee8dcf9ba6573d11f26c1574e89c546d8", "version": "1.9.6", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 535b7c4dd24688..9ac81a207509ff 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0089cd2cc3d48d19a5b465f43454dfb0124f9723", + "version": "2.3.1", + "port-version": 2 + }, + { + "git-tree": "6af271c0d09d27f6cea912e0b3f81a310d3992be", + "version": "2.3.1", + "port-version": 1 + }, { "git-tree": "41790e82daaddc561ebaf5ea9f589bd2e148e31a", "version": "2.3.1", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 058dbd1021e571..9f8bbfc9b724a6 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba65238d3998c84df40961d63f7c254fbac7639d", + "version": "14.0.1", + "port-version": 1 + }, { "git-tree": "d244c75813c1f05a64a4a763166fa4f8e3e63eb0", "version": "14.0.1", diff --git a/versions/o-/onnxruntime-gpu.json b/versions/o-/onnxruntime-gpu.json index 589614e59ea8cb..092ed1c3b12a41 100644 --- a/versions/o-/onnxruntime-gpu.json +++ b/versions/o-/onnxruntime-gpu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3836c30f0e39aa6c9f9a9dbfa8f146e3ae5e97cf", + "version": "1.15.1", + "port-version": 0 + }, { "git-tree": "7b91d7cf9e629be0d5581c85e8520a1850d0bf2a", "version": "1.14.1", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index ff0b032ac13114..dd98295120b9d3 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c876665c0fa5b8d427ee9cadd4185a1a08d008da", + "version": "0.3.24", + "port-version": 0 + }, { "git-tree": "d701021ccf4a0729f77788b2d90da377bfdd1486", "version": "0.3.23", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index c6aea22191ace9..e591990c202648 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8e9c9fb982bef129111ea811c3948ffd570a16dc", + "version": "7.7.2", + "port-version": 1 + }, + { + "git-tree": "5eb5e2e8cacf7653315ee887ad2d19e0e5ab5d7f", + "version": "7.7.2", + "port-version": 0 + }, + { + "git-tree": "23b7ba4d766b45ff9e93dae282a3f8e461a57dcc", + "version": "7.6.2", + "port-version": 7 + }, { "git-tree": "3a62400394101d54a0bea8a45ac0c1f68cf27b68", "version": "7.6.2", diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 4d749dfe24d568..469b9749cc7ceb 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,8 +1,13 @@ { "versions": [ { - "git-tree": "d728bb2681e89ffbe9c6e1ec2811d5d194d9fd09", - "version-semver": "2.1.2", + "git-tree": "661b43b1d2c452e40476bbb64bb6e68dfc437c7b", + "version-semver": "2.2.1", + "port-version": 1 + }, + { + "git-tree": "d5c69dc2c181e658e67ba57e3836a548c469477a", + "version-semver": "2.2.1", "port-version": 0 }, { diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index 602273cd0be504..1d218ef468f410 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a4e55d470b2cff8fddb4f6f44ab15b4b5c0f603", + "version": "2.4.13.7", + "port-version": 19 + }, { "git-tree": "246c2e39fa6e117cbea4548446b7f66909de3329", "version": "2.4.13.7", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 207e8e4007ca16..1d0f322be447be 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8eca838beb277535a53756ceb5da17aa8b5050a8", + "version": "3.4.18", + "port-version": 11 + }, { "git-tree": "b66d5bf3d61ae3bd5e71952b7642658d8562ae5d", "version": "3.4.18", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 5b61f33676acc4..8d1ade83c42779 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,40 @@ { "versions": [ + { + "git-tree": "ef78c1958b122045e9d1e353150049431b3162fa", + "version": "4.8.0", + "port-version": 7 + }, + { + "git-tree": "6a1280a0a3854032ba4ae9172b509ce46f81795f", + "version": "4.8.0", + "port-version": 6 + }, + { + "git-tree": "6deec5bdb97d4d3a667aa10e31698ce54abdc9a7", + "version": "4.8.0", + "port-version": 5 + }, + { + "git-tree": "0d0ef2f6aa4911ca1cf367093c0b6a89cea97fe3", + "version": "4.8.0", + "port-version": 4 + }, + { + "git-tree": "d22421d8b63a7e2221f91520e9dcfcce1ca7bb48", + "version": "4.8.0", + "port-version": 3 + }, + { + "git-tree": "89d6da3b45b7e1667bdc3083f9641e57ad4930a9", + "version": "4.8.0", + "port-version": 2 + }, + { + "git-tree": "78f4556a682ebb41e2ff3f26090ef51cafe5a66c", + "version": "4.8.0", + "port-version": 1 + }, { "git-tree": "0bae188d52a71f441df28b25278e5506502dfd03", "version": "4.8.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 6ad6ba5c30ca38..9b0dd874dfae66 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c74249169c46dbedf60590f672fb709294ffc7c6", + "version": "2.4.14.0", + "port-version": 1 + }, + { + "git-tree": "965f6cf8bde18cb53a219f9b61b5099105b7fd2f", + "version": "2.4.14.0", + "port-version": 0 + }, { "git-tree": "1d6d564f1848ae68ece423fa0597c8a5fe6c9d5d", "version": "2.4.13.0", diff --git a/versions/o-/openjpeg.json b/versions/o-/openjpeg.json index e49ff61f40fb27..1909da47488e42 100644 --- a/versions/o-/openjpeg.json +++ b/versions/o-/openjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "608f895171abcfb72dd690a0f7121d265d0904b5", + "version": "2.5.0", + "port-version": 1 + }, { "git-tree": "3451436f9bb5f5ad8946b45868929488fe2c39dd", "version": "2.5.0", diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index e1e32f1bd90099..4649a87c686c9b 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8779bcf1acd942b029c79791b2335b252e151f20", + "version": "2.1.0", + "port-version": 2 + }, { "git-tree": "93c2bb0fd968757d60afa8ce2de0d456a3ae5cc0", "version": "2.1.0", diff --git a/versions/o-/openni2.json b/versions/o-/openni2.json index 36caa8dde40d70..60ca5f01a8cb4d 100644 --- a/versions/o-/openni2.json +++ b/versions/o-/openni2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5713db6efa79dd4b37af0ac38ed516f807d30db0", + "version": "2.2.0.33", + "port-version": 15 + }, { "git-tree": "31c61be8515cff93cca9a905969a8292023f0b4e", "version": "2.2.0.33", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index acd5127c7468e1..1a06bb6864f4c7 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e57c0f392fd8486892a91ca82b7bf2e34c59e374", + "version": "3.1.3", + "port-version": 0 + }, + { + "git-tree": "11cbc05950decb26474353fb9c0bfed3be3008c4", + "version": "3.1.2", + "port-version": 3 + }, + { + "git-tree": "4e8e2c30ede50b2df35ecf5a0ee574076cfbe06f", + "version": "3.1.2", + "port-version": 2 + }, { "git-tree": "5a99562f8ac47a68a58efba5f0d40259fedeecc5", "version": "3.1.2", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 9afb692e5787fc..0683b409a5db48 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ad2a8625bd852a203f6156970c0eada6f90c192", + "version-semver": "1.9.1", + "port-version": 1 + }, { "git-tree": "47c5c172ee9a7c663746a3c1cbabb359a1cbaf56", "version-semver": "1.9.1", diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json index 143dbe33172dd9..268858725a7020 100644 --- a/versions/o-/openvdb.json +++ b/versions/o-/openvdb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6200720b464b3cc005edd767613f3978f614a32f", + "version": "10.0.0", + "port-version": 5 + }, + { + "git-tree": "34b77a62946c569224d4aacc863e8ba9d7aea31f", + "version": "10.0.0", + "port-version": 4 + }, { "git-tree": "dc6551f1e86bf8c86ce9fd0133e6e979f3729faa", "version": "10.0.0", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index 57824c1a7a32dc..07122fc74b6fe7 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "185f20b166701fdc9c255e0ca7e574a88c1a34d9", + "version": "2023.1.0", + "port-version": 3 + }, + { + "git-tree": "142339d6db532cdecd3d59ccdb43411769bed1ca", + "version": "2023.1.0", + "port-version": 2 + }, + { + "git-tree": "b038a324f094f69ef18efe7cd9b4c3e7c71d7c9b", + "version": "2023.1.0", + "port-version": 1 + }, + { + "git-tree": "717114b7751c8866fc2f475267dea3c04a5cedcc", + "version": "2023.1.0", + "port-version": 0 + }, + { + "git-tree": "ad00a0dadb3ecf1eff66f9de71017808ade00d0f", + "version-date": "2023-06-11", + "port-version": 6 + }, { "git-tree": "7737d9d905aa9a31e47e32abf5ef420bd1446def", "version-date": "2023-06-11", diff --git a/versions/o-/orc.json b/versions/o-/orc.json index c0277b3cf49c85..82911f719841ba 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d045d211a7c1a657c3c6d1f2df0df8faf69c459", + "version": "1.9.1", + "port-version": 0 + }, { "git-tree": "101fdb5683877574e2730084978b77dfdf91d8ad", "version": "1.9.0", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 829b4ea465cb25..40d4e8d9844b22 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "27f28ccf9745bc2ca1757d5fa32b92373c176e2a", + "version": "3.6.5", + "port-version": 22 + }, + { + "git-tree": "6e9d4d04aae606c5ac02c497b17774d37e74de7a", + "version": "3.6.5", + "port-version": 21 + }, { "git-tree": "87727f247e97af37e53f77acadff05d6d06559d0", "version": "3.6.5", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 4c1d59b5afc213..3a32719f10271c 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2a88ce998fab5ed3f3a2edf817f32734c78187b", + "version": "1.50.14", + "port-version": 4 + }, { "git-tree": "4c3bbb58011a3e259be06531c08854dfd7bbabee", "version": "1.50.14", diff --git a/versions/p-/paraview.json b/versions/p-/paraview.json index 22ca71bcf73b8f..d6876c736b8c7c 100644 --- a/versions/p-/paraview.json +++ b/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2aa3d8185a319a76c7961608ecce8b2f03c08cd7", + "version": "5.11.0", + "port-version": 4 + }, { "git-tree": "ef783841125e47d511ecc6d0108e7b1ecaef1469", "version": "5.11.0", diff --git a/versions/p-/pbc.json b/versions/p-/pbc.json index 5da6ca4359ba54..3b0353201e6fe9 100644 --- a/versions/p-/pbc.json +++ b/versions/p-/pbc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6789ed942578afe4baac765d5e7549d421c25c76", + "version": "0.5.14", + "port-version": 9 + }, + { + "git-tree": "096b1e1d4077f9fbe44e8b0a6fa306e83270c632", + "version": "0.5.14", + "port-version": 8 + }, { "git-tree": "23f4f1804aaa515560fdd3efa19485c9714d2a20", "version": "0.5.14", diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index 30273e366b714f..35655855fb70fe 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f4bb7a9a1e628b9444dad7f5a36a2163df572ac", + "version": "1.13.1", + "port-version": 1 + }, { "git-tree": "83f84dc2de83d25e4eb58d69fcf09086ee8b65b5", "version": "1.13.1", diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json index 6783b13a459603..f615a1d26a1a72 100644 --- a/versions/p-/pcre2.json +++ b/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "678c2336c4102c5a8868570c60140fdc2a8d1dcf", + "version": "10.42", + "port-version": 1 + }, { "git-tree": "148d5898b3c1925fd8e82663589917255172d5c9", "version": "10.42", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index 1054a1a6333bfd..dc5b4daf75762a 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91391b35fb1af3810e79110564bcf6e668dd9194", + "version": "2.5.3", + "port-version": 3 + }, { "git-tree": "59463f5cf4dccd2c2167abad2e290413cdc91d22", "version": "2.5.3", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index eb53d6fc1d3507..ef29a8f6945e7f 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "890453e6b337c77f35dbb33620ac0ab32113f22f", + "version": "5.3.0", + "port-version": 0 + }, { "git-tree": "9663323fd4b0d5ff6623bad944b8f60ea2455821", "version": "5.2.1", @@ -81,4 +86,4 @@ "port-version": 0 } ] -} +} \ No newline at end of file diff --git a/versions/p-/plf-colony.json b/versions/p-/plf-colony.json index 16d3e369de96df..7530512ada1653 100644 --- a/versions/p-/plf-colony.json +++ b/versions/p-/plf-colony.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4c1ef0be7895ecc0e4deb82cb3a4fad3b29c03f", + "version": "7.3.1", + "port-version": 0 + }, { "git-tree": "7e90bb5fdf6e933b8d5c14e07d85c920e7a7afea", "version": "6.33", diff --git a/versions/p-/pmdk.json b/versions/p-/pmdk.json index 89f2fd7103d4a6..ed5c59c15da724 100644 --- a/versions/p-/pmdk.json +++ b/versions/p-/pmdk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b208389a2bc32898f0f4d13c5f222015ce9bd072", + "version": "1.12.0", + "port-version": 2 + }, + { + "git-tree": "5dc7f0e5a4d6348ac49617010105730775580f78", + "version": "1.12.0", + "port-version": 1 + }, { "git-tree": "a5b1d48503eab5f709ccc7cb62630817275f93e5", "version": "1.12.0", diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json index 7b07cfe4be4fb8..b99596bc96ae3f 100644 --- a/versions/p-/podofo.json +++ b/versions/p-/podofo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75683a46d35cfff92866f9c559833c7d1962cc55", + "version": "0.10.1", + "port-version": 0 + }, { "git-tree": "2b550a1cf9eabeb17534710cb767f971c57184c1", "version": "0.10.0", diff --git a/versions/p-/polyhook2.json b/versions/p-/polyhook2.json index f24afaca6c1b19..ba1fc504b65818 100644 --- a/versions/p-/polyhook2.json +++ b/versions/p-/polyhook2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "00a3d485f743b08f8c407139e5e8210468f44573", + "version-date": "2023-08-11", + "port-version": 0 + }, + { + "git-tree": "def3f21d5fdcf75184eff747c70e7dcf5be18517", + "version-date": "2023-05-16", + "port-version": 2 + }, { "git-tree": "4d6b2480d856d0e6009923d176fb68392e201ac8", "version-date": "2023-05-16", diff --git a/versions/p-/proj.json b/versions/p-/proj.json index e1193bec930560..af8483d5831971 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6e31164b906c96903b8352e6a9211ae019672ac4", + "version": "9.3.0", + "port-version": 1 + }, + { + "git-tree": "d3932aae445fce753fd58b103e1dcb0acfff0a39", + "version": "9.3.0", + "port-version": 0 + }, { "git-tree": "b3f5ec4ce13a932cb9f05f074e48b386fd5e4130", "version": "9.2.1", diff --git a/versions/p-/protobuf-c.json b/versions/p-/protobuf-c.json index 7f0316e49a302d..8aa97f64a453fe 100644 --- a/versions/p-/protobuf-c.json +++ b/versions/p-/protobuf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1adcf184e617f9f77bd727e6f5085665e471826", + "version-semver": "1.4.1", + "port-version": 0 + }, { "git-tree": "0ff60f2fb0722cbd851e37aebf489207c3743e18", "version-semver": "1.4.0", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index c5a11420ca8281..0850da2868cf07 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "193a933153e2cfab49dd265a48ebeb650a9107e4", + "version-string": "2023.10.02.00", + "port-version": 0 + }, { "git-tree": "9c24a9089256797b853fdf56833eafa213a51f2d", "version-string": "2023.07.03.00", diff --git a/versions/p-/ptc-print.json b/versions/p-/ptc-print.json index c66eaa04f50649..bce5460216a4eb 100644 --- a/versions/p-/ptc-print.json +++ b/versions/p-/ptc-print.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5a6a899a1a03b040d2bfd0e2cb9ef5b2e6dcde1", + "version": "1.4.1", + "port-version": 1 + }, { "git-tree": "03f588ecdd3b7638a92dd2c61ea3ca0adaa28eb6", "version": "1.4.0", diff --git a/versions/p-/pulzed-mini.json b/versions/p-/pulzed-mini.json new file mode 100644 index 00000000000000..c56daefdac44c2 --- /dev/null +++ b/versions/p-/pulzed-mini.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "784f59f1926b4dc6b103c5fdb9142ed0767bdae7", + "version": "0.9.14", + "port-version": 0 + } + ] +} diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json index 0b37891c8b31d8..605fade3c8a18f 100644 --- a/versions/p-/pybind11.json +++ b/versions/p-/pybind11.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7001887fb9e72bb5590da8407998dedbb4aa2719", + "version": "2.11.1", + "port-version": 0 + }, + { + "git-tree": "3aeca2d8bc4821ab8e508e9097386fdaa6f12eef", + "version": "2.11.0", + "port-version": 1 + }, { "git-tree": "14db30027dba1e9d7ba976dd0645dac59ec553a8", "version": "2.10.4", diff --git a/versions/p-/python2.json b/versions/p-/python2.json index 67ae0d8189b7ad..7dd282fbf1f88e 100644 --- a/versions/p-/python2.json +++ b/versions/p-/python2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7da4d853b4fdc4a0b1c183b327ef04d1af33c68b", + "version": "2.7.18", + "port-version": 7 + }, { "git-tree": "c2e0390fa02b868d438156ccfc47bbc85ea98660", "version": "2.7.18", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 6a5a2169ca5be4..fff69b431aaf5c 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "52f5c3a91d997108f5acebea1748176156dbefc9", + "version": "3.11.5", + "port-version": 0 + }, + { + "git-tree": "905c4ed6b6bb377fc9f7ed367f9ed39259083ba1", + "version": "3.11.4", + "port-version": 4 + }, + { + "git-tree": "f4df0070e757f97d325679377298c7de091e75f7", + "version": "3.11.4", + "port-version": 3 + }, { "git-tree": "4f49a2d2249cb9f81e3a5c83329f383de36faf16", "version": "3.11.4", diff --git a/versions/q-/qscintilla.json b/versions/q-/qscintilla.json index 2869bd1be9ddbd..931d5e268852d7 100644 --- a/versions/q-/qscintilla.json +++ b/versions/q-/qscintilla.json @@ -10,11 +10,6 @@ "version": "2.13.4", "port-version": 1 }, - { - "git-tree": "b5942c0b0a6d9131bc4ad9a1dde662f809a6d965", - "version": "2.13.4", - "port-version": 0 - }, { "git-tree": "63f2d1f0287a6d61b5c85b428920b0fbe102adec", "version": "2.12.0", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 353b669413b719..4a47889bba0921 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f70e09569f7a3dc11f7efe9acb2fe646e0354c9", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "8c51d3d09aed70fbbe41960be34875dbe211a88d", "version": "6.5.2", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index 31fcc899162bf3..7d8a3542a83c5a 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02baf17bff3c96ec6e5e2f79576528b095b6f6b8", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "6363a118373460520fc6cfe3f2bc70625d76ea7e", "version": "6.5.2", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index 6b3eddc47d02fc..ec5e76fdb9072c 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be8daf4a45d4f87e7867bd9110ba974c3db3aa00", + "version": "5.15.10", + "port-version": 1 + }, { "git-tree": "3476fd00f9a99f7993cb70835c78fc9d998f1974", "version": "5.15.10", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 7574e8826ecd98..f28cb7c57f72fd 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3910010e49edbdf2f8a7bf917ee51f5ab888769e", + "version": "5.15.10", + "port-version": 6 + }, { "git-tree": "36129e539ff3df7757bf3074b977dd32d6e85926", "version": "5.15.10", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 6e8b32b9bd3246..53f64754fe0583 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "796db01f88dcd7b21cc357eba90ed6b1ce6c1669", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "8153e0282226733d322d2e2c42c1d488a913875a", "version": "6.5.2", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 7f211871a116a8..7968596115decb 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb16d16a9320a29c3186de89a48d7407bcf00766", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "e4e77288d2aeeb9e4d69bb5bf56833ddb0b2414a", "version": "6.5.2", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index ea8560e7dd8352..f682663f2231ce 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df9800b840b0972676b0d95ef8b7e86986e5a24b", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "46708d0e771040647dcd94e89eb2b7be73f4008b", "version": "6.5.2", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 8df3b9331d2c02..e51759879a7c53 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ff10ec91d1eda17f49dd867924e6e034a0abd5c", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "d3e2f2eea0533fae78469704453203038e8e838a", "version": "6.5.2", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index c07ed1aa93ea5c..3aafba54fdb3e3 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84c40bfb820f201f6e431fff8298e82acd0e7951", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "489227e7e214d04f752a3838e9d802b0d0fab4f9", "version": "6.5.2", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index f036c3261e2883..e0e55af409be57 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c16003284dc1a246e17025e2831ec61e26ebde7", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "447a2ef6ef1109d9022f37eefd18e87db30b983a", "version": "6.5.2", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index 9ef810e8af2020..49d84b02f4fdbb 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09ef297e42457aa0c3bded1d834760d3fefb402a", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "1a77d33e54322275fc5e903d49eb732afbfd3486", "version": "6.5.2", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 58e7da160bed83..65b8c2445b503f 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18cd1d93b0a6560a076444c03d76e5339d17abee", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "9542502f4e10861691b7da5df3802959120eaa8a", "version": "6.5.2", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index f6975922d12ab1..800787c2a5b497 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d65969f28fb847dbfcd93ae76a2bc3019c6ab81", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "dba82b0a0cafa163aa6742efe438a6a5756efe87", "version": "6.5.2", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index 83b3f221b22f18..a9315028ef67f9 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "766f2aba652da721ddec6c476ecd2f1481ad030b", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "b77242456ce4629252f57093f5039be85c38b376", "version": "6.5.2", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 95eb95b6c56a51..4907c48b5cd036 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de18f463e0a97321b9eb039e9ddb1674600b993f", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "e80b76bc95256a794532cba53f7d72fa4eea8700", "version": "6.5.2", diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json index 593780ef424197..70e66556b53dbc 100644 --- a/versions/q-/qtgrpc.json +++ b/versions/q-/qtgrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7dc614f31a77ea86fc407ecdd994ae597ac9e94", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "1763921c7316e6a3aba9414e94f56bb7261df4de", "version": "6.5.2", diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index e215f2cd4733c8..cb5d8ad9e583a0 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1bef888af2bc8f653336ee8c817e1e3ea9b514a", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "f5824d09b2d937061ee4a7e86a558f63b4a7b1d1", "version": "6.5.2", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 97443ab07d7992..095fe8916e2a5a 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "102ca43cd0aa09e7c5ad522d983179e77bdb563e", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "741e655e5197d49f078cc20e745dfe5bca2cd4d4", "version": "6.5.2", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 900f60d9a242d2..2986d9ca61514c 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9ea8f81cfcb1c6b58edb0ac0fc9301bb28500b8", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "691ae1fd4a36582c8017a79459fd96655784b2ee", "version": "6.5.2", diff --git a/versions/q-/qtkeychain-qt6.json b/versions/q-/qtkeychain-qt6.json index aa49b7faff34de..d004ef1bde4ee5 100644 --- a/versions/q-/qtkeychain-qt6.json +++ b/versions/q-/qtkeychain-qt6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcb9fb0fa722410c03a4d6fbfdb3608af68de9d5", + "version": "0.14.1", + "port-version": 0 + }, { "git-tree": "3733fba48696a40e64b18c2d52d4adc04e6eb22d", "version": "0.13.2", diff --git a/versions/q-/qtkeychain.json b/versions/q-/qtkeychain.json index 511c7a6f7836aa..10ed2378dbff79 100644 --- a/versions/q-/qtkeychain.json +++ b/versions/q-/qtkeychain.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1cf630fddc142e2a81d7f198eb8c93b40c64a34", + "version": "0.14.1", + "port-version": 0 + }, { "git-tree": "516e24d31a7d28d7b5df372f99cf2780a3a7edbc", "version": "0.13.2", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index c62a64ac370e56..e0b09bc97295a2 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83bd9154b17ba720fb96ffa099ab841809f676ec", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "fea12c05097db9136b8963271b4a5a5acbe70cb7", "version": "6.5.2", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 16e25ab92f85d6..e68c58efbfd853 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a84cfd1e4542f3a6f61d7b9f21090bc15c2e3ee5", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "188fe7e059ff53af461d6ed7c84417e8fe3ce464", "version": "6.5.2", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 9e35053d192d18..7803785ee6480f 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ac387660fd91aebf9fdbeb678d45fb7fc7fb68f", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "f23d066ab0193faaa9310eb9c153be241eff7d15", "version": "6.5.2", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index ec49d49640f82f..fc699f1a7076eb 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "400ebbcd072b0b19822683e9060078196e7fafc6", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "db62f07a65602a4590c626e7e85f97c37167c873", "version": "6.5.2", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index c75b97a810c6d4..9cd4e1d95e1b7f 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "620531e56bfde6f0c2f158222e6d3fe174e94e7d", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "40dc02a348397ddcb72826b43ac92f904f792003", "version": "6.5.2", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 47d81d5de08e60..7b2687e2bfa095 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "843c419d80c9d87f46e8b9233ce9d4b8813ec173", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "4c19109158d36523cce9666a8aecde0339bdb50c", "version": "6.5.2", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index b63380344fda8d..d54c1eaeac5a88 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "87ddfbf3e66eebc33fb874c57a8a98644546f9c4", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "9b9a0c669614dfa4a16bfb33f8e0179f88ad267e", "version": "6.5.2", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index db336cbcab0c22..60df1502598f6e 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59b3203201b5711114749a093647e1deb8f433d3", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "2b677b0d3285e9f762ecf7f5c04a139b9bc8b207", "version": "6.5.2", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 46816d72343a62..975aca6ea7f18f 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b91395b12a8c64d6622a18a54c1f92203c70d591", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "60c7d74e37ffb1ecb1ec573e139995b2ad499bed", "version": "6.5.2", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index b40933fc08cd7e..f29c6d84097784 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cfacf9011d6a0ac51afade0fb3f560d8738c877", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "95a602581be8db01b45f5d82ac888e8b53118bca", "version": "6.5.2", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json index bd152e4b16654b..da651ba5fc6eba 100644 --- a/versions/q-/qtquickeffectmaker.json +++ b/versions/q-/qtquickeffectmaker.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a35495b91cd073de54bb5429d96c5e2f13bcef76", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "ca186afca8453a7d146b627732c60522cc1c33e1", "version": "6.5.2", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 990f6379a335fd..1aa86f5891c3c0 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45b571612589ee8327ee557fb23ebe6196de724a", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "af56a3ad90062d14975145eba080f6feb24ce572", "version": "6.5.2", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 3286f4f64c872e..d97ce51b90c7e5 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0326668fb829b020e66b53d8595e29fc2ac9d10d", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "82a9a1e72cf8a0111510d408ce6422aee6fe622a", "version": "6.5.2", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 99b0222820a8f8..3458b6b801bf5c 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38f9e0bb70c3b510e0496dd9678ae8051b7086ef", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "8d194a3a3cb4fea142a05be1674fed18ac2475d6", "version": "6.5.2", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 169be8cf1f8e69..3f7d53679ca6d4 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a68065c7c255aa4e07c10f140cf539ddf9481ca9", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "e2212f2468cacf17837a95da5a5d431ea2171a9b", "version": "6.5.2", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 54153ccb2fbe71..ae44a62575b253 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "894d8e4754494932a42bc1e5be1fe3094af6e299", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "f19591f70cbb86be89c7c669786a55cda7c26b6b", "version": "6.5.2", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 29d6243ff65ee8..69a7c1e581e69d 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74930da655fbc25f2ca02eb8e069732f566dc1d9", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "3003ea5237749657ca07cac13518a9b875fdff9b", "version": "6.5.2", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 51fbe01be440e1..984d9214f2a0cd 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c3ce884f17ccc857975e2d0247c13d7f07e733c", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "8023bcbf7bd359f9deabd2e7085a856ba279ec75", "version": "6.5.2", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index 75db0d667b1a9f..732a267de332fe 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6bb68e8f537cc9f201e30c56122b615fac0da48", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "59c3a9ed2002e2e7123a3bcc2651df6ceff63d53", "version": "6.5.2", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index e96cc96571dd1d..c7665e465d3a7b 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c69ed714c8ae47743eb654424d1bdac65b1ac07", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "f71487ce49dbff9ada7e7774ae100114fbe91ad0", "version": "6.5.2", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 0c6d4701d2ba4d..5c4890ecd9a834 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5481b3959bc7fbfc044326799d1c32f8ac42fc87", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "d8e1794649af0680e60316087e9892502ded7e1b", "version": "6.5.2", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index 70ae843ad7bceb..fc4978b6a1e808 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32afed31d843b9020943e27ce3ee3357d9f78ae5", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "6d17a7c50cfa57c7bc599b7fc4cedcf2d7b8aa95", "version": "6.5.2", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 8ab71b78be25a9..bf3c8286a8095f 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5be43c5f5cfe34aafe055afb69d844eedfcaf9e6", + "version": "6.5.3", + "port-version": 0 + }, + { + "git-tree": "8b5060f737cdf43c76dee17eb62ec5992d5ed6c3", + "version": "6.5.2", + "port-version": 1 + }, { "git-tree": "56528dbb98540dc6267def8ffa5ea971982870bb", "version": "6.5.2", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 611ae4d6e9c93a..1d899f35816630 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "568cb23f986ab02df124f82d9b9db980092f05fd", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "6a7bfa9db606a9849407ef81e575c95a76bb404b", "version": "6.5.2", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index c77550175a3f3b..5df70352af8635 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7793967dcf8f178741f048ff03687f79ffbc894", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "eb71691fb50da5650494a971b17d1939a125c6bf", "version": "6.5.2", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index bcf7f1f95c83f7..3cd13c89c5673f 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b0b645beae52a3390e57bb7c51c0795dd46ab15", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "da376af9fa349263e8bce84856b15f107c4cc57f", "version": "6.5.2", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 3e37691099d4bd..2ca8de2c11cbe7 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "864d67ee1194e13ff845a6ff17efc165c198fd55", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "b004232cc580fa7bdee24662b1596e65388933ca", "version": "6.5.2", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 66e5e887922a60..9ccd885b27b45c 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e442e9a131ddc682ac5adae8a16cafa801100583", + "version": "6.5.3", + "port-version": 0 + }, { "git-tree": "0d831987d781f596f45dbadc4619260f44969ba1", "version": "6.5.2", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 13a5f48ed370d9..91eded3def1744 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06ce851a1057845ec0b0eb879eb49e208a2c319e", + "version": "3.3.1", + "port-version": 0 + }, { "git-tree": "01864ad09e447d83801734e67bb68681323d050f", "version": "3.3.0", diff --git a/versions/r-/rapidfuzz.json b/versions/r-/rapidfuzz.json index 5215e99a80568b..69584cc3eafed7 100644 --- a/versions/r-/rapidfuzz.json +++ b/versions/r-/rapidfuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5adbaf988800a6554ee8fcada97f56a62d89e722", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "e4ccc785af13a54ced4b4333612323f98a85b68b", "version": "1.8.0", diff --git a/versions/r-/raygui.json b/versions/r-/raygui.json index dc8c8ed6bc911c..541e3deba263f5 100644 --- a/versions/r-/raygui.json +++ b/versions/r-/raygui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9b03e4c1effd2eabeac64b8475b55aedea84511", + "version": "4.0", + "port-version": 0 + }, { "git-tree": "9de0bb8aebc0b8a41b4c973b5820ace3c0015ad3", "version": "3.6", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index b1c9e11592af53..4af11939dfe519 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8481bb808a6e0cdd0862e22df7b59cc0e13542cc", + "version-semver": "4.5.0", + "port-version": 2 + }, { "git-tree": "1ae048ec33152df88804d243fd6e89691d5712d2", "version-semver": "4.5.0", diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json index 1a4a35f2236120..59219fab309598 100644 --- a/versions/r-/rbdl.json +++ b/versions/r-/rbdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a6d8dcfc91836032a5365ce4cd5a31aca1338a3", + "version": "3.3.0", + "port-version": 5 + }, { "git-tree": "70c51c8d79d0dab6a483d160024c6bc68a8169c3", "version": "3.2.0", diff --git a/versions/r-/readline-unix.json b/versions/r-/readline-unix.json index e27d0632d2548a..5c2834dce9b3cd 100644 --- a/versions/r-/readline-unix.json +++ b/versions/r-/readline-unix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ad0f063e0bf86f7bfbf455e7a1f7f16883528f0", + "version": "8.2", + "port-version": 1 + }, { "git-tree": "19fcd2b764ea6d261dfbd80961833e807cf93ea0", "version": "8.2", diff --git a/versions/r-/readline-win32.json b/versions/r-/readline-win32.json index 9776c9f0bfad6a..b5ab0d0b2b17ff 100644 --- a/versions/r-/readline-win32.json +++ b/versions/r-/readline-win32.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "932081e9a1f922cd1f3e710fd9fd426f882360aa", + "version": "5.0", + "port-version": 7 + }, + { + "git-tree": "c54e93659340794a88b8122fde8123941f0be228", + "version": "5.0", + "port-version": 6 + }, { "git-tree": "19f9684f55a9aa01b5612a5ebec47960f51bacdd", "version": "5.0", diff --git a/versions/r-/readline.json b/versions/r-/readline.json index a15bb5ea84beef..26acc5d439c703 100644 --- a/versions/r-/readline.json +++ b/versions/r-/readline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4d85b7efb4b5a01e60852a81a351971c8c5dd78", + "version": "0", + "port-version": 5 + }, { "git-tree": "24b7f806888a5db397f8d737e361e2c9e5025c1f", "version": "0", diff --git a/versions/r-/refl-cpp.json b/versions/r-/refl-cpp.json index 349e371cdeb009..8f2ae2b1dbe3d8 100644 --- a/versions/r-/refl-cpp.json +++ b/versions/r-/refl-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "765482ded64bcc076b2e2140ebff7128643d4811", + "version": "0.12.4", + "port-version": 0 + }, { "git-tree": "cb8d6fa4720dd349ab60b95ad01380b55d0d4e1c", "version": "0.12.3", diff --git a/versions/r-/restinio.json b/versions/r-/restinio.json index bd86a8ad5d07ac..a0aafefd646eab 100644 --- a/versions/r-/restinio.json +++ b/versions/r-/restinio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa95495106621bad74854c9f376a2c5e1b936f05", + "version": "0.6.19", + "port-version": 0 + }, { "git-tree": "f749e69b703a537f74f52fcef9327950e7d56ea9", "version": "0.6.18", diff --git a/versions/r-/rhash.json b/versions/r-/rhash.json index 194462b1b8c1ad..d31d125d13babd 100644 --- a/versions/r-/rhash.json +++ b/versions/r-/rhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb7e94fe8d5d109574fd0e304e246c780f0b43c5", + "version": "1.4.4", + "port-version": 0 + }, { "git-tree": "85de223344c08a1efc2f9f6ec6bcb69529851199", "version": "1.4.2", diff --git a/versions/r-/robin-map.json b/versions/r-/robin-map.json index c70a28997e1ea6..3aabec38fc785d 100644 --- a/versions/r-/robin-map.json +++ b/versions/r-/robin-map.json @@ -22,7 +22,7 @@ }, { "git-tree": "84f1433234bb4813feee71e4042174ec9e8d5a7a", - "version-semver": "0.6.3", + "version-string": "0.6.3", "port-version": 0 }, { diff --git a/versions/r-/rocksdb.json b/versions/r-/rocksdb.json index be4b0c2a63e860..0b4cd7b95ff3b4 100644 --- a/versions/r-/rocksdb.json +++ b/versions/r-/rocksdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "caf00463e9aa52209110783d90fa39066eaa4249", + "version": "8.5.3", + "port-version": 0 + }, { "git-tree": "3d5c9033fedfbf0a9e993125f5511616b894f493", "version": "8.3.2", diff --git a/versions/r-/rsasynccpp.json b/versions/r-/rsasynccpp.json index 1a1afbc268bba5..27731d034dc988 100644 --- a/versions/r-/rsasynccpp.json +++ b/versions/r-/rsasynccpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f6d24a0e92e32d4bfdba144d4c449d672313c89", + "version": "0.0.7", + "port-version": 3 + }, { "git-tree": "44c0663e6c7ee48730c4db3336c455e1e45c473a", "version": "0.0.7", diff --git a/versions/r-/rsm-bsa.json b/versions/r-/rsm-bsa.json index 4211b79cdbf61c..efcfde9a11b5dd 100644 --- a/versions/r-/rsm-bsa.json +++ b/versions/r-/rsm-bsa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56763c1c1befe44030f14704e1be0c05424f039e", + "version-semver": "4.1.0", + "port-version": 0 + }, { "git-tree": "f91c3a5ffa0abe0eb4b3dc47421fb302dd258b05", "version-semver": "4.0.3", diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index f063294b3cec2c..439729dfcc7fab 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63d580588bb49ec2767eed209af0c854cc2d5da2", + "version": "0.21.0", + "port-version": 2 + }, { "git-tree": "6a0ba7b4b9ea0239aa474d40263d96919a81958c", "version": "0.21.0", diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json index ec95ea91a161b0..6dcf99a4a671bc 100644 --- a/versions/r-/rtmidi.json +++ b/versions/r-/rtmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83f2bd1bc41359997ee59a894bbfe5aab7e5a5df", + "version": "5.0.0", + "port-version": 3 + }, { "git-tree": "70873823ce910dcf80078a94f12191371523d84c", "version": "5.0.0", diff --git a/versions/s-/scintilla.json b/versions/s-/scintilla.json index 10da952742b22b..8bf6bdbe982560 100644 --- a/versions/s-/scintilla.json +++ b/versions/s-/scintilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8851877b637605265f10c086366f022205fcc1f7", + "version": "4.4.6", + "port-version": 3 + }, { "git-tree": "f6d2625e3fbec10fec4c9ee4de19143df3656213", "version": "4.4.6", diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index 429cb991d75291..e2e858116c657d 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d2d619116db10c60c0553f9ca6e155f16e05bdd", + "version": "1.1.2", + "port-version": 0 + }, { "git-tree": "2d7e548589e4fb172fd5fbb61bbd9a816d971b92", "version": "1.0", diff --git a/versions/s-/sdformat13.json b/versions/s-/sdformat13.json new file mode 100644 index 00000000000000..5e08f899eeefe3 --- /dev/null +++ b/versions/s-/sdformat13.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "88424090fdd3b2122094e75be5c68b3f2f58cda5", + "version": "13.5.0", + "port-version": 1 + }, + { + "git-tree": "b8f7d3bdbefa0795808f6c9a42764584d6e96f2c", + "version": "13.5.0", + "port-version": 0 + } + ] +} diff --git a/versions/s-/sdl1.json b/versions/s-/sdl1.json index 3426feee6821f0..8d959596ffdde0 100644 --- a/versions/s-/sdl1.json +++ b/versions/s-/sdl1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "201b5219b28e0c1299f7ebda041cbc85115983ba", + "version": "1.2.15", + "port-version": 19 + }, { "git-tree": "5463be881042b7d98bf14377bb790a2a83c3a39e", "version": "1.2.15", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 23c925fe05b856..e254df72244c67 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6b6220c48794ae1238dd8a6b491059446a8d3ebb", + "version": "2.28.3", + "port-version": 1 + }, + { + "git-tree": "cd85a856abc649e2717e838cf498052704226ed9", + "version": "2.28.3", + "port-version": 0 + }, + { + "git-tree": "e2235ea94a5142fe57d9c27f6d2c3307177df933", + "version": "2.28.2", + "port-version": 0 + }, { "git-tree": "778bb1c06d96198619bbd75704bbd4592e5f4f3a", "version": "2.26.5", diff --git a/versions/s-/seasocks.json b/versions/s-/seasocks.json new file mode 100644 index 00000000000000..29f4c153358f55 --- /dev/null +++ b/versions/s-/seasocks.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "03e48020c7de7692366f75676b4f8567d96e22f0", + "version": "1.4.6", + "port-version": 0 + }, + { + "git-tree": "2477e55b543e20d96c95546ff5a362d8a1a72044", + "version": "1.4.5", + "port-version": 0 + } + ] +} diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index 92b718dfcb467e..57dc77d8e90214 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29d5488afb2bc4a0ea9a986412d569ba9575809b", + "version": "2.6.0", + "port-version": 19 + }, { "git-tree": "7712e31893217c566173961ad3681c19856e69e6", "version": "2.6.0", diff --git a/versions/s-/si.json b/versions/s-/si.json new file mode 100644 index 00000000000000..a1595c8955b657 --- /dev/null +++ b/versions/s-/si.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "288cfb02ca17822810538628dab87c6773081160", + "version": "2.5.1", + "port-version": 0 + } + ] +} diff --git a/versions/s-/sigmatch.json b/versions/s-/sigmatch.json new file mode 100644 index 00000000000000..4500fbd15c8781 --- /dev/null +++ b/versions/s-/sigmatch.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "83b6f5b1da02efa0313fdf8caa5ee44f41047143", + "version": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/s-/simsimd.json b/versions/s-/simsimd.json new file mode 100644 index 00000000000000..97e785ba0ddb86 --- /dev/null +++ b/versions/s-/simsimd.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3d7b5f4bfb287e7ac7f0a9ad241a566f53f959d4", + "version": "1.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/s-/skia.json b/versions/s-/skia.json index ee8bed49024928..b1cc162851005a 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "df5e0eb3dc6aa8ee9b5829caf01ce7876bc7c2fe", + "version": "0.36.0", + "port-version": 10 + }, + { + "git-tree": "9389efe5ea2540ef9a0885b796d13e0d730fb603", + "version": "0.36.0", + "port-version": 9 + }, { "git-tree": "59bcc7110298012cf8f0d6e68ec8d04a4cb01e8b", "version": "0.36.0", diff --git a/versions/s-/snap7.json b/versions/s-/snap7.json new file mode 100644 index 00000000000000..dfacb418444825 --- /dev/null +++ b/versions/s-/snap7.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9183c4fc6d65ae695c68f0481e5a7dc0067f65fe", + "version": "1.4.2", + "port-version": 1 + }, + { + "git-tree": "7239966c661f1446977b064f7dec762248edf8d4", + "version": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/versions/s-/soci.json b/versions/s-/soci.json index 7128527522871f..9df5c8393297a8 100644 --- a/versions/s-/soci.json +++ b/versions/s-/soci.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a70ee9344f5a66ed9ad34a5f64608b81e66bfde", + "version": "4.0.3", + "port-version": 1 + }, { "git-tree": "11a646f331554958a517bc644c54df99dfbbbd1b", "version": "4.0.3", diff --git a/versions/s-/soil2.json b/versions/s-/soil2.json index 187420ec98d5d0..741ba6ece5ff94 100644 --- a/versions/s-/soil2.json +++ b/versions/s-/soil2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d39031bc410f4e384b777c895f5fb733efeb3e60", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "9d6004f9bd4f228751d31a1921bb8ece30d3c6eb", "version": "1.3.0", diff --git a/versions/s-/spatialite-tools.json b/versions/s-/spatialite-tools.json index 45a1dda88f64b9..bf2e402a251f6a 100644 --- a/versions/s-/spatialite-tools.json +++ b/versions/s-/spatialite-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "706b7879f1ae2e597ffefd6ab923251be8706605", + "version": "5.1.0-a", + "port-version": 0 + }, { "git-tree": "200da5b412aa158df73737b51ef1b679c5bbf27f", "version": "5.0.1", diff --git a/versions/s-/sqlcipher.json b/versions/s-/sqlcipher.json index 7d48ce1aeba76f..715ef7ea632d7a 100644 --- a/versions/s-/sqlcipher.json +++ b/versions/s-/sqlcipher.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81b4c14ac8275c922f1a972db7452c98b002526b", + "version": "4.5.4", + "port-version": 0 + }, { "git-tree": "d270ac9cc648113c540f9f29e9ab0ebece65e369", "version": "4.5.3", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 8bb7967f0397d0..ad00ae370deab6 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4f7a1dcf86377b6045fbf05eb0ec1baff1d2ceb6", + "version": "3.43.0", + "port-version": 0 + }, + { + "git-tree": "3846bd7701a147c0ed20bb7715c0be031f471f92", + "version": "3.42.0", + "port-version": 2 + }, { "git-tree": "3414b2e79fd240d315ac9fc1165fc376966c8322", "version": "3.42.0", diff --git a/versions/s-/sqlitecpp.json b/versions/s-/sqlitecpp.json index 316add8815e659..4ece543ce2ffa0 100644 --- a/versions/s-/sqlitecpp.json +++ b/versions/s-/sqlitecpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82921718a535a8c074d454e2b3a650467b866877", + "version": "3.3.1", + "port-version": 0 + }, { "git-tree": "b239a7578034b934210ab61e462b789feffe2136", "version": "3.3.0", diff --git a/versions/s-/stduuid.json b/versions/s-/stduuid.json index c89c5a62626f11..8baded3bb7e996 100644 --- a/versions/s-/stduuid.json +++ b/versions/s-/stduuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3a58db8b151c363a0f3df4a99e416d3a8dc0b62", + "version": "1.2.3", + "port-version": 0 + }, { "git-tree": "bd235773c953e5636a7b9f6356437daef6e5010c", "version": "1.2.2", diff --git a/versions/s-/strong-type.json b/versions/s-/strong-type.json index 0fb3641a1f15a4..3cb4130da789e4 100644 --- a/versions/s-/strong-type.json +++ b/versions/s-/strong-type.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "946a58c83d58700039546b6f177b1a1c97ba9487", + "version": "12", + "port-version": 0 + }, { "git-tree": "017b73a108f38fb46a32be946809985a6b1ab96c", "version": "8", diff --git a/versions/s-/symengine.json b/versions/s-/symengine.json index 309e9fbaf70ab8..41b4b059ee86b4 100644 --- a/versions/s-/symengine.json +++ b/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af6b6ed24e9fd37de357cd126afe917b47febd25", + "version": "0.10.1", + "port-version": 1 + }, { "git-tree": "63418f8cd771072202c4155627e90e280ddecf3c", "version": "0.10.1", diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json index 2d3654f86912c5..1e1fac76f23599 100644 --- a/versions/t-/taglib.json +++ b/versions/t-/taglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c92006e63d77c27bda8b2f60517d7b21c1a62ca4", + "version-semver": "1.13.1", + "port-version": 1 + }, { "git-tree": "81b5a2b206dc7c7b17ac4a50656a7c3789c2505e", "version-semver": "1.13.0", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 4ce5e4476c8782..920d8ad518626d 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "376c59cda9f516006ce87b0f5da05be5a67fed7d", + "version": "2021.10.0", + "port-version": 2 + }, + { + "git-tree": "e8bd03cdf65a8793c09146f67f942afa941c68a0", + "version": "2021.10.0", + "port-version": 1 + }, { "git-tree": "117288ebe187535733fd627985c192553c7b82e6", "version": "2021.10.0", diff --git a/versions/t-/tcl.json b/versions/t-/tcl.json index 908597ddaabb18..0f424272fad672 100644 --- a/versions/t-/tcl.json +++ b/versions/t-/tcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e825eeb13189650d5919608370935891a5cba218", + "version-string": "core-9-0-a1", + "port-version": 6 + }, { "git-tree": "cb31c47230370021b4bee86bf0d711e70ff546f4", "version-string": "core-9-0-a1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index f8477ca0249d9c..d73eacce060e73 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "894841bddec08acc323ddaf3f10f6dfdee9a92c6", + "version": "5.3.2", + "port-version": 0 + }, + { + "git-tree": "54030ed07fda737ddd8f8190177960d9d592821a", + "version": "5.3.1", + "port-version": 3 + }, + { + "git-tree": "044e8b2ab97dcd3de6080c6688ade20310e53d02", + "version": "5.3.1", + "port-version": 2 + }, { "git-tree": "d0b39327eee123cac1611afe9d88303822fedbdf", "version": "5.3.1", diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index 3fdaa6754dbb67..6125b28fcbebe5 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "11178391a67b24a7bbbe7950359aaad9e51cfce6", + "version": "0.10.1", + "port-version": 1 + }, + { + "git-tree": "36eecd20e7b2bd74489580f5b1b0e61a87be5dfc", + "version": "0.10.1", + "port-version": 0 + }, { "git-tree": "4614b6b2399a749c1ac0699429f38e35d9faee9a", "version": "0.10.0", diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json index 384f4e6f21001c..97acd53979a50c 100644 --- a/versions/t-/thrift.json +++ b/versions/t-/thrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a85bec1a50438e0a5d4edbfb7d507a26ace7f010", + "version": "0.19.0", + "port-version": 0 + }, { "git-tree": "fc85618cd8a4849e400d28916b733f2426c9246d", "version": "0.16.0", diff --git a/versions/t-/tomlplusplus.json b/versions/t-/tomlplusplus.json index a5947f3b183043..04996f96f9e48b 100644 --- a/versions/t-/tomlplusplus.json +++ b/versions/t-/tomlplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5d2f60be4fafc9cf2f8a9fbf5b69c8001e7f461", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "bf80fe2b73187c7a5ae1ea2d32cba894c13f7224", "version": "3.1.0", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index 1ab90d01ba9233..bbbbb0828a4816 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d84bb317ef020ff408ce8000ecb896d7fe4fe78", + "version-semver": "0.9.1", + "port-version": 3 + }, { "git-tree": "10b47fa5363e3108af03ccd6729f17b7a05c4804", "version-semver": "0.9.1", diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index 7f57fd2a7bec9f..975874d1e33ebe 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8c48e0f8f1877f0392dcb0f1d1d31011c9db957", + "version-semver": "1.5.14", + "port-version": 0 + }, { "git-tree": "4ac910f7ba58f9ee8ceff1c8ac1d2dfa0200136f", "version-semver": "1.5.11", diff --git a/versions/t-/trompeloeil.json b/versions/t-/trompeloeil.json index 1a3a6ac725cfc5..cca466315bc85e 100644 --- a/versions/t-/trompeloeil.json +++ b/versions/t-/trompeloeil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a00a802a482a267ddba63aae7ce5f89973427210", + "version": "45", + "port-version": 0 + }, { "git-tree": "876864d2915f8530d28bd8a2c6ca0fd418dd7829", "version": "43", diff --git a/versions/u-/unicorn.json b/versions/u-/unicorn.json index 3ff8b2895ed8c8..a3fd4f274336fd 100644 --- a/versions/u-/unicorn.json +++ b/versions/u-/unicorn.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d1d99593115946401db9ccd090cd53dc8ae303ba", + "version": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "31ff77ab3e1221d27f0b4ea2432ac7002181f984", + "version": "1.0.3", + "port-version": 1 + }, { "git-tree": "ec4ae5e99d2204a11e112c2f1a596ac2d4f5f2f9", "version": "1.0.3", diff --git a/versions/u-/unordered-dense.json b/versions/u-/unordered-dense.json index b89eb6e826d9d8..629deeccb5d1ee 100644 --- a/versions/u-/unordered-dense.json +++ b/versions/u-/unordered-dense.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c25f50471fcb367451a465853e405a50e372e279", + "version": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "abbf5a684519e60642ad5113f5e2f63762f60f93", + "version": "4.1.1", + "port-version": 0 + }, { "git-tree": "404e82b0f085a6d68323630f530c04e86b5eeb2b", "version": "4.0.1", diff --git a/versions/u-/unrar.json b/versions/u-/unrar.json index 27da1388c1ac4b..d9863e01366ea7 100644 --- a/versions/u-/unrar.json +++ b/versions/u-/unrar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bc071be9e736a08d2826e81e000dbc6aa6d4b2b", + "version": "6.1.7", + "port-version": 3 + }, { "git-tree": "6849b794133f944030e40dc8c73b1fa4fc2a4f13", "version": "6.1.7", diff --git a/versions/u-/upb.json b/versions/u-/upb.json index 46a2d02d402d85..6e515219183f26 100644 --- a/versions/u-/upb.json +++ b/versions/u-/upb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d7a6a503d8e111f919697470e47030cba1172b3", + "version-date": "2022-06-21", + "port-version": 1 + }, { "git-tree": "4a5b5306d38f1a58f65c98c236b84ca297501ab1", "version-date": "2022-06-21", diff --git a/versions/u-/urho3d.json b/versions/u-/urho3d.json index 1009d23737502d..4c27e17c4e60c4 100644 --- a/versions/u-/urho3d.json +++ b/versions/u-/urho3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aceb5375954d594c93c9e75ff4fd7ea0cfdb9323", + "version-date": "2021-03-01", + "port-version": 5 + }, { "git-tree": "fe6e49016a6f15bc04e04727f2e4712e75625425", "version-date": "2021-03-01", diff --git a/versions/u-/usbmuxd.json b/versions/u-/usbmuxd.json index f52d336737c2ca..5edeadcf1d8e4e 100644 --- a/versions/u-/usbmuxd.json +++ b/versions/u-/usbmuxd.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "edc61063b642372c7d9de82f7ecc55ed39971c3d", + "version-date": "2023-07-21", + "port-version": 0 + }, + { + "git-tree": "4116e3cd80421add75aeeb413386b03cbfad5670", + "version": "1.2.235", + "port-version": 5 + }, { "git-tree": "f2c137f8ea6a9f68922e301479aa2b251c130636", "version": "1.2.235", diff --git a/versions/u-/usearch.json b/versions/u-/usearch.json new file mode 100644 index 00000000000000..b674ad598358f9 --- /dev/null +++ b/versions/u-/usearch.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5ed129aec7ee2dec29767918714015211a556038", + "version": "2.3.2", + "port-version": 0 + } + ] +} diff --git a/versions/u-/utfcpp.json b/versions/u-/utfcpp.json index d5a9dbac8dbc6a..c2a0319d906f5c 100644 --- a/versions/u-/utfcpp.json +++ b/versions/u-/utfcpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "323b2ffdbd38cf8e756a5ae5714ef2169c0cd6b3", + "version": "3.2.5", + "port-version": 0 + }, + { + "git-tree": "6c3de7ba47b92f266d5cce0a4f69925af4abda8f", + "version": "3.2.4", + "port-version": 0 + }, { "git-tree": "6871a843dce2e99e0973ca0a2a837ea78c3add39", "version": "3.2.3", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index 7d8073cf428759..4225493c8ed3d5 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab4cfc5f196adbe34d9a4d75758137c5fddaafe9", + "version": "9.1.269.39", + "port-version": 6 + }, { "git-tree": "efe56a72380aed1323f5e19b4b20a3e02fae8112", "version": "9.1.269.39", diff --git a/versions/v-/vcpkg-cmake-get-vars.json b/versions/v-/vcpkg-cmake-get-vars.json index 56e54de8af3b7f..4bfa475bc11eaf 100644 --- a/versions/v-/vcpkg-cmake-get-vars.json +++ b/versions/v-/vcpkg-cmake-get-vars.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "c6eb09f11e34173a4bfc31252d02d6aea6c25d8f", - "version-date": "2023-04-13", - "port-version": 0 - }, { "git-tree": "2e624c2cf12a97a7a802e31ff1d28b9fa6ba9bde", "version-date": "2023-03-02", diff --git a/versions/v-/vcpkg-pkgconfig-get-modules.json b/versions/v-/vcpkg-pkgconfig-get-modules.json index ce08cd4ec9e0a9..b04399b18eae09 100644 --- a/versions/v-/vcpkg-pkgconfig-get-modules.json +++ b/versions/v-/vcpkg-pkgconfig-get-modules.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "365f7303c0f9fe13458a62e7e4998760e6d918a4", + "version-date": "2023-09-06", + "port-version": 0 + }, { "git-tree": "57e857fda6b1dadd02036d9c012963db900bfc33", "version-date": "2023-02-25", diff --git a/versions/v-/vcpkg-tool-ninja.json b/versions/v-/vcpkg-tool-ninja.json index 989abb5d8657c4..40503ccbc11969 100644 --- a/versions/v-/vcpkg-tool-ninja.json +++ b/versions/v-/vcpkg-tool-ninja.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4000f008484105462069d70c1b70295ab72dafb3", + "version-date": "2022-03-31", + "port-version": 2 + }, { "git-tree": "e4dafd8bf3868653e8e4fa81340dfeaea288a43c", "version-date": "2022-03-31", diff --git a/versions/v-/vlpp.json b/versions/v-/vlpp.json index a6f0339e2c11ea..7dad7480377e3f 100644 --- a/versions/v-/vlpp.json +++ b/versions/v-/vlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "654b1fb66c8a083d723a6a655acf5eb706fe97f2", + "version": "1.1.0.0", + "port-version": 1 + }, { "git-tree": "8df8b965877d7d55e02b0563e1874d6c4fbbd9f2", "version": "1.1.0.0", diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json index e661ead044c227..8de858a28f4742 100644 --- a/versions/v-/vsg.json +++ b/versions/v-/vsg.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e541c0ad81c0926c15e5f362dcdac38f99dbed19", + "version": "1.0.9", + "port-version": 0 + }, + { + "git-tree": "6c882aab471b516ea2137b20450773b5ae7c57c3", + "version": "1.0.8", + "port-version": 0 + }, { "git-tree": "083510fe30c973a53fe65f4565d7c4159fdff36a", "version": "1.0.6", diff --git a/versions/v-/vsgxchange.json b/versions/v-/vsgxchange.json new file mode 100644 index 00000000000000..e285a83e573aeb --- /dev/null +++ b/versions/v-/vsgxchange.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8a026d7763afb5ffa6081e9baf6de63a8d500790", + "version": "1.0.5", + "port-version": 0 + }, + { + "git-tree": "4019eb900d9064c6cb03767678bf82dd9860033e", + "version": "1.0.4", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index f9db0e29470dbd..b927e043ae3c1d 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6365f197946995803914141a82c1830d165427b3", + "version-semver": "9.2.0-pv5.11.0", + "port-version": 10 + }, { "git-tree": "a2a544c0f17d33ceb785ecd4b263f6f540562974", "version-semver": "9.2.0-pv5.11.0", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 3af037ee84a02a..1f87d08d0da64e 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff239f5d33f181256ff31bbb5cfc0bdc7329937c", + "version-string": "2023.10.02.00", + "port-version": 0 + }, { "git-tree": "105b20279ba475028db9848e6acc0950843e103c", "version-string": "2023.07.03.00", diff --git a/versions/w-/wg21-linear-algebra.json b/versions/w-/wg21-linear-algebra.json index b83a1d9e38d9f5..8889f6a60ffd2c 100644 --- a/versions/w-/wg21-linear-algebra.json +++ b/versions/w-/wg21-linear-algebra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85073707ba15d2e60bdcf7e7f0c513d6bebe6332", + "version": "0.7.3", + "port-version": 0 + }, { "git-tree": "d3968b4096fba4dbd1189fb9b7b1d33ba562fdc7", "version": "0.7.2", diff --git a/versions/w-/wil.json b/versions/w-/wil.json index dd76fa52cdfa34..3d16548b460128 100644 --- a/versions/w-/wil.json +++ b/versions/w-/wil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ddb021c58bdc3c24a0440d2e6f808797cd698bf8", + "version-date": "2023-08-24", + "port-version": 0 + }, { "git-tree": "8e96d6798de6842dc009f957172841b8fcf711d7", "version-date": "2023-04-11", diff --git a/versions/w-/winpcap.json b/versions/w-/winpcap.json index ce841f61c47833..30e73f43459039 100644 --- a/versions/w-/winpcap.json +++ b/versions/w-/winpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa00dc5de34d5076f7d7bad06b649b6ce4412b68", + "version": "4.1.3", + "port-version": 11 + }, { "git-tree": "93484c8257a6ac5a90f5d540d143a6f4fe5968f2", "version": "4.1.3", diff --git a/versions/w-/woff2.json b/versions/w-/woff2.json index 64a7f4a77d1d32..60f4d2454cf83f 100644 --- a/versions/w-/woff2.json +++ b/versions/w-/woff2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbd2207ad0ad1e7e52b421b86f96deff9ed7ec65", + "version": "1.0.2", + "port-version": 4 + }, { "git-tree": "b60f5207764279d61a2bb9f35e4881c4af2a6b2c", "version": "1.0.2", diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json index 4c57d003e1447a..3d586e4d21c33f 100644 --- a/versions/w-/wolfssl.json +++ b/versions/w-/wolfssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1ed14c731f84f9a8f885e9bf40898c318bd4986", + "version": "5.6.3", + "port-version": 1 + }, { "git-tree": "e809eb7090657113c8f628ce22975c7f3bd3dbfd", "version": "5.6.3", diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json index 2a0a89ea43d65b..9cd67fb72424b6 100644 --- a/versions/w-/wpilib.json +++ b/versions/w-/wpilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7da141104a256a768fa72c6b3f98104904ebe45e", + "version-date": "2023-08-24", + "port-version": 0 + }, { "git-tree": "e62481ee582e81ab3ba9fe7ad99a89fa1671c230", "version-date": "2020-03-02", diff --git a/versions/x-/x265.json b/versions/x-/x265.json index 5923b4ed2da3a7..23a00b658a804c 100644 --- a/versions/x-/x265.json +++ b/versions/x-/x265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8aa499d4919383c463198cedf2bc8cea9b01adff", + "version": "3.4", + "port-version": 10 + }, { "git-tree": "aa43c511cf7041c15a3a56b0527124fa5f1640f2", "version": "3.4", diff --git a/versions/x-/xmlsec.json b/versions/x-/xmlsec.json index 7a18fbcca4a5c3..6d32e4da36abfc 100644 --- a/versions/x-/xmlsec.json +++ b/versions/x-/xmlsec.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9152aec5099de6e629c31adc81bd07fc6f87607e", + "version": "1.3.1", + "port-version": 1 + }, + { + "git-tree": "3ca82fa3b389ead91f8abe51fb628fc1959cf29b", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "716c1bdec11ab1f1053e76b14604a5d166484465", "version": "1.2.37", diff --git a/versions/x-/xtensor.json b/versions/x-/xtensor.json index 3a836ce093d90b..90157a3fc058b5 100644 --- a/versions/x-/xtensor.json +++ b/versions/x-/xtensor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3243d2557778b77adbd7b2dbc83ade2456e8fe5c", + "version": "0.24.6", + "port-version": 1 + }, { "git-tree": "aeb0efc2bdf326191f5dff18bb2506690902b162", "version": "0.24.6", diff --git a/versions/y-/yomm2.json b/versions/y-/yomm2.json index 5c495265dee87a..b520e9609a7b24 100644 --- a/versions/y-/yomm2.json +++ b/versions/y-/yomm2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7fb081bdba7637ab5c5bc26d1dfb2a80a1fd1303", + "version": "1.4.0", + "port-version": 1 + }, + { + "git-tree": "eb04c5f671a8ba74f8f98bb4c1b53716336ce441", + "version": "1.4.0", + "port-version": 0 + }, { "git-tree": "9b2200dcba64aecc83b9009b7d8f1ccb383003c8", "version": "1.3.1", diff --git a/versions/y-/yyjson.json b/versions/y-/yyjson.json index b3de3eae5e5adb..6bdb82399c8029 100644 --- a/versions/y-/yyjson.json +++ b/versions/y-/yyjson.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "23f8cd0e06d0c615ea534c70316b3f55a696912a", + "version": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "658e0c2de9549d6330f76f33992a45e110bfcb74", + "version": "0.6.0", + "port-version": 1 + }, { "git-tree": "959e0191dd4850c8915d57c1ffeccfaf983e0616", "version": "0.6.0", diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json index 3f7dbb1e357304..5988b40cac5521 100644 --- a/versions/z-/zeroc-ice.json +++ b/versions/z-/zeroc-ice.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "9048b568a7f81f0a8788c6dd8b0215cb1cd300eb", + "version": "3.7.9", + "port-version": 4 + }, + { + "git-tree": "45f338a327c4b8ea7eb16fc81e650cd0f999449c", + "version": "3.7.9", + "port-version": 3 + }, + { + "git-tree": "dc07eee81cdf5c66efc83d606c635e722ef23d39", + "version": "3.7.9", + "port-version": 2 + }, + { + "git-tree": "bb449d6446b3700170a831c0b155d58be3613a26", + "version": "3.7.9", + "port-version": 1 + }, { "git-tree": "aba63efeb29d2249b285f6188b44fde25dbff9d3", "version": "3.7.9", diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json index ab73c500e03947..4155c7899e24aa 100644 --- a/versions/z-/zlib-ng.json +++ b/versions/z-/zlib-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5618019c0972a9e8bb9422609352679cf248f85", + "version": "2.1.3", + "port-version": 0 + }, { "git-tree": "ea181bc5e9362185c5d5d85d23bbb15267c82cdb", "version": "2.0.7", diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json index 9528646a6ed8d1..63e0ea6ed63642 100644 --- a/versions/z-/zlib.json +++ b/versions/z-/zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ac18c6e6e3e2bf5a9e3d0bc8a845f198e4c4e05", + "version": "1.3", + "port-version": 0 + }, { "git-tree": "ad5a49006f73b45b715299515f31164131b51982", "version": "1.2.13", diff --git a/versions/z-/zstd.json b/versions/z-/zstd.json index e539895eb9584f..1de36099039f0f 100644 --- a/versions/z-/zstd.json +++ b/versions/z-/zstd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44fdd2e1576b62ee75cdaab5ce74452ed08f84ce", + "version": "1.5.5", + "port-version": 1 + }, { "git-tree": "2a6d14da5f876e43859950a12a330f8b03cdc327", "version": "1.5.5",