diff --git a/CONTRIBUTING_zh.md b/CONTRIBUTING_zh.md new file mode 100644 index 00000000000000..7aef2f5dcb9fd8 --- /dev/null +++ b/CONTRIBUTING_zh.md @@ -0,0 +1,33 @@ +# 贡献准则 + +Vcpkg 是一个尝试由社区驱动，旨在构建一个多产的、健壮的本地库生态系统 - 您的贡献价值不可估量！ + +## 报告问题 + +最简单的方法是通过 `vcpkg.exe` 或 [GitHub](https://github.com/Microsoft/vcpkg) 报告已有的包的问题。 当报告 `vcpkg.exe` 的问题时，确保清楚地说明: +- 机器设置: “我用的是Windows 10周年更新。 我的机器正位于fr-fr区域。 我成功地运行了'install boost'。” +- 复现步骤: “运行 'vcpkg list'” +- 预期结果: “我预期看到 'boost:x86-windows'” +- 实际结果: “没有输出” 或 “我得到一个崩溃对话框” + +当报告包的问题时，一定要清楚地说明: +- 机器设置 (上述) +- 您正在构建什么包以及它的版本，例如: “opencv 3.1.0” +- 构建过程中的任何相关错误日志 + +## 贡献 (PR) + +我们很乐意接受关于修复、特性、新包和更新现有包的拉取请求。 为了避免浪费您的时间，我们强烈建议您提交一个问题来讨论您想要制作的PR是否能被接受。 对于特性和新包来说也是如此。 + +### 新包贡献准则 + +我们很高兴您有兴趣来提交一个新的包! 这里有一些指导方针来帮助您编写一个优秀的端口文件: +- 避免功能补丁。 当没有其他方法时，补丁应该被视为实现兼容性的最后手段。 +- 当无法避免补丁时，请不要修改默认行为。 一个补丁的理想生命周期是与上游合并，不再被需要。 在决定如何修补某些内容时，请记住这一目标。 +- 相比原始的 `execute_command` 调用，尽量改为通过 `vcpkg_xyz` 函数实现。这使得在添加新特性(如自定义编译器标志或生成器)时更容易进行长期维护。 + +## 法律声明 + +在您的拉取请求被接受之前，您需要完成一个贡献者许可协议 (CLA)。 本协议证明您允许我们使用您提交的源代码，并且本作品是在合适的许可下提交的，我们可以使用它。 + +您可以通过 https://cla.microsoft.com 上的步骤来完成CLA。 一旦我们收到已签署的CLA，我们将审查请求。 您只需要这样做一次。 diff --git a/README.md b/README.md index 421f22cb5e8e5e..d4d1bb19588d72 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,6 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help. * Discord: [\#include \](https://www.includecpp.org), the #🌏vcpkg channel * Docs: [Documentation](docs/README.md) -[![Build Status](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master) - # Table of Contents - [Vcpkg: Overview](#vcpkg-overview) @@ -30,7 +28,6 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help. - [Quick Start: Unix](#quick-start-unix) - [Installing Linux Developer Tools](#installing-linux-developer-tools) - [Installing macOS Developer Tools](#installing-macos-developer-tools) - - [Installing GCC for macOS before 10.15](#installing-gcc-for-macos-before-1015) - [Using vcpkg with CMake](#using-vcpkg-with-cmake) - [Visual Studio Code with CMake Tools](#visual-studio-code-with-cmake-tools) - [Vcpkg with Visual Studio CMake Projects](#vcpkg-with-visual-studio-cmake-projects) @@ -40,6 +37,7 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help. - [Examples](#examples) - [Contributing](#contributing) - [License](#license) +- [Security](#security) - [Telemetry](#telemetry) # Getting Started @@ -141,9 +139,6 @@ Prerequisites for Linux: Prerequisites for macOS: - [Apple Developer Tools][getting-started:macos-dev-tools] -- On macOS 10.14 or below, you will also need: - - [Homebrew][getting-started:macos-brew] - - [g++][getting-started:macos-gcc] >= 6 from Homebrew First, download and bootstrap vcpkg itself; it can be installed anywhere, but generally we recommend using vcpkg as a submodule for CMake projects. @@ -205,7 +200,7 @@ If you want to add instructions for your specific distro, ## Installing macOS Developer Tools -On macOS 10.15, the only thing you should need to do is run the following in your terminal: +On macOS, the only thing you should need to do is run the following in your terminal: ```sh $ xcode-select --install @@ -213,25 +208,6 @@ $ xcode-select --install Then follow along with the prompts in the windows that comes up. -On macOS 10.14 and previous, you'll also need to install g++ from homebrew; -follow the instructions in the following section. - -### Installing GCC for macOS before 10.15 - -This will _only_ be necessary if you're using a macOS version from before 10.15. -Installing homebrew should be very easy; check out for more information, -but at its simplest, run the following command: - -```sh -$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -``` - -Then, in order to grab an up-to-date version of gcc, run the following: - -```sh -$ brew install gcc -``` - You'll then be able to bootstrap vcpkg along with the [quick start guide](#quick-start-unix) ## Using vcpkg with CMake @@ -312,7 +288,7 @@ To enable tab-completion in the shell of your choice, run: or ```sh -$ ./vcpkg integrate bash +$ ./vcpkg integrate bash # or zsh ``` depending on the shell you use, then restart your console. @@ -350,7 +326,18 @@ with any additional questions or comments. # License -The code in this repository is licensed under the [MIT License](LICENSE.txt). +The code in this repository is licensed under the [MIT License](LICENSE.txt). The libraries +provided by ports are licensed under the terms of their original authors. Where available, vcpkg +places the associated license(s) in the location `installed//share//copyright`. + +# Security + +Most ports in vcpkg build the libraries in question using the original build system preferred +by the original developers of those libraries, and download source code and build tools from their +official distribution locations. For use behind a firewall, the specific access needed will depend +on which ports are being installed. If you must install in in an "air gapped" environment, consider +installing once in a non-"air gapped" environment, populating an +[asset cache](docs/users/assetcaching.md) shared with the otherwise "air gapped" environment. # Telemetry diff --git a/README_es.md b/README_es.md index 9f3c7c2b5f2164..0ffcb3a49b3a15 100644 --- a/README_es.md +++ b/README_es.md @@ -22,8 +22,6 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o * Discord: [\#include \](https://www.includecpp.org), en el canal #🌏vcpkg * Docs: [Documentación](docs/README.md) -[![Estado de compilación](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master) - ## Tabla de contenido - [Vcpkg](#vcpkg) @@ -33,7 +31,6 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o - [Inicio rápido: Unix](#inicio-rápido-unix) - [Instalando Herramientas de desarrollo en Linux](#instalando-herramientas-de-desarrollo-en-linux) - [Instalando Herramientas de desarrollo en macOS](#instalando-herramientas-de-desarrollo-en-macos) - - [Instalando GCC en macOS previo a 10.15](#instalando-gcc-en-macos-previo-a-1015) - [Usando Vcpkg con CMake](#usando-vcpkg-con-cmake) - [Visual Studio Code con CMake Tools](#visual-studio-code-con-cmake-tools) - [Vcpkg con proyectos de Visual Studio(CMake)](#vcpkg-con-proyectos-de-visual-studiocmake) @@ -44,6 +41,7 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o - [Ejemplos](#ejemplos) - [Contribuyendo](#contribuyendo) - [Licencia](#licencia) +- [Seguridad](#seguridad) - [Telemetría](#telemetría) ## Primeros pasos @@ -134,9 +132,6 @@ Prerrequisitos para Linux: Prerrequisitos para macOS: - [Herramientas de desarrollo de Apple][getting-started:macos-dev-tools] -- En macOS 10.14 o inferior, también necesita: - - [Homebrew][getting-started:macos-brew] - - [g++][getting-started:macos-gcc] >= 6 de Homebrew Primero, descargue y compile vcpkg, puede ser instalado donde sea, pero recomendamos usar vcpkg como submodulo para proyectos de CMake. @@ -218,25 +213,6 @@ $ xcode-select --install Luego seguir los pasos que aparecerán en las ventanas que se muestran. -En macOS 10.14 y previos, también requiere instalar g++ de homebrew; -siguiendo los pasos en la sección siguiente. - -#### Instalando GCC en macOS previo a 10.15 - -Este paso _solo_ es requerido si está usando una versión de macOS previa a 10.15. -Instalar homebrew debería ser sencillo; visite para mas información, -pero de manera simple, ejecute el siguiente comando: - -```sh -$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -``` - -luego, para obtener una versión actualizada de gcc, ejecute el comando: - -```sh -$ brew install gcc -``` - Posteriormente podrá compilar vcpkg junto con la [guía de inicio rápido](#inicio-rápido-unix) ### Usando Vcpkg con CMake @@ -346,10 +322,8 @@ Para más información, revise la especificación de [manifiesto][getting-starte [getting-started:integration]: docs/users/integration.md [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]: #installing-linux-developer-tools -[getting-started:macos-dev-tools]: #installing-macos-developer-tools -[getting-started:macos-brew]: #installing-gcc-on-macos -[getting-started:macos-gcc]: #installing-gcc-on-macos +[getting-started:linux-gcc]: #Instalando-Herramientas-de-desarrollo-en-Linux +[getting-started:macos-dev-tools]: #Instalando-Herramientas-de-desarrollo-en-macOS [getting-started:visual-studio]: https://visualstudio.microsoft.com/ [getting-started:manifest-spec]: docs/specifications/manifests.md @@ -366,7 +340,7 @@ para activar el autocompletado en la terminal de elección ejecute: o ```sh -$ ./vcpkg integrate bash +$ ./vcpkg integrate bash # o zsh ``` según la terminal que use, luego reinicie la consola. @@ -407,6 +381,16 @@ con cualquier pregunta adicional o comentarios. ## Licencia El código en este repositorio se encuentra licenciado mediante la [Licencia MIT](LICENSE.txt). +Las bibliotecas proveídas por los `ports` están licenciadas mediante los terminos de los autores originales. +Donde estén disponibles, vcpkg almacena las licencias asociadas en la siguiente ubicación `installed//share//copyright`. + +# Seguridad + +La mayoría de los `ports` en vcpkg construyen las bibliotecas usando su sistema de compilación preferido +por los autores originales de las bibliotecas, y descargan el código fuente asi como las herramientas de compilación +de sus ubicaciones de distribucion oficiales. Para aquellos que usan un firewall, el acceso dependerá de cuales `ports` +están siendo instalados. Si tiene que instalarlos en un entorno aislado, puede instalarlos previamente en un entorno +no aislado, generando un [caché del paquete](docs/users/assetcaching.md) compartido con el entorno aislado. ## Telemetría diff --git a/README_ko_KR.md b/README_ko_KR.md index 3f76ac0c5c0d67..a7a71fa1e0fdf9 100644 --- a/README_ko_KR.md +++ b/README_ko_KR.md @@ -1,105 +1,122 @@ # Vcpkg: 개요 -Vcpkg는 Windows, Linux 및 MacOS에서 C 및 C++ 라이브러리를 관리하는 데 도움이 됩니다. -이 툴과 생태계는 지속적으로 진화하고 있으며 항상 기여해 주셔서 감사합니다! +[中文总览](README_zh_CN.md) +[Español](README_es.md) +[English](README.md) +[Français](README_fr.md) + +Vcpkg는 Windows, Linux 및 MacOS에서 C 및 C++ 라이브러리를 관리하는 데 도움을 주는 라이브러리입니다. +이 도구와 생태계는 지속적으로 진화하고 있으며, 저희는 기여를 언제나 환영합니다! 이전에 vcpkg를 사용한 적이 없거나 vcpkg를 사용하는 방법을 알고 싶을 경우, -vcpkg 사용을 시작하는 방법은 [시작하기](#시작하기) 섹션을 확인하세요. +아래의 [시작하기](#시작하기) 단락을 확인하면 vcpkg 사용을 시작하는 방법이 설명되어 있습니다. -사용 가능한 명령어에 대한 간단한 설명을 보려면 vcpkg를 설치 한 후 `vcpkg help` 또는 `vcpkg help [command]` 명령어로 명령어 별 도움말을 볼 수 있습니다. +Vcpkg를 설치하였다면, `vcpkg help` 명령어로 사용 가능한 명령어에 대한 간단한 설명을 볼 수 있습니다. +`vcpkg help [command]` 명령어로는 각 명령어별 도움말을 볼 수 있습니다. -* Github: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) +* Github: port는 [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)에, 관련 프로그램은 [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)에 있습니다. * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), #vcpkg 채널 * Discord: [\#include \](https://www.includecpp.org), #🌏vcpkg 채널 -* Docs: [Documentation](docs/README.md) - -[![Build Status](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master) +* 도움말: [Documentation](docs/README.md) # 목차 -- [Vcpkg: 개요 둘러보기](#vcpkg-개요) +- [Vcpkg: 개요](#vcpkg-개요) - [목차](#목차) - [시작하기](#시작하기) - - [빠르게 시작하기: 윈도우](#빠르게-시작하기-윈도우) - - [빠르게 시작하기: 유닉스](#빠르게-시작하기-유닉스) - - [리눅스 개발자 도구 설치하기](#리눅스-개발자-도구-설치하기) + - [빠르게 시작하기: Windows](#빠르게-시작하기-windows) + - [빠르게 시작하기: Unix](#빠르게-시작하기-unix) + - [Linux 개발자 도구 설치하기](#linux-개발자-도구-설치하기) - [macOS 개발자 도구 설치하기](#macos-개발자-도구-설치하기) - - [10.15버전 이전 macOS에 GCC 설치하기](#1015버전-이전-macos에-gcc-설치하기) - [CMake와 함께 vcpkg 사용](#cmake와-함께-vcpkg-사용) - [Visual Studio Code와 CMake Tools](#visual-studio-code와-cmake-tools) - - [Visual Studio CMake 프로젝트와 Vcpkg](#visual-studio-cmake-프로젝트와-vcpkg) + - [Vcpkg와 Visual Studio CMake 프로젝트](#vcpkg와-visual-studio-cmake-프로젝트) - [Vcpkg와 CLion](#vcpkg와-clion) - - [서브모듈로서의 Vcpkg](#서브모듈로서의-vcpkg) -- [탭 완성/자동 완성](#탭-완성/자동-완성) -- [예제](#예제) -- [기여](#기여) + - [서브모듈로 vcpkg 사용하기](#서브모듈로-vcpkg-사용하기) +- [탭 완성/자동 완성](#탭-완성자동-완성) +- [예시](#예시) +- [기여하기](#기여하기) - [라이선스](#라이선스) +- [보안](#보안) - [데이터 수집](#데이터-수집) # 시작하기 -먼저, 사용하는 운영체제에 따라 빠르게 시작하기 문서를 따라가세요. -[윈도우](#빠르게-시작하기-윈도우) 또는 [macOS 그리고 Linux](#빠르게-시작하기-유닉스). +먼저, 사용하는 운영체제에 따라 +[윈도우](#빠르게-시작하기-windows) 또는 [macOS와 Linux](#빠르게-시작하기-unix) +빠르게 시작하기 가이드를 따라가세요. -더 많은 정보를 얻고 싶다면, [패키지 설치 및 사용][getting-started:using-a-package] 문서를 참고하세요. -만약 필요한 라이브러리가 vcpkg 카탈로그에 없는 경우, vcpkg 팀이나 커뮤니티가 볼 수 있는 -[GitHub 저장소에서 이슈를 열 ​​수 있습니다][contributing:submit-issue] -또한 잠재적으로 vcpkg에 포트가 추가될 것 입니다. +더 자세한 정보는 [패키지 설치 및 사용][getting-started:using-a-package]에 있습니다. +만약 필요한 라이브러리가 vcpkg 카탈로그에 없는 경우, +[GitHub 저장소에서 이슈를 열 ​​수 있습니다][contributing:submit-issue]. +Vcpkg 팀과 커뮤니티가 이슈를 확인하면, 해당하는 port를 추가할 수 있습니다. -vcpkg를 설치하고 작동 한 후, -셸에 [탭 완성/자동 완성](#탭-완성/자동-완성)을 추가 할 수 있습니다. +Vcpkg의 설치가 완료되었다면, +셸에 [탭 완성](#탭-완성자동-완성)을 추가할 수 있습니다. 마지막으로, vcpkg의 미래에 관심이 있다면, [manifest][getting-started:manifest-spec] 가이드를 확인하세요! -이것은 실험적인 기능이며 버그가 있을 수도 있습니다. -시도해보고 문제가 있다면 [이슈을 여세요][contributing:submit-issue]! +이것은 실험적인 기능이며 버그가 있을 가능성이 높습니다. +시도해보고 문제가 있다면 [이슈를 열어주세요][contributing:submit-issue]! -## 빠르게 시작하기: 윈도우 +## 빠르게 시작하기: Windows 필요조건: - Windows 7 이상 - [Git][getting-started:git] - [Visual Studio][getting-started:visual-studio] 영어 언어팩이 설치된 2015 Update 3 버전 이상 - -첫번째로, vcpkg 자체를 다운로드하고 부트스트랩합니다; 어디에나 설치할 수 있습니다, -하지만 일반적으로 CMake 프로젝트의 하위 모듈로 vcpkg를 사용하는 것이 좋습니다. -Visual Studio 프로젝트를 위해 전역적으로 설치합니다. -설치 위치는 `C:\src\vcpkg` 나 `C:\dev\vcpkg`를 사용할것을 권장합니다. -그렇지 않으면 일부 포트 빌드 시스템에서 경로 문제가 발생할 수도 있습니다. + +첫번째로, vcpkg 자체를 다운로드하고 부트스트랩합니다. Vcpkg는 어디에나 설치할 수 있지만, +일반적으로 CMake 프로젝트는 vcpkg를 submodule로 사용하는 것을, +Visual Studio 프로젝트는 시스템에 설치하는 것을 추천합니다. +시스템 설치는 `C:\src\vcpkg` 나 `C:\dev\vcpkg` 등의 위치에 하는 것을 권장하는데, +그렇지 않으면 일부 포트 빌드 시스템에서 경로 문제가 발생할 수도 있기 때문입니다. ```cmd > git clone https://github.com/microsoft/vcpkg > .\vcpkg\bootstrap-vcpkg.bat ``` -당신의 프로젝트에 라이브러리를 설치, 실행 시키려면 다음과 같이 작성하세요: +당신의 프로젝트에 라이브러리를 설치하려면 다음 명령을 실행하세요. ```cmd > .\vcpkg\vcpkg install [packages to install] ``` -다음과 같이 `search` 하위 명령어를 사용하여 필요한 라이브러리를 검색 할 수도 있습니다. +참고로, 위 명령은 x86 라이브러리를 설치하는 것이 기본 설정입니다. 만약 x64 버전을 +설치하고 싶다면, 다음 명령을 실행하세요. + +```cmd +> .\vcpkg\vcpkg install [package name]:x64-windows +``` + +또는 이렇게도 가능합니다. + +```cmd +> .\vcpkg\vcpkg install [packages to install] --triplet=x64-windows +``` + +다음과 같이 `search` 하위 명령어를 사용하여 필요한 라이브러리를 검색할 수도 있습니다. ```cmd > .\vcpkg\vcpkg search [search term] ``` Visual Studio에서 vcpkg를 사용하려면 -다음 명령을 실행합니다 (관리자 권한이 필요할 수도 있습니다): +다음 명령을 실행해야 합니다(관리자 권한이 필요할 수도 있습니다). ```cmd > .\vcpkg\vcpkg integrate install ``` - -그런 다음, 이제 CMake가 아닌 새 프로젝트를 만들 수 있습니다. (또는 기존 프로젝트를 열 수 있습니다) -설치된 모든 라이브러리는 즉시 `# include` 될 준비가 되어 추가 구성없이 프로젝트에서 사용할 수 있습니다. +이제 CMake를 사용하지 않는 프로젝트도 만들 수 (또는 기존 프로젝트를 열 수) 있습니다. +설치한 모든 라이브러리는 추가 설정 없이도 프로젝트에서 즉시 `# include` 및 사용할 수 있습니다. Visual Studio에서 CMake를 사용하는 경우, -[여기를 보세요](#visual-studio-code와-cmake-tools). +[여기를 보세요](#vcpkg와-visual-studio-cmake-프로젝트). IDE 외부에서 CMake와 함께 vcpkg를 사용하려면, -툴체인 파일을 사용할 수 있습니다: +다음과 같이 툴체인 파일을 사용할 수 있습니다. ```cmd > cmake -B [build directory] -S . -DCMAKE_TOOLCH @@ -107,14 +124,14 @@ AIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake > cmake --build [build directory] ``` -CMake와 라이브러리를 사용하려면 `find_package` 등이 필요합니다. -IDE에서 CMake 사용에 대한 자세한 내용은 [CMake 섹션](#cmake와-함께-vcpkg-사용)을 확인하세요. - +CMake에서 라이브러리를 사용하려면 여전히 `find_package` 등이 필요합니다. +CMake를 IDE와 사용하는 방법을 포함한 +자세한 정보는 [CMake 섹션](#cmake와-함께-vcpkg-사용)을 확인하세요. Visual Studio Code를 포함한 다른 툴의 경우 -[통합 가이드][getting-started:integration]을 확인하세요. +[통합 가이드][getting-started:integration]를 확인하세요. -## 빠르게 시작하기: 유닉스 +## 빠르게 시작하기: Unix Linux에서의 필요조건: - [Git][getting-started:git] @@ -122,47 +139,45 @@ Linux에서의 필요조건: macOS에서의 필요조건: - [Apple Developer Tools][getting-started:macos-dev-tools] -- macOS 10.14이나 아래 버전에서는 다음 도구들도 필요합니다: - - [Homebrew][getting-started:macos-brew] - - [g++][getting-started:macos-gcc] >= 6 from Homebrew -첫번째로, vcpkg 자체를 다운로드하고 부트스트랩합니다; 어디에나 설치할 수 있습니다, -하지만 일반적으로 CMake 프로젝트의 하위 모듈로 vcpkg를 사용하는 것이 좋습니다. +우선, vcpkg 자체를 다운로드하고 설치해야 합니다. 어디에나 설치할 수 있지만, +일반적으로 CMake 프로젝트의 하위 모듈로 vcpkg를 사용하는 것이 좋습니다. ```sh $ git clone https://github.com/microsoft/vcpkg $ ./vcpkg/bootstrap-vcpkg.sh ``` -당신의 프로젝트에 라이브러리를 설치, 실행 시키려면 다음과 같이 작성하세요: +프로젝트에 라이브러리를 설치하려면 다음 명령을 실행하세요. ```sh $ ./vcpkg/vcpkg install [packages to install] ``` -다음과 같이 `search` 하위 명령어를 사용하여 필요한 라이브러리를 검색 할 수도 있습니다. +다음과 같이 `search` 하위 명령어를 사용하여 필요한 라이브러리를 검색할 수도 있습니다. ```sh $ ./vcpkg/vcpkg search [search term] ``` -CMake에서 vcpkg를 사용하려면 툴체인 파일을 사용할 수 있습니다 +CMake와 함께 vcpkg를 사용하려면 툴체인 파일을 이용해 보세요. + ```sh $ cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake $ cmake --build [build directory] ``` -CMake와 라이브러리를 사용하려면 `find_package` 등이 필요합니다. -CMake 및 CMake Tools for VSCode에서 vcpkg를 가장 잘 사용하는 방법에 대한 자세한 내용은 -[CMake 섹션](#cmake와-함께-vcpkg-사용)을 확인하세요. +CMake에서 라이브러리를 사용하려면 여전히 `find_package` 등이 필요합니다. +CMake와 VSCode를 위한 CMake Tools를 vcpkg와 함께 사용하는 최선의 방법을 포함한 +자세한 정보는 [CMake 섹션](#cmake와-함께-vcpkg-사용)을 확인하세요. -다른 툴에 대해서는 [통합 가이드][getting-started:integration]을 확인하세요. -## 리눅스 개발자 도구 설치하기 +다른 툴에 대해서는 [통합 가이드][getting-started:integration]를 확인하세요. -리눅스의 다양한 배포판에는 다양한 패키지가 있습니다. -설치 필요: +## Linux 개발자 도구 설치하기 --Debian, Ubuntu, popOS 및 기타 Debian 기반 배포판: +Linux의 배포판별로 설치해야 하는 개발자 소프트웨어가 다릅니다. + +- Debian, Ubuntu, popOS 및 기타 Debian 기반 배포판 ```sh $ sudo apt-get update @@ -177,49 +192,30 @@ $ sudo yum install devtoolset-7 $ scl enable devtoolset-7 bash ``` -다른 배포판의 경우 g++ 6 이상의 버전을 설치해야합니다. -특정 배포판에 대한 지침을 추가하려면 +다른 배포판의 경우, g++ 6 이상의 버전을 설치하여야 합니다. +특정 배포판에 대한 안내를 추가하고 싶은 경우, [PR을 열어주세요][contributing:submit-pr]! ## macOS 개발자 도구 설치하기 -macOS 10.15에서는 터미널에서 다음 명령어를 실행하시면 됩니다. +macOS에서는 터미널에서 다음 명령어를 실행하기만 하면 됩니다. ```sh $ xcode-select --install ``` -그런 다음 나타나는 창에 나타나는 메시지를 따르세요. - -macOS 10.14 및 이전 버전에서는 homebrew에서 g++도 설치해야합니다. -다음 섹션의 지침을 따르세요. - -### 10.15버전 이전 macOS에 GCC 설치하기 - -이번 섹션은 10.15 이전의 macOS 버전을 사용하는 경우에만 필요합니다. -homebrew를 설치하는 것은 매우 쉽습니다. 자세한 내용은 를 확인하세요. -가장 간단하게 다음 명령어을 실행합니다. - -```sh -$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -``` - -그런 다음 최신 버전의 gcc를 설치하시려면 다음 명령어를 실행하십시오. - -```sh -$ brew install gcc -``` +그런 다음 나타나는 창의 안내에 따르세요. -그런다음 [빠른 시작 가이드](#빠르게-시작하기-유닉스)와 함께 vcpkg를 부트스트랩 할 수 있습니다. +설치가 끝나면 [빠른 시작 가이드](#빠르게-시작하기-unix)를 참고하여 vcpkg를 설치하세요. ## CMake와 함께 vcpkg 사용 -CMake와 함께 vcpkg를 사용하는 경우, 다음과 같이 따라해 보세요 +CMake와 함께 vcpkg를 사용하는 경우, 다음 내용이 도움이 될 것입니다! ### Visual Studio Code와 CMake Tools -작업 공간 `settings.json` 파일에 다음을 추가하면 -CMake 도구는 라이브러리에 자동으로 vcpkg를 사용합니다. +Workspace `settings.json` 파일에 다음을 추가하면 +CMake Tools는 자동으로 vcpkg의 라이브러리를 사용할 것입니다. ```json { @@ -229,9 +225,9 @@ CMake 도구는 라이브러리에 자동으로 vcpkg를 사용합니다. } ``` -### Visual Studio CMake 프로젝트와 Vcpkg +### Vcpkg와 Visual Studio CMake 프로젝트 -CMake 설정 편집기를 열고 'CMake toolchain file'에서 +CMake 설정 편집기를 열고 `CMake toolchain file`에서 vcpkg 툴체인 파일에 경로를 추가합니다. ``` @@ -242,7 +238,7 @@ vcpkg 툴체인 파일에 경로를 추가합니다. Toolchains settings을 엽니다. (File > Settings on Windows and Linux, CLion > Preferences on macOS), -그리고 Cmake 세팅을 엽니다 (Build, Execution, Deployment > CMake). +그리고 CMake 세팅을 엽니다 (Build, Execution, Deployment > CMake). 마지막으로 `CMake options`에서 다음 줄을 추가합니다. ``` @@ -251,18 +247,20 @@ Toolchains settings을 엽니다. 각 프로필에 이것을 추가해야합니다. -### 서브모듈로서의 Vcpkg +### 서브모듈로 vcpkg 사용하기 -프로젝트의 하위 모듈로 vcpkg를 사용하는 경우 -cmake 호출에`CMAKE_TOOLCHAIN_FILE`을 전달하는 대신 첫 번째 `project ()` 호출 전에 CMakeLists.txt에 다음을 추가 할 수 있습니다. +프로젝트의 서브모듈로 vcpkg를 사용하는 경우, +cmake 실행 시 `CMAKE_TOOLCHAIN_FILE`을 전달하는 대신, +첫 번째 `project()` 호출 전에 CMakeLists.txt에 다음을 추가하는 방법도 있습니다. ```cmake set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file") ``` -이렇게 하면 `CMAKE_TOOLCHAIN_FILE`을 직접 전달하여 구성-빌드 단계가 약간 더 쉬워지지만 -사람들이 vcpkg를 사용하지 못하게 됩니다. +이렇게 하면 설정-빌드 단계가 약간 더 쉬워집니다. +또한, 여전히 `CMAKE_TOOLCHAIN_FILE`을 직접 전달하면 +vcpkg를 사용하지 않을 수 있습니다. [getting-started:using-a-package]: docs/examples/installing-and-using-packages.md [getting-started:integration]: docs/users/integration.md @@ -278,43 +276,43 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/ # 탭 완성/자동 완성 `vcpkg`는 powershell과 bash 모두에서 명령, 패키지 이름 및 옵션의 자동 완성을 지원합니다. -선택한 셸에서 탭 완성을 활성화하려면 다음 명령어를 실행합니다. +선택한 셸에서 탭 완성을 활성화하려면 다음 두 명령어 중 하나를 실행합니다. ```pwsh > .\vcpkg integrate powershell ``` -혹은 - ```sh -$ ./vcpkg integrate bash +$ ./vcpkg integrate bash # or zsh ``` -사용하는 셸에 따라 콘솔을 다시 시작세요. +그 다음 콘솔을 재시작하세요. -# 예제 +# 예시 -구체적인 연습은 [문서](docs/README.md)를 참고하세요, -including [패키지 설치 및 사용](docs/examples/installing-and-using-packages.md), +[패키지 설치 및 사용](docs/examples/installing-and-using-packages.md), [zip 파일에서 새 패키지 추가](docs/examples/packaging-zipfiles.md), -및 [GitHub 저장소에서 새 패키지 추가](docs/examples/packaging-github-repos.md). +[GitHub 저장소에서 새 패키지 추가](docs/examples/packaging-github-repos.md)에 +대한 구체적인 예시는 [문서](docs/README.md)를 참고하세요. -이제 ReadTheDocs에서 온라인으로 문서를 사용할 수도 있습니다: ! +문서는 이제 웹사이트 https://vcpkg.io/ 에서도 온라인으로 확인 가능합니다. 모든 피드백에 진심으로 감사드립니다! +https://github.com/vcpkg/vcpkg.github.io/issues 에서 이슈를 제출할 수 있습니다. -[4분짜리 데모 영상을 보세요](https://www.youtube.com/watch?v=y41WFKbQFTw). +[4분짜리 데모 영상도 준비되어 있습니다](https://www.youtube.com/watch?v=y41WFKbQFTw). -# 기여 +# 기여하기 -Vcpkg는 오픈소스 프로젝트입니다, 따라서 여러분의 기여로 만들어 졌습니다. -기여할 수 있는 몇 가지 방법은 다음과 같습니다: +Vcpkg는 오픈소스 프로젝트입니다, 따라서 여러분의 기여를 통해 만들어집니다. +기여할 수 있는 몇 가지 방법은 다음과 같습니다. -* vcpkg 또는 기존 패키지의 [문제 제출][contributing:submit-issue] -* [Submit Fixes and New Packages][contributing:submit-pr] +* Vcpkg 또는 vcpkg에 포함된 패키지의 [이슈 제출][contributing:submit-issue] +* [수정 사항 및 새 패키지 제출][contributing:submit-pr] -자세한 내용은 [컨트리뷰팅 가이드](CONTRIBUTING.md)를 참고하세요. +자세한 내용은 [기여 가이드](CONTRIBUTING.md)를 참고하세요. 이 프로젝트는 [Microsoft Open Source Code of Conduct][contributing:coc]을 채택했습니다. -더 많은 정보를 얻고 싶다면 [Code of Conduct FAQ][contributing:coc-faq] 문서를 참고하거나 추가 질문 또는 의견은 이메일 [opencode@microsoft.com](mailto:opencode@microsoft.com)로 보내주세요. +더 많은 정보를 얻고 싶다면 [Code of Conduct FAQ][contributing:coc-faq] 문서를 참고하세요. +추가 질문이나 의견은 이메일 [opencode@microsoft.com](mailto:opencode@microsoft.com)로 보내주세요. [contributing:submit-issue]: https://github.com/microsoft/vcpkg/issues/new/choose [contributing:submit-pr]: https://github.com/microsoft/vcpkg/pulls @@ -323,14 +321,27 @@ Vcpkg는 오픈소스 프로젝트입니다, 따라서 여러분의 기여로 # 라이선스 -이 저장소의 코드는 [MIT 라이선스](LICENSE.txt)에 따라 라이선스가 부여됩니다. +이 저장소의 코드는 [MIT 라이선스](LICENSE.txt)에 따라 사용이 허가됩니다. Port로 제공되는 +라이브러리는 각 라이브러리의 원저자가 설정한 라이선스에 따라 제공됩니다. 가능한 경우, vcpkg는 +`installed//share//copyright`에 관련된 라이선스를 저장합니다. + +# 보안 + +Vcpk가 제공하는 대부분의 port는 각각의 라이브러리를 빌드할 때 +원 개발자들이 권장하는 빌드 시스템을 이용하고, +소스 코드와 빌드 도구를 각각의 공식 배포처로부터 다운로드합니다. +방화벽 뒤에서 사용하는 경우, 어떤 port를 설치하느냐에 따라 필요한 접근 권한이 달라질 수 있습니다. +만약 "air gapped" 환경에서 설치해야만 한다면, "air gapped"가 아닌 환경에서 +[asset 캐시](docs/users/assetcaching.md)를 다운로드하고, +이후에 "air gapped" 환경에서 공유하는 것을 고려해 보십시오. # 데이터 수집 vcpkg는 사용자 경험을 개선하는 데 도움이 되도록 사용 데이터를 수집합니다. Microsoft는 이 정보를 익명으로 수집합니다. -bootstrap-vcpkg 스크립트를 -disableMetrics를 추가해 다시 실행하여 원격 분석을 옵트아웃 할 수 있습니다. -커맨드 라인에서 --disable-metrics를 vcpkg에 전달합니다. -또는 VCPKG_DISABLE_METRICS 환경 변수를 설정합니다. +다음을 통해 원격 정보 제공을 비활성화할 수 있습니다. +- -disableMetrics 옵션을 포함하여 bootstrap-vcpkg 스크립트 실행 +- 명령줄에서 vcpkg에 --disable-metrics 전달 +- VCPKG_DISABLE_METRICS 환경 변수 설정 -docs/about/privacy.md 에 vcpkg 데이터 수집에 대해 자세히 알아보세요. +docs/about/privacy.md에서 vcpkg 데이터 수집에 대해 자세히 알아보세요. diff --git a/README_zh_CN.md b/README_zh_CN.md index 3195378646996e..5c4ddc57860b19 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -5,7 +5,7 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。 这个工具和生态链正在不断发展，我们一直期待您的贡献！ -若您从未使用过vcpkg或希望了解如何使用vcpkg，请查阅[快速开始](#入门)章节。 +若您从未使用过vcpkg，或者您正在尝试了解如何使用vcpkg，请查阅 [入门](#入门) 章节。 如需获取有关可用命令的简短描述，请在编译vcpkg后执行 `vcpkg help` 或执行 `vcpkg help [command]` 来获取具体的帮助信息。 @@ -25,7 +25,6 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。 - [快速开始: Unix](#快速开始-unix) - [安装 Linux Developer Tools](#安装-linux-developer-tools) - [安装 macOS Developer Tools](#安装-macos-developer-tools) - - [在 macOS 10.15 之前版本中安装 GCC](#在-macos-1015-之前版本中安装-gcc) - [在 CMake 中使用 vcpkg](#在-cmake-中使用-vcpkg) - [Visual Studio Code 中的 CMake Tools](#visual-studio-code-中的-cmake-tools) - [Visual Studio CMake 工程中使用 vcpkg](#visual-studio-cmake-工程中使用-vcpkg) @@ -33,13 +32,13 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。 - [将 vcpkg 作为一个子模块](#将-vcpkg-作为一个子模块) - [Tab补全/自动补全](#tab补全自动补全) - [示例](#示例) - - [贡献者](#贡献者) -- [License](#license) + - [贡献](#贡献) +- [开源协议](#开源协议) - [数据收集](#数据收集) # 入门 -首先，请阅读以下任一方面的快速入门指南： +首先，请阅读以下任一快速入门指南： [Windows](#快速开始-windows) 或 [macOS和Linux](#快速开始-unix)， 这取决于您使用的是什么平台。 @@ -58,13 +57,13 @@ vcpkg团队和贡献者可以看到它的地方， ## 快速开始: Windows -需求: +前置条件: - Windows 7 或更新的版本 - [Git][getting-started:git] -- [Visual Studio 2015 Update 3][getting-started:visual-studio] 或更新的版本（包含英文语言包） +- [Visual Studio 2015 Update 3][getting-started:visual-studio] 或更新的版本（**包含英文语言包**） -首先，请下载vcpkg并执行 bootstrap.bat 脚本。 -它可以安装在任何地方，但是通常我们建议您使用 vcpkg 作为 CMake 项目的子模块，并将其全局安装到 Visual Studio 项目中。 +首先，**请使用git clone vcpkg** 并执行 bootstrap.bat 脚本。 +您可以将vcpkg安装在任何地方，但是通常我们建议您使用 vcpkg 作为 CMake 项目的子模块，并将其全局安装到 Visual Studio 项目中。 我们建议您使用例如 `C:\src\vcpkg` 或 `C:\dev\vcpkg` 的安装目录，否则您可能遇到某些库构建系统的路径问题。 ```cmd @@ -78,20 +77,32 @@ vcpkg团队和贡献者可以看到它的地方， > .\vcpkg\vcpkg install [packages to install] ``` +请注意: vcpkg在Windows中默认编译并安装x86版本的库。 若要编译并安装x64版本，请执行: + +```cmd +> .\vcpkg\vcpkg install [package name]:x64-windows +``` + +或 + +```cmd +> .\vcpkg\vcpkg install [packages to install] --triplet=x64-windows +``` + 您也可以使用 `search` 子命令来查找vcpkg中集成的库: ```cmd > .\vcpkg\vcpkg search [search term] ``` -若您希望在 Visual Studio 中使用vcpkg，请运行以下命令 (首次启动需要管理员权限) +若您希望在 Visual Studio 中使用vcpkg，请运行以下命令 (可能需要管理员权限) ```cmd > .\vcpkg\vcpkg integrate install ``` 在此之后，您可以创建一个非cmake项目 (或打开已有的项目)。 -在您的项目中，所有已安装的库均可立即使用 `#include` 包含您需使用的库的头文件并无需添加额外配置。 +在您的项目中，所有已安装的库均可立即使用 `#include` 包含您需使用的库的头文件且无需额外配置。 若您在 Visual Studio 中使用cmake工程，请查阅[这里](#visual-studio-cmake-工程中使用-vcpkg)。 @@ -102,24 +113,21 @@ vcpkg团队和贡献者可以看到它的地方， > cmake --build [build directory] ``` -在cmake中，您仍需通过 `find_package` 来使用第三方库。 +在cmake中，您仍需通过 `find_package` 来使用vcpkg中已安装的库。 请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获取更多信息，其中包含了在IDE中使用cmake的内容。 对于其他工具 (包括Visual Studio Code)，请查阅 [集成指南][getting-started:integration]。 ## 快速开始: Unix -Linux平台的使用需求: +Linux平台前置条件: - [Git][getting-started:git] - [g++][getting-started:linux-gcc] >= 6 -macOS平台的使用需求: +macOS平台前置条件: - [Apple Developer Tools][getting-started:macos-dev-tools] -- macOS 10.14 或更低版本中，您也需要: - - [Homebrew][getting-started:macos-brew] - - Homebrew 中 [g++][getting-started:macos-gcc] >= 6 -首先，请下载vcpkg并执行 bootstrap.sh 脚本。 +首先，**请使用git clone vcpkg** 并执行 bootstrap.sh 脚本。 我们建议您将vcpkg作为cmake项目的子模块使用。 ```sh @@ -146,7 +154,7 @@ $ cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts $ cmake --build [build directory] ``` -在cmake中，您仍需通过 `find_package` 来使用第三方库。 +在cmake中，您仍需通过 `find_package` 来使用vcpkg中已安装的库。 为了您更好的在cmake或 VSCode CMake Tools 中使用vcpkg， 请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获取更多信息， 其中包含了在IDE中使用cmake的内容。 @@ -177,33 +185,13 @@ $ scl enable devtoolset-7 bash ## 安装 macOS Developer Tools -在 macOS 10.15 中，唯一需要做的是在终端中运行以下命令: +在 macOS 中，您唯一需要做的是在终端中运行以下命令: ```sh $ xcode-select --install ``` 然后按照出现的窗口中的提示进行操作。 - -在 macOS 10.14 及先前版本中，您也需要使用 homebrew 安装 g++。 -请遵循以下部分中的说明： - -### 在 macOS 10.15 之前版本中安装 GCC - -此条只在您的macOS版本低于 10.15 时是必须的。 -安装homebrew应当很轻松，请查阅 以获取更多信息。 -为了更简便，请使用以下命令: - -```sh -$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -``` - -然后，为了获取最新版本的gcc，请运行以下命令： - -```sh -$ brew install gcc -``` - 此时，您就可以使用 bootstrap.sh 编译vcpkg了。 请参阅 [快速开始](#快速开始-unix) ## 在 CMake 中使用 vcpkg @@ -279,7 +267,7 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/ 或 ```sh -$ ./vcpkg integrate bash +$ ./vcpkg integrate bash # 或 zsh ``` 然后重新启动控制台。 @@ -291,11 +279,12 @@ $ ./vcpkg integrate bash [使用压缩文件添加包](docs/examples/packaging-zipfiles.md) 和 [从GitHub源中添加一个包](docs/examples/packaging-github-repos.md)。 -我们的文档现在也可以从 [ReadTheDocs](https://vcpkg.readthedocs.io/) 在线获取。 +我们的文档现在也可以从 [vcpkg.io](https://vcpkg.io/) 在线获取。 +我们真诚的希望您向我们提出关于此网站的任何建议! 请在[这里](https://github.com/vcpkg/vcpkg.github.io/issues) 打开issue. 观看4分钟 [demo视频](https://www.youtube.com/watch?v=y41WFKbQFTw)。 -## 贡献者 +## 贡献 Vcpkg是一个开源项目，并通过您的贡献不断发展。 下面是一些您可以贡献的方式: @@ -303,17 +292,17 @@ Vcpkg是一个开源项目，并通过您的贡献不断发展。 * [提交一个关于vcpkg或已支持包的新issue][contributing:submit-issue] * [提交修复PR和创建新包][contributing:submit-pr] -请参阅我们的 [贡献准则](CONTRIBUTING.md) 了解更多详细信息。 +请参阅我们的 [贡献准则](CONTRIBUTING_zh.md) 了解更多详细信息。 该项目采用了 [Microsoft开源行为准则][contributing:coc]。 -获取更多信息请查看 [行为准则FAQ][contributing:coc-faq] 或联系 [opencode@microsoft.com](mailto:opencode@microsoft.com)提出其他问题或意见。 +获取更多信息请查看 [行为准则FAQ][contributing:coc-faq] 或联系 [opencode@microsoft.com](mailto:opencode@microsoft.com) 提出其他问题或意见。 [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/ -# License +# 开源协议 在此存储库中使用的代码均遵循 [MIT License](LICENSE.txt)。 @@ -321,5 +310,9 @@ Vcpkg是一个开源项目，并通过您的贡献不断发展。 vcpkg会收集使用情况数据，以帮助我们改善您的体验。 Microsoft收集的数据是匿名的。 -您也可以通过使用 `-disableMetrics` 、在命令行上将`--disable-metrics`传递给vcpkg，或通过设置环境变量 `VCPKG_DISABLE_METRICS` 并重新运行 bootstrap-vcpkg 脚本来选择禁用数据收集。 +您也可以通过以下步骤禁用数据收集： +- 将选项 `-disableMetrics` 传递给 bootstrap-vcpkg 脚本并重新运行此脚本 +- 向 vcpkg 命令传递选项 `--disable-metrics` +- 设置环境变量 `VCPKG_DISABLE_METRICS` + 请在 [privacy.md](docs/about/privacy.md) 中了解有关 vcpkg 数据收集的更多信息。 diff --git a/docs/README.md b/docs/README.md index 598cb7eaf169b1..6b770e189ba4f8 100644 --- a/docs/README.md +++ b/docs/README.md @@ -29,10 +29,11 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too ### Maintainer Help -- [Manifest files - vcpkg.json](maintainers/manifest-files.md) -- [Control files](maintainers/control-files.md) -- [Portfile functions](maintainers/portfile-functions.md) -- [Common CMake definitions](maintainers/vcpkg_common_definitions.md) +- [Manifest Files - vcpkg.json](maintainers/manifest-files.md) +- [Control Files](maintainers/control-files.md) +- [Portfile Functions](maintainers/portfile-functions.md) +- [Authoring Script Ports](maintainers/authoring-script-ports.md) +- [Common CMake Definitions](maintainers/vcpkg_common_definitions.md) - [Maintainer Guidelines](maintainers/maintainer-guide.md) - [Creating Registries](maintainers/registries.md) - [CMake Guidelines](maintainers/cmake-guidelines.md) diff --git a/docs/examples/modify-baseline-to-pin-old-boost.md b/docs/examples/modify-baseline-to-pin-old-boost.md index 72e285f386b9a8..679f468a97d578 100644 --- a/docs/examples/modify-baseline-to-pin-old-boost.md +++ b/docs/examples/modify-baseline-to-pin-old-boost.md @@ -62,7 +62,7 @@ Use `"overrides"` to force specific versions in a package-by-package basis. { "name": "boost-core", "version": "1.72" }, { "name": "boost-integer", "version": "1.72" }, { "name": "boost-io", "version": "1.72" }, - { "name": "boost-tuple", "version": "1.72" } + { "name": "boost-tuple", "version": "1.72" } ] } ``` @@ -166,7 +166,7 @@ git checkout master In this example, commit SHA `9b5cf7c3d9376ddf43429671282972ec4f99aa85` is the commit ID with the modified baseline. Even when a different branch (`master` in this case) is checked out, Git is able to find the commit as long as the branch with the modified baseline exists (the `custom-boost-baseline` branch we created in step 1). -We run `vcpkg --feature-flags="manifests,versions" install` in the directory containing our manifest file and the output looks like this: +We run `vcpkg install` in the directory containing our manifest file and the output looks like this: ``` The following packages will be built and installed: diff --git a/docs/examples/packaging-github-repos.md b/docs/examples/packaging-github-repos.md index 3a0e81c2f93a46..7091c7e01cf6d9 100644 --- a/docs/examples/packaging-github-repos.md +++ b/docs/examples/packaging-github-repos.md @@ -32,15 +32,12 @@ The important parts to update are `REPO` for the GitHub repository path, `REF` f Finally, we configure the project with CMake, install the package, and copy over the license file: ```cmake -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) -vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libogg RENAME copyright) +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libogg" RENAME copyright) ``` -Check the documentation for [`vcpkg_configure_cmake`](../maintainers/vcpkg_configure_cmake.md) and [`vcpkg_install_cmake`](../maintainers/vcpkg_install_cmake.md) if your package needs additional options. +Check the documentation for [`vcpkg_cmake_configure`](../maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md) and [`vcpkg_cmake_install`](../maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md) if your package needs additional options. Now you can run `vcpkg install libogg` to build and install the package. diff --git a/docs/examples/patching.md b/docs/examples/patching.md index 4afc1ffafd58da..dc9de168273de9 100644 --- a/docs/examples/patching.md +++ b/docs/examples/patching.md @@ -151,7 +151,7 @@ vcpkg_extract_source_archive_ex( "use-abort-on-all-platforms.patch" ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( ... ``` diff --git a/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt b/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt index d3218866f57b7d..eded6e5473f788 100644 --- a/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt +++ b/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt @@ -10,4 +10,4 @@ project(test) find_package(jsoncpp CONFIG REQUIRED) add_library(my_lib my_lib.cpp) -target_link_libraries(my_lib jsoncpp_lib) +target_link_libraries(my_lib JsonCpp::JsonCpp) diff --git a/docs/maintainers/authoring-script-ports.md b/docs/maintainers/authoring-script-ports.md new file mode 100644 index 00000000000000..f14eaa44071454 --- /dev/null +++ b/docs/maintainers/authoring-script-ports.md @@ -0,0 +1,45 @@ +# Authoring Script Ports + +Ports can expose functions for other ports to consume during their build. For +example, the `vcpkg-cmake` helper port exposes the `vcpkg_cmake_configure()` +helper function. Packaging common scripts into a shared helper port makes +maintenance easier because all consumers can be updated from a single place. +Because the scripts come from a port, they can be versioned and depended upon +via all the same mechanisms as any other port. + +Script ports are implemented via the `vcpkg-port-config.cmake` extension +mechanism. Before invoking the `portfile.cmake` of a port, vcpkg will first +import `share//vcpkg-port-config.cmake` from each direct dependency. If +the direct dependency is a host dependency, the import will be performed in the +host installed tree (e.g. +`${HOST_INSTALLED_DIR}/share//vcpkg-port-config.cmake`). + +Only direct dependencies are considered for `vcpkg-port-config.cmake` inclusion. +This means that if a script port relies on another script port, it must +explicitly import the `vcpkg-port-config.cmake` of its dependency. + +Script-to-script dependencies should not be marked as host. The dependency from +a target port to a script should be marked host, which means that scripts should +always already be natively compiling. By making script-to-script dependencies +`"host": false`, it ensures that one script can depend upon the other being in +its same install directory. + +Ports should never provide a `vcpkg-port-config.cmake` file under a different +`share/` subdirectory than the current port (`${PORT}`). + +## Example + +```cmake +# ${CURRENT_PACKAGES_DIR}/share/my-helper/vcpkg-port-config.cmake + +# This include guard ensures the file will be loaded only once +include_guard(GLOBAL) + +# This is how you could pull in a transitive dependency +include("${CMAKE_CURRENT_LIST_DIR}/../my-other-helper/vcpkg-port-config.cmake") + +# Finally, it is convention to put each public function into a separate file with a matching name +include("${CMAKE_CURRENT_LIST_DIR}/my_helper_function_01.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/my_helper_function_02.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/my_helper_function_03.cmake") +``` diff --git a/docs/maintainers/cmake-guidelines.md b/docs/maintainers/cmake-guidelines.md index c0bd5b6a081ff8..fb682f2760e766 100644 --- a/docs/maintainers/cmake-guidelines.md +++ b/docs/maintainers/cmake-guidelines.md @@ -138,7 +138,7 @@ We hope that they will make both forwards and backwards compatibility easier. - This `cmake_minimum_required` should be bumped every time a new version of CMake is added to `vcpkgTools.xml`, as should the `cmake_minimum_required` in all of the helper `CMakeLists.txt` files. -- `vcpkg.cmake` must assume a version of CMake back to 3.1 in general +- `vcpkg.cmake` must assume a version of CMake back to 3.7.2 in general - Specific functions and options may assume a greater CMake version; if they do, make sure to comment that function or option with the required CMake version. diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index 855a3a36c4dfc1..1bf8e94836fa03 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -93,6 +93,19 @@ the files installed by `b` must be the same, regardless of influence by the prev In the entire vcpkg system, no two ports a user is expected to use concurrently may provide the same file. If a port tries to install a file already provided by another file, installation will fail. If a port wants to use an extremely common name for a header, for example, it should place those headers in a subdirectory rather than in `include`. +### Add CMake exports in an unofficial- namespace + +A core design ideal of vcpkg is to not create "lock-in" for customers. In the build system, there should be no difference between depending on a library from the system, and depending on a library from vcpkg. To that end, we avoid adding CMake exports or targets to existing libraries with "the obvious name", to allow upstreams to add their own official CMake exports without conflicting with vcpkg. + +To that end, any CMake configs that the port exports, which are not in the upstream library, should have `unofficial-` as a prefix. Any additional targets should be in the `unofficial::::` namespace. + +This means that the user should see: + * `find_package(unofficial- CONFIG)` as the way to get at the unique-to-vcpkg package + * `unofficial::::` as an exported target from that port. + +Examples: + * [`brotli`](https://github.com/microsoft/vcpkg/blob/4f0a640e4c5b74166b759a862d7527c930eff32e/ports/brotli/install.patch) creates the `unofficial-brotli` package, producing target `unofficial::brotli::brotli`. + ## Features ### Do not use features to implement alternatives @@ -166,16 +179,15 @@ Examples: [abseil](../../ports/abseil/portfile.cmake) ### Choose either static or shared binaries -By default, `vcpkg_configure_cmake()` will pass in the appropriate setting for `BUILD_SHARED_LIBS`, +By default, `vcpkg_cmake_configure()` will pass in the appropriate setting for `BUILD_SHARED_LIBS`, however for libraries that don't respect that variable, you can switch on `VCPKG_LIBRARY_LINKAGE`: ```cmake string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DKEYSTONE_BUILD_STATIC=${KEYSTONE_BUILD_STATIC} -DKEYSTONE_BUILD_SHARED=${KEYSTONE_BUILD_SHARED} @@ -188,17 +200,18 @@ When defining a feature that captures an optional dependency, ensure that the dependency will not be used accidentally when the feature is not explicitly enabled. ```cmake +set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB ON) +set(CMAKE_REQUIRE_FIND_PACKAGE_ZLIB OFF) if ("zlib" IN_LIST FEATURES) set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB OFF) -else() - set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB ON) + set(CMAKE_REQUIRE_FIND_PACKAGE_ZLIB ON) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=${CMAKE_REQUIRE_FIND_PACKAGE_ZLIB} ) ``` @@ -206,19 +219,20 @@ The snippet below using `vcpkg_check_features()` is equivalent, [see the docume ```cmake vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "zlib" CMAKE_REQUIRE_FIND_PACKAGE_ZLIB INVERTED_FEATURES "zlib" CMAKE_DISABLE_FIND_PACKAGE_ZLIB ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ) ``` -Note that `ZLIB` in the above is case-sensitive. See the [cmake documentation](https://cmake.org/cmake/help/v3.15/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html) for more details. +Note that `ZLIB` in the above is case-sensitive. See the [CMAKE_DISABLE_FIND_PACKAGE_PackageName](https://cmake.org/cmake/help/v3.22/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html) and [CMAKE_REQUIRE_FIND_PACKAGE_PackageName](https://cmake.org/cmake/help/v3.22/variable/CMAKE_REQUIRE_FIND_PACKAGE_PackageName.html) documnetation for more details. ### Place conflicting libs in a `manual-link` directory @@ -318,6 +332,8 @@ Because of this, it is preferable to patch the buildsystem directly when setting When making changes to a library, strive to minimize the final diff. This means you should _not_ reformat the upstream source code when making changes that affect a region. Also, when disabling a conditional, it is better to add a `AND FALSE` or `&& 0` to the condition than to delete every line of the conditional. +Don't add patches if the port is outdated and updating the port to a newer released version would solve the same issue. vcpkg prefers updating ports over patching outdated versions unless the version bump breaks a considerable amount of dependent ports. + This helps to keep the size of the vcpkg repository down as well as improves the likelihood that the patch will apply to future code versions. ### Do not implement features in patches diff --git a/docs/maintainers/manifest-files.md b/docs/maintainers/manifest-files.md index a10f5464e72373..46bd73a97a81ed 100644 --- a/docs/maintainers/manifest-files.md +++ b/docs/maintainers/manifest-files.md @@ -433,6 +433,7 @@ These predefined identifier expressions are computed from standard triplet setti - `static` - `VCPKG_LIBRARY_LINKAGE` == `"static"` - `wasm32` - `VCPKG_TARGET_ARCHITECTURE` == `"wasm32"` - `emscripten` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Emscripten"` +- `staticcrt` - `VCPKG_CRT_LINKAGE` == `"static"` These predefined identifier expressions can be overridden in the triplet file, via the [`VCPKG_DEP_INFO_OVERRIDE_VARS`](../users/triplets.md) option, @@ -452,3 +453,99 @@ This field is optional and defaults to true. ``` This means "doesn't support uwp, nor arm32 (but does support arm64)". + +### `"license"` + +The license of the port. This is an [SPDX license expression], +or `null` for proprietary licenses and other licenses for which +one should "just read the `copyright` file" (e.g., Qt). + +[SPDX license expression]: https://spdx.dev/ids/#how + +Additionally, you can find the list of [recognized license IDs] +and [recognized license exception IDs] in Annex A of the SPDX specification. + +[recognized license IDs]: https://spdx.github.io/spdx-spec/SPDX-license-list/#a1-licenses-with-short-identifiers +[recognized license exception IDs]: https://spdx.github.io/spdx-spec/SPDX-license-list/#a2-exceptions-list + +The following is an EBNF conversion of the ABNF located at +, +and this is what we actually parse in vcpkg. +Note that vcpkg does not support DocumentRefs. + +```ebnf +idchar = ? regex /[-.a-zA-Z0-9]/ ? +idstring = ( idchar ), { idchar } ; + +(* note that unrecognized license and license exception IDs will be warned against *) +license-id = idstring ; +license-exception-id = idstring ; +(* note that DocumentRefs are unsupported by this implementation *) +license-ref = "LicenseRef-", idstring ; + +with = [ whitespace ], "WITH", [ whitespace ] ; +and = [ whitespace ], "AND", [ whitespace ] ; +or = [ whitespace ], "OR", [ whitespace ] ; + +simple-expression = [ whitespace ], ( + | license-id + | license-id, "+" + | license-ref + ), [ whitespace ] ; + +(* the following are split up from compound-expression to make precedence obvious *) +parenthesized-expression = + | simple-expression + | [ whitespace ], "(", or-expression, ")", [ whitespace ] ; + +with-expression = + | parenthesized-expression + | simple-expression, with, license-exception-id, [ whitespace ] ; + +(* note: "a AND b OR c" gets parsed as "(a AND b) OR c" *) +and-expression = with-expression, { and, with-expression } ; +or-expression = and-expression, { or, and-exression } ; + +license-expression = or-expression ; +``` + +#### Examples + +For libraries with simple licensing, +only one license identifier may be needed; + +vcpkg, for example, would use this since it uses the MIT license: + +```json +{ + "license": "MIT" +} +``` + +Many GPL'd projects allow either the GPL 2 or any later versions: + +```json +{ + "license": "GPL-2.0-or-later" +} +``` + +Many Rust projects, in order to make certain they're useable with GPL, +but also desiring the MIT license, will allow licensing under either +the MIT license or Apache 2.0: + +```json +{ + "license": "Apache-2.0 OR MIT" +} +``` + +Some major projects include exceptions; +the Microsoft C++ standard library, and the LLVM project, +are licensed under Apache 2.0 with the LLVM exception: + +```json +{ + "license": "Apache-2.0 WITH LLVM-exception" +} +``` diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 1c24f8e98c9e92..6c7b87fdc859d9 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -33,7 +33,7 @@ - [vcpkg\_execute\_required\_process\_repeat](vcpkg_execute_required_process_repeat.md) - [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md) - [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md) -- [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md) +- [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md) (deprecated) - [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md) - [vcpkg\_find\_fortran](vcpkg_find_fortran.md) - [vcpkg\_fixup\_cmake\_targets](vcpkg_fixup_cmake_targets.md) (deprecated, use [vcpkg\_cmake\_config\_fixup](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md)) diff --git a/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md b/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md index e4b486798ca388..469e0b197a8072 100644 --- a/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md +++ b/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md @@ -10,6 +10,7 @@ Additionally corrects common issues with targets, such as absolute paths and inc vcpkg_cmake_config_fixup( [PACKAGE_NAME ] [CONFIG_PATH ] + [TOOLS_PATH ] [DO_NOT_DELETE_PARENT_CONFIG_PATH] [NO_PREFIX_CORRECTION] ) @@ -35,11 +36,13 @@ and applies a rather simply correction which in some cases will yield the wrong ## How it Works 1. Moves `/debug//*targets-debug.cmake` to `/share/${PACKAGE_NAME}`. -2. Removes `/debug//*config.cmake`. -3. Transform all references matching `/bin/*.exe` to `/tools//*.exe` on Windows. -4. Transform all references matching `/bin/*` to `/tools//*` on other platforms. -5. Fixes `${_IMPORT_PREFIX}` in auto generated targets. -6. Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets. +2. Transforms all references matching `/bin/*.exe` to `/${TOOLS_PATH}/*.exe` on Windows. +3. Transforms all references matching `/bin/*` to `/${TOOLS_PATH}/*` on other platforms. +4. Fixes `${_IMPORT_PREFIX}` in auto generated targets. +5. Replaces `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs. +6. Merges INTERFACE_LINK_LIBRARIES of release and debug configurations. +7. Replaces `${CURRENT_INSTALLED_DIR}` with `${VCPKG_IMPORT_PREFIX}` in targets. +8. Removes `/debug//*config.cmake`. ## Examples diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md index 51a96372f812cd..b8f9c3b8ab0515 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md @@ -20,6 +20,8 @@ and this is something we recommend doing whenever possible. Otherwise, you can use `TARGET` to set the target to build. This function defaults to not passing a target to cmake. +[`vcpkg_cmake_install()`]: vcpkg_cmake_install.md + `LOGFILE_BASE` is used to set the base of the logfile names; by default, this is `build`, and thus the logfiles end up being something like `build-x86-windows-dbg.log`; if you use `vcpkg_cmake_install`, diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md index 6053b363c69728..fd84c25290f46e 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md @@ -87,7 +87,7 @@ This command supplies many common arguments to CMake. To see the full list, exam * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) +* [opencv4](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv4/portfile.cmake) ## Source [ports/vcpkg-cmake/vcpkg\_cmake\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake) diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md index 29ac265aa6eef1..1d708d3a1300d5 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md @@ -15,7 +15,7 @@ vcpkg_cmake_install( with additional parameters to set the `TARGET` to `install`, and to set the `LOGFILE_ROOT` to `install` as well. -[`vcpkg_cmake_build()`]: vcpkg_cmake_build.cmake +[`vcpkg_cmake_build()`]: vcpkg_cmake_build.md ## Examples: diff --git a/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md b/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md index 06299533a00c6f..1dbcf37e033391 100644 --- a/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md +++ b/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md @@ -10,6 +10,7 @@ Retrieve required module information from pkgconfig modules x_vcpkg_pkgconfig_get_modules( PREFIX MODULES ... + [CFLAGS] [LIBS] [LIBRARIES] [LIBRARIES_DIRS] diff --git a/docs/maintainers/registries.md b/docs/maintainers/registries.md index a4df8d32bb6406..18c54a447fb09c 100644 --- a/docs/maintainers/registries.md +++ b/docs/maintainers/registries.md @@ -14,6 +14,7 @@ have created, please read [this documentation](../users/registries.md). - [Adding a New Version](#adding-a-new-version) - [Filesystem Registries](#filesystem-registries) - [Adding a New Version](#adding-a-new-version-1) + - [Builtin Registries](#builtin-registries) ## Overview @@ -122,6 +123,13 @@ baseline to a commit ID, that commit ID must always exist, and be accessible from your HEAD commit, which is what is actually fetched. This means that your HEAD commit should be a child of all previous HEAD commits. +### Builtin Registries + +Builtin registries are treated as special Git registries. Instead of fetching +from a remote url, builtin registries consult the `$VCPKG_ROOT/.git` directory +of the vcpkg clone. They use the currently checked out `$VCPKG_ROOT/versions` +directory as the source for versioning information. + #### Adding a New Version There is some git trickery involved in creating a new version of a port. The diff --git a/docs/maintainers/vcpkg_check_features.md b/docs/maintainers/vcpkg_check_features.md index a8b90a3cd90ce9..c22908589da072 100644 --- a/docs/maintainers/vcpkg_check_features.md +++ b/docs/maintainers/vcpkg_check_features.md @@ -56,9 +56,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS secure MI_SECURE ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DMI_SEE_ASM=ON;-DMI_OVERRIDE=OFF;-DMI_SECURE=ON" ${FEATURE_OPTIONS} @@ -77,9 +76,8 @@ vcpkg_check_features( websockets CPPREST_EXCLUDE_WEBSOCKETS ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DCPPREST_EXCLUDE_BROTLI=ON;-DCPPREST_EXCLUDE_WEBSOCKETS=OFF" ${FEATURE_OPTIONS} @@ -99,9 +97,8 @@ vcpkg_check_features( cuda BUILD_GPU ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DWITH_CUDA=ON;-DBUILD_CUDA=ON;-DBUILD_GPU=ON" ${FEATURE_OPTIONS} @@ -121,9 +118,8 @@ vcpkg_check_features( tbb ROCKSDB_IGNORE_PACKAGE_TBB ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DWITH_TBB=ON;-DROCKSDB_IGNORE_PACKAGE_TBB=OFF" ${FEATURE_OPTIONS} diff --git a/docs/maintainers/vcpkg_extract_source_archive.md b/docs/maintainers/vcpkg_extract_source_archive.md index 1d807edc8eb706..69a95a5103ee8a 100644 --- a/docs/maintainers/vcpkg_extract_source_archive.md +++ b/docs/maintainers/vcpkg_extract_source_archive.md @@ -19,6 +19,7 @@ The latter is suggested to use for all future `vcpkg_extract_source_archive`s. vcpkg_extract_source_archive( ARCHIVE [NO_REMOVE_ONE_LEVEL] + [SKIP_PATCH_CHECK] [PATCHES ...] [SOURCE_BASE ] [BASE_DIRECTORY | WORKING_DIRECTORY ] @@ -59,6 +60,10 @@ prevent `vcpkg_extract_source_archive` from performing this transformation. If the source needs to be patched in some way, the `PATCHES` argument allows one to do this, just like other `vcpkg_from_*` functions. +Additionally, the `SKIP_PATCH_CHECK` is provided for `--head` mode - +this allows patches to fail to apply silently. +This argument should _only_ be used when installing a `--head` library, +since otherwise we want a patch failing to appply to be a hard error. `vcpkg_extract_source_archive` extracts the files to `${CURRENT_BUILDTREES_DIR}//-.clean`. diff --git a/docs/maintainers/vcpkg_fail_port_install.md b/docs/maintainers/vcpkg_fail_port_install.md index f729b19a356891..1d59fd8c1896f8 100644 --- a/docs/maintainers/vcpkg_fail_port_install.md +++ b/docs/maintainers/vcpkg_fail_port_install.md @@ -1,5 +1,7 @@ # vcpkg_fail_port_install +**This function has been deprecated in favor of the `supports` field in [`manifest file`](manifest-files.md#supports) et al.** + The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_fail_port_install.md). Checks common requirements and fails the current portfile with a (default) error message diff --git a/docs/maintainers/vcpkg_find_fortran.md b/docs/maintainers/vcpkg_find_fortran.md index 227c1c8372a2a3..b02c0c51b66c90 100644 --- a/docs/maintainers/vcpkg_find_fortran.md +++ b/docs/maintainers/vcpkg_find_fortran.md @@ -15,7 +15,7 @@ vcpkg_find_fortran() ```cmake vcpkg_find_fortran(fortran_args) # ... -vcpkg_configure_cmake(... +vcpkg_cmake_configure(... OPTIONS ${fortran_args} ) diff --git a/docs/users/authentication.md b/docs/users/authentication.md index 727b996178e445..4c1d1b9f044a54 100644 --- a/docs/users/authentication.md +++ b/docs/users/authentication.md @@ -77,3 +77,15 @@ vcpkg_from_github( ``` For private ports, we recommend using `vcpkg_from_git()` instead of `vcpkg_from_github()` and the pre-seeding method above. + +## Pass Jenkins gitUsernamePassword credentials + +The simplest and most secure option to Git authentication to GitHub from Jenkins is using [GitHub App](https://github.com/jenkinsci/github-branch-source-plugin/blob/master/docs/github-app.adoc) and the following: +```groovy +withCredentials([gitUsernamePassword(credentialsId: 'jenkins-github-app')]) { + withEnv(['VCPKG_KEEP_ENV_VARS=GIT_ASKPASS']) { + bat 'cmake' + } +} +``` +This sets the GIT_ASKPASS with a path to helper script which responds with git credentials query and instructs `vcpkg` to keep this environment variable. The password is a [GitHub App token](https://github.blog/2021-04-05-behind-githubs-new-authentication-token-formats/) with 1 hour lifetime. diff --git a/docs/users/host-dependencies.md b/docs/users/host-dependencies.md index 6521d28dd961ba..4e7cf39a34c38e 100644 --- a/docs/users/host-dependencies.md +++ b/docs/users/host-dependencies.md @@ -46,12 +46,10 @@ The default host triplets are chosen based on the host architecture and operatin Producing a tool has no special requirements; tools should be authored as a standard port, following all the normal policies and practices. Notably, they should build against `TARGET_TRIPLET`, not `HOST_TRIPLET` within the context of their portfile. -Sometimes, it can be useful to determine whether the current context is a cross-compiling one or not. This should be done by comparing the strings `TARGET_TRIPLET` and `HOST_TRIPLET`. For example: +If the current context is cross-compiling (`TARGET_TRIPLET` is not `HOST_TRIPLET`), then `VCPKG_CROSSCOMPILING` will be set to a truthy value. ```cmake -string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" I_AM_NOT_CROSSCOMPILING) - -if(TARGET_TRIPLET STREQUAL HOST_TRIPLET) +if(VCPKG_CROSSCOMPILING) # This is a native build else() # This is a cross build @@ -60,6 +58,8 @@ endif() ## Host-only ports -Some ports are host-only: script ports and tool ports are common examples. -In this case, you can use the `"native"` supports expression to describe this. -This supports expression is true when `TARGET_TRIPLET == HOST_TRIPLET`. +Some ports should only be depended upon via a host dependency; script ports and +tool ports are common examples. In this case, you can use the `"native"` +supports expression to describe this. This supports expression is true when +`VCPKG_CROSSCOMPILING` is false (implying that `TARGET_TRIPLET == +HOST_TRIPLET`). diff --git a/docs/users/manifests.md b/docs/users/manifests.md index 89dcc25b30e563..387511b65e5066 100644 --- a/docs/users/manifests.md +++ b/docs/users/manifests.md @@ -74,21 +74,25 @@ This is a required field. ### Version fields -There is, at this point, only one version field - `"version-string"`. However, more will be added in the future. -You must have one (and only one) version field. There are different reasons to use each version field: - -* `"version-string"` - used for packages that don't have orderable versions. This is pretty uncommon, - but since we don't have any versioning constraints yet, this is the only one that you can use. - -Additionally, the `"port-version"` field is used by registries of packages, -as a way to version "the package gotten from `vcpkg install`" differently from the upstream package version. -You shouldn't need to worry about this at all. - -#### Additional version fields - -**Experimental behind the `versions` feature flag** - -See [versioning](versioning.md#version-schemes) for additional version types. +There are four version field options, depending on how the port orders its +releases. + +* [`"version"`](versioning.md#version) - Generic, dot-separated numeric + sequence. +* [`"version-semver"`](versioning.md#version-semver) - [Semantic Version + 2.0.0](https://semver.org/#semantic-versioning-specification-semver) +* [`"version-date"`](versioning.md#version-date) - Used for packages which do + not have numeric releases (for example, Live-at-HEAD). Matches `YYYY-MM-DD` + with optional trailing dot-separated numeric sequence. +* [`"version-string"`](versioning.md#version-string) - Used for packages that + don't have orderable versions. This should be rarely used, however all ports + created before the other version fields were introduced use this scheme. + +Additionally, the optional `"port-version"` field is used to indicate revisions +to the port with the same upstream source version. For pure consumers, this +field should not be used. + +See [versioning](versioning.md#version-schemes) for more details. ### `"description"` @@ -99,11 +103,15 @@ while the remaining strings are treated as the full description. ### `"builtin-baseline"` -**Experimental behind the `versions` feature flag** +This field indicates the commit of vcpkg which provides global minimum version +information for your manifest. It is required for top-level manifest files using +versioning. -This field indicates the commit of vcpkg which provides global minimum version information for your manifest. It is required for top-level manifest files using versioning. +This is a convenience field that has the same semantic as replacing your default +registry in +[`vcpkg-configuration.json`](registries.md#configuration-default-registry). -See also [versioning](versioning.md#builtin-baseline) for more semantic details. +See [versioning](versioning.md#builtin-baseline) for more semantic details. ### `"dependencies"` @@ -183,19 +191,18 @@ although one can define their own. #### `"version>="` Field -**Experimental behind the `versions` feature flag** - A minimum version constraint on the dependency. -This field specifies the minimum version of the dependency using a '#' suffix to denote port-version if non-zero. +This field specifies the minimum version of the dependency, optionally using a +`#N` suffix to denote port-version if non-zero. See also [versioning](versioning.md#version-1) for more semantic details. ### `"overrides"` -**Experimental behind the `versions` feature flag** +This field pins exact versions for individual dependencies. -This field enables version resolution to be ignored for certain dependencies and to use specific versions instead. +`"overrides"` from transitive manifests (i.e. from dependencies) are ignored. See also [versioning](versioning.md#overrides) for more semantic details. @@ -275,8 +282,6 @@ and that's the `"default-features"` field, which is an array of feature names. ## Command Line Interface -**Experimental behind the `manifests` feature flag** - When invoked from any subdirectory of the directory containing `vcpkg.json`, `vcpkg install` with no package arguments will install all manifest dependencies into `/vcpkg_installed/`. Most of `vcpkg install`'s classic mode parameters function the same in manifest mode. @@ -339,6 +344,11 @@ If unset, vcpkg will automatically detect an appropriate native triplet (x64-win See also [Host Dependencies](host-dependencies.md). +### `VCPKG_INSTALLED_DIR` + +This variable allows one to set the location of the `vcpkg_installed` directory. +It defaults to `${CMAKE_BINARY_DIR}/vcpkg_installed`. + #### `VCPKG_MANIFEST_MODE` This variable controls whether vcpkg operates in manifest mode or in classic mode. To disable manifest mode even with a @@ -458,7 +468,9 @@ not respond to changes unless a `.cpp` is edited. When using Visual Studio 2015 integration, these properties can be set in your project file before the - +```xml + +``` line, which unfortunately requires manual editing of the `.vcxproj` or passing on the msbuild command line with `/p:`. With 2017 or later integration, These properties can additionally be set via the Visual Studio GUI under diff --git a/docs/users/registries.md b/docs/users/registries.md index 53db7cb1f429fd..06a0bf35bf54fd 100644 --- a/docs/users/registries.md +++ b/docs/users/registries.md @@ -97,7 +97,7 @@ will work: { "default-registry": { "kind": "git", - "repository": "https://git.example.com/vcpkg", + "repository": "https://internal/mirror/of/github.com/Microsoft/vcpkg", "baseline": "eefee7408133f3a0fef711ef9c6a3677b7e06fd7" }, "registries": [ diff --git a/docs/users/versioning.md b/docs/users/versioning.md index bad49da0d7f8fc..7b091a8a8f62b1 100644 --- a/docs/users/versioning.md +++ b/docs/users/versioning.md @@ -99,9 +99,14 @@ Examples: ## Version constraints ### `builtin-baseline` -Accepts a Git commit ID. Vcpkg will try to find a baseline file in the given commit ID and use that to set the baseline versions (lower bounds) of all dependencies. +Accepts a Git commit ID. vcpkg will try to find a baseline file in the given +commit ID and use that to set the baseline versions (lower bounds) of all +dependencies. -Baselines provide stability and ease of development for top-level manifest files. They are not considered from ports consumed as a dependency. If a minimum version constraint is required during transitive version resolution, the port should use `version>=`. +Baselines provide stability and ease of development for top-level manifest +files. They are not considered from ports consumed as a dependency. If a minimum +version constraint is required during transitive version resolution, the port +should use `version>=`. Example: ```json @@ -113,12 +118,28 @@ Example: } ``` -You can get the current commit of your vcpkg instance either by adding an empty `"builtin-baseline"` field, installing, and examining the error message or by running `git rev-parse HEAD` in the root of the vcpkg instance. +You can get the current commit of your vcpkg instance either by adding an empty +`"builtin-baseline"` field, installing, and examining the error message or by +running `git rev-parse HEAD` in the root of the vcpkg instance. + +When resolving version constraints for a package, vcpkg will look for a baseline +version by looking at the baseline file in the given commit ID. If the given +commit ID doesn't have a `versions/baseline.json` file or if the baseline file +exists but it does not declare a baseline version for the package the invocation +will fail. + +This field is a convenience field that has the same semantic as replacing your +default registry in +[`vcpkg-configuration.json`](registries.md#configuration-default-registry). +```json +{ + "default-registry": { + "kind": "builtin", + "baseline": "" + } +} +``` -When resolving version constraints for a package, vcpkg will look for a baseline version by looking -at the baseline file in the given commit ID. -If the given commit ID doesn't have a `versions/baseline.json` file or if the baseline file exists -but it does not declare a baseline version for the package the invocation will fail. ### `version>=` Expresses a minimum version requirement, `version>=` declarations put a lower boundary on the versions that can be used to satisfy a dependency. @@ -161,95 +182,6 @@ For an override to take effect, the overridden package must form part of the dep } ``` -## Version files -Vcpkg uses a set of metadata files to power its versioning feature. - -These files are located in the following locations: -* `${VCPKG_ROOT}/versions/baseline.json`, (this file is common to all ports) and -* `${VCPKG_ROOT}/versions/${first-letter-of-portname}-/${portname}.json` (one per port). - -For example, for `zlib` the relevant files are: -* `${VCPKG_ROOT}/versions/baseline.json` -* `${VCPKG_ROOT}/versions/z-/zlib.json` - -The vcpkg public CI checks validate that each time a port is added or updated its respective version files are also updated. - -### Baseline file -The baseline file located in `${VCPKG_ROOT}/versions/baseline.json` is used to declared the current baseline versions of all packages. - -For example: -```json -{ - "default": { - "3fd": { "baseline": "2.6.3", "port-version": 0 }, - "7zip": { "baseline": "19.00", "port-version": 2 }, - "abseil": { "baseline": "2020-09-23", "port-version": 1 } - } -} -``` - -Provided that there are no local modifications to the ports, the versions of all packages in the baseline file should map to the version of their corresponding portfiles in the `ports/` directory. - -### Versions file -Each port in vcpkg has a corresponding versions file, the location of a port's versions file follows the pattern: - -```sh -${VCPKG_ROOT}/versions/${first-letter-of-portname}-/${portname}.json -``` - -For example, for `zlib` the corresponding versions file is: - -```sh -${VCPKG_ROOT}/versions/z-/zlib.json -``` - -These files contain an array of all the versions available for a given port. -For example, the contents of `versions/z-/zlib.json` declare the following versions: -```json -{ - "versions": [ - { - "git-tree": "827111046e37c98153d9d82bb6fa4183b6d728e4", - "version-string": "1.2.11", - "port-version": 9 - }, - { - "git-tree": "068430e3e24fa228c302c808ba99f8a48d126557", - "version-string": "1.2.11", - "port-version": 8 - }, - ... - ] -} -``` -Each version declared in this file uses the same syntax used in manifest files, but adds an extra `git-tree` property. The value of `git-tree` is the SHA hash, as calculated by Git, of the directory containing the portfiles for the declared version. You can ask Git for the object SHA via the syntax: -``` -git rev-parse : -``` -For example, -``` -git rev-parse HEAD:ports/zlib -``` - -### Updating the version files -The recommended method to update these files is to run the `x-add-version` command. - -For example, if you have made changes to `zlib`: - -``` -vcpkg x-add-version zlib -``` - -If you're updating multiple ports at the same time, instead you can run: - -``` -vcpkg x-add-version --all -``` - -To update the files for all modified ports at once. - -_NOTE: These commands require you to have committed your changes to the ports before running them. The reason is that the Git SHA of the port directory is required in these version files. But don't worry, the `x-add-version` command will warn you if you have local changes that haven't been committed._ - ## See Also * The [implementation details](versioning.implementation-details.md) diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake index 294b0370cbd9f9..ae68509292b774 100644 --- a/ports/3fd/portfile.cmake +++ b/ports/3fd/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "osx" "linux") - # Check architecture: if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(BUILD_ARCH "Win32") diff --git a/ports/3fd/vcpkg.json b/ports/3fd/vcpkg.json index 286cb8aa3cc56b..5ee8f2d4ecf622 100644 --- a/ports/3fd/vcpkg.json +++ b/ports/3fd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "3fd", "version": "2.6.3", - "port-version": 1, + "port-version": 2, "description": "C++ Framework For Fast Development", "supports": "windows & !static & !arm64", "dependencies": [ diff --git a/ports/7zip/7zip-config.cmake.in b/ports/7zip/7zip-config.cmake.in new file mode 100644 index 00000000000000..442821af97acfa --- /dev/null +++ b/ports/7zip/7zip-config.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/7zip-targets.cmake") + +check_required_components(7zip) diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt index 4ed90058413b0c..a7fb577bc558dd 100644 --- a/ports/7zip/CMakeLists.txt +++ b/ports/7zip/CMakeLists.txt @@ -1,23 +1,16 @@ -# Created from 7-zip v19.00 - 7zip/CPP/7zip/Bundles/Format7zF +cmake_minimum_required(VERSION 3.19) -cmake_minimum_required(VERSION 3.11) -cmake_policy(VERSION 3.11) +project(7zip LANGUAGES C CXX) -project(7zip LANGUAGES C CXX ASM_MASM) - -set(SRC_ASM - Asm/x86/AesOpt.asm - Asm/x86/7zCrcOpt.asm - Asm/x86/XzCrc64Opt.asm -) - -if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set_source_files_properties(${SRC_ASM} PROPERTIES COMPILE_FLAGS "-Dx64") -else() - set_source_files_properties(${SRC_ASM} PROPERTIES COMPILE_FLAGS "-safeseh") +if(VCPKG_TARGET_IS_WINDOWS) + enable_language(ASM_MASM) +elseif(VCPKG_TARGET_IS_LINUX) + enable_language(ASM) endif() -set(SRC_COMPRESS +add_library(7zip) + +target_sources(7zip PRIVATE CPP/7zip/Compress/Bcj2Coder.cpp CPP/7zip/Compress/Bcj2Register.cpp CPP/7zip/Compress/BcjCoder.cpp @@ -68,9 +61,7 @@ set(SRC_COMPRESS CPP/7zip/Compress/ZlibEncoder.cpp CPP/7zip/Compress/ZDecoder.cpp CPP/7zip/Compress/CodecExports.cpp -) -set(SRC_CRYPTO CPP/7zip/Crypto/7zAes.cpp CPP/7zip/Crypto/7zAesRegister.cpp CPP/7zip/Crypto/HmacSha1.cpp @@ -85,9 +76,7 @@ set(SRC_CRYPTO CPP/7zip/Crypto/WzAes.cpp CPP/7zip/Crypto/ZipCrypto.cpp CPP/7zip/Crypto/ZipStrong.cpp -) -set(SRC_C C/7zBuf2.c C/7zStream.c C/Alloc.c @@ -106,12 +95,12 @@ set(SRC_C C/Lzma2Dec.c C/Lzma2DecMt.c C/Lzma2Enc.c - C/LzmaDec.c C/LzmaEnc.c C/LzmaLib.c C/MtCoder.c C/MtDec.c C/Ppmd7.c + C/Ppmd7aDec.c C/Ppmd7Dec.c C/Ppmd7Enc.c C/Ppmd8.c @@ -128,27 +117,21 @@ set(SRC_C C/Aes.c C/7zCrc.c C/XzCrc64.c -) - -set_source_files_properties( - ${SRC_COMPRESS} - ${SRC_CRYPTO} - ${SRC_C} - PROPERTIES - COMPILE_FLAGS $<$:"/O2"> -) -set(SRC_OTHER CPP/Common/CRC.cpp CPP/Common/CrcReg.cpp CPP/Common/DynLimBuf.cpp CPP/Common/IntToString.cpp + CPP/Common/LzFindPrepare.cpp CPP/Common/MyMap.cpp CPP/Common/MyString.cpp CPP/Common/MyVector.cpp + CPP/Common/MyWindows.cpp CPP/Common/MyXml.cpp CPP/Common/NewHandler.cpp + CPP/Common/Sha1Prepare.cpp CPP/Common/Sha1Reg.cpp + CPP/Common/Sha256Prepare.cpp CPP/Common/Sha256Reg.cpp CPP/Common/StringConvert.cpp CPP/Common/StringToInt.cpp @@ -192,6 +175,7 @@ set(SRC_OTHER CPP/7zip/Archive/ApmHandler.cpp CPP/7zip/Archive/ArHandler.cpp CPP/7zip/Archive/ArjHandler.cpp + CPP/7zip/Archive/Base64Handler.cpp CPP/7zip/Archive/Bz2Handler.cpp CPP/7zip/Archive/ComHandler.cpp CPP/7zip/Archive/CpioHandler.cpp @@ -303,32 +287,112 @@ set(SRC_OTHER CPP/7zip/Archive/Zip/ZipOut.cpp CPP/7zip/Archive/Zip/ZipUpdate.cpp CPP/7zip/Archive/Zip/ZipRegister.cpp -) -add_library(7zip - ${SRC_ASM} - ${SRC_OTHER} - ${SRC_COMPRESS} - ${SRC_CRYPTO} - ${SRC_C} CPP/7zip/Archive/Archive2.def C/Util/LzmaLib/LzmaLib.def ) +# 7zCrcOpt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/7zCrcOpt.asm) + set_source_files_properties(Asm/x86/7zCrcOpt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/7zCrcOpt.c) + endif() +else() + target_sources(7zip PRIVATE C/7zCrcOpt.c) +endif() + +# AesOpt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/AesOpt.asm) + set_source_files_properties(Asm/x86/AesOpt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/AesOpt.c) + endif() +else() + target_sources(7zip PRIVATE C/AesOpt.c) +endif() + +# LzFindOpt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/LzFindOpt.asm) + set_source_files_properties(Asm/x86/LzFindOpt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/LzFindOpt.c) + endif() +else() + target_sources(7zip PRIVATE C/LzFindOpt.c) +endif() + +# LzmaDecOpt +target_sources(7zip PRIVATE C/LzmaDec.c) +if((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") OR + (VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + ) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/LzmaDecOpt.asm) + set_source_files_properties(Asm/x86/LzmaDecOpt.asm PROPERTIES LANGUAGE ASM_MASM) + elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + target_sources(7zip PRIVATE Asm/arm64/LzmaDecOpt.S) + set_source_files_properties(Asm/x86/LzmaDecOpt.asm PROPERTIES LANGUAGE ASM) + endif() + + get_source_file_property(defs C/LzmaDec.c COMPILE_DEFINITIONS) + list(APPEND defs "_LZMA_DEC_OPT") + set_source_files_properties(C/LzmaDec.c PROPERTIES COMPILE_DEFINITIONS "${defs}") +endif() + +# Sha1Opt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/Sha1Opt.asm) + set_source_files_properties(Asm/x86/Sha1Opt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/Sha1Opt.c) + endif() +else() + target_sources(7zip PRIVATE C/Sha1Opt.c) +endif() + +# Sha256Opt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/Sha256Opt.asm) + set_source_files_properties(Asm/x86/Sha256Opt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/Sha256Opt.c) + endif() +else() + target_sources(7zip PRIVATE C/Sha256Opt.c) +endif() + +# XzCrc64Opt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/XzCrc64Opt.asm) + set_source_files_properties(Asm/x86/XzCrc64Opt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/XzCrc64Opt.c) + endif() +else() + target_sources(7zip PRIVATE C/XzCrc64Opt.c) +endif() + target_compile_definitions(7zip PUBLIC + -D_REENTRANT + -D_FILE_OFFSET_BITS=64 + -D_LARGEFILE_SOURCE -DEXTERNAL_CODECS -D_7ZIP_LARGE_PAGES -DUNICODE -D_UNICODE ) -target_compile_options(7zip - PRIVATE - /wd5043 - $<$:/guard:cf> -) - target_include_directories(7zip INTERFACE $/7zip/CPP @@ -359,7 +423,7 @@ set(PUBLIC_HEADERS install( TARGETS 7zip - EXPORT 7zip + EXPORT 7zip-targets ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin @@ -375,10 +439,19 @@ foreach(HEADER ${PUBLIC_HEADERS}) ) endforeach() +include(CMakePackageConfigHelpers) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/7zip-config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/7zip-config.cmake" + INSTALL_DESTINATION "share/7zip" +) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/7zip-config.cmake" + DESTINATION "share/7zip" +) + install( - EXPORT 7zip + EXPORT 7zip-targets DESTINATION share/7zip - FILE 7zipConfig.cmake NAMESPACE 7zip:: - CONFIGURATIONS Release ) diff --git a/ports/7zip/License.txt b/ports/7zip/License.txt deleted file mode 100644 index e9113842cecc6f..00000000000000 --- a/ports/7zip/License.txt +++ /dev/null @@ -1,90 +0,0 @@ - 7-Zip source code - ~~~~~~~~~~~~~~~~~ - License for use and distribution - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - 7-Zip Copyright (C) 1999-2019 Igor Pavlov. - - The licenses for files are: - - 1) CPP/7zip/Compress/Rar* files: the "GNU LGPL" with "unRAR license restriction" - 2) CPP/7zip/Compress/LzfseDecoder.cpp: the "BSD 3-clause License" - 3) Some files are "public domain" files, if "public domain" status is stated in source file. - 4) the "GNU LGPL" for all other files. If there is no license information in - some source file, that file is under the "GNU LGPL". - - The "GNU LGPL" with "unRAR license restriction" means that you must follow both - "GNU LGPL" rules and "unRAR license restriction" rules. - - - - - GNU LGPL information - -------------------- - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - - - - BSD 3-clause License - -------------------- - - The "BSD 3-clause License" is used for the code in LzfseDecoder.cpp that implements LZFSE data decompression. - That code was derived from the code in the "LZFSE compression library" developed by Apple Inc, - that also uses the "BSD 3-clause License": - - ---- - Copyright (c) 2015-2016, Apple Inc. All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the distribution. - - 3. Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ---- - - - - - unRAR license restriction - ------------------------- - - The decompression engine for RAR archives was developed using source - code of unRAR program. - All copyrights to original unRAR code are owned by Alexander Roshal. - - The license for original unRAR code has the following restriction: - - The unRAR sources cannot be used to re-create the RAR compression algorithm, - which is proprietary. Distribution of modified unRAR sources in separate form - or as a part of other software is permitted, provided that it is clearly - stated in the documentation and source comments that the code may - not be used to develop a RAR (WinRAR) compatible archiver. - - - -- - Igor Pavlov diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake index bffb9b4dfefb1e..5dd58bfdbddb02 100644 --- a/ports/7zip/portfile.cmake +++ b/ports/7zip/portfile.cmake @@ -1,32 +1,30 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "linux" "osx") - -set(7ZIP_VERSION 19.00) +set(7ZIP_VERSION "2107") vcpkg_download_distfile(ARCHIVE - URLS "https://www.7-zip.org/a/7z1900-src.7z" - FILENAME "7z1900-src.7z" - SHA512 d68b308e175224770adc8b1495f1ba3cf3e7f67168a7355000643d3d32560ae01aa34266f0002395181ed91fb5e682b86e0f79c20625b42d6e2c62dd24a5df93 + URLS "https://www.7-zip.org/a/7z${7ZIP_VERSION}-src.7z" + FILENAME "7z${7ZIP_VERSION}-src.7z" + SHA512 c13521a9829ac239a89015e1f5da27eeaa2469754e3f8ca32311d964ea9d0b40a17e4f8ccbd425d3e865aa768be345368f1c36f354d5710ac7cb2749dd6a3ab5 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${7ZIP_VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/7zip-config.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() - +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + file( - INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + INSTALL "${SOURCE_PATH}/DOC/License.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/7zip/unRarLicense.txt b/ports/7zip/unRarLicense.txt deleted file mode 100644 index 5f78b728da5500..00000000000000 --- a/ports/7zip/unRarLicense.txt +++ /dev/null @@ -1,41 +0,0 @@ - ****** ***** ****** unRAR - free utility for RAR archives - ** ** ** ** ** ** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ****** ******* ****** License for use and distribution of - ** ** ** ** ** ** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ** ** ** ** ** ** FREE portable version - ~~~~~~~~~~~~~~~~~~~~~ - - The source code of unRAR utility is freeware. This means: - - 1. All copyrights to RAR and the utility unRAR are exclusively - owned by the author - Alexander Roshal. - - 2. The unRAR sources may be used in any software to handle RAR - archives without limitations free of charge, but cannot be used - to re-create the RAR compression algorithm, which is proprietary. - Distribution of modified unRAR sources in separate form or as a - part of other software is permitted, provided that it is clearly - stated in the documentation and source comments that the code may - not be used to develop a RAR (WinRAR) compatible archiver. - - 3. The unRAR utility may be freely distributed. No person or company - may charge a fee for the distribution of unRAR without written - permission from the copyright holder. - - 4. THE RAR ARCHIVER AND THE UNRAR UTILITY ARE DISTRIBUTED "AS IS". - NO WARRANTY OF ANY KIND IS EXPRESSED OR IMPLIED. YOU USE AT - YOUR OWN RISK. THE AUTHOR WILL NOT BE LIABLE FOR DATA LOSS, - DAMAGES, LOSS OF PROFITS OR ANY OTHER KIND OF LOSS WHILE USING - OR MISUSING THIS SOFTWARE. - - 5. Installing and using the unRAR utility signifies acceptance of - these terms and conditions of the license. - - 6. If you don't agree with terms of the license you must remove - unRAR files from your storage devices and cease to use the - utility. - - Thank you for your interest in RAR and unRAR. - - - Alexander L. Roshal \ No newline at end of file diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json index a8c7b6ce54dc00..542e88c002735c 100644 --- a/ports/7zip/vcpkg.json +++ b/ports/7zip/vcpkg.json @@ -1,8 +1,19 @@ { "name": "7zip", - "version-string": "19.00", - "port-version": 3, + "version-string": "21.07", + "port-version": 1, "description": "Library for archiving file with a high compression ratio.", "homepage": "https://www.7-zip.org", - "supports": "!(linux | osx | arm | uwp)" + "license": "LGPL-2.1-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/abseil/fix-cxx-standard.patch b/ports/abseil/fix-cxx-standard.patch index 19e1f54db3f100..83cdcbcc531422 100644 --- a/ports/abseil/fix-cxx-standard.patch +++ b/ports/abseil/fix-cxx-standard.patch @@ -1,5 +1,5 @@ diff --git a/CMake/abslConfig.cmake.in b/CMake/abslConfig.cmake.in -index 62d246d..00947cf 100644 +index 62d246d..afcec1f 100644 --- a/CMake/abslConfig.cmake.in +++ b/CMake/abslConfig.cmake.in @@ -6,3 +6,5 @@ find_dependency(Threads) @@ -8,12 +8,11 @@ index 62d246d..00947cf 100644 include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +set(ABSL_USE_CXX17 @ABSL_USE_CXX17@) -\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt -index f0af6f6..927f4ed 100644 +index 750a475..239977f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -57,6 +57,23 @@ else() +@@ -67,6 +67,23 @@ else() option(ABSL_ENABLE_INSTALL "Enable install rule" ON) endif() @@ -34,28 +33,27 @@ index f0af6f6..927f4ed 100644 + set(STD_VARIANT 0) +endif() + - list(APPEND CMAKE_MODULE_PATH - ${CMAKE_CURRENT_LIST_DIR}/CMake - ${CMAKE_CURRENT_LIST_DIR}/absl/copts + option(ABSL_PROPAGATE_CXX_STD + "Use CMake C++ standard meta features (e.g. cxx_std_11) that propagate to targets that link to Abseil" + OFF) # TODO: Default to ON for CMake 3.8 and greater. diff --git a/absl/base/CMakeLists.txt b/absl/base/CMakeLists.txt -index 9ff5aa2..315bee4 100644 +index c7233cb..65a9076 100644 --- a/absl/base/CMakeLists.txt +++ b/absl/base/CMakeLists.txt -@@ -87,6 +87,12 @@ absl_cc_library( - absl::errno_saver +@@ -38,6 +38,11 @@ absl_cc_library( + COPTS + ${ABSL_DEFAULT_COPTS} ) - +if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/options.h.in) + file(RENAME ${CMAKE_CURRENT_LIST_DIR}/options.h ${CMAKE_CURRENT_LIST_DIR}/options.h.in) +endif() +file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/options.h) +configure_file(${CMAKE_CURRENT_LIST_DIR}/options.h.in ${CMAKE_CURRENT_LIST_DIR}/options.h @ONLY) -+ + absl_cc_library( NAME - config diff --git a/absl/base/options.h b/absl/base/options.h -index 6a0fb07..54a9780 100644 +index 56b4e36..0b098ed 100644 --- a/absl/base/options.h +++ b/absl/base/options.h @@ -100,7 +100,7 @@ diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 6539cd271627d6..1289eed36a9c53 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 278e0a071885a22dcd2fd1b5576cc44757299343 #LTS 20210324, Patch 2 - SHA512 a9e8e9169ebcfb8bc2eca28152ad2f655f48e6281ea932eb712333f3d0aa0b6fa1a9b184f3e2ddd75d932a54b501cc5c7bb29a1c9de5d2146f82fc5754653895 + REF 215105818dfde3174fe799600bb0f3cae233d0bf #LTS 20211102, Patch 1 + SHA512 75d234eac76be8790cf09e3e1144e4b4cf5cacb61e46961a9e4a35b37d0fa85243afdd5de5f47a006ef96af6fc91ecc0c233297c4c32258c08d46304b3361330 HEAD_REF master PATCHES # in C++17 mode, use std::any, std::optional, std::string_view, std::variant @@ -14,8 +14,7 @@ vcpkg_from_github( # in C++11 mode, force use of library replacement types, otherwise the automatic # detection can cause ABI issues depending on which compiler options # are enabled for consuming user code - fix-cxx-standard.patch - fix-32-bit-arm.patch + fix-cxx-standard.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -53,4 +52,4 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) ) endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 9d6159b210726e..3c9dc5eef209cf 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,7 +1,6 @@ { "name": "abseil", - "version-string": "20210324.2", - "port-version": 1, + "version-string": "20211102.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/portfile.cmake b/ports/ace/portfile.cmake index 190a2f8dfe5d43..a9312dcaafdc91 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -1,7 +1,7 @@ # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter" # when invoking `prj_install.pl`. # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it. -set(ACE_VERSION 7.0.5) +set(ACE_VERSION 7.0.6) string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION}) if("tao" IN_LIST FEATURES) @@ -10,14 +10,13 @@ if("tao" IN_LIST FEATURES) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.zip" FILENAME ACE-TAO-${ACE_VERSION}.zip - SHA512 3ea0cc7b35433d7c41f51137caacd394a976cf4d5c2972a35015901b3ba172bacff0216a3146bf632b929a63853b7123019382c22d14c6d64e43a71a61b88023 + SHA512 faef212f066263f9a87a688d105f15097f6b78fd77baf9e2b7da008027cd9ad0478b1f016892ee2d36fcb5aa6b14cc6fbb8fb906f018db6a1089820d522c65f9 ) else() - # VCPKG_TARGET_IS_LINUX vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz" FILENAME ACE-TAO-${ACE_VERSION}.tar.gz - SHA512 65c6557f72a57dc137882bbf6cbb009ae2e403c9848e3e4c3165f1ed55865c5e08fc0226dcf715b33bfa501b13b3863f5c40403791b0dcd29b7c88fec20a9660 + SHA512 5d0bbeb1f729c3304637a15979303ba6efdbe52bb5d4ac73930fe9b86dbb73a5d74325476809863b26e1a3fc39a205d9d3a9909bce7bbdc5869de3e30f1bc317 ) endif() else() @@ -26,65 +25,60 @@ else() vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.zip" FILENAME ACE-src-${ACE_VERSION}.zip - SHA512 73707c92a0533ab60f090cfb620d508755b8267e2b83fb52d9903c4d780d2e2b504545433fdbe34801d4895cf938ecc5a5f26c34528851080bcce07f5a501ac1 + SHA512 91f35727afc652f537ce242eb0a9e10878b51b63f9c10f72bddd6491481f10eec5d9d8469f79da3b95adeab7d6848eb1e8bad4e43f61db63daf796a2cd205d61 ) - else(VCPKG_TARGET_IS_WINDOWS) - # VCPKG_TARGET_IS_LINUX + else() vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz" FILENAME ACE-src-${ACE_VERSION}.tar.gz - SHA512 6e5e43e600763e612c292cb88443e4dce1be94d049e2a784c5a4d4720314b484cccec4f7f05534c6ef824d86bef8bfe4ff5bce5f7998896cdaa599302b5b2562 + SHA512 9770fab3552835803a93c9a234218c9dd961ecde67227ee92e0972cd2e2ff267147b255ab437453a887bc47b20f70c7a64efeada5dde5d3ea2cade54200e8354 ) endif() endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" ) -set(ACE_ROOT ${SOURCE_PATH}) -set(ENV{ACE_ROOT} ${ACE_ROOT}) -set(ACE_SOURCE_PATH ${ACE_ROOT}/ace) +set(ACE_ROOT "${SOURCE_PATH}") +set(ENV{ACE_ROOT} "${ACE_ROOT}") +set(ACE_SOURCE_PATH "${ACE_ROOT}/ace") if("tao" IN_LIST FEATURES) - set(TAO_ROOT ${SOURCE_PATH}/TAO) - set(ENV{TAO_ROOT} ${TAO_ROOT}) - set(WORKSPACE ${TAO_ROOT}/TAO_ACE) + set(TAO_ROOT "${SOURCE_PATH}/TAO") + set(ENV{TAO_ROOT} "${TAO_ROOT}") + set(WORKSPACE "${TAO_ROOT}/TAO_ACE") else() - set(WORKSPACE ${ACE_ROOT}/ace/ace) + set(WORKSPACE "${ACE_ROOT}/ace/ace") endif() if("wchar" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "uses_wchar=1") endif() if("zlib" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "zlib=1") - set(ENV{ZLIB_ROOT} ${CURRENT_INSTALLED_DIR}) + set(ENV{ZLIB_ROOT} "${CURRENT_INSTALLED_DIR}") else() list(APPEND ACE_FEATURE_LIST "zlib=0") endif() if("ssl" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "ssl=1") list(APPEND ACE_FEATURE_LIST "openssl11=1") - set(ENV{SSL_ROOT} ${CURRENT_INSTALLED_DIR}) + set(ENV{SSL_ROOT} "${CURRENT_INSTALLED_DIR}") else() list(APPEND ACE_FEATURE_LIST "ssl=0") endif() if("xml-utils" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "xerces3=1") - set(ENV{XERCESCROOT} ${CURRENT_INSTALLED_DIR}) + set(ENV{XERCESCROOT} "${CURRENT_INSTALLED_DIR}") else() list(APPEND ACE_FEATURE_LIST "xerces3=0") endif() list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES) -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(MPC_STATIC_FLAG -static) -endif() - # Acquire Perl and add it to PATH (for execution of MPC) vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) -vcpkg_add_to_path(${PERL_PATH}) +vcpkg_add_to_path("${PERL_PATH}") if (TRIPLET_SYSTEM_ARCH MATCHES "x86") set(MSBUILD_PLATFORM "Win32") @@ -104,39 +98,47 @@ if(VCPKG_TARGET_IS_WINDOWS) else() set(SOLUTION_TYPE vs2022) endif() - file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(MPC_STATIC_FLAG -static) + endif() + set(config_h_contents "#include \"ace/config-windows.h\"\n") elseif(VCPKG_TARGET_IS_LINUX) set(SOLUTION_TYPE gnuace) - file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"") - file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU") + set(config_h_contents "#include \"ace/config-linux.h\"\n") + file(WRITE "${ACE_ROOT}/include/makeinclude/platform_macros.GNU" "CCFLAGS += -fPIC\ninclude $(ACE_ROOT)/include/makeinclude/platform_linux.GNU") elseif(VCPKG_TARGET_IS_OSX) set(SOLUTION_TYPE gnuace) - file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-macosx.h\"") - file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") + set(config_h_contents "#include \"ace/config-macosx.h\"\n") + file(WRITE "${ACE_ROOT}/include/makeinclude/platform_macros.GNU" "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") endif() +if("wchar" IN_LIST FEATURES) + string(APPEND config_h_contents "#define ACE_USES_WCHAR 1\n") +endif() +file(WRITE "${ACE_SOURCE_PATH}/config.h" "${config_h_contents}") + if(VCPKG_TARGET_IS_UWP) set(MPC_VALUE_TEMPLATE -value_template link_options+=/APPCONTAINER) endif() # Invoke mwc.pl to generate the necessary solution and project files vcpkg_execute_build_process( - COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ${WORKSPACE}.mwc ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} - WORKING_DIRECTORY ${ACE_ROOT} + COMMAND ${PERL} "${ACE_ROOT}/bin/mwc.pl" -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" "${WORKSPACE}.mwc" ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} + WORKING_DIRECTORY "${ACE_ROOT}" LOGNAME mwc-${TARGET_TRIPLET} ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( - COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ${ACE_ROOT}/ACEXML/ACEXML.mwc ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} - WORKING_DIRECTORY ${ACE_ROOT}/ACEXML + COMMAND ${PERL} "${ACE_ROOT}/bin/mwc.pl" -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" "${ACE_ROOT}/ACEXML/ACEXML.mwc" ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} + WORKING_DIRECTORY "${ACE_ROOT}/ACEXML" LOGNAME mwc-xml-${TARGET_TRIPLET} ) endif() if(VCPKG_TARGET_IS_WINDOWS) if("tao" IN_LIST FEATURES OR "xml" IN_LIST FEATURES) - file(WRITE ${SOURCE_PATH}/Directory.Build.props " + file(WRITE "${SOURCE_PATH}/Directory.Build.props" " @@ -150,9 +152,9 @@ if(VCPKG_TARGET_IS_WINDOWS) ") endif() - file(RELATIVE_PATH PROJECT_SUBPATH ${SOURCE_PATH} ${WORKSPACE}.sln) + file(RELATIVE_PATH PROJECT_SUBPATH "${SOURCE_PATH}" "${WORKSPACE}.sln") vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ${PROJECT_SUBPATH} LICENSE_SUBPATH COPYING PLATFORM ${MSBUILD_PLATFORM} @@ -167,19 +169,19 @@ if(VCPKG_TARGET_IS_WINDOWS) file( GLOB HEADER_FILES - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.hpp - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.cpp - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.idl - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.pidl) + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.hpp" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.cpp" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.idl" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.pidl") file(INSTALL ${HEADER_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) + DESTINATION "${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}") endforeach() endfunction() get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) - set(SOURCE_COPY_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}) + set(SOURCE_COPY_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}") # Install headers in subdirectory set(ACE_INCLUDE_FOLDERS @@ -194,22 +196,22 @@ if(VCPKG_TARGET_IS_WINDOWS) "ace/os_include/net" "ace/os_include/netinet" "ace/os_include/sys") - install_includes(${SOURCE_COPY_PATH} "${ACE_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}" "${ACE_INCLUDE_FOLDERS}") if("ssl" IN_LIST FEATURES) - install_includes(${SOURCE_COPY_PATH} "ace/SSL") + install_includes("${SOURCE_COPY_PATH}" "ace/SSL") endif() if("tao" IN_LIST FEATURES) set(ACEXML_INCLUDE_FOLDERS "ACEXML/apps/svcconf" "ACEXML/common" "ACEXML/parser/parser") - install_includes(${SOURCE_COPY_PATH} "${ACEXML_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}" "${ACEXML_INCLUDE_FOLDERS}") set(ACE_PROTOCOLS_INCLUDE_FOLDERS "ace/HTBP" "ace/INet" "ace/RMCast" "ace/TMCast") - install_includes(${SOURCE_COPY_PATH}/protocols "${ACE_PROTOCOLS_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}/protocols" "${ACE_PROTOCOLS_INCLUDE_FOLDERS}") - install_includes(${SOURCE_COPY_PATH} "Kokyu") + install_includes("${SOURCE_COPY_PATH}" "Kokyu") set(TAO_ORBSVCS_INCLUDE_FOLDERS "orbsvcs" @@ -243,11 +245,11 @@ if(VCPKG_TARGET_IS_WINDOWS) if("ssl" IN_LIST FEATURES) list(APPEND TAO_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/SSLIOP") endif() - install_includes(${SOURCE_COPY_PATH}/TAO/orbsvcs "${TAO_ORBSVCS_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}/TAO/orbsvcs" "${TAO_ORBSVCS_INCLUDE_FOLDERS}") set(TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/FT_ReplicationManager" "orbsvcs/Notify_Service") - install_includes(${SOURCE_COPY_PATH}/TAO "${TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}/TAO" "${TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS}") set(TAO_INCLUDE_FOLDERS "tao" @@ -289,13 +291,13 @@ if(VCPKG_TARGET_IS_WINDOWS) if("zlib" IN_LIST FEATURES) list(APPEND TAO_INCLUDE_FOLDERS "tao/Compression/zlib") endif() - install_includes(${SOURCE_COPY_PATH}/TAO "${TAO_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}/TAO" "${TAO_INCLUDE_FOLDERS}") endif() if("xml" IN_LIST FEATURES) - file(RELATIVE_PATH PROJECT_SUBPATH_XML ${SOURCE_PATH} ${ACE_ROOT}/ACEXML/ACEXML.sln) + file(RELATIVE_PATH PROJECT_SUBPATH_XML "${SOURCE_PATH}" "${ACE_ROOT}/ACEXML/ACEXML.sln") vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ${PROJECT_SUBPATH_XML} LICENSE_SUBPATH COPYING PLATFORM ${MSBUILD_PLATFORM} @@ -304,17 +306,17 @@ if(VCPKG_TARGET_IS_WINDOWS) set(ACEXML_INCLUDE_FOLDERS "ACEXML/common" "ACEXML/parser/parser") - install_includes(${SOURCE_COPY_PATH} "${ACEXML_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}" "${ACEXML_INCLUDE_FOLDERS}") endif() # Remove dlls without any export if("tao" IN_LIST FEATURES OR "xml" IN_LIST FEATURES) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.dll - ${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.pdb - ${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd.dll - ${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb) + "${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.dll" + "${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.pdb" + "${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb") endif() endif() @@ -329,22 +331,26 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) list(APPEND _ace_makefile_macros "ssl=1") endif() - set(ENV{INSTALL_PREFIX} ${CURRENT_PACKAGES_DIR}) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND _ace_makefile_macros "static_libs_only=1") + endif() + + set(ENV{INSTALL_PREFIX} "${CURRENT_PACKAGES_DIR}") # Set `PWD` environment variable since ACE's `install` make target calculates install dir using this env. set(_prev_env $ENV{PWD}) - get_filename_component(WORKING_DIR ${WORKSPACE} DIRECTORY) - set(ENV{PWD} ${WORKING_DIR}) + get_filename_component(WORKING_DIR "${WORKSPACE}" DIRECTORY) + set(ENV{PWD} "${WORKING_DIR}") message(STATUS "Building ${TARGET_TRIPLET}-dbg") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${WORKING_DIR} + WORKING_DIRECTORY "${WORKING_DIR}" LOGNAME make-${TARGET_TRIPLET}-dbg ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" LOGNAME make-xml-${TARGET_TRIPLET}-dbg ) endif() @@ -352,20 +358,20 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) message(STATUS "Packaging ${TARGET_TRIPLET}-dbg") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY ${WORKING_DIR} + WORKING_DIRECTORY "${WORKING_DIR}" LOGNAME install-${TARGET_TRIPLET}-dbg ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" LOGNAME install-xml-${TARGET_TRIPLET}-dbg ) endif() - file(COPY ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug) + file(COPY "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") - file(GLOB _pkg_components ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc) + file(GLOB _pkg_components "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") foreach(_pkg_comp ${_pkg_components}) file(READ ${_pkg_comp} _content) string(REPLACE "libdir=${CURRENT_PACKAGES_DIR}/lib" "libdir=${CURRENT_PACKAGES_DIR}/debug/lib" _content ${_content}) @@ -375,13 +381,13 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} realclean - WORKING_DIRECTORY ${WORKING_DIR} + WORKING_DIRECTORY "${WORKING_DIR}" LOGNAME realclean-${TARGET_TRIPLET}-dbg ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} realclean - WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" LOGNAME realclean-xml-${TARGET_TRIPLET}-dbg ) endif() @@ -389,13 +395,13 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) message(STATUS "Building ${TARGET_TRIPLET}-rel") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${WORKING_DIR} + WORKING_DIRECTORY "${WORKING_DIR}" LOGNAME make-${TARGET_TRIPLET}-rel ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" LOGNAME make-xml-${TARGET_TRIPLET}-rel ) endif() @@ -403,26 +409,26 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) message(STATUS "Packaging ${TARGET_TRIPLET}-rel") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY ${WORKING_DIR} + WORKING_DIRECTORY "${WORKING_DIR}" LOGNAME install-${TARGET_TRIPLET}-rel ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" LOGNAME install-xml-${TARGET_TRIPLET}-rel ) endif() if("tao" IN_LIST FEATURES) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() message(STATUS "Packaging ${TARGET_TRIPLET}-rel done") # Restore `PWD` environment variable set($ENV{PWD} _prev_env) # Handle copyright - file(INSTALL ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + file(INSTALL "${ACE_ROOT}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/ace/bin/MakeProjectCreator") file(REMOVE "${CURRENT_PACKAGES_DIR}/share/ace/ace-devel.sh") diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 35177021d5ace1..3d2ff0a718eb64 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,10 +1,11 @@ { "name": "ace", - "version": "7.0.5", - "port-version": 1, + "version": "7.0.6", + "port-version": 3, "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html", + "license": "DOC", "features": { "ssl": { "description": "Enable SSL/TLS features in ACE", diff --git a/ports/activemq-cpp/portfile.cmake b/ports/activemq-cpp/portfile.cmake index 4700c5c3df60f4..0645eaf234241e 100644 --- a/ports/activemq-cpp/portfile.cmake +++ b/ports/activemq-cpp/portfile.cmake @@ -1,28 +1,37 @@ -vcpkg_fail_port_install( ON_TARGET "uwp" "osx") - set(VERSION 3.9.5) +set(PATCHES ) +if (NOT VCPKG_TARGET_IS_LINUX) + set(PATCHES FunctionLevelLinkingOn.diff) + if(VCPKG_CRT_LINKAGE STREQUAL "static") + list(APPEND PATCHES fix-crt-linkage.patch) + else() + list(APPEND PATCHES fix-crt-linkage-dyn.patch) + endif() +endif() + vcpkg_download_distfile(ARCHIVE URLS "https://www.apache.org/dist/activemq/activemq-cpp/${VERSION}/activemq-cpp-library-${VERSION}-src.tar.bz2" FILENAME "activemq-cpp-library-${VERSION}-src.tar.bz2" SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2 ) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES ${PATCHES} +) -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - ) - +if (VCPKG_TARGET_IS_LINUX) vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG OPTIONS "--with-openssl=${CURRENT_INSTALLED_DIR}" - "--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr" + "--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr" ) vcpkg_install_make() + file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/activemq" "${CURRENT_PACKAGES_DIR}/include/activemq") file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/cms" "${CURRENT_PACKAGES_DIR}/include/cms") file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/decaf" "${CURRENT_PACKAGES_DIR}/include/decaf") @@ -30,19 +39,6 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") vcpkg_copy_pdbs() else() - set(PATCHES FunctionLevelLinkingOn.diff) - if(VCPKG_CRT_LINKAGE STREQUAL "static") - list(APPEND PATCHES fix-crt-linkage.patch) - else() - list(APPEND PATCHES fix-crt-linkage-dyn.patch) - endif() - - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES ${PATCHES} - ) - set(ACTIVEMQCPP_MSVC_PROJ "${SOURCE_PATH}/vs2010-build/activemq-cpp.vcxproj") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ACTIVEMQCPP_SHARED_LIB) diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json index 9a804bf4bf7487..c2bdb9c173f615 100644 --- a/ports/activemq-cpp/vcpkg.json +++ b/ports/activemq-cpp/vcpkg.json @@ -1,10 +1,14 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 5, + "port-version": 8, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "supports": "!(uwp | osx)", "dependencies": [ - "apr" + "apr", + { + "name": "libuuid", + "platform": "!windows & !osx" + } ] } diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index e91bbd88f95e35..4c6a52472b46ee 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali diff --git a/ports/akali/vcpkg.json b/ports/akali/vcpkg.json index fb1cc78517e26e..1977d5a26f2e16 100644 --- a/ports/akali/vcpkg.json +++ b/ports/akali/vcpkg.json @@ -1,7 +1,7 @@ { "name": "akali", "version-string": "1.42", - "port-version": 2, + "port-version": 3, "description": "C++ Common Library.", "homepage": "https://github.com/winsoft666/akali", "supports": "!(arm | arm64 | uwp)" diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 7723a9b34f001a..2415acdcea46d2 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -1,8 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_ARCH "x86") # see https://github.com/alembic/alembic/issues/372 -endif() - vcpkg_buildpath_length_warning(37) vcpkg_from_github( diff --git a/ports/alembic/vcpkg.json b/ports/alembic/vcpkg.json index 52a28dae10ea40..cbc9fc27fecbe5 100644 --- a/ports/alembic/vcpkg.json +++ b/ports/alembic/vcpkg.json @@ -1,6 +1,7 @@ { "name": "alembic", "version": "1.8.3", + "port-version": 1, "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/0001-control-empty-fix-the-static-build.patch b/ports/alsa/0001-control-empty-fix-the-static-build.patch deleted file mode 100644 index c5ec3d124ac1ac..00000000000000 --- a/ports/alsa/0001-control-empty-fix-the-static-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 81e7923fbfad45b2f353a4d6e3053af51f5f7d0b Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 15 Jun 2021 23:21:42 +0200 -Subject: [PATCH] control: empty - fix the static build - -Reported-by: Jan Palus -Fixes: https://github.com/alsa-project/alsa-lib/issues/157 -Signed-off-by: Jaroslav Kysela ---- - src/control/control_empty.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/control/control_empty.c b/src/control/control_empty.c -index 49d1026c..c9b048c1 100644 ---- a/src/control/control_empty.c -+++ b/src/control/control_empty.c -@@ -30,7 +30,7 @@ - - #ifndef PIC - /* entry for static linking */ --const char *_snd_module_ctl_empty = ""; -+const char *_snd_module_control_empty = ""; - #endif - - /*! \page control_plugins --- -2.33.0 - diff --git a/ports/alsa/portfile.cmake b/ports/alsa/portfile.cmake index c0e6f2f3dacc6d..4b998055a27a2f 100644 --- a/ports/alsa/portfile.cmake +++ b/ports/alsa/portfile.cmake @@ -11,11 +11,9 @@ These can be installed on Ubuntu systems via sudo apt install autoconf libtool" vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alsa-project/alsa-lib - REF v1.2.5.1 - SHA512 1c8613e520bd24ec2332b677a35d1c49171781f6408be61c79ec90d143d424d8df6e1c9e22e082d331022e0fe858145f7ea214a7b731ed5e306762194b49d50e + REF v1.2.6.1 + SHA512 d1de9112ec0d600db6e5a20b558811a7a9f34d00a9b1dfb5332669b73732c1c1b8ddda57368edc199e255eba8bcb8a6767b4d9325c9860ade02d84dcaac6eb47 HEAD_REF master - PATCHES - 0001-control-empty-fix-the-static-build.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/alsa/vcpkg.json b/ports/alsa/vcpkg.json index 6590e42eb6a6df..58535469ce8c4b 100644 --- a/ports/alsa/vcpkg.json +++ b/ports/alsa/vcpkg.json @@ -1,7 +1,8 @@ { "name": "alsa", - "version": "1.2.5.1", + "version": "1.2.6.1", "description": "The Advanced Linux Sound Architecture (ALSA) - library", "homepage": "https://www.alsa-project.org/", + "license": "LGPL-2.1-or-later", "supports": "linux" } diff --git a/ports/ampl-asl/portfile.cmake b/ports/ampl-asl/portfile.cmake index 96af62c254b2b1..fb6c664ca44fbf 100644 --- a/ports/ampl-asl/portfile.cmake +++ b/ports/ampl-asl/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ampl/asl @@ -15,9 +13,8 @@ vcpkg_from_github( install-targets.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_MCMODELLARGE=OFF -DBUILD_DYNRT_LIBS=OFF # CRT linkage uses C/CXX FLAGS in vcpkg @@ -25,13 +22,13 @@ vcpkg_configure_cmake( -DBUILD_CPP=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-asl TARGET_PATH share/unofficial-asl) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-asl) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # from ampl-mp license -file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/ampl-asl/vcpkg.json b/ports/ampl-asl/vcpkg.json index 5a9827dfdb2596..4b5c163b292b61 100644 --- a/ports/ampl-asl/vcpkg.json +++ b/ports/ampl-asl/vcpkg.json @@ -1,8 +1,19 @@ { "name": "ampl-asl", - "version-string": "2020-11-11", - "port-version": 1, + "version-date": "2020-11-11", + "port-version": 3, "description": "AMPL Solver Library", "homepage": "https://github.com/ampl/asl", - "supports": "!uwp" + "license": null, + "supports": "!uwp & !(osx & arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/ampl-mp/portfile.cmake b/ports/ampl-mp/portfile.cmake index 730e687e62bf2d..701298a2ff643b 100644 --- a/ports/ampl-mp/portfile.cmake +++ b/ports/ampl-mp/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ampl/mp @@ -49,4 +47,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ) -configure_file(${SOURCE_PATH}/LICENSE.rst ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) \ No newline at end of file +configure_file(${SOURCE_PATH}/LICENSE.rst ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/ampl-mp/vcpkg.json b/ports/ampl-mp/vcpkg.json index 8e97a5ce05982a..bc017ae1556549 100644 --- a/ports/ampl-mp/vcpkg.json +++ b/ports/ampl-mp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ampl-mp", "version-string": "2020-11-11", - "port-version": 1, + "port-version": 2, "description": "An open-source library for mathematical programming", "homepage": "https://github.com/ampl/mp", "supports": "!uwp", diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake index b4a0a110e02d85..4b616f9b86ed57 100644 --- a/ports/amqpcpp/portfile.cmake +++ b/ports/amqpcpp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/amqpcpp/vcpkg.json b/ports/amqpcpp/vcpkg.json index c34f008483c073..2fe066c649366d 100644 --- a/ports/amqpcpp/vcpkg.json +++ b/ports/amqpcpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "amqpcpp", "version": "4.3.15", + "port-version": 1, "description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker", "homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP", "supports": "!uwp", diff --git a/ports/anax/osx-arm.patch b/ports/anax/osx-arm.patch new file mode 100644 index 00000000000000..450cd82e200371 --- /dev/null +++ b/ports/anax/osx-arm.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d427767..80965bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,10 +154,6 @@ set_target_properties(${ANAX_LIBRARY_NAME} PROPERTIES + SOVERSION ${ANAX_VERSION_MAJOR} + ) + +-if(APPLE) +- set_target_properties(${ANAX_LIBRARY_NAME} PROPERTIES OSX_ARCHITECTURES "i386;x86_64;") +-endif() +- + # Library files + install( + TARGETS ${ANAX_LIBRARY_NAME} diff --git a/ports/anax/portfile.cmake b/ports/anax/portfile.cmake index 411e0483078f4a..56c9156b8daa98 100644 --- a/ports/anax/portfile.cmake +++ b/ports/anax/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( HEAD_REF master PATCHES Add-bin-output.patch + osx-arm.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/anax) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/anax/LICENSE ${CURRENT_PACKAGES_DIR}/share/anax/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/anax/vcpkg.json b/ports/anax/vcpkg.json index 1b44cd38d6e519..fbaeb17bbe40e1 100644 --- a/ports/anax/vcpkg.json +++ b/ports/anax/vcpkg.json @@ -1,7 +1,14 @@ { "name": "anax", - "version-string": "2.1.0", - "port-version": 7, + "version": "2.1.0", + "port-version": 8, "description": "An open source C++ entity system.", - "homepage": "https://github.com/miguelmartin75/anax" + "homepage": "https://github.com/miguelmartin75/anax", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/antlr4/export_guid.patch b/ports/antlr4/export_guid.patch index 4974718a7a355d..053a6e236122e9 100644 --- a/ports/antlr4/export_guid.patch +++ b/ports/antlr4/export_guid.patch @@ -1,22 +1,22 @@ -diff -urN a/runtime/src/support/guid.h b/runtime/src/support/guid.h ---- a/runtime/src/support/guid.h -+++ b/runtime/src/support/guid.h -@@ -38,7 +38,7 @@ +diff -urN a/runtime/src/support/Guid.h b/runtime/src/support/Guid.h +--- a/runtime/src/support/Guid.h ++++ b/runtime/src/support/Guid.h +@@ -42,7 +42,7 @@ namespace antlrcpp { // 16 byte value that can be passed around by value. It also supports // conversion to string (via the stream operator <<) and conversion from a // string via constructor. --class Guid -+class ANTLR4CPP_PUBLIC Guid - { +-class Guid final { ++class ANTLR4CPP_PUBLIC Guid final { public: - -@@ -90,7 +90,7 @@ + using size_type = typename std::array::size_type; + using pointer = typename std::array::pointer; +@@ -131,7 +131,7 @@ private: // function would no longer be cross-platform if we parameterized the android // version. Instead, construction of the GuidGenerator may be different on // each platform, but the use of newGuid is uniform. --class GuidGenerator -+class ANTLR4CPP_PUBLIC GuidGenerator - { +-class GuidGenerator final { ++class ANTLR4CPP_PUBLIC GuidGenerator final { public: #ifdef GUID_ANDROID - \ No newline at end of file + GuidGenerator(JNIEnv *env); + diff --git a/ports/antlr4/fix_utfcpp_dependency.patch b/ports/antlr4/fix_utfcpp_dependency.patch index 629e12f38ec2c9..a055df4707b617 100644 --- a/ports/antlr4/fix_utfcpp_dependency.patch +++ b/ports/antlr4/fix_utfcpp_dependency.patch @@ -1,45 +1,31 @@ -diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt -index a8503bb61..e7b01b7cb 100644 +diff -urN a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt -@@ -1,17 +1,3 @@ +@@ -51,27 +51,6 @@ else() + + if (utf8cpp_HEADER) + include_directories(${utf8cpp_HEADER}) +- else() +- include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) +- set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty) +- set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp) +- ExternalProject_Add( +- utf8cpp +- GIT_REPOSITORY "https://github.com/nemtrif/utfcpp" +- GIT_TAG "v3.1.1" +- SOURCE_DIR ${UTFCPP_DIR} +- UPDATE_DISCONNECTED 1 +- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -DUTF8_TESTS=off -DUTF8_SAMPLES=off +- STEP_TARGETS build) - --include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) +- include_directories( +- ${UTFCPP_DIR}/install/include/utf8cpp +- ${UTFCPP_DIR}/install/include/utf8cpp/utf8 +- ) - --set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty) --set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp) --ExternalProject_Add( -- utfcpp -- GIT_REPOSITORY "git://github.com/nemtrif/utfcpp" -- GIT_TAG "v3.1.1" -- SOURCE_DIR ${UTFCPP_DIR} -- UPDATE_DISCONNECTED 1 -- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -Dgtest_force_shared_crt=ON -- TEST_AFTER_INSTALL 1 -- STEP_TARGETS build) - - - include_directories( -@@ -23,8 +13,6 @@ include_directories( - ${PROJECT_SOURCE_DIR}/runtime/src/tree - ${PROJECT_SOURCE_DIR}/runtime/src/tree/pattern - ${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath -- ${UTFCPP_DIR}/install/include/utf8cpp -- ${UTFCPP_DIR}/install/include/utf8cpp/utf8 - ) - - -@@ -131,13 +119,6 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/" - FILES_MATCHING PATTERN "*.h" - ) - --install(FILES "${UTFCPP_DIR}/source/utf8.h" -- DESTINATION "include/antlr4-runtime") --install(DIRECTORY "${UTFCPP_DIR}/source/utf8" -- DESTINATION "include/antlr4-runtime" -- COMPONENT dev -- FILES_MATCHING PATTERN "*.h" -- ) - - +- add_dependencies(antlr4_shared utf8cpp) +- add_dependencies(antlr4_static utf8cpp) +- set(INSTALL_utf8cpp TRUE) + endif() + endif() diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 1770cabfc1dcac..312bb688150fc9 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -1,11 +1,9 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - -set(VERSION 4.9.1) +set(VERSION 4.9.3) vcpkg_download_distfile(ARCHIVE - URLS "http://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip" + URLS "https://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip" FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip" - SHA512 fe33005f73f8d408fcea8ebab62c0def119bbe0c075f04a66404d0df258126eb6caf0a8bbac34d5c4c9e79d4aa8896f32698a560d4be7d71a32dcc3457245cee + SHA512 23995a6fa661ff038142fa7220a195db3a9a26744d516011dedc3192f152b06a8e31f6cc8f969f8927b86392a960d03e89572e753f033f950839a5bd38d4c722 ) # license not exist in antlr folder. @@ -20,21 +18,20 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} NO_REMOVE_ONE_LEVEL REF ${VERSION} - PATCHES + PATCHES fixed_build.patch uuid_discovery_fix.patch export_guid.patch fix_utfcpp_dependency.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS_DEBUG -DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/dist OPTIONS_RELEASE -DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/dist ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/debug/share diff --git a/ports/antlr4/uuid_discovery_fix.patch b/ports/antlr4/uuid_discovery_fix.patch index 818a9307be9f45..9221d296ca408e 100644 --- a/ports/antlr4/uuid_discovery_fix.patch +++ b/ports/antlr4/uuid_discovery_fix.patch @@ -1,9 +1,9 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -40,8 +40,10 @@ +@@ -42,8 +42,10 @@ if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR endif() - + if(CMAKE_SYSTEM_NAME MATCHES "Linux") - find_package(PkgConfig REQUIRED) - pkg_check_modules(UUID REQUIRED uuid) @@ -14,15 +14,22 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt endif() if(APPLE) find_library(COREFOUNDATION_LIBRARY CoreFoundation) -diff -urN a/runtime/src/support/guid.cpp b/runtime/src/support/guid.cpp ---- a/runtime/src/support/guid.cpp -+++ b/runtime/src/support/guid.cpp -@@ -22,6 +22,7 @@ - THE SOFTWARE. - */ - +diff --git a/runtime/src/support/Guid.cpp b/runtime/src/support/Guid.cpp +--- a/runtime/src/support/Guid.cpp ++++ b/runtime/src/support/Guid.cpp +@@ -24,6 +24,7 @@ + + #include + +#include "antlr4-common.h" - #include "guid.h" - + #include "Guid.h" + #ifdef GUID_LIBUUID - \ No newline at end of file +@@ -35,6 +36,7 @@ + #endif + + #ifdef GUID_WINDOWS ++#define NOMINMAX + #include + #endif + diff --git a/ports/antlr4/vcpkg.json b/ports/antlr4/vcpkg.json index 22a33dc30588e8..442ba951507d82 100644 --- a/ports/antlr4/vcpkg.json +++ b/ports/antlr4/vcpkg.json @@ -1,6 +1,6 @@ { "name": "antlr4", - "version-string": "4.9.1", + "version": "4.9.3", "port-version": 1, "description": "ANother Tool for Language Recognition", "homepage": "https://www.antlr.org", @@ -9,6 +9,10 @@ { "name": "libuuid", "platform": "!uwp & !windows & !osx" + }, + { + "name": "vcpkg-cmake", + "host": true } ] } diff --git a/ports/aom/aom-uninitialized-pointer.diff b/ports/aom/aom-uninitialized-pointer.diff new file mode 100644 index 00000000000000..b80f2e08ffa328 --- /dev/null +++ b/ports/aom/aom-uninitialized-pointer.diff @@ -0,0 +1,13 @@ +diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake +index 43d60ae..35c510b 100644 +--- a/build/cmake/aom_configure.cmake ++++ b/build/cmake/aom_configure.cmake +@@ -265,6 +265,8 @@ if(MSVC) + + # Disable MSVC warnings that suggest making code non-portable. + add_compiler_flag_if_supported("/wd4996") ++ # Disable MSVC warnings for potentially uninitialized local pointer variable. ++ add_compiler_flag_if_supported("/wd4703") + if(ENABLE_WERROR) + add_compiler_flag_if_supported("/WX") + endif() diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake index aaad140a9971e1..2daeebea5cfe4f 100644 --- a/ports/aom/portfile.cmake +++ b/ports/aom/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "UWP") - # NASM is required to build AOM vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) @@ -19,6 +17,7 @@ vcpkg_from_git( aom-rename-static.diff # Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream aom-install.diff + aom-uninitialized-pointer.diff ) vcpkg_cmake_configure( @@ -46,5 +45,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index 4c129276311c9c..76a736ad033b11 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aom", "version-semver": "3.2.0", - "port-version": 1, + "port-version": 2, "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", - "supports": "!uwp & !arm", + "supports": "!(windows & arm & !uwp)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/approval-tests-cpp/portfile.cmake b/ports/approval-tests-cpp/portfile.cmake index aa0ed552e47b14..38eaf3acb79d0a 100644 --- a/ports/approval-tests-cpp/portfile.cmake +++ b/ports/approval-tests-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_download_distfile(single_header - URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.12.1/ApprovalTests.v.10.12.1.hpp - FILENAME ApprovalTests.v.10.12.1.hpp - SHA512 80921b8334c4c48380306a285e4f18f55872bced7a5f7f4c1a9db9c4fbd1cebf7c0ed8cca28e80b3024e34e2b41799976b1d36ecbf8d40e2bcfe45efab20d138 + URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.12.2/ApprovalTests.v.10.12.2.hpp + FILENAME ApprovalTests.v.10.12.2.hpp + SHA512 ed59736f52afff246409dcf435ad12a8f15697ae80962c456ca877fbf8adcb99af1bb71424ebcb214df719506015aac27006c1cfec174700b1833db64efb3568 ) vcpkg_download_distfile(license_file - URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.12.1/LICENSE - FILENAME ApprovalTestsLicense.v.10.12.1 + URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.12.2/LICENSE + FILENAME ApprovalTestsLicense.v.10.12.2 SHA512 dc6b68d13b8cf959644b935f1192b02c71aa7a5cf653bd43b4480fa89eec8d4d3f16a2278ec8c3b40ab1fdb233b3173a78fd83590d6f739e0c9e8ff56c282557 ) diff --git a/ports/approval-tests-cpp/vcpkg.json b/ports/approval-tests-cpp/vcpkg.json index 2af427ab1274ac..a57ee3113679c1 100644 --- a/ports/approval-tests-cpp/vcpkg.json +++ b/ports/approval-tests-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "approval-tests-cpp", - "version": "10.12.1", + "version": "10.12.2", "description": "Approval Tests allow you to verify a chunk of output (such as a file) in one operation as opposed to writing test assertions for each element.", "homepage": "https://github.com/approvals/ApprovalTests.cpp" } diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake index befefb4fca2ea2..d50966c4e761b6 100644 --- a/ports/apr-util/portfile.cmake +++ b/ports/apr-util/portfile.cmake @@ -1,5 +1,5 @@ vcpkg_download_distfile(ARCHIVE - URLS "http://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2" + URLS "https://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2" FILENAME "apr-util-1.6.1.tar.bz2" SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d @@ -63,7 +63,6 @@ else() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - NO_DEBUG OPTIONS "--prefix=${CURRENT_INSTALLED_DIR}" "--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr" diff --git a/ports/apr-util/vcpkg.json b/ports/apr-util/vcpkg.json index 7398beb9caa9e1..0dbff727e0cade 100644 --- a/ports/apr-util/vcpkg.json +++ b/ports/apr-util/vcpkg.json @@ -1,7 +1,7 @@ { "name": "apr-util", - "version-string": "1.6.1", - "port-version": 5, + "version": "1.6.1", + "port-version": 7, "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/", "dependencies": [ diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 1061497a5a0191..eb0fc8708f93e8 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -64,7 +64,6 @@ else() set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration") vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - NO_DEBUG OPTIONS "--prefix=${CURRENT_INSTALLED_DIR}" "${CONFIGURE_PARAMETER_1}" @@ -83,7 +82,11 @@ else() vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread rt dl uuid crypt) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}\"" "`dirname $0`/../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\"" "") endif() # Handle copyright diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index 67bca3b0a77f2f..afeff1d238ef21 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "apr", "version": "1.7.0", - "port-version": 5, + "port-version": 7, "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/", "supports": "!uwp", diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake index 5002c99a028370..5000897913c71f 100644 --- a/ports/apsi/portfile.cmake +++ b/ports/apsi/portfile.cmake @@ -1,9 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if("hexl" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/APSI diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json index 97792cc04d4bff..29b3035dff8829 100644 --- a/ports/apsi/vcpkg.json +++ b/ports/apsi/vcpkg.json @@ -1,9 +1,10 @@ { "name": "apsi", "version-semver": "0.7.0", + "port-version": 2, "description": "APSI is a research library for asymmetric private set intersection.", "homepage": "https://github.com/microsoft/APSI", - "supports": "static", + "supports": "static & !(arm & osx)", "dependencies": [ "flatbuffers", "jsoncpp", diff --git a/ports/arcus/portfile.cmake b/ports/arcus/portfile.cmake index d2777742ba946f..c85b0f73f90800 100644 --- a/ports/arcus/portfile.cmake +++ b/ports/arcus/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ultimaker/libArcus @@ -28,4 +26,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME Arcus CONFIG_PATH lib/cmake/Arcus) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) \ No newline at end of file +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/arcus/vcpkg.json b/ports/arcus/vcpkg.json index bf7b6b4db1d42b..356415b524ca12 100644 --- a/ports/arcus/vcpkg.json +++ b/ports/arcus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arcus", "version-semver": "4.10.0", - "port-version": 1, + "port-version": 2, "description": "This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library.", "homepage": "https://github.com/Ultimaker/libArcus", "supports": "!uwp", diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index c5d72826d98d59..30030dcd8e65b0 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -41,6 +41,13 @@ if(SHARE_LEN EQUAL 0) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Armadillo") endif() +set(filename "${CURRENT_PACKAGES_DIR}/include/armadillo_bits/config.hpp") +if(EXISTS "${filename}") + file(READ "${filename}" contents) + string(REGEX REPLACE "\n#define ARMA_AUX_LIBS [^\\n]*\n" "\n" contents "${contents}") + file(WRITE "${filename}" "${contents}") +endif() + file(COPY "${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) diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index 02e934e2000ee4..7cceca21897898 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "armadillo", "version": "10.6.2", - "port-version": 2, + "port-version": 4, "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use", "homepage": "http://arma.sourceforge.net", "dependencies": [ diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch index a9b3a26280cabe..45624f168983f8 100644 --- a/ports/arrow/all.patch +++ b/ports/arrow/all.patch @@ -1,5 +1,5 @@ diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake -index cd8290d1b..12c52c184 100644 +index 391c43e0a..50f6d3d3c 100644 --- a/cpp/cmake_modules/BuildUtils.cmake +++ b/cpp/cmake_modules/BuildUtils.cmake @@ -427,7 +427,7 @@ function(ADD_ARROW_LIB LIB_NAME) diff --git a/ports/arrow/fix-dependencies.patch b/ports/arrow/fix-dependencies.patch index 3e22d18019e74b..e9b740df9ff9aa 100644 --- a/ports/arrow/fix-dependencies.patch +++ b/ports/arrow/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index b5a39bf33..af1e16a9b 100644 +index 2d7baf118..ace45d35b 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt -@@ -668,7 +668,7 @@ endif() +@@ -699,7 +699,7 @@ endif() if(ARROW_WITH_BROTLI) # Order is important for static linking @@ -11,7 +11,7 @@ index b5a39bf33..af1e16a9b 100644 list(APPEND ARROW_LINK_LIBS ${ARROW_BROTLI_LIBS}) list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_BROTLI_LIBS}) if(Brotli_SOURCE STREQUAL "SYSTEM") -@@ -684,9 +684,9 @@ if(ARROW_WITH_BZ2) +@@ -715,9 +715,9 @@ if(ARROW_WITH_BZ2) endif() if(ARROW_WITH_LZ4) @@ -23,7 +23,7 @@ index b5a39bf33..af1e16a9b 100644 endif() endif() -@@ -735,10 +735,10 @@ if(ARROW_S3) +@@ -787,10 +787,10 @@ if(ARROW_WITH_OPENTELEMETRY) endif() if(ARROW_WITH_UTF8PROC) @@ -38,7 +38,7 @@ index b5a39bf33..af1e16a9b 100644 endif() diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake -index e6852d9c2..fc0973ffa 100644 +index bc389521b..1b358ce70 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES @@ -50,15 +50,16 @@ index e6852d9c2..fc0973ffa 100644 BZip2 c-ares gflags -@@ -61,14 +61,14 @@ set(ARROW_THIRDPARTY_DEPENDENCIES +@@ -62,7 +62,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES gRPC GTest LLVM - Lz4 + lz4 + opentelemetry-cpp ORC re2 - Protobuf +@@ -70,7 +70,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES RapidJSON Snappy Thrift @@ -67,7 +68,26 @@ index e6852d9c2..fc0973ffa 100644 xsimd ZLIB zstd) -@@ -945,7 +945,7 @@ macro(build_snappy) +@@ -893,17 +893,7 @@ set(Boost_ADDITIONAL_VERSIONS + # so we first need to determine whether we're building it + if(ARROW_WITH_THRIFT AND Thrift_SOURCE STREQUAL "AUTO") + find_package(Thrift 0.11.0 MODULE COMPONENTS ${ARROW_THRIFT_REQUIRED_COMPONENTS}) +- if(Thrift_FOUND) +- find_package(PkgConfig QUIET) +- pkg_check_modules(THRIFT_PC +- thrift +- NO_CMAKE_PATH +- NO_CMAKE_ENVIRONMENT_PATH +- QUIET) +- if(THRIFT_PC_FOUND) +- string(APPEND ARROW_PC_REQUIRES_PRIVATE " thrift") +- endif() +- else() ++ if(NOT Thrift_FOUND AND NOT THRIFT_FOUND) + set(Thrift_SOURCE "BUNDLED") + endif() + endif() +@@ -1038,7 +1028,7 @@ macro(build_snappy) endmacro() if(ARROW_WITH_SNAPPY) @@ -76,7 +96,7 @@ index e6852d9c2..fc0973ffa 100644 if(${Snappy_SOURCE} STREQUAL "SYSTEM" AND NOT snappy_PC_FOUND) get_target_property(SNAPPY_LIB Snappy::snappy IMPORTED_LOCATION) string(APPEND ARROW_PC_LIBS_PRIVATE " ${SNAPPY_LIB}") -@@ -1014,10 +1014,16 @@ macro(build_brotli) +@@ -1108,10 +1098,16 @@ macro(build_brotli) endmacro() if(ARROW_WITH_BROTLI) @@ -96,7 +116,7 @@ index e6852d9c2..fc0973ffa 100644 include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) endif() -@@ -1133,7 +1139,7 @@ macro(build_glog) +@@ -1228,7 +1224,7 @@ macro(build_glog) endmacro() if(ARROW_USE_GLOG) @@ -105,7 +125,7 @@ index e6852d9c2..fc0973ffa 100644 # TODO: Don't use global includes but rather target_include_directories get_target_property(GLOG_INCLUDE_DIR glog::glog INTERFACE_INCLUDE_DIRECTORIES) include_directories(SYSTEM ${GLOG_INCLUDE_DIR}) -@@ -1206,8 +1212,7 @@ endmacro() +@@ -1302,8 +1298,7 @@ endmacro() if(ARROW_NEED_GFLAGS) set(ARROW_GFLAGS_REQUIRED_VERSION "2.1.0") resolve_dependency(gflags @@ -115,15 +135,34 @@ index e6852d9c2..fc0973ffa 100644 REQUIRED_VERSION ${ARROW_GFLAGS_REQUIRED_VERSION} IS_RUNTIME_DEPENDENCY -@@ -1309,6 +1314,7 @@ if(ARROW_WITH_THRIFT) - if(NOT Thrift_FOUND AND NOT THRIFT_FOUND) +@@ -1402,9 +1397,10 @@ endmacro() + if(ARROW_WITH_THRIFT) + # We already may have looked for Thrift earlier, when considering whether + # to build Boost, so don't look again if already found. +- if(NOT Thrift_FOUND) ++ if(TRUE) # Thrift c++ code generated by 0.13 requires 0.11 or greater resolve_dependency(Thrift + USE_CONFIG TRUE REQUIRED_VERSION 0.11.0 PC_PACKAGE_NAMES -@@ -1413,6 +1419,7 @@ if(ARROW_WITH_PROTOBUF) +@@ -1413,6 +1409,14 @@ if(ARROW_WITH_THRIFT) + # TODO: Don't use global includes but rather target_include_directories + include_directories(SYSTEM ${THRIFT_INCLUDE_DIR}) + ++ if(THRIFT_INCLUDE_DIR) ++ file(READ "${THRIFT_INCLUDE_DIR}/config.h" THRIFT_CONFIG_H_CONTENT) ++ string(REGEX MATCH "#define PACKAGE_VERSION \"[0-9.]+\"" THRIFT_VERSION_DEFINITION ++ "${THRIFT_CONFIG_H_CONTENT}") ++ string(REGEX MATCH "[0-9.]+" THRIFT_VERSION "${THRIFT_VERSION_DEFINITION}") ++ set(THRIFT_VERSION "${THRIFT_VERSION}") ++ endif() ++ + string(REPLACE "." ";" VERSION_LIST ${THRIFT_VERSION}) + list(GET VERSION_LIST 0 THRIFT_VERSION_MAJOR) + list(GET VERSION_LIST 1 THRIFT_VERSION_MINOR) +@@ -1528,6 +1532,7 @@ if(ARROW_WITH_PROTOBUF) set(ARROW_PROTOBUF_REQUIRED_VERSION "2.6.1") endif() resolve_dependency(Protobuf @@ -131,7 +170,7 @@ index e6852d9c2..fc0973ffa 100644 REQUIRED_VERSION ${ARROW_PROTOBUF_REQUIRED_VERSION} PC_PACKAGE_NAMES -@@ -1423,6 +1430,10 @@ if(ARROW_WITH_PROTOBUF) +@@ -1538,6 +1543,10 @@ if(ARROW_WITH_PROTOBUF) endif() # TODO: Don't use global includes but rather target_include_directories @@ -142,7 +181,7 @@ index e6852d9c2..fc0973ffa 100644 include_directories(SYSTEM ${PROTOBUF_INCLUDE_DIR}) if(TARGET arrow::protobuf::libprotobuf) -@@ -1471,12 +1482,18 @@ if(ARROW_WITH_PROTOBUF) +@@ -1586,12 +1595,18 @@ if(ARROW_WITH_PROTOBUF) # Log protobuf paths as we often see issues with mixed sources for # the libraries and protoc. @@ -161,7 +200,7 @@ index e6852d9c2..fc0973ffa 100644 message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") endif() -@@ -1889,7 +1906,7 @@ endmacro() +@@ -2001,7 +2016,7 @@ endmacro() if(ARROW_WITH_RAPIDJSON) set(ARROW_RAPIDJSON_REQUIRED_VERSION "1.1.0") resolve_dependency(RapidJSON @@ -170,7 +209,7 @@ index e6852d9c2..fc0973ffa 100644 TRUE REQUIRED_VERSION ${ARROW_RAPIDJSON_REQUIRED_VERSION} -@@ -2024,10 +2041,11 @@ macro(build_lz4) +@@ -2140,10 +2155,11 @@ macro(build_lz4) endmacro() if(ARROW_WITH_LZ4) @@ -184,7 +223,7 @@ index e6852d9c2..fc0973ffa 100644 include_directories(SYSTEM ${LZ4_INCLUDE_DIR}) endif() -@@ -2090,7 +2108,7 @@ endmacro() +@@ -2207,7 +2223,7 @@ endmacro() if(ARROW_WITH_ZSTD) # ARROW-13384: ZSTD_minCLevel was added in v1.4.0, required by ARROW-13091 resolve_dependency(zstd @@ -193,7 +232,7 @@ index e6852d9c2..fc0973ffa 100644 libzstd REQUIRED_VERSION 1.4.0) -@@ -2262,9 +2280,8 @@ macro(build_utf8proc) +@@ -2390,9 +2406,8 @@ macro(build_utf8proc) endmacro() if(ARROW_WITH_UTF8PROC) @@ -205,7 +244,7 @@ index e6852d9c2..fc0973ffa 100644 PC_PACKAGE_NAMES libutf8proc) -@@ -2272,7 +2289,7 @@ if(ARROW_WITH_UTF8PROC) +@@ -2400,7 +2415,7 @@ if(ARROW_WITH_UTF8PROC) # TODO: Don't use global definitions but rather # target_compile_definitions or target_link_libraries @@ -214,7 +253,7 @@ index e6852d9c2..fc0973ffa 100644 INTERFACE_COMPILER_DEFINITIONS) if(UTF8PROC_COMPILER_DEFINITIONS) add_definitions(-D${UTF8PROC_COMPILER_DEFINITIONS}) -@@ -2280,7 +2297,7 @@ if(ARROW_WITH_UTF8PROC) +@@ -2408,7 +2423,7 @@ if(ARROW_WITH_UTF8PROC) # TODO: Don't use global includes but rather # target_include_directories or target_link_libraries @@ -223,7 +262,7 @@ index e6852d9c2..fc0973ffa 100644 INTERFACE_INCLUDE_DIRECTORIES) include_directories(SYSTEM ${UTF8PROC_INCLUDE_DIR}) endif() -@@ -2335,7 +2352,7 @@ endmacro() +@@ -3317,7 +3332,7 @@ endmacro() macro(build_grpc) resolve_dependency(c-ares @@ -232,16 +271,16 @@ index e6852d9c2..fc0973ffa 100644 TRUE PC_PACKAGE_NAMES libcares) -@@ -2600,7 +2617,7 @@ endmacro() - if(ARROW_WITH_GRPC) - set(ARROW_GRPC_REQUIRED_VERSION "1.17.0") +@@ -3555,7 +3570,7 @@ if(ARROW_WITH_GRPC) + set(gRPC_SOURCE "${Protobuf_SOURCE}") + endif() resolve_dependency(gRPC - HAVE_ALT + USE_CONFIG TRUE REQUIRED_VERSION ${ARROW_GRPC_REQUIRED_VERSION} -@@ -2610,6 +2627,10 @@ if(ARROW_WITH_GRPC) +@@ -3565,6 +3580,10 @@ if(ARROW_WITH_GRPC) # TODO: Don't use global includes but rather target_include_directories get_target_property(GRPC_INCLUDE_DIR gRPC::grpc++ INTERFACE_INCLUDE_DIRECTORIES) include_directories(SYSTEM ${GRPC_INCLUDE_DIR}) @@ -252,11 +291,21 @@ index e6852d9c2..fc0973ffa 100644 if(GRPC_VENDORED) set(GRPCPP_PP_INCLUDE TRUE) +@@ -4315,7 +4334,8 @@ if(ARROW_S3) + s3 + transfer + identity-management +- sts) ++ sts ++ CONFIG) + endif() + + # Restore previous value of BUILD_SHARED_LIBS diff --git a/cpp/src/arrow/adapters/orc/CMakeLists.txt b/cpp/src/arrow/adapters/orc/CMakeLists.txt -index ca901b07d..4512a175f 100644 +index b1b6847cf..444a45e4e 100644 --- a/cpp/src/arrow/adapters/orc/CMakeLists.txt +++ b/cpp/src/arrow/adapters/orc/CMakeLists.txt -@@ -29,7 +29,7 @@ set(ORC_MIN_TEST_LIBS +@@ -30,7 +30,7 @@ set(ORC_MIN_TEST_LIBS GTest::gtest_main GTest::gtest Snappy::snappy diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 225dd7426c4f67..972be66415ada3 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -1,25 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-5.0.0 - SHA512 68f4377f654423e7ea47c8c0170ddb030d0b020b936ec435854e216392e6515d870287f410d0acd48b36dcfec61be4c4a95794857f1d91c66745f3c6ed748034 + REF apache-arrow-7.0.0 + SHA512 4df480e03dcd85c1c04f93ca55968cf64eb96b4bdb586d9ad3bd1d5ba6d9ec7cca34fefef43d84b921ba74ceaeb48f8ac9d1d1355f2408ebffd2b2a00a3da2bd HEAD_REF master PATCHES all.patch fix-dependencies.patch ) -file(REMOVE ${SOURCE_PATH}/cpp/cmake_modules/Findzstd.cmake - ${SOURCE_PATH}/cpp/cmake_modules/FindBrotli.cmake - ${SOURCE_PATH}/cpp/cmake_modules/Find-c-aresAlt.cmake - ${SOURCE_PATH}/cpp/cmake_modules/FindLz4.cmake - ${SOURCE_PATH}/cpp/cmake_modules/FindSnappy.cmake - ${SOURCE_PATH}/cpp/cmake_modules/FindThrift.cmake - ${SOURCE_PATH}/cpp/cmake_modules/FindGLOG.cmake - ${SOURCE_PATH}/cpp/cmake_modules/Findutf8proc.cmake - ${SOURCE_PATH}/cpp/cmake_modules/FindRapidJSONAlt.cmake - ${SOURCE_PATH}/cpp/cmake_modules/FindgRPCAlt.cmake - ${SOURCE_PATH}/cpp/cmake_modules/FindgflagsAlt.cmake +file(REMOVE "${SOURCE_PATH}/cpp/cmake_modules/Findzstd.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindBrotli.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/Find-c-aresAlt.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindLz4.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindSnappy.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindThrift.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindGLOG.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/Findutf8proc.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindRapidJSONAlt.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindgRPCAlt.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindgflagsAlt.cmake" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -32,6 +32,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS orc ARROW_ORC parquet ARROW_PARQUET parquet PARQUET_REQUIRE_ENCRYPTION + plasma ARROW_PLASMA s3 ARROW_S3 ) @@ -60,11 +61,11 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/cpp - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}/cpp" OPTIONS ${FEATURE_OPTIONS} ${MALLOC_OPTIONS} + ${S3_OPTIONS} -DCMAKE_SYSTEM_PROCESSOR=${VCPKG_TARGET_ARCHITECTURE} -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} @@ -80,24 +81,37 @@ vcpkg_cmake_configure( -DARROW_WITH_ZLIB=ON -DARROW_WITH_ZSTD=ON -DZSTD_MSVC_LIB_PREFIX= + MAYBE_UNUSED_VARIABLES + ZSTD_MSVC_LIB_PREFIX ) vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib") message(FATAL_ERROR "Installed lib file should be named 'arrow.lib' via patching the upstream build.") endif() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/arrow) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY) +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) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(GLOB PARQUET_FILES ${CURRENT_PACKAGES_DIR}/share/${PORT}/Parquet*) +file(COPY ${PARQUET_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/parquet") +file(REMOVE_RECURSE ${PARQUET_FILES}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/FindParquet.cmake ${CURRENT_PACKAGES_DIR}/share/parquet/FindParquet.cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if ("plasma" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES plasma-store-server AUTO_CLEAN) +endif () vcpkg_fixup_pkgconfig() diff --git a/ports/arrow/usage b/ports/arrow/usage new file mode 100644 index 00000000000000..0dcfa79cbcded0 --- /dev/null +++ b/ports/arrow/usage @@ -0,0 +1,7 @@ +The package arrow provides CMake targets: + + find_package(Arrow CONFIG REQUIRED) + target_link_libraries(main PRIVATE ${ARROW_LIBRARIES}) + + find_package(Parquet CONFIG REQUIRED) + target_link_libraries(main PRIVATE ${PARQUET_LIBRARIES}) \ No newline at end of file diff --git a/ports/arrow/vcpkg-cmake-wrapper.cmake b/ports/arrow/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..29d04506e5105f --- /dev/null +++ b/ports/arrow/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET arrow_static) + list(APPEND ARROW_LIBRARIES arrow_static) + list(APPEND PARQUET_LIBRARIES parquet_static) +elseif (TARGET arrow_shared) + list(APPEND ARROW_LIBRARIES arrow_shared) + list(APPEND PARQUET_LIBRARIES parquet_shared) +endif() diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 2f73bca2088ece..1c2b84085435f0 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,9 +1,10 @@ { "name": "arrow", - "version": "5.0.0", + "version": "7.0.0", "port-version": 2, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", + "license": "Apache-2.0", "supports": "x64 | (arm64 & !windows)", "dependencies": [ "boost-filesystem", @@ -74,7 +75,14 @@ ] }, "parquet": { - "description": "Parquet support" + "description": "Parquet support", + "dependencies": [ + "rapidjson" + ] + }, + "plasma": { + "description": "Plasma support", + "supports": "!windows" }, "s3": { "description": "S3 support", diff --git a/ports/ashes/portfile.cmake b/ports/ashes/portfile.cmake index ef2fcf40fd31f2..5b4bb03aa5954e 100644 --- a/ports/ashes/portfile.cmake +++ b/ports/ashes/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "iOS" "Android" ON_ARCH "x86" "arm") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( @@ -7,7 +5,7 @@ vcpkg_from_github( REPO DragonJoker/Ashes REF 0f4e6d0ea308eb60ae32274acc9a4d345a4977ff SHA512 0ce74780786d018e7a447c4e49d3cd83ad53b238a79fc484025e2034cd49a64253363cd592d2da367befa7cd5443b90eb1c5dae54b22756f7b4a0cdecb93c588 - PATCHES + PATCHES fix-cast.patch ) vcpkg_configure_cmake( diff --git a/ports/ashes/vcpkg.json b/ports/ashes/vcpkg.json index cc2567786f3c4a..b2141ba204ee63 100644 --- a/ports/ashes/vcpkg.json +++ b/ports/ashes/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ashes", "version-date": "2021-06-18", + "port-version": 1, "description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.", "homepage": "https://github.com/DragonJoker/Ashes", "supports": "!osx & !linux & !ios & !android & !uwp & !x86 & !arm & !static", diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index ee8bb3c8e2b20f..28b16b55d15a20 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc - REF v1.3.1 - SHA512 c7a9f9c85e0611fd73a827270edf27deefe59b424e6d572efc8b532d305bf41e8fccb24a6507819dca0712f40e1d6abd56a4e6b099dbee729b125b0b610cd4fb + REF v1.4.0 + SHA512 2888c4abd5a531983a647a51971fd09eeb3e9f5bc7d2f95aa10f455d2d0f852367a8b039c867730c604be5e248cb0aacaf55fd0b23d05322c23d94dee719a7ad HEAD_REF master ) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index fc67a0f0efa9c8..242dacb6f0ed20 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,8 +1,9 @@ { "name": "asio-grpc", - "version": "1.3.1", + "version": "1.4.0", "description": "Asynchronous gRPC with Asio/unified executors", "homepage": "https://github.com/Tradias/asio-grpc", + "license": "Apache-2.0", "dependencies": [ "grpc", { diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 53621f4bf0204f..6f83c5f4067ba8 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-20-0 - SHA512 dc2def1f2b93866100b5d645f77c4a231fe3feae457010abf4e659df76b08b46870d608cf792a2f82e1b28c69c320055862647fb29aa0677a58d6141d58e76b2 + REF asio-1-22-1 + SHA512 7658293f2be1f5ea659a424614b2f3092954df45802fbb0031b7983d11762f4f68d18eab076e14954df3a24ce89ff26bd4bebea88b9a3dc680387252efec8398 HEAD_REF master ) diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 7dce132e14c728..ab4d1455678081 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,9 +1,9 @@ { "name": "asio", - "version": "1.20.0", + "version": "1.22.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.20.0/doc/", + "documentation": "https://think-async.com/Asio/asio-1.22.1/doc/", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/asiosdk/portfile.cmake b/ports/asiosdk/portfile.cmake index 85042eabf1c879..a5760164140df7 100644 --- a/ports/asiosdk/portfile.cmake +++ b/ports/asiosdk/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "Linux" "OSX" "uwp") - set(VERSION 2.3.3) vcpkg_download_distfile(ARCHIVE diff --git a/ports/asiosdk/vcpkg.json b/ports/asiosdk/vcpkg.json index d4c04063f2fe19..6d3e9ce6095a2e 100644 --- a/ports/asiosdk/vcpkg.json +++ b/ports/asiosdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "asiosdk", "version": "2.3.3", - "port-version": 3, + "port-version": 4, "description": "ASIO is a low latency audio API from Steinberg.", "homepage": "https://www.steinberg.net/en/company/developers.html", "supports": "windows & !(arm | uwp)" diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake index 2914e4e5ffe946..ffcdcd59a23674 100644 --- a/ports/asmjit/portfile.cmake +++ b/ports/asmjit/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmjit/asmjit diff --git a/ports/asmjit/vcpkg.json b/ports/asmjit/vcpkg.json index 93eb16b3eb9f60..bf06441091f447 100644 --- a/ports/asmjit/vcpkg.json +++ b/ports/asmjit/vcpkg.json @@ -1,6 +1,7 @@ { "name": "asmjit", "version-date": "2021-10-26", + "port-version": 1, "description": "Complete x86/x64 JIT and Remote Assembler for C++", "homepage": "https://github.com/asmjit/asmjit", "supports": "!arm", diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index d0a2e1f735a0ab..2c7b4360ab7218 100644 --- a/ports/atk/vcpkg.json +++ b/ports/atk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "atk", "version": "2.36.0", - "port-version": 1, + "port-version": 2, "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", "supports": "!arm", @@ -11,6 +11,10 @@ { "name": "glib", "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true } ] } diff --git a/ports/atkmm/vcpkg.json b/ports/atkmm/vcpkg.json index c173ce9cee760d..ac6b39011ec55a 100644 --- a/ports/atkmm/vcpkg.json +++ b/ports/atkmm/vcpkg.json @@ -1,13 +1,17 @@ { "name": "atkmm", "version": "2.36.0", - "port-version": 1, + "port-version": 2, "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.", "homepage": "https://www.gtkmm.org", "dependencies": [ "atk", "gettext", "glib", - "glibmm" + "glibmm", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/audiofile/fix-cmakeLists.patch b/ports/audiofile/fix-cmakeLists.patch index a7551d6ade776f..a281171a59e5c0 100644 --- a/ports/audiofile/fix-cmakeLists.patch +++ b/ports/audiofile/fix-cmakeLists.patch @@ -1,33 +1,9 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d43c0c7..1bf21cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -4,6 +4,8 @@ cmake_minimum_required (VERSION 3.12) - project ("AudioFile" VERSION 1.0.9 - DESCRIPTION "A simple C++ library for reading and writing audio files." - HOMEPAGE_URL "https://github.com/adamstark/AudioFile") -+option(BUILD_EXAMPLES "Build examples" OFF) -+option(BUILD_TESTS "Build tests" OFF) +@@ -42,3 +42,10 @@ endif () #=============================================================================== - include (GNUInstallDirs) -@@ -21,10 +23,20 @@ target_include_directories ( - target_compile_features (${PROJECT_NAME} INTERFACE cxx_std_11) - - #=============================================================================== -+if(BUILD_EXAMPLES) - add_subdirectory (examples) -+endif() - -+if(BUILD_TESTS) - enable_testing() - add_subdirectory (tests) -- -+endif() - #=============================================================================== --set (CMAKE_SUPPRESS_REGENERATION true) -\ No newline at end of file -+set (CMAKE_SUPPRESS_REGENERATION true) + set (CMAKE_SUPPRESS_REGENERATION true) + +#install and export targets +install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config) @@ -35,4 +11,3 @@ index d43c0c7..1bf21cf 100644 +install(EXPORT ${PROJECT_NAME}Config DESTINATION share/AudioFile FILE ${PROJECT_NAME}Config.cmake) +#install headers +install(FILES AudioFile.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -\ No newline at end of file diff --git a/ports/audiofile/portfile.cmake b/ports/audiofile/portfile.cmake index df0fff37426b00..18188b6542a3bd 100644 --- a/ports/audiofile/portfile.cmake +++ b/ports/audiofile/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adamstark/AudioFile - REF b7dd84abd5763f64fcf74e58499c4b5d779a396d # 1.0.9 - SHA512 daadbf7badadee4a189453af137b1ea5a5ba3486780d02664d1516f379c3705155b1036a9f8f7acd49b6a82269a07e510edcd5e9de55c73f47250244a510ccbb + REF 004065d01e9b7338580390d4fdbfbaa46adede4e # 1.1.0 + SHA512 99d31035fc82ca8da3c555c30b6b40ea99e15e1f82002c7f04c567ab7aee1de71deddf6930564c56f3a2e83eea1b5f5e9ca631673ed4a943579732b8d62e9603 HEAD_REF master PATCHES fix-cmakeLists.patch diff --git a/ports/audiofile/vcpkg.json b/ports/audiofile/vcpkg.json index 8d982a697255a3..e9c294bbe6a823 100644 --- a/ports/audiofile/vcpkg.json +++ b/ports/audiofile/vcpkg.json @@ -1,9 +1,9 @@ { "name": "audiofile", - "version": "1.0.9", + "version": "1.1.0", "description": "A simple header-only C++ library for reading and writing audio files.", "homepage": "https://github.com/adamstark/AudioFile", - "license": "GPL-3.0", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake index af6641c3f97246..c64088b2ec57ea 100644 --- a/ports/avisynthplus/portfile.cmake +++ b/ports/avisynthplus/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AviSynth/AviSynthPlus diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json index 88e47ac016c0a5..9527fdf40a15d8 100644 --- a/ports/avisynthplus/vcpkg.json +++ b/ports/avisynthplus/vcpkg.json @@ -1,8 +1,8 @@ { "name": "avisynthplus", "version-semver": "3.7.0", - "port-version": 1, + "port-version": 3, "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", - "homepage": "http://avs-plus.net/", + "homepage": "https://avs-plus.net/", "supports": "!arm & !uwp" } diff --git a/ports/avro-c/avro.patch b/ports/avro-c/avro.patch index e916150024db10..513bbe0bb2c637 100644 --- a/ports/avro-c/avro.patch +++ b/ports/avro-c/avro.patch @@ -12,7 +12,7 @@ index aa923e1..9ee7937 100644 # Eliminates warning about linker paths when linking both zlib and # liblzma. cmake_policy(SET CMP0003 NEW) -@@ -149,50 +152,60 @@ else (ZLIB_FOUND) +@@ -149,20 +152,25 @@ else (ZLIB_FOUND) message("Disabled deflate codec. zlib not found.") endif (ZLIB_FOUND) @@ -38,24 +38,13 @@ index aa923e1..9ee7937 100644 -find_package(PkgConfig) -pkg_check_modules(LZMA liblzma) --if (LZMA_FOUND) +find_package(LibLZMA REQUIRED) -+if (LibLZMA_FOUND) ++set(LZMA_FOUND 1) ++set(LZMA_LIBRARIES LibLZMA::LibLZMA) + if (LZMA_FOUND) set(LZMA_PKG liblzma) add_definitions(-DLZMA_CODEC) -+ set(LZMA_LIBRARIES LibLZMA::LibLZMA) - include_directories(${LZMA_INCLUDE_DIRS}) - link_directories(${LZMA_LIBRARY_DIRS}) - message("Enabled lzma codec") --else (LZMA_FOUND) -+else (LibLZMA_FOUND) - set(LZMA_PKG "") - set(LZMA_LIBRARIES "") - message("Disabled lzma codec. liblzma not found.") --endif (LZMA_FOUND) -+endif (LibLZMA_FOUND) - - set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES}) +@@ -179,20 +187,26 @@ set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES}) set(CODEC_PKG "@ZLIB_PKG@ @LZMA_PKG@ @SNAPPY_PKG@") # Jansson JSON library diff --git a/ports/avro-c/portfile.cmake b/ports/avro-c/portfile.cmake index f509dbef79e35d..ac0742680b3f08 100644 --- a/ports/avro-c/portfile.cmake +++ b/ports/avro-c/portfile.cmake @@ -1,5 +1,4 @@ vcpkg_buildpath_length_warning(37) -vcpkg_fail_port_install(ON_TARGET "uwp") if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() @@ -40,4 +39,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/lang/c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/lang/c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/avro-c/vcpkg.json b/ports/avro-c/vcpkg.json index b05dbfe0ec05c0..888afb3ba21e9f 100644 --- a/ports/avro-c/vcpkg.json +++ b/ports/avro-c/vcpkg.json @@ -1,9 +1,10 @@ { "name": "avro-c", "version": "1.11.0", - "port-version": 1, + "port-version": 3, "description": "Apache Avro is a data serialization system", "homepage": "https://github.com/apache/avro", + "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ "jansson", diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json index dc8f75e8ae5fcf..4fa7c170105ad7 100644 --- a/ports/aws-c-auth/vcpkg.json +++ b/ports/aws-c-auth/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-auth", "version": "0.6.3", - "port-version": 1, + "port-version": 2, "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", "homepage": "https://github.com/awslabs/aws-c-auth", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", "aws-c-http", diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json index 48c7406ceddd0c..94b2f10728a2de 100644 --- a/ports/aws-c-cal/vcpkg.json +++ b/ports/aws-c-cal/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-cal", "version": "0.5.12", - "port-version": 1, + "port-version": 2, "description": "C99 wrapper for cryptography primitives.", "homepage": "https://github.com/awslabs/aws-c-cal", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", { diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json index 67d58320721786..7d927640d42147 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-common", "version": "0.6.9", - "port-version": 1, + "port-version": 2, "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "openssl", { diff --git a/ports/aws-c-compression/vcpkg.json b/ports/aws-c-compression/vcpkg.json index 8b62d0389731b9..1e994e501c2798 100644 --- a/ports/aws-c-compression/vcpkg.json +++ b/ports/aws-c-compression/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-compression", "version": "0.2.14", - "port-version": 1, + "port-version": 2, "description": "C99 implementation of huffman encoding/decoding", "homepage": "https://github.com/awslabs/aws-c-compression", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", { diff --git a/ports/aws-c-event-stream/vcpkg.json b/ports/aws-c-event-stream/vcpkg.json index 7018ea0b297574..ebabcab6a4d0b0 100644 --- a/ports/aws-c-event-stream/vcpkg.json +++ b/ports/aws-c-event-stream/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-event-stream", "version": "0.2.7", - "port-version": 1, + "port-version": 2, "description": "C99 implementation of the vnd.amazon.event-stream content-type.", "homepage": "https://github.com/awslabs/aws-c-event-stream", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-cal", "aws-c-common", diff --git a/ports/aws-c-http/vcpkg.json b/ports/aws-c-http/vcpkg.json index f7cf65478f5baf..34b0ed7ad36f9d 100644 --- a/ports/aws-c-http/vcpkg.json +++ b/ports/aws-c-http/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-http", "version": "0.6.5", - "port-version": 1, + "port-version": 2, "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications", "homepage": "https://github.com/awslabs/aws-c-http", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-cal", "aws-c-common", diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json index 60a1fb934a28d1..9fddd3bf3e2783 100644 --- a/ports/aws-c-io/vcpkg.json +++ b/ports/aws-c-io/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-io", "version": "0.10.7", - "port-version": 1, + "port-version": 2, "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-cal", "aws-c-common", diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json index de7e464efb6a10..5b0aff0a4c5fe6 100644 --- a/ports/aws-c-mqtt/vcpkg.json +++ b/ports/aws-c-mqtt/vcpkg.json @@ -1,11 +1,14 @@ { "name": "aws-c-mqtt", "version": "0.7.6", - "port-version": 1, + "port-version": 3, "description": "C99 implementation of the MQTT 3.1.1 specification.", "homepage": "https://github.com/awslabs/aws-c-mqtt", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ + "aws-c-common", + "aws-c-http", + "aws-c-io", { "name": "s2n", "platform": "!uwp & !windows" diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json index 31dba925664f63..d6fb5f033c34ee 100644 --- a/ports/aws-c-s3/vcpkg.json +++ b/ports/aws-c-s3/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-s3", "version": "0.1.25", - "port-version": 1, + "port-version": 2, "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", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-auth", "aws-c-cal", diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json index 3cdea45345ddfe..c31742e6a8861f 100644 --- a/ports/aws-checksums/vcpkg.json +++ b/ports/aws-checksums/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-checksums", "version": "0.1.11", - "port-version": 2, + "port-version": 3, "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", "homepage": "https://github.com/awslabs/aws-checksums", - "supports": "!arm", + "supports": "!(windows & arm)", "dependencies": [ "aws-c-common", { diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json index 3b8cfafde8e874..02a962c205ba05 100644 --- a/ports/aws-crt-cpp/vcpkg.json +++ b/ports/aws-crt-cpp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-crt-cpp", "version": "0.15.1", - "port-version": 2, + "port-version": 3, "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", "homepage": "https://github.com/awslabs/aws-crt-cpp", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-auth", "aws-c-cal", diff --git a/ports/aws-lambda-cpp/portfile.cmake b/ports/aws-lambda-cpp/portfile.cmake index 714296ed18c6b9..acebd82a394957 100644 --- a/ports/aws-lambda-cpp/portfile.cmake +++ b/ports/aws-lambda-cpp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows" "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-lambda-cpp diff --git a/ports/aws-lambda-cpp/vcpkg.json b/ports/aws-lambda-cpp/vcpkg.json index 7d65385fef50d6..833eb112e1c08f 100644 --- a/ports/aws-lambda-cpp/vcpkg.json +++ b/ports/aws-lambda-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "aws-lambda-cpp", - "version-string": "0.2.7", + "version": "0.2.7", + "port-version": 1, "description": "C++ Runtime for AWS Lambda.", "supports": "linux", "dependencies": [ diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 26c6a832806fed..42c09123d36823 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF b0204a7b6a33211f533a175e987a755f714bf7f3 # 1.9.96 - SHA512 456d3fc256a5a26843ecf16014242514b165ae5fa35f088d57aa54a744d19e2c38bd0bed9b6a4b76948c8a49cf87a06a4c722be5a910ed41dfd9c9b9a66b398d + REF 26fa78673ec93dc703e80b741d8b437237798297 # 1.9.160 + SHA512 dfc6c1017dd1e76196861f0bd7e270736c2e74d55da1e394f7d64d8b1e2d978ad21f273ba4cd5d476d5f7dbe21eb0e3f170017dff97d3c3cca951f3ac68cf6f8 PATCHES fix-config.patch patch-relocatable-rpath.patch diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index f4065a4b48360c..a1a7850ce5a05f 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,11 +1,11 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.9.96", - "port-version": 6, + "version": "1.9.160", + "port-version": 1, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-crt-cpp", { diff --git a/ports/azure-c-shared-utility/fix-install-location-preview.patch b/ports/azure-c-shared-utility/fix-install-location-preview.patch new file mode 100644 index 00000000000000..41162fd2eed101 --- /dev/null +++ b/ports/azure-c-shared-utility/fix-install-location-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25bbf383..31ca2da2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -678,7 +678,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") + endif() + +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(${build_as_dynamic}) + set(targets aziotsharedutil aziotsharedutil_dll) diff --git a/ports/azure-c-shared-utility/fix-install-location.patch b/ports/azure-c-shared-utility/fix-install-location.patch new file mode 100644 index 00000000000000..56d5b363e515db --- /dev/null +++ b/ports/azure-c-shared-utility/fix-install-location.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index deeaae7d..c0c84275 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -689,7 +689,7 @@ install (TARGETS ${targets} EXPORT aziotsharedutilTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot + ) +-install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azure_c_shared_utility) ++install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot/azure_c_shared_utility) + install (FILES ${micromock_h_files_full_path} ${INSTALL_H_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot) + + diff --git a/ports/azure-c-shared-utility/improve-dependencies-preview.patch b/ports/azure-c-shared-utility/improve-dependencies-preview.patch new file mode 100644 index 00000000000000..42fe1e6583671b --- /dev/null +++ b/ports/azure-c-shared-utility/improve-dependencies-preview.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46334c1..aaeea20 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,7 +115,6 @@ if(${use_openssl}) + if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR}) + find_package(OpenSSL REQUIRED) + endif() +- include_directories(${OPENSSL_INCLUDE_DIR}) + endif() + + if(${use_applessl}) +@@ -521,8 +520,7 @@ if(${use_http}) + set(CURL_FIND_REQUIRED 1) + find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES) + +- include_directories(${CURL_INCLUDE_DIRS}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl) + endif(NOT use_builtin_httpapi) + endif() + endif(${use_http}) +@@ -561,7 +559,7 @@ if(${use_bearssl}) + endif() + + if(${use_openssl}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL) + if (WIN32) + set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32) + endif() +@@ -703,7 +701,7 @@ write_basic_package_version_file( + + configure_file("configs/${PROJECT_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" +- COPYONLY ++ @ONLY + ) + + install(EXPORT aziotsharedutilTargets +@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets + + install( + FILES +- "configs/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" + "configs/${PROJECT_NAME}Functions.cmake" + "configs/azure_iot_build_rules.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" +diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake +index 52f2c7e1..11e9332b 100644 +--- a/configs/azure_c_shared_utilityConfig.cmake ++++ b/configs/azure_c_shared_utilityConfig.cmake +@@ -1,6 +1,14 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + ++include(CMakeFindDependencyMacro) ++if("@use_openssl@") ++ find_dependency(OpenSSL) ++endif() ++if(UNIX AND NOT "@use_builtin_httpapi@") ++ find_dependency(CURL) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/azure_c_shared_utilityTargets.cmake") + + get_target_property(AZURE_C_SHARED_UTILITY_INCLUDES aziotsharedutil INTERFACE_INCLUDE_DIRECTORIES) diff --git a/ports/azure-c-shared-utility/improve-dependencies.patch b/ports/azure-c-shared-utility/improve-dependencies.patch new file mode 100644 index 00000000000000..9afa24d13f9265 --- /dev/null +++ b/ports/azure-c-shared-utility/improve-dependencies.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46334c1..aaeea20 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,7 +115,6 @@ if(${use_openssl}) + if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR}) + find_package(OpenSSL REQUIRED) + endif() +- include_directories(${OPENSSL_INCLUDE_DIR}) + endif() + + if(${use_applessl}) +@@ -521,8 +520,7 @@ if(${use_http}) + set(CURL_FIND_REQUIRED 1) + find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES) + +- include_directories(${CURL_INCLUDE_DIRS}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl) + endif(NOT use_builtin_httpapi) + endif() + endif(${use_http}) +@@ -561,7 +559,7 @@ if(${use_bearssl}) + endif() + + if(${use_openssl}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL) + if (WIN32) + set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32) + endif() +@@ -703,7 +701,7 @@ write_basic_package_version_file( + + configure_file("configs/${PROJECT_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" +- COPYONLY ++ @ONLY + ) + + install(EXPORT aziotsharedutilTargets +@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets + + install( + FILES +- "configs/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" + "configs/${PROJECT_NAME}Functions.cmake" + "configs/azure_iot_build_rules.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" +diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake +index 416dd1c..0e1e4d4 100644 +--- a/configs/azure_c_shared_utilityConfig.cmake ++++ b/configs/azure_c_shared_utilityConfig.cmake +@@ -1,8 +1,11 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + +-if(UNIX) +- include(CMakeFindDependencyMacro) ++include(CMakeFindDependencyMacro) ++if("@use_openssl@") ++ find_dependency(OpenSSL) ++endif() ++if(UNIX AND NOT "@use_builtin_httpapi@") + find_dependency(CURL) + endif() + diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 7bdb50aa127ccd..674f6156faa709 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if("public-preview" IN_LIST FEATURES) @@ -10,40 +8,45 @@ if("public-preview" IN_LIST FEATURES) SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789 HEAD_REF master PATCHES + fix-install-location-preview.patch fix-utilityFunctions-conditions-preview.patch disable-error.patch + improve-dependencies-preview.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 73a2039cc0de5ececf5755ebe731a6b5b98f85da - SHA512 6374b7b175a5c0206bee148c35eb6a3a79f1b149e87d2b51981a9fd1446809134a1aa0f28f4acf1318719ac5554f7bd8de225a5dca63eb6537012aed6b10e4cc + REF 1a27846886a74702d409a8f0e2d77a38163cefc7 + SHA512 c30cba73692691fe1310b6180e3aeaf4d86b6276981c680cac31d605634e5dedbce3f823142dfebba4ae2f76ccead965a527d95df0e52af638a30ddec9818fbd HEAD_REF master PATCHES + fix-install-location.patch fix-utilityFunctions-conditions.patch disable-error.patch + improve-dependencies.patch ) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON -Duse_default_uuid=ON -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_c_shared_utility) +vcpkg_cmake_config_fixup(PACKAGE_NAME azure_c_shared_utility CONFIG_PATH lib/cmake/azure_c_shared_utility) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(COPY ${SOURCE_PATH}/configs/azure_iot_build_rules.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${SOURCE_PATH}/configs/azure_iot_build_rules.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json index 7fa90c73e2cf17..547d08ee976b41 100644 --- a/ports/azure-c-shared-utility/vcpkg.json +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -1,8 +1,10 @@ { "name": "azure-c-shared-utility", - "version-date": "2021-09-09", + "version-date": "2022-01-21", + "port-version": 2, "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", + "license": "MIT", "supports": "!uwp", "dependencies": [ "azure-macro-utils-c", @@ -14,7 +16,15 @@ "name": "openssl", "platform": "linux" }, - "umock-c" + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "public-preview": { diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 82279f8f189b31..3f6a0c7e37874a 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.3.1 - SHA512 affdd6387b5b40f0362d4151f91b1a0f3d0269189240baf981e31a9a1860b77d7fcfeb7819f93f9b1e5764ab1ba2190cf1c6261f23345e0928453550f8537de1 + REF azure-core_1.4.0 + SHA512 08359026469beeeaf9e7318da00683fa58943a093fc690fc0701ed99d4baf28834b42a19794eeae9df8fca70f35cda34809298bba45cb04a363b2475e93ad974 ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 91bf1818164b37..b5a171ae335848 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.3.1", + "version-semver": "1.4.0", "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++." diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake index 417698981c134a..a6b797a23a2251 100644 --- a/ports/azure-identity-cpp/portfile.cmake +++ b/ports/azure-identity-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-identity_1.1.0 - SHA512 83893ae2bc5edf7d63615e6017ea0474e9c620171e9320dabbe41d40b5659dca4f6d8a10599ec02054b2d3265eebfbd419ceab43669ba5ba0e04e72a38297a07 + REF azure-identity_1.2.0 + SHA512 f27adda21a7d7b687cae08bed6b9f1e7ef10a9f36a886021c939da570c01fe4ab153bbc5852280bb147c879d6cdb4361d9655656398368814f4842ebc9ddc2dc ) vcpkg_cmake_configure( diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json index ec0ea4dbb02bee..d88dfb3378b03d 100644 --- a/ports/azure-identity-cpp/vcpkg.json +++ b/ports/azure-identity-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-identity-cpp", - "version-semver": "1.1.0", + "version-semver": "1.2.0", "description": [ "Microsoft Azure Identity SDK for C++", "This library provides common authentication-related abstractions for Azure SDK." @@ -10,7 +10,8 @@ "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.4.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-iot-sdk-c/fix-cmake.patch b/ports/azure-iot-sdk-c/fix-install-location.patch similarity index 83% rename from ports/azure-iot-sdk-c/fix-cmake.patch rename to ports/azure-iot-sdk-c/fix-install-location.patch index b75b4ca7c86e35..aeb0c817c8096d 100644 --- a/ports/azure-iot-sdk-c/fix-cmake.patch +++ b/ports/azure-iot-sdk-c/fix-install-location.patch @@ -1,8 +1,8 @@ diff --git a/provisioning_client/CMakeLists.txt b/provisioning_client/CMakeLists.txt -index c39188dca..d4ef43cb3 100644 +index 39f269d51..ff53ca32d 100644 --- a/provisioning_client/CMakeLists.txt +++ b/provisioning_client/CMakeLists.txt -@@ -359,7 +359,7 @@ if(${use_installed_dependencies}) +@@ -357,7 +357,7 @@ if(${use_installed_dependencies}) set(CMAKE_INSTALL_LIBDIR "lib") endif() @@ -10,8 +10,8 @@ index c39188dca..d4ef43cb3 100644 + install(TARGETS ${provisioning_libs} EXPORT azure_iot_sdksTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/../bin -@@ -374,26 +374,6 @@ if(${use_installed_dependencies}) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +@@ -372,26 +372,6 @@ if(${use_installed_dependencies}) VERSION ${PROV_SDK_VERSION} COMPATIBILITY SameMajorVersion ) diff --git a/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch b/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch new file mode 100644 index 00000000000000..9ccf48e5c90cde --- /dev/null +++ b/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch @@ -0,0 +1,13 @@ +diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt +index 07ab3b7..9769a08 100644 +--- a/iothub_client/CMakeLists.txt ++++ b/iothub_client/CMakeLists.txt +@@ -441,7 +441,7 @@ add_library(iothub_client + target_include_directories(iothub_client + PUBLIC + $ +- $ ++ $ + ) + applyXcodeBuildFlagsIfNeeded(iothub_client) + target_link_libraries(iothub_client ${iothub_client_libs}) diff --git a/ports/azure-iot-sdk-c/improve-external-deps-preview.patch b/ports/azure-iot-sdk-c/improve-external-deps-preview.patch new file mode 100644 index 00000000000000..8526cd6eb4d3fb --- /dev/null +++ b/ports/azure-iot-sdk-c/improve-external-deps-preview.patch @@ -0,0 +1,112 @@ +diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake +index b9c62e8..edf5847 100644 +--- a/configs/azure_iot_sdksConfig.cmake ++++ b/configs/azure_iot_sdksConfig.cmake +@@ -1,5 +1,11 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. ++include(CMakeFindDependencyMacro) ++find_dependency(unofficial-parson) ++find_dependency(uamqp) ++find_dependency(uhttp) ++find_dependency(umqtt) ++find_dependency(azure_c_shared_utility) + + include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake") + +diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +index 33b5b8709..45ef7b87a 100644 +--- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt ++++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +@@ -31,12 +31,10 @@ set(${theseTestsName}_c_files + + set(${theseTestsName}_c_files + ../../../certs/certs.c +- ../../../deps/parson/parson.c + ) + + set(${theseTestsName}_h_files + ../../../certs/certs.h +- ../../../deps/parson/parson.h + ../common_dt_e2e/iothubclient_common_dt_e2e.h + ) + +diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +index d05d654..5872c8d 100644 +--- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt ++++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files + + set(${theseTestsName}_c_files + ../../../certs/certs.c +- ../../../deps/parson/parson.c + ) + + set(${theseTestsName}_h_files + ../../../certs/certs.h +- ../../../deps/parson/parson.h + ../common_dt_e2e/iothubclient_common_dt_e2e.h + ) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ba2f8e016..19885c8b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -179,17 +179,6 @@ endif() + # Use solution folders. + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +-# build the parson library for json parsing +-add_library(parson +- ./deps/parson/parson.c +- ./deps/parson/parson.h +-) +-if (MSVC) +- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232") +-endif() +-set(parson_h_install_files ./deps/parson/parson.h) +-set(parson_install_libs parson) +- + if (IN_OPENWRT) + ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") + INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") +@@ -407,7 +396,7 @@ endif() + + if (${use_installed_dependencies}) + # Install azure_iot_sdks +- set(package_location "cmake") ++ set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + include(CMakePackageConfigHelpers) + +@@ -422,14 +411,10 @@ if (${use_installed_dependencies}) + COPYONLY + ) + +- install(FILES ${parson_h_install_files} +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot +- ) +- install(TARGETS ${parson_install_libs} EXPORT azure_iot_sdksTargets +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot +- ) ++ find_package(unofficial-parson REQUIRED CONFIG) ++ if(NOT TARGET parson) ++ add_library(parson ALIAS unofficial::parson::parson) ++ endif() + + install(EXPORT azure_iot_sdksTargets + FILE +@@ -446,11 +431,5 @@ if (${use_installed_dependencies}) + DESTINATION + ${package_location} + ) +-else() +- install(FILES ${parson_h_install_files} +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot) +- install(TARGETS ${parson_install_libs} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + diff --git a/ports/azure-iot-sdk-c/improve-external-deps.patch b/ports/azure-iot-sdk-c/improve-external-deps.patch index 171964bafc5047..8f616807816962 100644 --- a/ports/azure-iot-sdk-c/improve-external-deps.patch +++ b/ports/azure-iot-sdk-c/improve-external-deps.patch @@ -1,82 +1,29 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a8011fb..9fc05c7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -155,17 +155,6 @@ endif() - # Use solution folders. - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - --# build the parson library for json parsing --add_library(parson -- ./deps/parson/parson.c -- ./deps/parson/parson.h --) --if (MSVC) -- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232") --endif() --set(parson_h_install_files ./deps/parson/parson.h) --set(parson_install_libs parson) -- - if (IN_OPENWRT) - ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") - INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake index b9c62e8..edf5847 100644 --- a/configs/azure_iot_sdksConfig.cmake +++ b/configs/azure_iot_sdksConfig.cmake -@@ -1,5 +1,10 @@ +@@ -1,5 +1,11 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. +include(CMakeFindDependencyMacro) +find_dependency(unofficial-parson) +find_dependency(uamqp) ++find_dependency(uhttp) +find_dependency(umqtt) +find_dependency(azure_c_shared_utility) include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake") -diff --git a/dependencies.cmake b/dependencies.cmake -index fd06df6..c0e06fa 100644 ---- a/dependencies.cmake -+++ b/dependencies.cmake -@@ -18,6 +18,9 @@ if(${use_installed_dependencies}) - endif () - endif () - -+ find_package(unofficial-parson REQUIRED) -+ link_libraries(unofficial::parson::parson) -+ - else () - add_subdirectory(c-utility) - diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt -index 161872a..d53e111 100644 +index 33b5b8709..45ef7b87a 100644 --- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt -@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files - - set(${theseTestsName}_c_files - ../../../certs/certs.c -- ../../../deps/parson/parson.c - ) - - set(${theseTestsName}_h_files - ../../../certs/certs.h -- ../../../deps/parson/parson.h - ../common_dt_e2e/iothubclient_common_dt_e2e.h - ) - -diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt -index d472161..b0291e8 100644 ---- a/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt -+++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt -@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files +@@ -22,11 +22,9 @@ set(${theseTestsName}_c_files set(${theseTestsName}_c_files ../../../certs/certs.c - ../../../deps/parson/parson.c ) - set(${theseTestsName}_h_files ../../../certs/certs.h - ../../../deps/parson/parson.h @@ -87,7 +34,7 @@ diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/i index d05d654..5872c8d 100644 --- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt -@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files +@@ -22,12 +22,10 @@ set(${theseTestsName}_nuget_c_files set(${theseTestsName}_c_files ../../../certs/certs.c @@ -100,18 +47,33 @@ index d05d654..5872c8d 100644 ../common_dt_e2e/iothubclient_common_dt_e2e.h ) -diff --git a/iothub_service_client/CMakeLists.txt b/iothub_service_client/CMakeLists.txt -index e47473e..b073513 100644 ---- a/iothub_service_client/CMakeLists.txt -+++ b/iothub_service_client/CMakeLists.txt -@@ -81,9 +81,7 @@ endif() - setSdkTargetBuildProperties(iothub_service_client) - - if(NOT ${nuget_e2e_tests}) -- target_link_libraries(iothub_service_client uamqp parson) --else() -- target_link_libraries(iothub_service_client parson) -+ target_link_libraries(iothub_service_client uamqp) +diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt +index 22e24f851..7dc30beba 100644 +--- a/deps/CMakeLists.txt ++++ b/deps/CMakeLists.txt +@@ -37,5 +37,8 @@ endif() + if(NOT ${use_installed_dependencies}) + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/parson) + else() +- find_package(parson REQUIRED CONFIG) ++ find_package(unofficial-parson REQUIRED CONFIG) ++ if(NOT TARGET parson) ++ add_library(parson ALIAS unofficial::parson::parson) ++ endif() + endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b72bd41ed..b2812f1fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -242,7 +242,10 @@ endif() + + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps) + if(${use_installed_dependencies}) +- find_package(parson REQUIRED CONFIG) ++ find_package(unofficial-parson REQUIRED CONFIG) ++ if(NOT TARGET parson) ++ add_library(parson ALIAS unofficial::parson::parson) ++ endif() endif() - if (NOT ${ARCHITECTURE} STREQUAL "ARM") + include_directories(${MACRO_UTILS_INC_FOLDER}) diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 8e6043d9283b29..8edad368853e4e 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -8,21 +8,19 @@ if("public-preview" IN_LIST FEATURES) SHA512 6798b17d6768b3ccbd0eb66719b50f364cd951736eb71110e2dc9deca054a1566ff88b9e8c5e9b52536e4308cad6cd3cbebff3282c123083e3afaee5535e724b HEAD_REF public-preview PATCHES - improve-external-deps.patch - fix-cmake.patch - remove-werror.patch + improve-external-deps-preview.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 808a5595f98853a5f2eae2c67dd9b3608a2338ea - SHA512 29cb04679b75a48a8a69713045465c7c416755764ec80781405c8528abd8225654c3262ed3816fb03a13f7505f6c811afbdc5dabc79b676b4f727feaf11e0583 + REF 5805fb669ffe2adff021d68c62725d0bd783ac49 + SHA512 8f1aa1020f3bb8b3e801f3977d11be50fd07d961c89ac921f795ef8a99312f12e1ddb2268ce3d2fb84b6a42bb5806cde410e6b51c7c4539a9a11a9ae512dbcd1 HEAD_REF master PATCHES + fix-install-location.patch improve-external-deps.patch - fix-cmake.patch - remove-werror.patch + fix-iothubclient-includes.patch ) endif() @@ -32,12 +30,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS use-prov-client use_prov_client ) -file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) -file(COPY ${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/) +file(COPY "${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake" DESTINATION "${SOURCE_PATH}/deps/azure-c-shared-utility/configs/") +file(COPY "${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -Dskip_samples=ON -Duse_installed_dependencies=ON @@ -45,14 +42,17 @@ vcpkg_configure_cmake( -Dbuild_as_dynamic=OFF -Duse_edge_modules=ON -Dwarnings_as_errors=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic + warnings_as_errors ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_iot_sdks) +vcpkg_cmake_config_fixup(PACKAGE_NAME azure_iot_sdks CONFIG_PATH "lib/cmake/azure_iot_sdks") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-iot-sdk-c/remove-werror.patch b/ports/azure-iot-sdk-c/remove-werror.patch deleted file mode 100644 index 694ae7929e89af..00000000000000 --- a/ports/azure-iot-sdk-c/remove-werror.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,14 +34,11 @@ - if (MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4232") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4232") - # Make warning as error -- add_definitions(/WX) - else() - # Make warning as error -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") - endif() - - IF(WIN32) - # windows needs this define - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json index a04e188d8745c1..eb8d7405f982c8 100644 --- a/ports/azure-iot-sdk-c/vcpkg.json +++ b/ports/azure-iot-sdk-c/vcpkg.json @@ -1,8 +1,10 @@ { "name": "azure-iot-sdk-c", - "version-date": "2021-09-09", + "version-date": "2022-01-21", + "port-version": 2, "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", "homepage": "https://github.com/Azure/azure-iot-sdk-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", @@ -10,7 +12,15 @@ "azure-uhttp-c", "azure-umqtt-c", "parson", - "umock-c" + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "public-preview": { diff --git a/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch b/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch new file mode 100644 index 00000000000000..eb94390e635547 --- /dev/null +++ b/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch @@ -0,0 +1,13 @@ +diff --git a/tools/k4aviewer/k4alogdockcontrol.cpp b/tools/k4aviewer/k4alogdockcontrol.cpp +index 4289f71..407e912 100644 +--- a/tools/k4aviewer/k4alogdockcontrol.cpp ++++ b/tools/k4aviewer/k4alogdockcontrol.cpp +@@ -161,7 +161,7 @@ K4ADockControlStatus K4ALogDockControl::Show() + + if (updated) + { +- ImGui::SetScrollHere(1.0f); ++ ImGui::SetScrollHereY(1.0f); + } + + ImGui::EndChild(); diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index bffcf83e8fd725..414b6775f0b42f 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( fix-dependency-imgui.patch fix-linux.patch fix-calibration-c.patch + fix-build-imgui.patch ) vcpkg_find_acquire_program(PYTHON3) @@ -23,43 +24,36 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) # .rc file needs windows.h, so do not use PREFER_NINJA here -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} -DK4A_SOURCE_LINK=OFF -DK4A_MTE_VERSION=ON -DBUILD_EXAMPLES=OFF -DWITH_TEST=OFF - -DIMGUI_EXTERNAL_PATH=${CURRENT_INSTALLED_DIR}/include/bindings + -DIMGUI_EXTERNAL_PATH="${CURRENT_INSTALLED_DIR}/include/bindings" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Avoid deleting debug/lib/cmake when fixing the first cmake -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake ${CURRENT_PACKAGES_DIR}/debug/share) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/k4a TARGET_PATH share/k4a) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/k4arecord TARGET_PATH share/k4arecord) +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/share") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/share") + +vcpkg_cmake_config_fixup(PACKAGE_NAME k4a CONFIG_PATH share/k4a) +vcpkg_cmake_config_fixup(PACKAGE_NAME k4arecord CONFIG_PATH share/k4arecord) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if ("tool" IN_LIST FEATURES) - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) - file(GLOB AZURE_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - file(COPY ${AZURE_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(REMOVE ${AZURE_TOOLS}) - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) - file(GLOB AZURE_TOOLS ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - file(REMOVE ${AZURE_TOOLS}) - endif() + vcpkg_copy_tools(TOOL_NAMES k4arecorder k4aviewer AzureKinectFirmwareTool AUTO_CLEAN) endif() 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() # Install Depth Engine @@ -84,14 +78,14 @@ else () endif () if (VCPKG_TARGET_IS_LINUX) - file(COPY ${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0 DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY ${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") else() - file(COPY ${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk) - file(COPY ${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk) + file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") + file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json index f20bbe2af61bf3..3addef920be400 100644 --- a/ports/azure-kinect-sensor-sdk/vcpkg.json +++ b/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -1,10 +1,10 @@ { "name": "azure-kinect-sensor-sdk", "version": "1.4.1", - "port-version": 3, + "port-version": 4, "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.", "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK", - "supports": "linux & windows", + "supports": "linux | windows", "dependencies": [ "azure-c-shared-utility", "cjson", @@ -21,7 +21,15 @@ }, "libyuv", "matroska", - "spdlog" + "spdlog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "docs": { @@ -36,7 +44,7 @@ "name": "imgui", "features": [ "glfw-binding", - "opengl3-glew-binding" + "opengl3-binding" ] } ] diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json index 367a73a1746a22..0d4df0005ef4ab 100644 --- a/ports/azure-macro-utils-c/vcpkg.json +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-macro-utils-c", - "version-string": "2020-06-17", - "port-version": 3, + "version-date": "2022-01-21", "description": "A library of macros for the Azure IoT SDK Suite", "features": { "public-preview": { diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake index 5b0035e64d287a..ff74c8cd4c09ca 100644 --- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-certificates_4.0.0-beta.1 - SHA512 8cb7fccade755cb984a311430a808e777a041e663b607a40308a79b353431abea2eaef1c49c48c783ec9020b5d0e6e53fa101f2e2432bd71bba3b578bfe810ca + REF azure-security-keyvault-certificates_4.0.0-beta.2 + SHA512 b8e3c2fc942854610a9ae3a0f57f1f1e5a5fe73905ca5085bb418b68e9888f7acb1d0866ba7692b055d4438bdf4f3f796e5860a95e0d9663e68353dabd07bed7 ) vcpkg_cmake_configure( diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json index 06b6ce023199f4..a7ea535745a55b 100644 --- a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-certificates-cpp", - "version-semver": "4.0.0-beta.1", + "version-semver": "4.0.0-beta.2", "description": [ "Microsoft Azure Key Vault Certificates SDK for C++", "This library provides Azure Key Vault Certificates SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.2.0" + "version>=": "1.3.1" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-security-keyvault-common-cpp/portfile.cmake b/ports/azure-security-keyvault-common-cpp/portfile.cmake deleted file mode 100644 index e0f4762f6539f1..00000000000000 --- a/ports/azure-security-keyvault-common-cpp/portfile.cmake +++ /dev/null @@ -1,19 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-common_4.0.0-beta.3 - SHA512 bdd5b59b8e1e53cde8df9b38881e067328e9b434cbf80cf63b2a0ef17e9e30c7b42c7439bb4ea47c412a566478c44364618b918af8139765d789101549f6062e -) - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-common/ - PREFER_NINJA - OPTIONS - -DWARNINGS_AS_ERRORS=OFF -) - -vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_copy_pdbs() diff --git a/ports/azure-security-keyvault-common-cpp/vcpkg.json b/ports/azure-security-keyvault-common-cpp/vcpkg.json deleted file mode 100644 index be5ed47776bda4..00000000000000 --- a/ports/azure-security-keyvault-common-cpp/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "azure-security-keyvault-common-cpp", - "version-semver": "4.0.0-beta.3", - "description": [ - "Microsoft Azure Common Key Vault SDK for C++", - "This library provides common Azure Key Vault related abstractions for Azure SDK." - ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-common", - "license": "MIT", - "dependencies": [ - { - "name": "azure-core-cpp", - "default-features": false - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake index 3e6b1c84faa044..3589f406199d0d 100644 --- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-secrets_4.0.0-beta.1 - SHA512 dc40606fdd5f0c6934f9720fc9722346a5bff02093cd9a1805ca6a2356854a8648fcdf689e3456162b0b93dc85bea916ca1532547a4937113067deb5abdb3ff7 + REF azure-security-keyvault-secrets_4.0.0-beta.2 + SHA512 471158c13cd356289f1876f68c69ce761adead141aa832d13abed8a3dd5a221666a09a9c33d8f840ec1372d4edf602d867dba5978262785bf9b9040a50e08904 ) vcpkg_cmake_configure( diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json index f95d098002d357..198577edfa0bb2 100644 --- a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-secrets-cpp", - "version-semver": "4.0.0-beta.1", + "version-semver": "4.0.0-beta.2", "description": [ "Microsoft Azure Key Vault Secrets SDK for C++", "This library provides Azure Key Vault Secrets SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.2.0" + "version>=": "1.3.1" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index bffc0c5ed56e03..064a05e539a9a9 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.2.1 - SHA512 7150b1d5c9ceb7ca2f500b3ff1fe45ca2f2769ec895191fa8b0fd0b63e5acc6f8fd58b3aec1b00ba5125d99a5f28c29335f8d13253af7d1d70b1575b98183810 + REF azure-storage-blobs_12.3.0 + SHA512 69fb5b32544492d32fdf5d125852b98ccc89688f0c606a8fc6be88bd0e2091df1ccf483cefeb075f17fd78c7e6b1ff6c97d7e3db0f60362fe888bb07ea2a4967 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 8f0295819a723d..4e7e7897bdf6b9 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.2.1", + "version-semver": "12.3.0", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.0" + "version>=": "12.2.1" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index 9843c83a34a6b7..e84cb2a07aacc2 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.2.0 - SHA512 59d7c755c9aca09e49487765c5571da242bd6cbf426f6fd07a2d7235f4e5c894f6a36e209f08908d1e6fc97d64d60fd5e7f4dd87d88416e21b6591fc88674663 + REF azure-storage-common_12.2.2 + SHA512 dff3c48a4177e43b2ca0f28128a6c6002e46f64895c1431cafc8db766de6f3498c9502d671c3ba49122feb8bf271291fda1bd24986bb9ff650ab33be60b14447 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index d1729985a9654f..6d74341ec20c47 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.2.0", + "version-semver": "12.2.2", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.0.0" + "version>=": "1.3.1" }, { "name": "libxml2", diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake index c091b31c0c0942..b4bad8eee3a4f1 100644 --- a/ports/azure-storage-cpp/portfile.cmake +++ b/ports/azure-storage-cpp/portfile.cmake @@ -1,5 +1,4 @@ message(WARNING "azure-storage-cpp is no longer actively developed. Instead, users should migrate to the new sdk:azure-core-cpp") -vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -31,4 +30,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() - diff --git a/ports/azure-storage-cpp/vcpkg.json b/ports/azure-storage-cpp/vcpkg.json index 21180d49ff3332..53dc1752c960d8 100644 --- a/ports/azure-storage-cpp/vcpkg.json +++ b/ports/azure-storage-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-storage-cpp", "version-string": "7.5.0", - "port-version": 2, + "port-version": 3, "description": [ "[legacy] Microsoft Azure Storage Client SDK for C++", "A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client." diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index fad24c17114d32..e29137531a4365 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.2.0 - SHA512 42e5fd30f76236cbe055ed51fdba3672421e9ad329addc665df1b2d29d5ea1df016932b5d4c28c7a0dd820bbab09d4b245711a7020d4b9a1e96d05657c05b94b + REF azure-storage-files-datalake_12.3.1 + SHA512 4d0879808e0d2c2ca0e2c6a89496af3f51a8bcebd071ea51359bb42f1ead193292bb3e21c8c3f023634a48585ab68bdd4d95af0b7357a3e92030c6d1a12ceba9 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index b59f47fd39076a..fff483c1272902 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.2.0", + "version-semver": "12.3.1", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-blobs-cpp", "default-features": false, - "version>=": "12.2.0" + "version>=": "12.3.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 420ee8925c841b..21dacef3ab9eee 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.2.0 - SHA512 b3e0c0a6b4ab11ff9d4c3318a56621d4d6c453b393f692f5d61118a18c571fbb5a1b259c44bb2ba7ac14e056d3a30bde66e36601139d704baeb9cbc865c43ecd + REF azure-storage-files-shares_12.2.1 + SHA512 c3fd61496833fd90984c20c3ec6f3be663dda922458a7984ce6010c82df28a546f2e24f7d3690f327b22dbdf2abc669f12ebc182f43ba171111ece0450dbe35c ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 54807b9b469ca1..0d0d853eb5a427 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.2.0", + "version-semver": "12.2.1", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.0" + "version>=": "12.2.2" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake index 6adb069928c52a..cb4c32538acdef 100644 --- a/ports/azure-storage-queues-cpp/portfile.cmake +++ b/ports/azure-storage-queues-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-queues_12.0.0-beta.2 - SHA512 43815483aa8def6eb475683d765a5315a65218bceb9dbf95b9f4e154c23ed8af1af4a52943b4b89fed35b50318407c98674e8af4c4076e42be60f460a610a118 + REF azure-storage-queues_12.0.0-beta.4 + SHA512 8330fcbf2a8c22d7e6ac7c0dc86613c8552c645e4344599333fd68eb4a7cb446d6a4f7c0d7f630c8bab947a67d445828901f2c4999b7f27457b1c9d7ef06f988 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json index 8a8fafe2178d53..b48d71ab27de70 100644 --- a/ports/azure-storage-queues-cpp/vcpkg.json +++ b/ports/azure-storage-queues-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-queues-cpp", - "version-semver": "12.0.0-beta.2", + "version-semver": "12.0.0-beta.4", "description": [ "Microsoft Azure Storage Queues SDK for C++", "This library provides Azure Storage Queues SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.0" + "version>=": "12.2.2" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index 3b95f6447e6452..8e296ff0ac8efe 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -12,8 +12,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF b75cdb7e1736a388fe3e9fc2a99493aa1db6f43f - SHA512 a13da2bc8a471329cbcd63aaa6fb94265388f709bf8977d55017a6cdd5af21e3b08935498ff8bfebfa63791dfa04552806684fae82b664045a12d14a91df3183 + REF 85aae56beb717dddaf5512845de537d2926afb02 + SHA512 3d9e7788c784169e6d1d9abd233e00a4c1e6525d67cbc25f8ba42292b6d66d0179a742833a0c00a3a0df6498bf88dc8b12a40c183e7141f7290cbb4eceb67dbe HEAD_REF master ) endif() @@ -27,6 +27,8 @@ vcpkg_configure_cmake( -Dskip_samples=ON -Duse_installed_dependencies=ON -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) vcpkg_install_cmake() diff --git a/ports/azure-uamqp-c/vcpkg.json b/ports/azure-uamqp-c/vcpkg.json index 52dfd75fad1c85..40c1177fd8b817 100644 --- a/ports/azure-uamqp-c/vcpkg.json +++ b/ports/azure-uamqp-c/vcpkg.json @@ -1,8 +1,10 @@ { "name": "azure-uamqp-c", - "version-date": "2021-09-09", + "version-date": "2022-01-21", + "port-version": 1, "description": "AMQP library for C", "homepage": "https://github.com/Azure/azure-uamqp-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", diff --git a/ports/azure-uhttp-c/package-location-fix-preview.patch b/ports/azure-uhttp-c/package-location-fix-preview.patch new file mode 100644 index 00000000000000..8544ae63b982de --- /dev/null +++ b/ports/azure-uhttp-c/package-location-fix-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27eae0b..ef87ec0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -138,7 +138,7 @@ if (NOT ${skip_samples}) + endif() + + # Install uhttp +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 4a3105c021c8e1..0478c7174375f6 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -7,35 +7,38 @@ if("public-preview" IN_LIST FEATURES) REF d84a20609a2b5a555920389451fb3c9a2ed3656c SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6 HEAD_REF master + PATCHES + package-location-fix-preview.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF db8ac9c1353fe05cf6917e8ec8bcb866bf4a6f11 - SHA512 4c9b053bcdc1086dbba6883a887e5af1f6aa4572bfb1e36c3b07c9bb93c35b188cb31f510fca5c4b2a0557df446dd965eafda993eab7c04b4502ed07b269c148 + REF 1cc70f4d21ad69768cafb9551b1b512118fba995 + SHA512 6604e82b347a1a4eb5072ab762fde7bd5ae9b32848a78da9103e0eb528b9ccd420a12dbc237dc0b5fe6db271d5cdcd24eedf1cde8ac058102fdd24c5a5a33f26 HEAD_REF master ) endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON -Dbuild_as_dynamic=OFF -DCMAKE_INSTALL_INCLUDEDIR=include + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uhttp) +vcpkg_cmake_config_fixup(PACKAGE_NAME uhttp CONFIG_PATH "lib/cmake/uhttp") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-uhttp-c/vcpkg.json b/ports/azure-uhttp-c/vcpkg.json index 11f6fea12c3f02..ff97c54e3c98b2 100644 --- a/ports/azure-uhttp-c/vcpkg.json +++ b/ports/azure-uhttp-c/vcpkg.json @@ -1,12 +1,22 @@ { "name": "azure-uhttp-c", - "version-date": "2021-09-09", + "version-date": "2022-01-21", + "port-version": 1, "description": "Azure HTTP Library written in C", "homepage": "https://github.com/Azure/azure-uhttp-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", - "umock-c" + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "public-preview": { diff --git a/ports/azure-umqtt-c/package-location-fix-preview.patch b/ports/azure-umqtt-c/package-location-fix-preview.patch new file mode 100644 index 00000000000000..ec837b7c018cb2 --- /dev/null +++ b/ports/azure-umqtt-c/package-location-fix-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8fd08f0..c228519 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,7 +155,7 @@ endif () + include(GNUInstallDirs) + + # Install umqtt +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index a3e9246bb471f7..e9e65434ff5693 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -7,34 +7,37 @@ if("public-preview" IN_LIST FEATURES) REF 7557db6de094b67818d3c410dc95a3cf07cd86a6 SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40 HEAD_REF master + PATCHES + package-location-fix-preview.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 12cb55ee5a926a124f22ad737c7cec35f6af7165 - SHA512 ed7d5c5132cfaa46574e70a99ce0181208b772fa2dca9122c8d16918af29240a2060705a25b121785c210eb5a4b917588a1623aedfd0bf9a4cf39df601b05dea + REF 09558f380a314ea89b28f406cc810f47718cea49 + SHA512 7fc1b3d4ed6bd7401b764e27755270dd97caeb09f3bdede90e2e8c554acd13b5c24f9c7343e642bcb62d2937b8169d900fa46a1b97a8c439733c8cdcac19d548 HEAD_REF master ) endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umqtt) +vcpkg_cmake_config_fixup(PACKAGE_NAME umqtt CONFIG_PATH "lib/cmake/umqtt") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-umqtt-c/vcpkg.json b/ports/azure-umqtt-c/vcpkg.json index 1ccfb1699f46a8..ec223bd03ba980 100644 --- a/ports/azure-umqtt-c/vcpkg.json +++ b/ports/azure-umqtt-c/vcpkg.json @@ -1,12 +1,22 @@ { "name": "azure-umqtt-c", - "version-date": "2021-09-09", + "version-date": "2022-01-21", + "port-version": 1, "description": "General purpose library for communication over the mqtt protocol", "homepage": "https://github.com/Azure/azure-umqtt-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", - "umock-c" + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "public-preview": { diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index 7d44789c42047b..3a23531d0edcbe 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index 23aec994670b68..4cbc024b4cd6ad 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bddisasm", "version": "1.34.7", + "port-version": 1, "maintainers": "Cristi Anichitei ", "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", "homepage": "https://github.com/bitdefender/bddisasm", diff --git a/ports/bde/vcpkg.json b/ports/bde/vcpkg.json index 7fffab8885a0c5..b4e77488fd083c 100644 --- a/ports/bde/vcpkg.json +++ b/ports/bde/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bde", - "version-string": "3.2.0.0", - "port-version": 4, + "version": "3.2.0.0", + "port-version": 5, "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.", - "supports": "!windows" + "supports": "!windows & !arm" } diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index 0782dbdfba5c9d..79feac53adf6f3 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index 4632b9786ab203..835160cc34d19f 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "behaviortree-cpp", "version": "3.5.6", - "port-version": 1, + "port-version": 2, "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 f1b79a6ca79b38..a5cf1ea0ad6dea 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -1,6 +1,3 @@ -#https://github.com/google/benchmark/issues/661 -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json index 713f0fa31669b1..833ba8759d8943 100644 --- a/ports/benchmark/vcpkg.json +++ b/ports/benchmark/vcpkg.json @@ -1,6 +1,8 @@ { + "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", "name": "benchmark", "version-semver": "1.6.0", + "port-version": 1, "description": "A library to support the benchmarking of functions, similar to unit-tests.", "homepage": "https://github.com/google/benchmark", "supports": "!uwp", diff --git a/ports/berkeleydb/portfile.cmake b/ports/berkeleydb/portfile.cmake index 93d89fb3ebd8c2..5d3495496683de 100644 --- a/ports/berkeleydb/portfile.cmake +++ b/ports/berkeleydb/portfile.cmake @@ -1,7 +1,5 @@ -vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx") - vcpkg_download_distfile(ARCHIVE - URLS "http://download.oracle.com/berkeley-db/db-4.8.30.NC.zip" + URLS "https://download.oracle.com/berkeley-db/db-4.8.30.NC.zip" FILENAME "db-4.8.30.NC.zip" SHA512 59c1d2d5a3551f988ab1dc063900572b67ad087537e0d71760de34601f9ebd4d5c070a49b809bec4a599a62417e9a162683ce0f6442deb1a0dadb80764bf6eab ) diff --git a/ports/berkeleydb/vcpkg.json b/ports/berkeleydb/vcpkg.json index 318643530b6cc5..d9436faa637f0c 100644 --- a/ports/berkeleydb/vcpkg.json +++ b/ports/berkeleydb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "berkeleydb", - "version-string": "4.8.30", - "port-version": 6, + "version": "4.8.30", + "port-version": 8, "description": "BDB - A high-performance embedded database for key/value data.", "homepage": "https://download.oracle.com/", "supports": "!(uwp | linux | osx)" diff --git a/ports/bext-di/portfile.cmake b/ports/bext-di/portfile.cmake index 8b123db7d2de4e..36ce8c0a9b213f 100644 --- a/ports/bext-di/portfile.cmake +++ b/ports/bext-di/portfile.cmake @@ -10,7 +10,7 @@ file(INSTALL ${SOURCE_PATH}/include/boost DESTINATION ${CURRENT_PACKAGES_DIR}/include) vcpkg_download_distfile(LICENSE - URLS http://www.boost.org/LICENSE_1_0.txt + URLS https://www.boost.org/LICENSE_1_0.txt FILENAME "di-copyright" SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 ) diff --git a/ports/bext-di/vcpkg.json b/ports/bext-di/vcpkg.json index 3278462b4b5ada..2b47e5578d98b1 100644 --- a/ports/bext-di/vcpkg.json +++ b/ports/bext-di/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bext-di", - "version-string": "1.2.0", + "version": "1.2.0", + "port-version": 1, "description": "C++14 Dependency Injection Library.", "homepage": "https://github.com/boost-ext/di" } diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake index 4b50bf92c7d026..8ad40fa4148c13 100644 --- a/ports/blend2d/portfile.cmake +++ b/ports/blend2d/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_ARCH "wasm32" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blend2d/blend2d diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json index 8c4eb58c2aeee9..9462adb6d1ef36 100644 --- a/ports/blend2d/vcpkg.json +++ b/ports/blend2d/vcpkg.json @@ -1,10 +1,11 @@ { "name": "blend2d", "version-date": "2021-03-17", + "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", - "supports": "!(arm | uwp)", + "supports": "!arm & !uwp & !wasm32", "default-features": [ "jit", "logging", diff --git a/ports/blitz/portfile.cmake b/ports/blitz/portfile.cmake index f53a286e7f1375..cba693f54ff0d7 100644 --- a/ports/blitz/portfile.cmake +++ b/ports/blitz/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blitzpp/blitz @@ -16,7 +14,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_DOC=OFF - -DBUILD_TESTING=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/blitz/vcpkg.json b/ports/blitz/vcpkg.json index 906e4d83391da7..93da72b81b94aa 100644 --- a/ports/blitz/vcpkg.json +++ b/ports/blitz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "blitz", - "version-string": "2020-03-25", - "port-version": 3, + "version-date": "2020-03-25", + "port-version": 5, "description": "Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.", "homepage": "https://github.com/blitzpp/blitz", "supports": "!(arm | arm64 | uwp)", @@ -13,6 +13,10 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-tool-python2", + "host": true } ] } diff --git a/ports/blosc/0001-find-deps.patch b/ports/blosc/0001-find-deps.patch index af0f92150a1216..33407b9b3151d2 100644 --- a/ports/blosc/0001-find-deps.patch +++ b/ports/blosc/0001-find-deps.patch @@ -1,16 +1,3 @@ -diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt -index 1d1bebe..3a7a51c 100644 ---- a/blosc/CMakeLists.txt -+++ b/blosc/CMakeLists.txt -@@ -109,7 +109,7 @@ endif(NOT DEACTIVATE_ZLIB) - - if (NOT DEACTIVATE_ZSTD) - if (ZSTD_FOUND) -- set(LIBS ${LIBS} ${ZSTD_LIBRARY}) -+ set(LIBS ${LIBS} ${ZSTD_LIBRARIES}) - else (ZSTD_FOUND) - file(GLOB ZSTD_FILES - ${ZSTD_LOCAL_DIR}/common/*.c diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake index e581a80..8ce17c5 100644 --- a/cmake/FindLZ4.cmake @@ -63,45 +50,3 @@ index 688d4d5..c8b9a05 100644 + SNAPPY DEFAULT_MSG + SNAPPY_LIBRARY SNAPPY_INCLUDE_DIR +) -diff --git a/cmake/FindZstd.cmake b/cmake/FindZstd.cmake -index 7db4bb9..ba20ba6 100644 ---- a/cmake/FindZstd.cmake -+++ b/cmake/FindZstd.cmake -@@ -1,10 +1,30 @@ -+include(FindPackageHandleStandardArgs) -+ - find_path(ZSTD_INCLUDE_DIR zstd.h) - --find_library(ZSTD_LIBRARY NAMES zstd) -+get_filename_component(_prefix_path ${ZSTD_INCLUDE_DIR} PATH) -+ -+find_library( -+ ZSTD_LIBRARY_DEBUG -+ NAMES zstdd -+ PATHS ${_prefix_path}/debug/lib -+ NO_DEFAULT_PATH -+) -+ -+find_library( -+ ZSTD_LIBRARY_RELEASE -+ NAMES zstd -+ PATHS ${_prefix_path}/lib -+ NO_DEFAULT_PATH -+) -+ -+unset(_prefix_path) -+ -+include(SelectLibraryConfigurations) -+select_library_configurations(ZSTD) - --if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY) -- set(ZSTD_FOUND TRUE) -- message(STATUS "Found Zstd library: ${ZSTD_LIBRARY}") --else () -- message(STATUS "No Zstd library found. Using internal sources.") --endif () -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args( -+ ZSTD -+ REQUIRED_VARS ZSTD_LIBRARIES ZSTD_INCLUDE_DIR -+) diff --git a/ports/blosc/vcpkg.json b/ports/blosc/vcpkg.json index 47ea38da4861fc..ba1b06bc181561 100644 --- a/ports/blosc/vcpkg.json +++ b/ports/blosc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "blosc", "version-string": "1.18.1", - "port-version": 3, + "port-version": 4, "description": "A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`", "homepage": "https://github.com/Blosc/c-blosc", "dependencies": [ diff --git a/ports/boinc/001-add-openssl3-support.patch b/ports/boinc/001-add-openssl3-support.patch new file mode 100644 index 00000000000000..d0fd5ea8902b6b --- /dev/null +++ b/ports/boinc/001-add-openssl3-support.patch @@ -0,0 +1,13 @@ +diff --git a/lib/crypt.cpp b/lib/crypt.cpp +index 01249cfc340..9b1f69160b8 100644 +--- a/lib/crypt.cpp ++++ b/lib/crypt.cpp +@@ -672,7 +672,7 @@ int check_validity_of_cert( + } + #ifdef HAVE_OPAQUE_RSA_DSA_DH + RSA *rsa; +- rsa = EVP_PKEY_get0_RSA(pubKey); ++ rsa = (rsa_st*)EVP_PKEY_get0_RSA(pubKey); + if (!RSA_blinding_on(rsa, c)) { + #else + if (!RSA_blinding_on(pubKey->pkey.rsa, c)) { diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake index 6fd0ccd9214281..0009b0e74645bf 100644 --- a/ports/boinc/portfile.cmake +++ b/ports/boinc/portfile.cmake @@ -1,7 +1,4 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm") -endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -9,6 +6,8 @@ vcpkg_from_github( REF client_release/7.18/7.18.1 SHA512 200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532 HEAD_REF master + PATCHES + 001-add-openssl3-support.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 44c78332346cd4..f962c47a59190a 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,9 +1,10 @@ { "name": "boinc", "version": "7.18.1", - "port-version": 3, + "port-version": 5, "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", + "license": "LGPL-3.0-or-later", "supports": "!(windows & arm) & !uwp", "dependencies": [ "openssl", diff --git a/ports/boolinq/portfile.cmake b/ports/boolinq/portfile.cmake index 08f1606fae6269..916f606bbce4f4 100644 --- a/ports/boolinq/portfile.cmake +++ b/ports/boolinq/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO k06a/boolinq - REF 3.0.2 - SHA512 9BE859485F7B0E8129D05E1AB92C7316C4C94EA9195779A363063ADA6BBB0E4231B0EF0A91807786B24E4CF694CF93E398782E57F9B46A57DADD436A6FF57E57 + REF 0df37ed90570a148c9d2395f5066313fd59247c9 #v3.0.4 + SHA512 c1c23cf4e3c3f2a02a6c6ea59faf1eb223fe0a6ba840b4f306671e3e866bfd156d0a7a46542b684eeba3d9c744d678c48d4f1d7471f07fb7f1ba0bb8812f548f HEAD_REF master ) diff --git a/ports/boolinq/vcpkg.json b/ports/boolinq/vcpkg.json index 9052b27ca03685..fbef717fe37c93 100644 --- a/ports/boolinq/vcpkg.json +++ b/ports/boolinq/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boolinq", - "version": "3.0.2", + "version": "3.0.4", "description": "Super tiny C++11 single-file header-only LINQ library", "homepage": "https://github.com/k06a/boolinq" } diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index 117343e2c90605..157442c128c4a9 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.77.0 - SHA512 6d742d26ae382a753274d0c2055653d5b6368f939c0ccbd0e79283e993736a5369cdaacac648361730937dab8e5b412f265abf9f99de3c42de60baa34afe7029 + REF boost-1.78.0 + SHA512 b72d1d2eac58261487ec9c87a2bb6fdd0eed229c39fef62fa83b188f423e9ad96bfd6e5d177b01dec2e541d2e94ca9e548f823a05af24338d97ad98f8d85ef9c HEAD_REF master ) diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json index 204f6cf7e2b3ac..dca627d17a68c7 100644 --- a/ports/boost-accumulators/vcpkg.json +++ b/ports/boost-accumulators/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-accumulators", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost accumulators module", "homepage": "https://github.com/boostorg/accumulators", "dependencies": [ diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 35a3148e1abfcd..32a88d3bab4215 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.77.0 - SHA512 1be1d06c3233d2dad2941696ecbbd77ff2d0cb3304e7a9fee4aa59bd8209ca858520d45bc67148e20defe98bf2c49ac79acf39c07bcc2b2262c1a812514d568b + REF boost-1.78.0 + SHA512 1536de626708ecef49d5d059258c5f00ea5d56a5ad8526bdb867494f7749ea7af25c10d90f642cd9d25a931dde87b2ab9eea1c2a20a2531ecd9d6b7e73ad4a4a HEAD_REF master ) diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json index 42fff1f9f09b2b..94af0f62625613 100644 --- a/ports/boost-algorithm/vcpkg.json +++ b/ports/boost-algorithm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-algorithm", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost algorithm module", "homepage": "https://github.com/boostorg/algorithm", "dependencies": [ diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index 811ce936c13b8a..eeed844f33c65c 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.77.0 - SHA512 786c63da7d5593282356dc0010a63b46b5f50236890228481c9676f543ab2d56cb5418d913bce2daad8c5bbad3feded7068ac2ab6d68481be9c25401b22ff7f6 + REF boost-1.78.0 + SHA512 2d7efe0a2a87942fe4e6b8e18871631c514d271f690a272e5b30e775eed60c389a2d2e7b1c6fdc7575d5ccea2d2a71a96169af60a0548d182ba9b90e5015a7b7 HEAD_REF master ) diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json index 9c1b7167fbcc4b..8bd47b5e73a779 100644 --- a/ports/boost-align/vcpkg.json +++ b/ports/boost-align/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-align", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost align module", "homepage": "https://github.com/boostorg/align", "dependencies": [ diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index 9719e5136294cf..f5c102e966f837 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.77.0 - SHA512 cfb7987b7dbbc959012786ded23f6241640cc5b308656318e3125d5903af61f3da2dc16a8cfe811b651f65eec0455f75c8cf31426267babd344c500e20869878 + REF boost-1.78.0 + SHA512 fd9670fc4d7086fc28131c8d02b5dcd0d4bbcfdf54720df1859c50079d77d19d6c08a70421b1c0ec7c13f3b31b8606eaa8f8db847fd359cf03e24f913b0e660c HEAD_REF master ) diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json index 3f15578da984c9..ee3b5952a86e93 100644 --- a/ports/boost-any/vcpkg.json +++ b/ports/boost-any/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-any", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost any module", "homepage": "https://github.com/boostorg/any", "dependencies": [ diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index c175b2962c3e28..eaf03c0bb75e15 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.77.0 - SHA512 e34d8e46ccb3d1efad8863a6babe59762c6cd7c5eaf45bd85402a68e445bde3202cd13c86d1ecef62d5b1855b4d32aa5d5bc62010213da38ee69b7c796669a53 + REF boost-1.78.0 + SHA512 1d07d224f3e0fd4a2d5beb4704d102a64e4f4f95bd6fb218c5b63b28acba8e5b3cac140505df94dab9082a0eae70e11821d827b2c586e6203562262dd9b8a1f2 HEAD_REF master ) diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json index c1e222945bae4d..e678bdd00a29af 100644 --- a/ports/boost-array/vcpkg.json +++ b/ports/boost-array/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-array", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost array module", "homepage": "https://github.com/boostorg/array", "dependencies": [ diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index 0a56245fb079ff..b5da68b829af67 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/asio - REF boost-1.77.0 - SHA512 b7387f03994ecb22c545ed162c9622676a806cb7434e29303a72ee91e776034626cc125271439e7fa5983c76c06a887472dc3843e2a8ffca3a6ff3caee763641 + REF boost-1.78.0 + SHA512 78c58a64d669eaeabb5ba003200c581065412d33912e641143186ee95c11e0fb0411ed8dbb9a9acced8c8ecd258e0de33872b2e22dfc4a572315cd9a665db8a6 HEAD_REF master PATCHES windows_alloca_header.patch ) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index 907244a5ff5eef..c0c49aa903d523 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -1,9 +1,8 @@ { "name": "boost-asio", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", - "supports": "!emscripten", "dependencies": [ "boost-align", "boost-array", @@ -24,7 +23,17 @@ "boost-throw-exception", "boost-type-traits", "boost-utility", - "boost-vcpkg-helpers", - "openssl" - ] + "boost-vcpkg-helpers" + ], + "features": { + "ssl": { + "description": "Build with SSL support", + "dependencies": [ + { + "name": "openssl", + "platform": "!emscripten" + } + ] + } + } } diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index e029a48ec5b718..9509e3e80965ab 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.77.0 - SHA512 90116861cd0457ffa61b4b2ebecc978252f74196ad87d1f756702b28b4010fe366b4dd1e6a5b3726c6926b4fb1821d9f997a758fd02f8d3be5a45ef64e104e27 + REF boost-1.78.0 + SHA512 8ad826aa3c3865d77d4155c4c2b318b2f6204e0861f9fb3699efa9e8c22752d6f419bba92ec0a035f3e2583aa7236d4c2ad83fdcf0cd625cc20d40690669bd2c HEAD_REF master ) diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json index 568a16df39ecb2..d486490dd7cbd3 100644 --- a/ports/boost-assert/vcpkg.json +++ b/ports/boost-assert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-assert", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost assert module", "homepage": "https://github.com/boostorg/assert", "dependencies": [ diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 1e31ee9061c240..ac380be7841b3b 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.77.0 - SHA512 5c72f5637f0c456a060a4204533798ceea39f95a7d96e4f9e05cdd25d178244b8a3a596a7387228df5929b1e3141724503b2579db9b546fadbb0e70648fc99e1 + REF boost-1.78.0 + SHA512 72cb3460624d3f4fa12859edc1086ed966ffb83be94dc22c257e088ba10c9686129baa410d7b524237794dd29c983d92c25f65fad6c7c84288275a4ca77b95e8 HEAD_REF master ) diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json index 528dab79dfad9e..50824920f4e43e 100644 --- a/ports/boost-assign/vcpkg.json +++ b/ports/boost-assign/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-assign", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost assign module", "homepage": "https://github.com/boostorg/assign", "dependencies": [ diff --git a/ports/boost-atomic/0001-fix-compilation-for-uwp.patch b/ports/boost-atomic/0001-fix-compilation-for-uwp.patch new file mode 100644 index 00000000000000..d4ad812af3f40f --- /dev/null +++ b/ports/boost-atomic/0001-fix-compilation-for-uwp.patch @@ -0,0 +1,81 @@ +From bf08155d16ea8c359d1bfab6bac684cdfada4a5b Mon Sep 17 00:00:00 2001 +From: Andrey Semashev +Date: Wed, 15 Dec 2021 02:06:11 +0300 +Subject: [PATCH] Fix compilation for UWP. + +UWP does not support APIs related to dynamic symbol binding and dlls. +Disable runtime detection of WaitOnAddress & co. for that target. These +APIs should be enabled at compile time on Windows 8. + +Fixes https://github.com/boostorg/atomic/issues/54. +--- + doc/changelog.qbk | 4 ++++ + src/wait_on_address.cpp | 16 ++++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/doc/changelog.qbk b/doc/changelog.qbk +index 9c370c9..ffbd902 100644 +--- a/doc/changelog.qbk ++++ b/doc/changelog.qbk +@@ -7,6 +7,10 @@ + + [section:changelog Changelog] + ++[heading Boost 1.79] ++ ++* Fixed compilation for Universal Windows Platform (UWP). ([github_issue 54]) ++ + [heading Boost 1.78] + + * Use process-local futex operations on Android for non-IPC waiting and notifying operations. +diff --git a/src/wait_on_address.cpp b/src/wait_on_address.cpp +index 7cf5bd0..6f8a165 100644 +--- a/src/wait_on_address.cpp ++++ b/src/wait_on_address.cpp +@@ -25,6 +25,8 @@ + #include + #include + ++#if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM ++ + #include + #include + #include +@@ -33,6 +35,8 @@ + + #include + ++#endif // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM ++ + #include + + namespace boost { +@@ -43,6 +47,8 @@ BOOST_ATOMIC_DECL wait_on_address_t* wait_on_address = NULL; + BOOST_ATOMIC_DECL wake_by_address_t* wake_by_address_single = NULL; + BOOST_ATOMIC_DECL wake_by_address_t* wake_by_address_all = NULL; + ++#if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM ++ + BOOST_ATOMIC_DECL once_flag wait_functions_once_flag = { 2u }; + + BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT +@@ -90,6 +96,16 @@ BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT + } + } + ++#else // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM ++ ++BOOST_ATOMIC_DECL once_flag wait_functions_once_flag = { 0u }; ++ ++BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT ++{ ++} ++ ++#endif // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM ++ + } // namespace detail + } // namespace atomics + } // namespace boost +-- +2.34.1.windows.1 + diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 331e57ee5d80bc..a04914fb5befc5 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -3,19 +3,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.77.0 - SHA512 fb3c0469e75eda40fd0d2a32bdc005fb0645cb52306468681a76c6ba4eaae608a5c4ad72a9363fdee6ecf432759667a850856b54500f5a4577ab34c701cf5c6a + REF boost-1.78.0 + SHA512 a6eba43c7038228fa7ce537b05429e263397bc914235d9ad9aa47badce5455f4905e15e5f1979c19088b47faca3091bd0dfcdb017290f796d34a36b682592345 HEAD_REF master + PATCHES 0001-fix-compilation-for-uwp.patch ) file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) string(REPLACE "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" - "project.load [ path.join [ path.make $(here:D) ] config/checks/architecture ]" + "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") - +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-atomic requires a newer version of vcpkg in order to build.") endif() diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index 9eaa56e1b1e92e..45840b8c9541f1 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-atomic", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", "dependencies": [ diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index a72efbe96c1ad8..186e878b1c658a 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.77.0 - SHA512 e4176ff221f99e43c54b39d8e0626931941b13813374a5302dd65797745f740a791c7a22bb713d1af2e7a9a4d0d6100c0aabf4b2af2c0fa1903dc35fb5c3d0d8 + REF boost-1.78.0 + SHA512 6b8c46d50833265642093d612c6a1c29e764e9fbee65e8514c377390ee69469a8a170ab5829de2d0f28641d5b15d11d7f174367d3c68eb0f36dbdd2b3bd08392 HEAD_REF master ) diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json index 919ee0e83bc187..5ea44a9744b2eb 100644 --- a/ports/boost-beast/vcpkg.json +++ b/ports/boost-beast/vcpkg.json @@ -1,18 +1,16 @@ { "name": "boost-beast", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost beast module", "homepage": "https://github.com/boostorg/beast", "supports": "!emscripten", "dependencies": [ - { - "name": "boost-asio", - "platform": "!emscripten" - }, + "boost-asio", "boost-assert", "boost-bind", "boost-config", "boost-container", + "boost-container-hash", "boost-core", "boost-endian", "boost-intrusive", @@ -23,6 +21,7 @@ "boost-static-assert", "boost-system", "boost-throw-exception", + "boost-type-index", "boost-type-traits", "boost-utility", "boost-vcpkg-helpers", diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 94b16bc5b174b2..23ab830ecd33c6 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.77.0 - SHA512 bbb6c21d7678f49dcba4ad27d873a02a026751385a0e98633b17651183b2b25c541d18fc6ad703d8b1298137b770bdf4cc46e808c45083650f3c2db2a2d1bb28 + REF boost-1.78.0 + SHA512 ab681674da7c1d5cf14f93f9832d5f0010661b42dc0fff2299dd7dced026fd0a474633363d070260a57bad0b3e956431c02ab5116e7d990d04bf37cf2f274c8a HEAD_REF master ) diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json index ac133a1e8ab044..ff6b9d7c060be7 100644 --- a/ports/boost-bimap/vcpkg.json +++ b/ports/boost-bimap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-bimap", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost bimap module", "homepage": "https://github.com/boostorg/bimap", "dependencies": [ diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index 1dd362b89aff5b..b23a81f8057c6f 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.77.0 - SHA512 ad765f5ceb327ead0c2858f0c6b3d85c3e6de2a287edecd5be8410ae8a248528c3389f78c0b37efd0eb18e5dc41492eff2b5f939c75aeeacfd1ea3745697eb57 + REF boost-1.78.0 + SHA512 8fc9484da8aeacd8a9fb60ad3dc061de278ae854d9abb6e513f330e38452d3af8cfa9342f185a15c7fff907b0dec02b7e54fbb8661633639aa34d9e9cd7ae7e2 HEAD_REF master ) diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json index 020db9f5fc2171..fb4e45d7bbd4ec 100644 --- a/ports/boost-bind/vcpkg.json +++ b/ports/boost-bind/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-bind", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost bind module", "homepage": "https://github.com/boostorg/bind", "dependencies": [ diff --git a/ports/boost-build/0001-don-t-skip-install-targets.patch b/ports/boost-build/0001-don-t-skip-install-targets.patch new file mode 100644 index 00000000000000..8a0415c7cc8b79 --- /dev/null +++ b/ports/boost-build/0001-don-t-skip-install-targets.patch @@ -0,0 +1,75 @@ +From 78fd284a42caabe8815cb0870b46e5567872e75b Mon Sep 17 00:00:00 2001 +From: Dmitry +Date: Sat, 11 Dec 2021 16:58:23 +0300 +Subject: [PATCH] Don't skip install targets if there's no in ureqs + (#113) + +--- + src/tools/stage.jam | 4 ++++ + test/install_build_no.py | 26 ++++++++++++++++++++++++++ + test/test_all.py | 1 + + 3 files changed, 31 insertions(+) + create mode 100755 test/install_build_no.py + +diff --git a/src/tools/stage.jam b/src/tools/stage.jam +index c5f02e3b..325129dc 100644 +--- a/src/tools/stage.jam ++++ b/src/tools/stage.jam +@@ -478,6 +478,10 @@ class install-target-class : basic-target + return [ sequence.unique $(result2) ] ; + } + ++ rule skip-from-usage-requirements ( ) ++ { ++ } ++ + # Returns true iff 'type' is subtype of some element of 'types-to-include'. + # + local rule include-type ( type : types-to-include * ) +diff --git a/test/install_build_no.py b/test/install_build_no.py +new file mode 100755 +index 00000000..0ccf3c5c +--- /dev/null ++++ b/test/install_build_no.py +@@ -0,0 +1,26 @@ ++#!/usr/bin/python ++ ++# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com) ++# Distributed under the Boost Software License, Version 1.0. ++# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt) ++ ++# Check that no in usage-requirements of dependencies does not affect ++# install rule, i.e. a skipped installed target does not affect insallation of ++# other targets. ++ ++import BoostBuild ++ ++t = BoostBuild.Tester() ++ ++t.write("a.cpp", "int main() {}\n") ++ ++t.write("jamroot.jam", """ ++make x : : maker : no ; ++exe a : a.cpp ; ++install install : x a ; ++""") ++ ++t.run_build_system() ++t.expect_addition("install/a.exe") ++ ++t.cleanup() +diff --git a/test/test_all.py b/test/test_all.py +index b7ef5ad7..9ed729d0 100644 +--- a/test/test_all.py ++++ b/test/test_all.py +@@ -250,6 +250,7 @@ tests = ["abs_workdir", + "inherit_toolset", + "inherited_dependency", + "inline", ++ "install_build_no", + "libjpeg", + "liblzma", + "libpng", +-- +2.34.1.windows.1 + diff --git a/ports/boost-build/0002-fix-get-version.patch b/ports/boost-build/0002-fix-get-version.patch new file mode 100644 index 00000000000000..cf35e7831c1e6c --- /dev/null +++ b/ports/boost-build/0002-fix-get-version.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/clang-linux.jam b/src/tools/clang-linux.jam +index 949e277..8934787 100644 +--- a/src/tools/clang-linux.jam ++++ b/src/tools/clang-linux.jam +@@ -97,7 +97,7 @@ rule init ( version ? : command * : options * ) { + + rule get-full-version ( command-string ) + { +- return [ common.match-command-output version : "version ([0-9.]+)" ++ return [ common.match-command-output version : "([0-9]+.[0-9]+.[0-9]+)" + : "$(command-string) --version" ] ; + } + diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index c0016203b07814..ec913ceaf73ed0 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -4,14 +4,17 @@ if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME return() endif() -set(BOOST_VERSION 1.77.0) +set(BOOST_VERSION 1.78.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build REF boost-${BOOST_VERSION} - SHA512 35352daaa31b54ee0bfce764dda0863931ac0e90aa8e3facde26a7ba472ddd2d799fced7cfcca8fc3ffd7a0a7f7e7d095337ba28f200da10e5187b7ef39bb88b + SHA512 867966e3d254c0e996786587fb64ad1bda6f96546e5302c15231b17d66537798770bbd9e89f800d445a1f0a4d3be06dff8aed42dfd3a77b563d0f5d715e79324 HEAD_REF master + PATCHES + 0001-don-t-skip-install-targets.patch + 0002-fix-get-version.patch ) vcpkg_download_distfile(ARCHIVE diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 420e86f76d482f..a425121de423a4 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-build", - "version-string": "1.77.0", + "version": "1.78.0", + "port-version": 1, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "dependencies": [ diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index 923c94793baed9..3366f1866dfd9d 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.77.0 - SHA512 ad0e266c219dba57048b4f3010a5740c7b6f914564123ba73c64b89952a2edf5b7e275d2bc4c8c456a7bc54abb736dc05ab4bc95b644f5ea724160671ebd95cf + REF boost-1.78.0 + SHA512 7bdd11a059bbf81e648e44750d77d1089674f34b167d86bfcfc653d2b6a6841188bccac2e7e9769a76022e052bba5b6d4c0b72bec1f630196a5ea290ffe5ee24 HEAD_REF master ) diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json index 9467c92e1f4a01..5a384b18a0bbaa 100644 --- a/ports/boost-callable-traits/vcpkg.json +++ b/ports/boost-callable-traits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-callable-traits", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost callable_traits module", "homepage": "https://github.com/boostorg/callable_traits", "dependencies": [ diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index 9253abf4e2a2a5..67632cdcd15a71 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.77.0 - SHA512 df6f3ebb5995b8cec0d0964625e3fd5c3a139178a6676c27a28163e2c1559fdb2289e05c4f4eaff94ee04dd1a01afbb30d99c1f7a0e09660c9d5bfe7414a4f51 + REF boost-1.78.0 + SHA512 5e4f289508f58fda3cdebe17a65b1e6eb911473b8e7ec382fdf834661e46c7645b4d864abac7a124100feb4e46bbac78cbc2d7101053c0c3538d6b74ff6830e3 HEAD_REF master ) diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json index dd8dca5c83cbf2..f6e6002cfa3eb8 100644 --- a/ports/boost-chrono/vcpkg.json +++ b/ports/boost-chrono/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-chrono", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost chrono module", "homepage": "https://github.com/boostorg/chrono", "dependencies": [ diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index 09a265da2fcc33..31d0e7d9293d0e 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.77.0 - SHA512 ffa84cd072a1ba9d9b88681558f4c9f8e62bf41a3003a68d33e69fe124e428f1f6c46cad6af7907fcefc6caedf548d525ea2b5474981db5e9f58285523ef6fb9 + REF boost-1.78.0 + SHA512 07b8cbec9a4f50b06c7da5ca496c86d697d8c78fb36588a9d6b36e9042ca53d2c28a0bb6cd97904a049efe60990b81d45b14693bffc91133dde4ab253deb0ea1 HEAD_REF master ) diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json index 1959cc56d41cae..bd6a20a0da0218 100644 --- a/ports/boost-circular-buffer/vcpkg.json +++ b/ports/boost-circular-buffer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-circular-buffer", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost circular_buffer module", "homepage": "https://github.com/boostorg/circular_buffer", "dependencies": [ diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index af9f20a0e01b36..78a4b6151649e5 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.77.0 - SHA512 427d8c3f8fad551942b5003aefeea805ffd1a6bea7b6d9ad834e8814474b7168ac9040675c59fa4808d3389ac436a90d508dbbe0576dbb4b4b16bd479dd96538 + REF boost-1.78.0 + SHA512 902f006406d376dc5ee68d4c2429ccf7fc5159e23e9b2b8238f5008bab87505bb2ff8c92084f6c7585a24c9874d73933bc6d6b92f36cd6cd0b83da9733a4b0e0 HEAD_REF master ) diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json index db5c4ac84e3fb6..fd584bd61d23b5 100644 --- a/ports/boost-compatibility/vcpkg.json +++ b/ports/boost-compatibility/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-compatibility", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost compatibility module", "homepage": "https://github.com/boostorg/compatibility", "dependencies": [ diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index d461a5f9be738d..f7ca475fb9019e 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.77.0 - SHA512 1ca1ed9fdb87ea5c848bdac6e1a941b85927c31454143d06d98e214469fa1b902f1bc722c0a3e99acdc184b966789cb02d1ad2502aebd83315c3b54959dc79c0 + REF boost-1.78.0 + SHA512 5e9daaaf875e636825ece0c38f16f503f102e42c1acb02539623c4488244e966689d8af850afc4c4d2abd7009f416ddb2e0c76cd43de4e2f7b022355a3409a36 HEAD_REF master ) diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json index 72e700266808a1..a5cfddc6c6119c 100644 --- a/ports/boost-compute/vcpkg.json +++ b/ports/boost-compute/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-compute", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost compute module", "homepage": "https://github.com/boostorg/compute", "dependencies": [ diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index 87184c7c618894..cdb17c36d7ddfe 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.77.0 - SHA512 83963c83de619c7078fd174f7c64b9ab7d4bb831fdfdceb78eae7fd406dc44e0877c1a985e55134026173dee295430f4b223bdd8bbd3bf5c3c48f99d7319090f + REF boost-1.78.0 + SHA512 b9d7caba37731ce3aeaa32016f7055f91e15843a8a6022e6863fd9ad86af4b0b8c0b7f3828d7601906deb5c84597546f155d5ad600c4b764c6a54e1fa2f6a869 HEAD_REF master ) diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index b25c16d80b49b7..685451d6303b22 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-concept-check", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", "dependencies": [ diff --git a/ports/boost-config/fix-emscripten-compilation.patch b/ports/boost-config/fix-emscripten-compilation.patch deleted file mode 100644 index f85fa3c478341d..00000000000000 --- a/ports/boost-config/fix-emscripten-compilation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 85292621ece3409a80929add91c971400ba724f3 Mon Sep 17 00:00:00 2001 -From: jzmaddock -Date: Fri, 10 Sep 2021 11:36:29 +0100 -Subject: [PATCH] Add emscripten testing and support. (#403) - -* Tentatively add emscripten testing and support. -Fixes https://github.com/boostorg/config/issues/402. ---- - include/boost/config/platform/wasm.hpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/include/boost/config/platform/wasm.hpp b/include/boost/config/platform/wasm.hpp -index c307812d..682b8485 100644 ---- a/include/boost/config/platform/wasm.hpp -+++ b/include/boost/config/platform/wasm.hpp -@@ -9,6 +9,12 @@ - - #define BOOST_PLATFORM "Wasm" - -+#ifdef __has_include -+#if __has_include() -+# define BOOST_HAS_UNISTD_H -+#endif -+#endif -+ - // boilerplate code: - #include - // --- -2.21.1 (Apple Git-122.3) - diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index c32b1dcb7e1e66..204d3b3dd95d5f 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/config - REF boost-1.77.0 - SHA512 c6df16825b7bb27412667e00b6b6cdecbf56ee0707aa1df3505637c7de5c39c87335fabd7cd4361b29625d71c7664e6af865fc271ad0b3e70cc8872825f6155e + REF boost-1.78.0 + SHA512 116820d81ff268e8231bfdd9160cf803bbf6f9987ab2261630bc7c21b283db9e7ef3b9576c4d3444a52ce2533fde653ff75f98f6c1cd5e78d5936df674f6f8ee HEAD_REF master - PATCHES fix-emscripten-compilation.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index 3b56236a548af7..2b650f63a1aa69 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-config", - "version": "1.77.0", - "port-version": 2, + "version": "1.78.0", "description": "Boost config module", "homepage": "https://github.com/boostorg/config", "dependencies": [ diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index d8e4da4118ed66..7b009e656cd030 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.77.0 - SHA512 e7963ffdb8ca7a2eb35af104e44975f775c1f71a869835f4aedce2a19c484097dbbe83221f3680c9d9a0288ec35e12983de2abac0334cb3c7d1de429f9edd765 + REF boost-1.78.0 + SHA512 344ed155031904336c48c61b66a23b420cb63e5601ea1f5eb614dcac576aff8900b3cd79889b5313f2f7558ece81efc3a1944c07d0374a00a3766eb4b1dda3e0 HEAD_REF master ) diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json index a422b05355796a..8584253804c5a7 100644 --- a/ports/boost-container-hash/vcpkg.json +++ b/ports/boost-container-hash/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-container-hash", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost container_hash module", "homepage": "https://github.com/boostorg/container_hash", "dependencies": [ diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index b52ba2406f520f..447dedabf89108 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.77.0 - SHA512 dec03159614a3d3017b2fae56b3c4ff5d6b3e0396490ea1b1015e54d3be1ec1c2c525ec6f410c2d94575025459d9053b9c29b9aa45d3a7a89656a82240fcfcda + REF boost-1.78.0 + SHA512 f20ca062d061c24caf262b6524525f4face4e7fc9e924d16b9160f7d7720c4490f131abc08f5ff9a04ea59c04cffef4f1cebf33a1d524aaed8903eb355b55700 HEAD_REF master ) diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json index c5dde650183ed5..0e6166c1b50b55 100644 --- a/ports/boost-container/vcpkg.json +++ b/ports/boost-container/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-container", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost container module", "homepage": "https://github.com/boostorg/container", "dependencies": [ diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index 56ecba686ebe5f..26e5bf522fb0f3 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.77.0 - SHA512 a65c27fe09bddfc1398331414f88f8fe2606ee147b2db2c5690dad8af860c03c6a4e61ecd750f43243bdcee5e5217cee77d469deb57b9ea0b181161e82b7a5cf + REF boost-1.78.0 + SHA512 ea2695df5301853209ed0db70cff632e27066dbd2dcfb3946022633427a45ad07f104eee7ac554038a45f4bf89fb8b39ee4d07f873aebb4571ed392d1e343879 HEAD_REF master ) @@ -12,7 +12,6 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") - if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-context requires a newer version of vcpkg in order to build.") endif() diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index cd4d54f195abbf..15d0080bfd495e 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-context", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "supports": "!uwp & !emscripten", diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index 3ade7be44a9ea8..f3053c69b39344 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.77.0 - SHA512 f7d26121200a3e3f5f693423b50ae313477749446ba0c89b2e47ce26007a0f7dd636c2ab47a83b120412d9fe09f3b905ca4a4ce93550be1ae4acb9c23f1892de + REF boost-1.78.0 + SHA512 c746ff575a33ef21245c927249142a017bb3616b4790d30bca0473ed70c626427be67d647f49693357440f6f9a540c6152df445de922bf4e6b55756197e5fbde HEAD_REF master ) diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json index 8d0fed3e433957..68ea09dc957502 100644 --- a/ports/boost-contract/vcpkg.json +++ b/ports/boost-contract/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-contract", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost contract module", "homepage": "https://github.com/boostorg/contract", "dependencies": [ diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index fdb6ada69b3e76..a9a1139b5b8520 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.77.0 - SHA512 d0c866f7cf01be8bd98903a5ea92f678eb119f767b97caa8a2e5edaafd2cfbe838ee02c50301de0a9cf8082db95e3379f2fb1cd2b7ed835288c89171b2753da2 + REF boost-1.78.0 + SHA512 0a3d649eccf90d3a2327139f236498dd11e49e308f30b559e7c91d955685eb859a76bb92d9cec6aa066dd898a35dc1c4cbfa60751db75331261f381bee1cc600 HEAD_REF master ) diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json index 1bd0be804435b2..c9f65045e4ba31 100644 --- a/ports/boost-conversion/vcpkg.json +++ b/ports/boost-conversion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-conversion", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost conversion module", "homepage": "https://github.com/boostorg/conversion", "dependencies": [ diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index 3331ec10bedc67..5a58a616852fda 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.77.0 - SHA512 5c682d0ebe3a23484beca5ae920351e29a8914f0f16bf4296569c03271466d7d2f1818e1674070d41994cf6ef7aa70560883f878c8108873932fdf1a15835f8b + REF boost-1.78.0 + SHA512 0a1b91d5b8e750de42ca774b98eb59b0b5287890546548facf049b9157e82bfdd741f8aeafba311dd9a99235da93a4224db0cabbfc4e0f8e7ac9c5c1f6d528bf HEAD_REF master ) diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json index f771279e7b0ba7..0e98735229ba57 100644 --- a/ports/boost-convert/vcpkg.json +++ b/ports/boost-convert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-convert", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost convert module", "homepage": "https://github.com/boostorg/convert", "dependencies": [ diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index 2c2ed7653fc73c..1403a0004b7645 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.77.0 - SHA512 2414c3ad43f7d1a2b6ded729a26825faaf69eb016b831be659f462e0e1f399e1e36a37ef46ea2f270423c409c5c40666b8516f30011b9094d679122da86436e9 + REF boost-1.78.0 + SHA512 df3a14047bf50dd98d21f1251c74685440c306948301f2017525f3ad638664f5b13c353cbfd78cb1f5b35b91eb0f8c5818fcf3939e9ce52c1d00b4a50a22e311 HEAD_REF master ) diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json index 578f83aaea3a74..d9eb92039bda7a 100644 --- a/ports/boost-core/vcpkg.json +++ b/ports/boost-core/vcpkg.json @@ -1,12 +1,13 @@ { "name": "boost-core", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost core module", "homepage": "https://github.com/boostorg/core", "dependencies": [ "boost-assert", "boost-config", "boost-static-assert", + "boost-throw-exception", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index 77e4b8ac4598cc..96bd3e99247e71 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.77.0 - SHA512 f586cc1e96115341b396b4750e1bf99a0f40a353c219bf0d7a1c3926935d632f880394e1b06e39ce53fc416fa71b7850d8ce894880ad66cde8307606eb1dece4 + REF boost-1.78.0 + SHA512 ebb8319388b2a57143a3fb5a66cc930547a804fd8b04374632c2fbaff8f28a1d9b22ea5862e39c1e653c2062c2137e97d38fa5cb44ce5699b07cc5c7526f311f HEAD_REF master ) diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index 57f4afa936f43d..47fa52783e940a 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-coroutine", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", "supports": "!arm & !uwp & !emscripten", @@ -23,7 +23,6 @@ }, "boost-move", "boost-system", - "boost-thread", "boost-throw-exception", "boost-type-traits", "boost-utility", diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index 9e32f0e5fc1d39..8fa27a2f95ca84 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.77.0 - SHA512 6e44ff880f2eca082e9f95bc5ecd79b4e17ddf22351a8d6ec3c20ca4eb967c23581e861d81c5516b8b88a4b6ad854dbb3cfe5af80f892d71eaef11d0a1558bfd + REF boost-1.78.0 + SHA512 e25ac3a97fe4ffd12449b324d311c4e8bb1f64db6166b460c087b09bffdcfa0746bf7731e08258b936639d319944b7f6d193ec92231d7f5d8cbee2f64d0f23e7 HEAD_REF master ) diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json index 5fe146960b888d..5707c0f8c1de0b 100644 --- a/ports/boost-coroutine2/vcpkg.json +++ b/ports/boost-coroutine2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-coroutine2", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost coroutine2 module", "homepage": "https://github.com/boostorg/coroutine2", "supports": "!emscripten", diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 71cf71dd1c1ca8..6904b3539fd899 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.77.0 - SHA512 f82a3a89208d10f29eae521eb11ce81316351b4b75f882ce8af4e981966b2798a94ea4825a80b854bef1fcb29bb712f094da7481061f376d9bac593ac2085cf3 + REF boost-1.78.0 + SHA512 e913075402e98eb4a8e216bce3307d5339c924206640a1f389dfaeeca0336be29714852d1c8a40ab9a7c4f40efd37d433cc7c717324911d48ee4b845c1ebdf83 HEAD_REF master ) diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json index 98c8a2e7958837..f7fd45e507fdb3 100644 --- a/ports/boost-crc/vcpkg.json +++ b/ports/boost-crc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-crc", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost crc module", "homepage": "https://github.com/boostorg/crc", "dependencies": [ diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 9e6ebe6ec012b3..7285a90ba91dfc 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.77.0 - SHA512 dc560858d38bae7be8fe70ced75f26fbb59b9b8f32ae5ae88cae9a6246db3f20ff3ab9d6b6e03d54ae4e93477801045891e6314d1bcca55ce97626da3c75191d + REF boost-1.78.0 + SHA512 a4fda022d4658fa4db22114cc696acbc369505eda9fab722bbc7d5149af22f8c5c4e0e12f86b1ae07223cef82d791c278c656a7f492a0f89200921964c7057fd HEAD_REF master ) diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json index d195fda68d76a0..2a371659153f2c 100644 --- a/ports/boost-date-time/vcpkg.json +++ b/ports/boost-date-time/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-date-time", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost date_time module", "homepage": "https://github.com/boostorg/date_time", "dependencies": [ diff --git a/ports/boost-describe/portfile.cmake b/ports/boost-describe/portfile.cmake index 745fd29833c35c..ee73f521284f67 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.77.0 - SHA512 70b9283fb106ec99fea1cf72400f813abf92b44e74f1bd18411201e96ddd78b0f244bc445bf304a2259da28a2a119d20bc89e50b19852cf2fd8c45d2ba99a302 + REF boost-1.78.0 + SHA512 2a3601bdd98dc3248402baca147000cece14458f9478af1726c919037190f1affae0e82f26124d17531da9e0dc8180998646babe7dc14756aa36cc5d51fde1cd HEAD_REF master ) diff --git a/ports/boost-describe/vcpkg.json b/ports/boost-describe/vcpkg.json index 4ced74c0e0696c..284565557a7618 100644 --- a/ports/boost-describe/vcpkg.json +++ b/ports/boost-describe/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-describe", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost describe module", "homepage": "https://github.com/boostorg/describe", "dependencies": [ diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index 7383a737410bb7..72829444a9f1b7 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.77.0 - SHA512 c65810121889ba39e149b120b69a682f62aadb9a660100bb7009e5f27ad36e645cfa7b0d98a0fbaef12cd3c15738660aa9b9d6ef9cd5e91cb5cddfa3b171fd03 + REF boost-1.78.0 + SHA512 7d3206d42a2af1692807845077abf2dd9330d0628a7a2dbd221f73b405bada294c5f380e3765a16df647bd4ffe4bacc5fda4a40f7c5b6c8f7dc77f20152e778f HEAD_REF master ) diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json index a5280c098de151..125895bc65e8a0 100644 --- a/ports/boost-detail/vcpkg.json +++ b/ports/boost-detail/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-detail", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost detail module", "homepage": "https://github.com/boostorg/detail", "dependencies": [ diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index 247ea4b8f5ccdf..58964d27654ec4 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.77.0 - SHA512 051de508ad1a0c635692845732ea12e2b3872599af9fbe70ed0183e8278292d3e9f5920ef851a052ca9ee7c8967c8486d894254b862ec379e36790536bd076dd + REF boost-1.78.0 + SHA512 bc7869b43cc2aaf69a168c8fab02d3f0eb9283ab47dd8f6d3fc15cd7f82d561f092fa77564cc70f43d14af9220f7a59addfb3c9e40744e3223aa8be6f3c5bb57 HEAD_REF master ) diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json index 27d027222ee719..abb260d6e0f308 100644 --- a/ports/boost-dll/vcpkg.json +++ b/ports/boost-dll/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-dll", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost dll module", "homepage": "https://github.com/boostorg/dll", "dependencies": [ diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index a3ebd00693d2e1..66a24c146c9567 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.77.0 - SHA512 dcabd09d66003a7ff306d26f37399281bb2516021f76a1bc1960ef3bbfcf89767d1638fe69b237108aab165d45887468c5a34bb1016852f7277397ca965b6a3b + REF boost-1.78.0 + SHA512 cb3b6542f16d97126eac963a48ace71b795bcc32148c2a8608694045afd833520c104c5ac7ad98ba8196bfa182040e4edd4c54d9af88b257aee0e390251c74a7 HEAD_REF master ) diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json index 1de96a61d4aa90..1ab3c838d2f680 100644 --- a/ports/boost-dynamic-bitset/vcpkg.json +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-dynamic-bitset", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost dynamic_bitset module", "homepage": "https://github.com/boostorg/dynamic_bitset", "dependencies": [ diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index bb3ff853a59f85..9f370038ebed66 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.77.0 - SHA512 f7ed33602a5d9860fa460bca51f9576a3d0c90b703b5e833e106ccf7e28b1449e86f230b353823578a669fcd65922d206ba03a390bfed258dd37edd8435736cd + REF boost-1.78.0 + SHA512 f010f4c1d301637fc8fbd9220eb7456cd9f0ce04cfc56af2c25092a7a53a4f7e541cfc65bab46e65fe6007184d335b99b03ec0d26ab7935ffd5d622c99caf817 HEAD_REF master ) diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json index a759a4a445e4d3..84f7432ac68f78 100644 --- a/ports/boost-endian/vcpkg.json +++ b/ports/boost-endian/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-endian", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost endian module", "homepage": "https://github.com/boostorg/endian", "dependencies": [ diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index e5f34243d58313..e96f086ccdab37 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.77.0 - SHA512 90af6443bed8114466bce41b43c7d1d439f0b62dee4e1609da84f60c41313aa94e4a6d7bf82e448d612e2521450cfd59cb34cf85f5962718ea33aa7027f5c84f + REF boost-1.78.0 + SHA512 b1e70fd27fb918cd3e6bd77307de96ccade192bbde8ddb2f27301d7b242e1d8acb1dc7590c361fb4036b0abe303b222d2b2d28263036de540044461850d31804 HEAD_REF master ) diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json index bca330a0a5d9b6..6e0ec47c301d18 100644 --- a/ports/boost-exception/vcpkg.json +++ b/ports/boost-exception/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-exception", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost exception module", "homepage": "https://github.com/boostorg/exception", "dependencies": [ diff --git a/ports/boost-fiber/b2-options.cmake b/ports/boost-fiber/b2-options.cmake new file mode 100644 index 00000000000000..296336aae92c4e --- /dev/null +++ b/ports/boost-fiber/b2-options.cmake @@ -0,0 +1,3 @@ +if("numa" IN_LIST FEATURES) + list(APPEND B2_OPTIONS numa=on) +endif() diff --git a/ports/boost-fiber/fix-build-numa.patch b/ports/boost-fiber/fix-build-numa.patch new file mode 100644 index 00000000000000..d1b93f2409b435 --- /dev/null +++ b/ports/boost-fiber/fix-build-numa.patch @@ -0,0 +1,15 @@ + build/Jamfile.v2 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 +index 3efdb96..8a6b6dd 100644 +--- a/build/Jamfile.v2 ++++ b/build/Jamfile.v2 +@@ -130,6 +130,7 @@ lib boost_fiber_numa + numa/algo/work_stealing.cpp + : + @numa ++ boost_fiber + [ requires cxx11_auto_declarations + cxx11_constexpr + cxx11_defaulted_functions diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index bfde32a75a4941..08851ff7290eb0 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -3,20 +3,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.77.0 - SHA512 f5ee6acc30902b2e68861a194f478a6a0a9ea8de096465fcb48c27756718fe6493c8c4d8e08b0473edd45162106061de735a95ff8679d54862cc3a62968aaa94 + REF boost-1.78.0 + SHA512 271454964e12c0006ed9ef52911cf76d004141da54d5f96e63d106a216841d9a939d3dcd802fc9e860ac6a21d0b7fab9f385e8647ebbd2fd669e48fc9b6a80c9 HEAD_REF master + PATCHES fix-build-numa.patch ) file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") +string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") - +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-fiber requires a newer version of vcpkg in order to build.") endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) -boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index f7654c22f9e16b..a7145abf7057b1 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-fiber", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", "supports": "!osx & !uwp & !arm & !emscripten", @@ -34,5 +34,10 @@ "name": "vcpkg-cmake", "host": true } - ] + ], + "features": { + "numa": { + "description": "Enable NUMA support" + } + } } diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index 0e1a1d02fe3bba..0d5b3bfccc19f6 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.77.0 - SHA512 ce63c951db9052bcc57f453628088791970245313f78af9131908731065b6fc906b885c05fd05bb8b902f52c191766858183f52a6954afe3cd4062c51b0592fd + REF boost-1.78.0 + SHA512 5a17a3084db574325394e56dc5fb740dfe6d0aa53026040ce98e6248a62501cf7b8f37721d7f6d6d0366ab5bdcbc52be9084ebf3147c91c6208fd9a67bfbac1c HEAD_REF master ) diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json index 9218ed31c7f174..57abd3b2cc884f 100644 --- a/ports/boost-filesystem/vcpkg.json +++ b/ports/boost-filesystem/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-filesystem", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost filesystem module", "homepage": "https://github.com/boostorg/filesystem", "supports": "!uwp", diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index 64f9ed3f80e596..eec3b10798ba3e 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.77.0 - SHA512 6175d43913ec8e9b96042dbc3babe4ab565bee97a3e87dc08282e624861f54b959dda61e73166f3b2d3aadec50c7cc100b3d32fa777083e90692cdcf89ef9fb9 + REF boost-1.78.0 + SHA512 192a9985ab4026284d703993e71db88feccc045bc3039763daa87078cd5881e0fee9e65024f264813d508d4cf53b41661befef50dbec911d4ad5063eb11da144 HEAD_REF master ) diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json index 9654c5c6b23e4f..2b348bff57307d 100644 --- a/ports/boost-flyweight/vcpkg.json +++ b/ports/boost-flyweight/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-flyweight", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", "dependencies": [ diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index f16a626a9a7729..3338bf2c2928c0 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.77.0 - SHA512 45a4bfb69ea3524c69de90e1b3495d1a5972110dec37f3d8fd623cb223484b076f54a1d6c4245925722b8c263077c6e461b16b8c53d2d264e01386722f502c83 + REF boost-1.78.0 + SHA512 dfc27c7f6353270e910a26511abef83d1f89cfbeeb6fe6da3cd51d1d6f832369734449b0c56e0476631216688d005047e5724a13df03cd3eeaba2b30b4c926d2 HEAD_REF master ) diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json index 5304250e401477..4b9f839305246b 100644 --- a/ports/boost-foreach/vcpkg.json +++ b/ports/boost-foreach/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-foreach", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", "dependencies": [ diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index b2c0651aef1c7b..95ff3d4955f56a 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.77.0 - SHA512 b83dd71f3b76773f852b5f680c5cdc62105b616b6343e87320eea718f13932ba4098f47b17a67f096855cbb0a717b01552c292c49397a093b3bacb009a48e675 + REF boost-1.78.0 + SHA512 5d104eaff0d91984c5ac712af1e53f0d73215dad4252b065dec119bbad5dde72a35bf23f56dc2f765902045ca94d5472c1ab15241ef631fdf784cd950a98e86f HEAD_REF master ) diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json index c383b31c9abf64..92004164869b17 100644 --- a/ports/boost-format/vcpkg.json +++ b/ports/boost-format/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-format", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost format module", "homepage": "https://github.com/boostorg/format", "dependencies": [ diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index a017e85c88b830..d4fd306c40ceeb 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.77.0 - SHA512 7a530e9505daf5c67c14a01476c0317f3f85b9976082eb02a90cc79fc7c1b9a26d9d23740c1324e4df00cf4e85b1e1b2a2a9638eee74f85193ae3b3bfb936f92 + REF boost-1.78.0 + SHA512 9cd5a8c91e3fa32e3d5aed48da82c5b22c4a3309eecb18adf07e716393e58bd61ae273a5077222ad4c036561b317591934c876392effeb47b231554a20ff291b HEAD_REF master ) diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json index 8f49bf9df71c7d..37bf9d59c5e4b4 100644 --- a/ports/boost-function-types/vcpkg.json +++ b/ports/boost-function-types/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-function-types", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", "dependencies": [ diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index d86bc5aea726be..922f9dcd6ec9a6 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.77.0 - SHA512 637f6d436614a805bb7d8e5dac0fc154896f4e77a51e1bf2d4509779bc412eaff1756dedcc9937490ca21d5bc15c8df6d911cfe9eebce51f80b5ec42a85d4155 + REF boost-1.78.0 + SHA512 b8a1da6c586948f3a7981c8adf0b3bc556da8aff9cae5dbb3bf4a7610e035a1969e89e3039d09105d28bcf73c04fd041b2c972fde9706657ac3996a9062fa96d HEAD_REF master ) diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index 00181a35f653db..13efb0089beb3f 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-function", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost function module", "homepage": "https://github.com/boostorg/function", "dependencies": [ diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index 844ccd4fff26db..e1b2257ba83db8 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.77.0 - SHA512 0b0d675482ccaa0ca2eff5c2a9d4ffe4ec2374320a8a0766e791b57eb16be661422727c5d55f3bce2113d6410e07b05b29369e1ed551545e9ad427b92fd44c83 + REF boost-1.78.0 + SHA512 d4fea4d4c5af107fb26b025c30dca05e5875e0ee2046f54f86a1acf3ea25864776783fdedc3922cd9fa8124cb10ad68c778dcd82f7575f70e6c14d6ff9b339f8 HEAD_REF master ) diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json index a00b0dc30355e2..5ffb24d9a11406 100644 --- a/ports/boost-functional/vcpkg.json +++ b/ports/boost-functional/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-functional", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", "dependencies": [ diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index bcbbb77464a9d1..9d6d94a2bd2e8e 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.77.0 - SHA512 c8ff639af2fe04a9a97d087ffdb023ca5530b6de0228f8f87150e6c18100aac6b500698fdfb2a431688be351b7d10e09f58006c9bf84660efe02fdd0c969446c + REF boost-1.78.0 + SHA512 dd76b330c21943ca05789756705dd62be3c987eb5023cf4ae9330e90a0020065cd7544bb8b7238b9e4c85ce5ed0db2b3f5895aecd222c0db3275b855323f2e7c HEAD_REF master ) diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json index 3b28a6b665ea7d..90ab4bb8b178ee 100644 --- a/ports/boost-fusion/vcpkg.json +++ b/ports/boost-fusion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-fusion", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", "dependencies": [ diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index 9530fbff3df15e..d8b6b6f4b46b96 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.77.0 - SHA512 a5c6b1051bba1ec60ab5ad99421892ad868f9d31ac1d8da5a7bb995bd4ad27ec9e20daf2ad5646e48badb33e8b14c8ebb9343923b6ff7f725347c222e797cb67 + REF boost-1.78.0 + SHA512 8b348420555d070412e543190e201b85b1e090911e6e299fd5cf375d1927e63092f95c8b17723d6477f96b7fb9edffaea2b0070a7794c1b2af2b63e62704c40e HEAD_REF master ) diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json index c1d574a84ac841..deb8974651fa68 100644 --- a/ports/boost-geometry/vcpkg.json +++ b/ports/boost-geometry/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-geometry", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", "dependencies": [ diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index b6dae42551f2e7..88602ed17d7ca2 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.77.0 - SHA512 a779a3a471509f0a5cbb9048ac4345bcde875cab1afb540bc4b0d051367b3bbd4eb41ebc2d0e50cc4dda9c7775e7b753cb3dd582ae6fe938ae94a71187de4089 + REF boost-1.78.0 + SHA512 6f8b94bb75cf5a1e8781454490d6873bf8c91e85ba7c98f81ece382000051c42512dc76939c693b9b24e97a3496f5fd97581a5665508bdb2ba11e570bc77bdfe HEAD_REF master ) diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index 991dc51d6e4690..32e00e207409e6 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-gil", - "version": "1.77.0", - "port-version": 1, + "version": "1.78.0", "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "dependencies": [ diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index b14dceb5008faf..6d0ca9b8e975ad 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.77.0 - SHA512 2236b4ad0eae70c6dba7814003cb6e37505a09b29f26e2558cc6784d01b37a2e715acac0fdcacf553b94328fa6495fdcacabd9e7d00068ce4baccd29060faca1 + REF boost-1.78.0 + SHA512 50efce738dcdb001c5d429274f1d699caa45e68998f60dfdd5c0a572981ca72a2d08159619adda8a011c1d6237bf615572f74ebe10f2fb98334984a54c9f653d HEAD_REF master ) diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json index 436b280efcea2b..d663fdd369c83a 100644 --- a/ports/boost-graph-parallel/vcpkg.json +++ b/ports/boost-graph-parallel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-graph-parallel", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", "supports": "!uwp", diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index 61bf8a3b91c72e..b74e7915768b0b 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.77.0 - SHA512 e7b318d18ec8586578d20398de862c852157f272bcc397b92a8808eb931aa1ca472df26972b052c123e3bed0213d41ad670bdc63621c6d5ef26495b66378bc76 + REF boost-1.78.0 + SHA512 af51d2d0c07bc3d6c880b114c34aec2ebde9f4c1b2ee73a7e8be4edf2a8175ae341b0ce8fb36fe7b4899aebaafe054720f573233b72849648ca0a97c92098d77 HEAD_REF master ) diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json index b4a2db93bf99fc..b89fa9f637defb 100644 --- a/ports/boost-graph/vcpkg.json +++ b/ports/boost-graph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-graph", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", "dependencies": [ diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index e4e5e22f89acd6..1e7c706aae4e5b 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.77.0 - SHA512 763d772026c9a3ed0e945c92c698f76a8acfb63947bea0520f58040c5461b2c8032fa025fbd93d44b17ea7d83ddd645d84ec1362d7e86b937cbb83e8108536f4 + REF boost-1.78.0 + SHA512 407cc2dbf4fee28182564925cf2a11074728322e03b2c5acbc9d34ed4d7e30befde9f74176270b63179f09504b42375249f09d336546ebdf2e24b4956d2fb885 HEAD_REF master ) diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json index de7c4aa378e101..6b588031404c19 100644 --- a/ports/boost-hana/vcpkg.json +++ b/ports/boost-hana/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-hana", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", "dependencies": [ diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 33804f98450c66..64c78f82bc8da1 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.77.0 - SHA512 73885784757bbec1ec5ac77fad398498f0f80f7d52b69f82b6d0c93d99cec38ec19765e20157fa6fee7e4fec371ce98962589ee2fc42b280dfe831ba56b0afef + REF boost-1.78.0 + SHA512 f8360f4cd5772e5e2fc62b4174778b227c34876fbda6b4a245d959ef895a20eb3fc88084de7f9f22caa89a9a6b4be50b5aff9088a8c81c4216450b5ebcdc5dc3 HEAD_REF master ) diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json index 6553f69d26d5fe..204c7c05d0438c 100644 --- a/ports/boost-heap/vcpkg.json +++ b/ports/boost-heap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-heap", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", "dependencies": [ diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index 739a20889ee65e..743a0744979d4f 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.77.0 - SHA512 bb802772651e1e850ffbf385c83685a0f745f4e90a48b18dc80b701c4bd865fe47e167a7a7a2d434d6d07fbde088b2c3344a67a08a1b5a9268b4f68d88256ee7 + REF boost-1.78.0 + SHA512 1124b52f68f6a240ca5fc8e1514fe3350a1f16260b137b5fbdd67c9fd68573f11a9d95cfcc6f370201ef6ae95a35098e1c8a457180c26ffaeb9b29bb6fbb0a2a HEAD_REF master ) diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json index 1bdde815c66753..60a7ce773bcdf7 100644 --- a/ports/boost-histogram/vcpkg.json +++ b/ports/boost-histogram/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-histogram", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", "dependencies": [ diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index 588a84b02697f1..d82fb2460fb720 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.77.0 - SHA512 8cbcc9ff6bf092c5ac90a44304a7e5eb2e969ad5d14d6913549941e941fe8bf1d2cabadfd6b4808fa494306eb53e9d1a5e6a9c7efa28db15b9844e87713e3cd6 + REF boost-1.78.0 + SHA512 120ff5db96651321eb2512b672c204219e6e6612e2a5764c933cd3b3d7afd82e2fe5ec57a0a293e83d276ee171aaca06eaa856dc8b7e5f891fdbd3bc536373a7 HEAD_REF master ) diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json index 065612d9399dbf..3839b5919bb221 100644 --- a/ports/boost-hof/vcpkg.json +++ b/ports/boost-hof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-hof", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", "dependencies": [ diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index a50473f909c8f8..5d3ecbfad05640 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.77.0 - SHA512 680119595e9743b70a0444ee65cace053269d6c04133c1a59e82cf2e41f7e73b4aab160a232902cbbc5c2d5f7f6633c1f00e1564c8c62b95beafd247ff482399 + REF boost-1.78.0 + SHA512 83d4f74ef6c4dbe7e6e9eaf1665bc2e013fa4236a92ea5b702889cb67e86d2c141897a8a9b627ef693c6514ddd148ea9f2120fc606e255238dd7ebd083a5fc47 HEAD_REF master ) diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json index 8d4cdc50cad90f..6e0df276f6cfd1 100644 --- a/ports/boost-icl/vcpkg.json +++ b/ports/boost-icl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-icl", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", "dependencies": [ diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index e5d3e499e7dbb5..abc67f88303329 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.77.0 - SHA512 31a254a1ae2ea201b6e202c5f4c47291915a6fe76c947bb1fb254dd065b47beaf97ef54cec6bb29058c671b63d240a3db268e03bb90b133d375eb0606421106e + REF boost-1.78.0 + SHA512 c0d87b0c8ccfc3923d61862429b22dcf09b9905c57927277bbef7c45ca1ae2ba57c35fd7d7ec3aec19eedf73598c4c1bf2d49c9d66af297fc2978cb196b6a64d HEAD_REF master ) diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json index d1b382d1987db7..4b6ac510f8b641 100644 --- a/ports/boost-integer/vcpkg.json +++ b/ports/boost-integer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-integer", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", "dependencies": [ diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index 431b05bd177b19..35c64ee14e56c2 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.77.0 - SHA512 59ccd15b58a8ba343ca4c009a3c6a59a06248d7f9829dbb355320d7184b6476dcbf98d68853fe9d2522e7d8500e39ce36073fde1f17cbab01003abb8e5d2d425 + REF boost-1.78.0 + SHA512 47ac928bc47f4fe0d504031e51c344f733820db2c40bb1e55187778692d480e692a3c3fee62e05d24b389b0117761ee8147fe8aaff1510a088047fb38a703986 HEAD_REF master ) diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json index 58f1ffb35e0a90..771a5c3e42d838 100644 --- a/ports/boost-interprocess/vcpkg.json +++ b/ports/boost-interprocess/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-interprocess", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", "dependencies": [ diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index a73a59b11fc6ca..9388382e23b5fc 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.77.0 - SHA512 c1a4780e77063da68c5d08604afd06ed4a17a2149217622037e23d5753a0324073f58e2ab899fffcb2edc8c19e5bf87bae330116407849f9ac90a2c71aeb1b1d + REF boost-1.78.0 + SHA512 8de185456a462e76a73b01b016e71ab4586a2676cbaaa666e52dbddd37341a6ba313bd51814f3d2bb22541c4cc067626b3d3c8346a02e7a0a38d6cae6cc59f80 HEAD_REF master ) diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json index 5612c624c1f0a5..7d7f46270b53ef 100644 --- a/ports/boost-interval/vcpkg.json +++ b/ports/boost-interval/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-interval", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", "dependencies": [ diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index 26d2cfaf58f23b..598bc378665713 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.77.0 - SHA512 9fed1756ca0c4abe1c64bd9794cc5f8548f71fef761d0cef25f6d10ee65d84cdc34216e20e4e29e34d7664a6addac7cbbc4f2f43d5faaa0c0660fad20a594ad3 + REF boost-1.78.0 + SHA512 8a9431af2346348c0981d296f5bf9126833d6831c50fee91c85b3bcafd117d9b39454837a40a3aca4385ebf1d59b795ea7ee8a5c0a6c8adbfe3f3de8a2e805d4 HEAD_REF master ) diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json index f79993cf332939..bd09c4b4be9899 100644 --- a/ports/boost-intrusive/vcpkg.json +++ b/ports/boost-intrusive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-intrusive", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", "dependencies": [ diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index 1a3fa780b00f7d..cca5ca4e5db52a 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.77.0 - SHA512 2806d3a5a66c0ea6b4a70fd19608e666eaa7569600a9cceee75313fa4945f652eac3522c67bc01a09f2ba5832b7f6e799e7f010d117a2112826c23a6753182e4 + REF boost-1.78.0 + SHA512 349333ed588658ed631a615a62808757216a09931fc1f4cb2ced9f7e8d5206fbe44fb29015f623dd174f6b743427ad6df6e69463b281b9824d29581736b1d658 HEAD_REF master ) diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json index 08082c3cab3c3a..d3bb556c1c5c4d 100644 --- a/ports/boost-io/vcpkg.json +++ b/ports/boost-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-io", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost io module", "homepage": "https://github.com/boostorg/io", "dependencies": [ diff --git a/ports/boost-iostreams/b2-options.cmake b/ports/boost-iostreams/b2-options.cmake index 1271c81305a7aa..b95c08db023ba5 100644 --- a/ports/boost-iostreams/b2-options.cmake +++ b/ports/boost-iostreams/b2-options.cmake @@ -27,12 +27,6 @@ if("lzma" IN_LIST FEATURES) list(APPEND B2_OPTIONS -sLZMA_INCLUDE="${CURRENT_INSTALLED_DIR}/include" ) - # Overwride debug library name - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND B2_OPTIONS - -sLZMA_NAME=lzmad - ) - endif() list(APPEND B2_OPTIONS -sLZMA_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" ) @@ -70,12 +64,6 @@ if("zstd" IN_LIST FEATURES) list(APPEND B2_OPTIONS -sZSTD_INCLUDE="${CURRENT_INSTALLED_DIR}/include" ) - # Overwride debug library name - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND B2_OPTIONS - -sZSTD_NAME=zstdd - ) - endif() list(APPEND B2_OPTIONS -sZSTD_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" ) diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index 827c7595b3f7f2..3160968abfdfc3 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.77.0 - SHA512 0b656124e468c50623d4336a9bb357ca211d6d3989e0dc63a9036a2d13bfc352992a8673b7f13debf387b434cdf604c8fbb13ccf5b0b3fd8415b0f839aa4d7cf + REF boost-1.78.0 + SHA512 ad766d5b922bf959480dbaaae80c82211118a11db2a1cc7790ac2885a9c2d85d883d320f6dc19a4cadb0d857398f4a21c173fd3ccf2ff2068718b32dc5cb67c1 HEAD_REF master PATCHES Removeseekpos.patch ) diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 4d694c8178d40d..080cec0a1a5794 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -1,9 +1,10 @@ { "name": "boost-iostreams", - "version": "1.77.0", - "port-version": 1, + "version": "1.78.0", + "port-version": 2, "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-assert", diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index 0743a5bbcd9e1c..6d970bfd37d093 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.77.0 - SHA512 9d374cd58bf3494197235521a16ea63609ebb368a041a039adf833b28050a49614466d667f64f5bf825d32a8aad83ee9859ec5bde188b49ea7e3ee84d2fc6aaf + REF boost-1.78.0 + SHA512 a6cea7025926b9482e3e0b0c19d9ba6d2bd2fe358c418d27b69ee8f9aa25204869f29412639242e244acb5eb5a7d5e79786d3bae649b1603f9123eeae16dc32b HEAD_REF master ) diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json index f581c57d707771..a9859042394741 100644 --- a/ports/boost-iterator/vcpkg.json +++ b/ports/boost-iterator/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-iterator", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", "dependencies": [ diff --git a/ports/boost-json/001-remove-checks.patch b/ports/boost-json/001-remove-checks.patch deleted file mode 100644 index cea25c9755bff7..00000000000000 --- a/ports/boost-json/001-remove-checks.patch +++ /dev/null @@ -1,30 +0,0 @@ - Jamfile | 2 +- - build/Jamfile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Jamfile b/Jamfile -index b999474..33bc8c9 100644 ---- a/Jamfile -+++ b/Jamfile -@@ -7,7 +7,7 @@ - # Official repository: https://github.com/boostorg/json - # - --import ../config/checks/config : requires ; -+rule requires ( checks * ) { } - - # These make sure we only build on - # compatible C++11 or later toolchains. -diff --git a/build/Jamfile b/build/Jamfile -index 8425ad3..86d1208 100644 ---- a/build/Jamfile -+++ b/build/Jamfile -@@ -7,7 +7,7 @@ - # Official repository: https://github.com/boostorg/json - # - --import ../../config/checks/config : requires ; -+rule requires ( checks * ) { } - - project boost/json - : requirements diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake index b9c44818818691..3e8c8f3a7fbc59 100644 --- a/ports/boost-json/portfile.cmake +++ b/ports/boost-json/portfile.cmake @@ -3,12 +3,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/json - REF boost-1.77.0 - SHA512 538d749ae612b3c2e1681978d1aa9c87aed89a48ef7ce3f7cbd3caf72c4f2e2a232b86b7b089d5ddf63acf71e1a82146de370dfa8c8b881cd07db09885f421ce + REF boost-1.78.0 + SHA512 245eb006392cea71fc4da0100a804cff0f4f0a63baf5e4d95ea3b8234a8b2a72344090ccf827a6334fe1819dc207d84a2c1709c62f71361a8e8824d84a51edab HEAD_REF master - PATCHES 001-remove-checks.patch ) +file(READ "${SOURCE_PATH}/build/Jamfile" _contents) +string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") +file(WRITE "${SOURCE_PATH}/build/Jamfile" "${_contents}") +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-json requires a newer version of vcpkg in order to build.") endif() diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json index c3d3dfc6077c5f..28efe2fca4e4fa 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-json", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost json module", "homepage": "https://github.com/boostorg/json", "dependencies": [ diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index f71d998d56c8d2..28adb4a18958cb 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.77.0 - SHA512 bf8514928f42618eb056fc61370606ac38c1914822c308a288342459b29a8c202f2ca6efe3c9317b371a5ca435da2c0b79f6f8de2df7a8a95033b9eb22331102 + REF boost-1.78.0 + SHA512 b3d923435133ba4bcffd0fb722d92ccf4f7b739a51390319db10ac43452141c1d786755ae143149102324548d4beb7e87e5767381b93cc814593ce9123f2dffb HEAD_REF master ) diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json index f7a79b818f0a30..3687066be5e2e3 100644 --- a/ports/boost-lambda/vcpkg.json +++ b/ports/boost-lambda/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lambda", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", "dependencies": [ diff --git a/ports/boost-lambda2/portfile.cmake b/ports/boost-lambda2/portfile.cmake index a0c3f402375ab2..43c1d15afb5914 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.77.0 - SHA512 2402ba5967082199d5c07f7bd03be9072b76173414a69029157e24bb3f65628febda7b609a128920e3b0f4bbc4265d6e692b24c985d39869b26f32168884df96 + REF boost-1.78.0 + SHA512 56c8e14dea12e32d8b049c6de2c5ed4ea299b169fc43d76c65aa1057dc5cad9e1182fdf9761381855c3b940ed4e34a794ea8aeca11fde116bc25c4ae1065cc58 HEAD_REF master ) diff --git a/ports/boost-lambda2/vcpkg.json b/ports/boost-lambda2/vcpkg.json index 56067a693f4930..068794a9375584 100644 --- a/ports/boost-lambda2/vcpkg.json +++ b/ports/boost-lambda2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lambda2", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost lambda2 module", "homepage": "https://github.com/boostorg/lambda2", "dependencies": [ diff --git a/ports/boost-leaf/portfile.cmake b/ports/boost-leaf/portfile.cmake index 27a688c0ab4d6f..1159bbf456f28d 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.77.0 - SHA512 46035f095b76cdc9fee7f608fe2d05d0ad7bd59eb7b87e675c371ce43d842176c797c19a388e010f9bd8bf418789953e6e659af7940c1b1de1c3f2ff717fff18 + REF boost-1.78.0 + SHA512 07f15896fe8dd1029aefe2988c82b688243b11f344fafe7ad80a93e70e75c7b35083d1a84944bc564aa591a086f20dfcb4010fc701b1e6780f93ac2dd5701c6b HEAD_REF master ) diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json index 2831156c4a476a..a4f670c4f41609 100644 --- a/ports/boost-leaf/vcpkg.json +++ b/ports/boost-leaf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-leaf", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", "dependencies": [ diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 253eb1e5742649..40c52885331a28 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.77.0 - SHA512 1c9cfee10bb61f52f653f4adf68d7342fe952c24a180aa49a5cc83689567be3a0f68c05e96ade23025163262e1ba96b545ed4e182d9411deb2251b54bcfb7fab + REF boost-1.78.0 + SHA512 01b544b29f8c4e7de7cb1f4d11835bf4c434fd65fa48983794cd4ec2847d3fc12692722025177552b4653f213d033811bafecf64ce3572885ea7cf522ab3f406 HEAD_REF master ) diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json index b2e3aa390e3cb6..7da42431e0693b 100644 --- a/ports/boost-lexical-cast/vcpkg.json +++ b/ports/boost-lexical-cast/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lexical-cast", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", "dependencies": [ diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index db61899eed3e71..3c44ceac6986aa 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.77.0 - SHA512 0e827aa35b9281abb2efc804c0eef554076fb39c29ce006b534a9e1f4bb6573e703a5f848fdb1ea5e3257ea9281bf1533239fce4e0275390e81740a4d2eed9e6 + REF boost-1.78.0 + SHA512 4df1e13e9314dc31fabd2e0451e09a69b6f976efa41b2fae87766bb9ba271ab47604f15ae138c694b8e15ea51289ca8c2e882179ca55b9abd904bd166b0bd2b4 HEAD_REF master ) diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json index 89c6386d471e3a..a54f8896163e23 100644 --- a/ports/boost-local-function/vcpkg.json +++ b/ports/boost-local-function/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-local-function", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", "dependencies": [ diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index 2ea0a35325125e..f20b7733406cb1 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.77.0 - SHA512 363bf4bc970fb044fc1739405ced27fee00fb2d5925263069f29821204c505ba4e4dac344a27232c8d7e96cd09d90342623ba5d93112277f21cf08ef5bbfd0ff + REF boost-1.78.0 + SHA512 17870d13898fe1c8df3958757aba81f385924ee063e9f92f821ced912346b89d106b2256d659239323efba125ecd8507a8f3fbc326285cc243befdab5dcaf72d HEAD_REF master PATCHES 0001-Fix-boost-ICU-support.patch diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index 6953dc449e6392..47c2adc8fd52d0 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-locale", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", "supports": "!uwp", diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index 124af670e09d72..b714183733fb37 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.77.0 - SHA512 134e9f9d30b4ac124f2a18e0cf265c7ea7342279876625302bfeec8e25aff716e00ccd229389b0197b59d9ca85787eafb3fdec680a70d791497245dd8ca2cbec + REF boost-1.78.0 + SHA512 f0e56532c369dcf9adb20ea1da6f647d083a67aea067109d7743e5eb4d26ebe2b21b8e2b131265db03f8155845d6948197acfbecb2da41f9f54c11f80e078ba9 HEAD_REF master ) diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json index 78b28dd4fd0734..65fb1c8965cde4 100644 --- a/ports/boost-lockfree/vcpkg.json +++ b/ports/boost-lockfree/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lockfree", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", "dependencies": [ diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index 970942ccfc321d..f3d3e8da871cd5 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -3,24 +3,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/log - REF boost-1.77.0 - SHA512 17203830dce28e3b5c2c7b78f412ecdcae8b08cfc6dd4ae251bc6c99d9c2c66b0b3b5df3c2620c8ef8f39e48b37fc7477f2a2d86ebcb69bc95eb9cb1a98d01a0 + REF boost-1.78.0 + SHA512 86f2c99647236f49a8a18a10a3c4a7409f15e5d5cdf8f925a7bd87a7eb196d3c53595b7ddc7fd56354181d5b7c433645f3ee349db59d5b971583166366550613 HEAD_REF master ) file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") +string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") string(REPLACE " @select-arch-specific-sources" "#@select-arch-specific-sources" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") file(READ ${SOURCE_PATH}/build/log-arch-config.jam _contents) string(REPLACE "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" - "project.load [ path.join [ path.make $(here:D) ] config/checks/architecture ]" + "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" _contents "${_contents}") file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}") - if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-log requires a newer version of vcpkg in order to build.") endif() diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json index 6812f2ed4ec235..131e173ab03230 100644 --- a/ports/boost-log/vcpkg.json +++ b/ports/boost-log/vcpkg.json @@ -1,16 +1,13 @@ { "name": "boost-log", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost log module", "homepage": "https://github.com/boostorg/log", "supports": "!uwp & !emscripten", "dependencies": [ "boost-align", "boost-array", - { - "name": "boost-asio", - "platform": "!emscripten" - }, + "boost-asio", "boost-assert", "boost-atomic", "boost-bind", diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index d44d928c12858c..c51df05187eec1 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.77.0 - SHA512 e99a3b173e1d72c5e3228ada3061a8f5e09c544d5d9bb125495aecd863494ad007e3b7b4348e7f1940efe003446ea0e97b48b44af0180661d3f73621468c5ef1 + REF boost-1.78.0 + SHA512 0f190c66e1f6ae30173c95db14c7a4373ffc55d3f48a0c54a1814e222b1cba05cf6668e6d90a780506dfa40b5060c0c0c1a4a0c76929fb420770d2134a8cbcd0 HEAD_REF master ) diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json index 4c33644bb1a374..fd1fc2c5258c5c 100644 --- a/ports/boost-logic/vcpkg.json +++ b/ports/boost-logic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-logic", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", "dependencies": [ diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index 3719fdda5f9e20..668a22fa8d2b82 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.77.0 - SHA512 8a35fff7ecb12bc8caf8951859555016caa21601d5aa21284aae83df19cde054bfe9ead4cb92341558b23794f2b7bfd37979acb9fc6b2f5546f50505adffd8d3 + REF boost-1.78.0 + SHA512 a5de0dfddca56ef67c750db55d103e41822ae3823c023f884211a1d993ebd4a35cceab024b405e48f51acc7f2ae7d1e97aa7e4c603eca929027b62ca2d234ff9 HEAD_REF master PATCHES 001-remove-checks.patch ) diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json index de22af32b91bee..86a66c666cf831 100644 --- a/ports/boost-math/vcpkg.json +++ b/ports/boost-math/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-math", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost math module", "homepage": "https://github.com/boostorg/math", "dependencies": [ diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 9240356058ba62..23eaea290a3b69 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.77.0 - SHA512 b46ebf646a8e00c42c817191c02353d0d1a7635b367066a1ebe56e095278ac1d17c147ce46ca6aa3ec9021960530867b8f0bd097201798ba83cf2108db0e7407 + REF boost-1.78.0 + SHA512 d068680be7609e3a9c87f8c027373eb68fe3c212944fe63369bca94842fd8ceb032a43a455a93248bf5578170acdb76c99aa1d04abc53901636d8e74c261755c HEAD_REF master ) diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json index 157d5a1b4fb4b3..41ccb894447674 100644 --- a/ports/boost-metaparse/vcpkg.json +++ b/ports/boost-metaparse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-metaparse", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", "dependencies": [ diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index efddc5c9149d1a..dfc10343a7f519 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -10,14 +10,6 @@ set(USER_CONFIG_EXTRA_LINES) set(B2_OPTIONS) -#### Handle ICU -if(WIN32) - list(APPEND B2_OPTIONS "--disable-icu") -else() - find_path(ICU_PATH include/unicode/utf.h) - list(APPEND B2_OPTIONS "-sICU_PATH=\"${ICU_PATH}\"") -endif() - # Add build type specific options if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") list(APPEND B2_OPTIONS runtime-link=shared) @@ -51,25 +43,42 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32) list(APPEND B2_OPTIONS "asmflags=/safeseh") endif() -if(MSVC) - set(USER_CONFIG_TOOLSET msvc) - if(MSVC_VERSION LESS 1900) - math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 60") +if(WIN32) + if(MSVC) + if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(USER_CONFIG_TOOLSET clang-win) + else() + set(USER_CONFIG_TOOLSET msvc) + endif() + if(MSVC_VERSION LESS 1900) + math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 60") + else() + math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 50") + endif() else() - math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 50") + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(USER_CONFIG_TOOLSET clang) + else() + set(USER_CONFIG_TOOLSET gcc) + endif() endif() list(APPEND B2_OPTIONS target-os=windows) elseif(APPLE) - set(USER_CONFIG_TOOLSET clang) + if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(USER_CONFIG_TOOLSET clang) + else() + set(USER_CONFIG_TOOLSET gcc) + endif() list(APPEND B2_OPTIONS target-os=darwin) -elseif(WIN32) - set(USER_CONFIG_TOOLSET gcc) - list(APPEND B2_OPTIONS target-os=windows) elseif(ANDROID) set(USER_CONFIG_TOOLSET gcc) list(APPEND B2_OPTIONS target-os=android) else() - set(USER_CONFIG_TOOLSET gcc) + if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(USER_CONFIG_TOOLSET clang) + else() + set(USER_CONFIG_TOOLSET gcc) + endif() list(APPEND B2_OPTIONS target-os=linux) endif() @@ -160,8 +169,12 @@ foreach(INCDIR IN LISTS CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) endforeach() if(APPLE) - string(APPEND CXXFLAGS " -D_DARWIN_C_SOURCE -std=c++11 -stdlib=libc++") - string(APPEND LDFLAGS " -stdlib=libc++") + if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + string(APPEND CXXFLAGS " -D_DARWIN_C_SOURCE -std=c++11 -stdlib=libc++") + string(APPEND LDFLAGS " -stdlib=libc++") + else() + string(APPEND CXXFLAGS " -D_DARWIN_C_SOURCE -std=c++11") + endif() endif() if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") @@ -231,6 +244,60 @@ if(NOT NUMBER_OF_PROCESSORS) set(NUMBER_OF_PROCESSORS 1) endif() +# Handle ICU +if(WIN32) + list(APPEND B2_OPTIONS "--disable-icu") +else() + find_path(ICU_PATH include/unicode/utf.h) + list(APPEND B2_OPTIONS "-sICU_PATH=\"${ICU_PATH}\"") +endif() + +# Handle Python +set(python_versions "") + +if("python2" IN_LIST FEATURES) + # Find Python2 in the current installed directory + file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") + string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") + string(APPEND USER_CONFIG_EXTRA_LINES + "using python : ${python2_version} : : \"${python2_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/lib\" ;\n" + "using python : ${python2_version} : : \"${python2_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/debug/lib\" : on ;\n" + ) + list(APPEND python_versions "${python2_version}") +endif() + +if("python3" IN_LIST FEATURES) + # Find Python3 in the current installed directory + file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") + string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") + string(APPEND USER_CONFIG_EXTRA_LINES + "using python : ${python3_version} : : \"${python3_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/lib\" ;\n" + "using python : ${python3_version} : : \"${python3_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/debug/lib\" : on ;\n" + ) + list(APPEND python_versions "${python3_version}") +endif() + +if("${PORT}" STREQUAL "boost-mpi" OR "${PORT}" STREQUAL "boost-graph-parallel") + string(APPEND USER_CONFIG_EXTRA_LINES + "using mpi : : \"${CURRENT_INSTALLED_DIR}/lib\"\n" + " \"${CURRENT_INSTALLED_DIR}/include\"\n" + ) + if(WIN32) + string(APPEND USER_CONFIG_EXTRA_LINES + " msmpi ;\n" + ) + else() + string(APPEND USER_CONFIG_EXTRA_LINES + " openmpi ;\n" + ) + endif() +endif() + +if(NOT python_versions STREQUAL "") + list(JOIN python_versions "," python_versions) + list(APPEND B2_OPTIONS "python=${python_versions}") +endif() + # Include port specific CMake fragment if(DEFINED BOOST_CMAKE_FRAGMENT) message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}") @@ -279,7 +346,7 @@ file(GLOB LIBS \"${SUBDIR}/*.so.*\" \"${SUBDIR}/*.so\" \"${SUBDIR}/*.a\" \"${SUB if(LIBS) file(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\") endif() -file(GLOB DLLS \"${SUBDIR}/*.dll\") +file(GLOB DLLS \"${SUBDIR}/*.dll\" \"${SUBDIR}/*.pyd\") if(DLLS) file(INSTALL \${DLLS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/bin\") endif() diff --git a/ports/boost-modular-build-helper/Jamroot.jam.in b/ports/boost-modular-build-helper/Jamroot.jam.in index 6094cc8d1ccf89..9a490b3ad557dc 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam.in +++ b/ports/boost-modular-build-helper/Jamroot.jam.in @@ -155,6 +155,15 @@ if "@PORT@" != "boost-container" explicit boost_container ; } +if "@PORT@" != "boost-python" +{ + use-project /boost/python : . ; + + lib boost_python : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_python@PYTHON_VERSION_TAG@@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_python : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_python@PYTHON_VERSION_TAG@@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_python ; +} + rule requires ( foo * ) { } diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index d35b4f99112f30..4cff5eab9bf8b1 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -1,7 +1,10 @@ +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") + get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY) -set(BOOST_VERSION 1.77.0) +set(BOOST_VERSION 1.78.0) string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" BOOST_VERSION_MATCH "${BOOST_VERSION}") if("${CMAKE_MATCH_3}" GREATER 0) set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}") @@ -43,6 +46,9 @@ function(boost_modular_build) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120") set(BOOST_LIB_RELEASE_SUFFIX -vc120-mt.lib) set(BOOST_LIB_DEBUG_SUFFIX -vc120-mt-gd.lib) + else() + set(BOOST_LIB_RELEASE_SUFFIX .lib) + set(BOOST_LIB_DEBUG_SUFFIX d.lib) endif() else() set(BOOST_LIB_PREFIX lib) @@ -79,6 +85,19 @@ function(boost_modular_build) file(WRITE "${_jamfile}" "${_contents}") endif() + if("python2" IN_LIST FEATURES) + # Find Python2 in the current installed directory + file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") + string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") + string(REPLACE "." "" PYTHON_VERSION_TAG "${python2_version}") + endif() + if("python3" IN_LIST FEATURES) + # Find Python3 in the current installed directory + file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") + string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") + string(REPLACE "." "" PYTHON_VERSION_TAG "${python3_version}") + endif() + configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/Jamroot.jam.in ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY) set(configure_options) @@ -104,9 +123,15 @@ function(boost_modular_build) vcpkg_cmake_install() - vcpkg_copy_pdbs() + vcpkg_copy_pdbs( + BUILD_PATHS + "${CURRENT_PACKAGES_DIR}/bin/*.dll" + "${CURRENT_PACKAGES_DIR}/bin/*.pyd" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.pyd" + ) - file(GLOB INSTALLED_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib ${CURRENT_PACKAGES_DIR}/lib/*.lib) + file(GLOB INSTALLED_LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib" "${CURRENT_PACKAGES_DIR}/lib/*.lib") foreach(LIB IN LISTS INSTALLED_LIBS) get_filename_component(OLD_FILENAME ${LIB} NAME) get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY) @@ -124,10 +149,10 @@ function(boost_modular_build) string(REPLACE "-${BOOST_VERSION_ABI_TAG}" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") # nothing to do - elseif(EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) - file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}) + elseif(EXISTS "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") + file(REMOVE "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") else() - file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) + file(RENAME "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}" "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") endif() endforeach() # Similar for mingw @@ -153,7 +178,7 @@ function(boost_modular_build) file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/has_icu.lib") endif() - if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/lib) + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/lib") message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.") endif() diff --git a/ports/boost-modular-build-helper/user-config.jam.in b/ports/boost-modular-build-helper/user-config.jam.in index fbd6f8d36e5e0b..fd9b9f0a91dc7d 100644 --- a/ports/boost-modular-build-helper/user-config.jam.in +++ b/ports/boost-modular-build-helper/user-config.jam.in @@ -7,17 +7,9 @@ using @USER_CONFIG_TOOLSET@ : @USER_CONFIG_TOOLSET_VERSION@ : @USER_CONFIG_TOOLS @USER_CONFIG_EXTRA_LINES@ -if "@PORT@" = "boost-mpi" || "@PORT@" = "boost-graph-parallel" -{ - using mpi : : - "@CURRENT_INSTALLED_DIR@/lib" - "@CURRENT_INSTALLED_DIR@/include" - msmpi ; -} - project user-config : ; -if "@USER_CONFIG_TOOLSET@" = "msvc" +if "@USER_CONFIG_TOOLSET@" = "msvc" || "@USER_CONFIG_TOOLSET@" = "clang-win" { lib advapi32 ; diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 9daad0988434fa..31ea55e28933e1 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,9 +1,10 @@ { "name": "boost-modular-build-helper", - "version": "1.77.0", - "port-version": 4, + "version": "1.78.0", + "port-version": 2, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ - "boost-uninstall" + "boost-uninstall", + "vcpkg-cmake" ] } diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index e1a2e72783122d..3bed2eb82acbc7 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.77.0 - SHA512 16a911d10e142c3fae375abd5062c45cb771aae214cebc4b56a1bf88e26dc7f33d678f68d47c7f6b15e6a893080a6f9db09ef944f9980463b063fe16b745b0fd + REF boost-1.78.0 + SHA512 e17ceeaf96375e2fed7ad8be88970cdcb9b94ff3e101bdf4291ef48bf64485da3c1b7449f77881a7a757a9f5a81568cb387733e1b1b3c66f99058db1487e7554 HEAD_REF master ) diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json index 0869b27f7cdcb4..513b88ea0dec06 100644 --- a/ports/boost-move/vcpkg.json +++ b/ports/boost-move/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-move", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost move module", "homepage": "https://github.com/boostorg/move", "dependencies": [ diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index 4eec827fce088d..a8d399799ffb79 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.77.0 - SHA512 02a93db3c0ee65b6742109c369c70300465ebc7d824f4c9bbf8f083395e68f0a4d2b4def8299f2fc29bc5c7cb0b18dc5a4d96d1f0e20216a49986ce9387ca5d1 + REF boost-1.78.0 + SHA512 e98ca08ffa766760f20f3e94a97cfe82a024c4a3ed7d1101e2a5a790c9d50dc19d83a2a9a934432f452c2746de1a8fb81c105e379703c4e2be745ef697c38a42 HEAD_REF master ) diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json index 7578247b5dc084..77700e66be6ca1 100644 --- a/ports/boost-mp11/vcpkg.json +++ b/ports/boost-mp11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mp11", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", "dependencies": [ 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 new file mode 100644 index 00000000000000..884e65d35b8954 --- /dev/null +++ b/ports/boost-mpi/fix-build-boost_mpi_python-on-windows.patch @@ -0,0 +1,15 @@ + 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/portfile.cmake b/ports/boost-mpi/portfile.cmake index 0dc764257259da..628897c5aa02e0 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -3,9 +3,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.77.0 - SHA512 9acefa7dfa5b103322bf16ac76f2b9977e6af598c8547e6e33299b610e43fe006409675b5829c3ddcf1a832e36d45d06ffee8e669950a45f64cca3f16faf0b1a + REF boost-1.78.0 + SHA512 22037c92eb0f2a8e26b39637003b0b470d1e34f85cb6c83cb6d63d84ff9b57adcf172ff4ecf86a30d07bd89f422a4b39eb12a7e5940648f6ebb2b7af66a00f2e HEAD_REF master + PATCHES fix-build-boost_mpi_python-on-windows.patch ) if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json index 9cb9d09e77ff1b..8e0512dc96e4ae 100644 --- a/ports/boost-mpi/vcpkg.json +++ b/ports/boost-mpi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mpi", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", "supports": "!uwp", @@ -24,10 +24,6 @@ }, "boost-mpl", "boost-optional", - { - "name": "boost-python", - "platform": "!uwp & !(arm & windows) & !emscripten" - }, "boost-serialization", "boost-smart-ptr", "boost-static-assert", @@ -40,5 +36,21 @@ "name": "vcpkg-cmake", "host": true } - ] + ], + "features": { + "python3": { + "description": "Build Python3 bindings", + "supports": "!static", + "dependencies": [ + { + "name": "boost-python", + "features": [ + "python3" + ], + "platform": "!uwp & !emscripten & !ios & !android" + }, + "python3" + ] + } + } } diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index 10784dfc410ee9..4f454995b7e038 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.77.0 - SHA512 8f43a32281aa33749fef93be450adb7ccc2774589afbb498bac335ff1cd95ad21e5899cb4c26cbdc2836764ca7264e1408e3d0c15a21d1488a56579304a29ba4 + REF boost-1.78.0 + SHA512 0aa3d20b10f5a4a655d07499372ac74114458a6209dc536a3a061e13683a12c98c9b129e3e5d103d95773fcf14afc6f94ac82ddb84d21dee55338bb5bbf2a47f HEAD_REF master ) diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json index f1d3dbca7d0e0b..5677301d2f0129 100644 --- a/ports/boost-mpl/vcpkg.json +++ b/ports/boost-mpl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mpl", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", "dependencies": [ diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index a6eb4db9e63ff9..159e23fa2832dc 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.77.0 - SHA512 b84162658b78cf8c1d60f3a390fa241293570f5956b31144fa56ffc74a22663c5a4c61a969c25db17c4265b44a4a216fc46becd40987ea8e6a198100191f7c03 + REF boost-1.78.0 + SHA512 0cc80428548b5fbde38efd8426bca954205e26ea2b9da1d9c682cd9315b298759c8db0540d0e216ff57bd613cebe9317764b2b52d24143ebee6c1eb080908eb1 HEAD_REF master ) diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json index 6b6a345466aabb..6c3e65a0679ad7 100644 --- a/ports/boost-msm/vcpkg.json +++ b/ports/boost-msm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-msm", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", "dependencies": [ diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index 78d172a5cb8fec..e6e85919b955d4 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.77.0 - SHA512 501bc069759a77535f85a309bdb13d0ef346ddc3d130145c5aa43797cc692cccf310bf3ebd7939e4d3452beec2314f1e07454017d8dc7c8b5ff079a7ba00f6de + REF boost-1.78.0 + SHA512 835a43e508ef2b2e03ecc8268770eb2e523414406d0da34ab5fdedf65e65b0f6d3dcfa8efbd2f4ee226331a56cb977106d8bdf8f285aa36f9055017be5be080b HEAD_REF master ) diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json index ac7da7e014b1bf..6ed7ba4f523084 100644 --- a/ports/boost-multi-array/vcpkg.json +++ b/ports/boost-multi-array/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-multi-array", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", "dependencies": [ diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index bd178e64d81623..19dd38b065884e 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.77.0 - SHA512 0cd8af351a946dca8c34e68b2b7419c815380d3ac21bcb4698112264a59a395d3adff47fced46fa8312e84aef336fc5d9b6ddb7c37f84faeb8d377afcbd00323 + REF boost-1.78.0 + SHA512 ea183d2e87d5d8655f96085ace78e8ee12678ae4603077773c658f6aa4d7bd86e1c120e0e0b6fef3b4fb42bf9ecbb79c4819c508eae4f5bf71c0ac6b50ec712a HEAD_REF master ) diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json index 0c18de7a925873..2b7da5ec72dfc9 100644 --- a/ports/boost-multi-index/vcpkg.json +++ b/ports/boost-multi-index/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-multi-index", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", "dependencies": [ diff --git a/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch b/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch new file mode 100644 index 00000000000000..3f393ce110a9f6 --- /dev/null +++ b/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch @@ -0,0 +1,29 @@ +From e1ae1e4dc3d450e47693f3b190520b598f88fc60 Mon Sep 17 00:00:00 2001 +From: jzmaddock +Date: Sat, 18 Dec 2021 16:58:47 +0000 +Subject: [PATCH] Fix selection logic in intel_intrinsics.hpp To correctly + exclude msvc+arm. Fixes https://github.com/boostorg/multiprecision/issues/405 + +--- + include/boost/multiprecision/cpp_int/intel_intrinsics.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp +index fcfacef1..eb4624bb 100644 +--- a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp ++++ b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp +@@ -31,9 +31,9 @@ + #undef BOOST_MP_HAS_IMMINTRIN_H + #endif + +-#if defined(BOOST_MSVC) && !defined(_M_IX86) && !defined(_M_ARM64) && !defined(_M_X64) ++#if defined(BOOST_MSVC) && !defined(_M_IX86) && !defined(_M_X64) && !defined(_M_AMD64) + // +-// When targeting platforms such as ARM, msvc still has the INtel headers in it's include path ++// When targeting platforms such as ARM, msvc still has the Intel headers in it's include path + // even though they're not usable. See https://github.com/boostorg/multiprecision/issues/321 + // + #undef BOOST_MP_HAS_IMMINTRIN_H +-- +2.34.1.windows.1 + diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 684d8796fdff88..1169ef02feb735 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -3,9 +3,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.77.0 - SHA512 bc29e03b4a43ddbb96e7be49a0cb45d9973571d2dff8e8e0c776a8fd8f9a5da13861764b4004768341dd19a2a04766785032cc414846005e44ee6263ebb1cb85 + REF boost-1.78.0 + SHA512 eef97b9a53e85e921d29dcea521ba8f751d71f03782d53eda345628d1ba400b83c7f656f41340128ded0a54a6d7955b1493cdca3804bea586158aa28b02fc941 HEAD_REF master + PATCHES 0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json index cd4bfdf322e905..6ab23e8796e070 100644 --- a/ports/boost-multiprecision/vcpkg.json +++ b/ports/boost-multiprecision/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-multiprecision", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", "dependencies": [ @@ -12,7 +12,6 @@ "boost-math", "boost-predef", "boost-random", - "boost-rational", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-nowide/001-remove-checks.patch b/ports/boost-nowide/001-remove-checks.patch deleted file mode 100644 index e097d8036d5e60..00000000000000 --- a/ports/boost-nowide/001-remove-checks.patch +++ /dev/null @@ -1,16 +0,0 @@ - build/Jamfile.v2 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 -index 44cbc1c..a5605a7 100644 ---- a/build/Jamfile.v2 -+++ b/build/Jamfile.v2 -@@ -8,7 +8,7 @@ - # (See accompanying file LICENSE or www.boost.org/LICENSE_1_0.txt) - # See library home page at http://www.boost.org/libs/nowide - --import ../../config/checks/config : requires ; -+rule requires ( checks * ) { } - - local requirements = - shared:BOOST_NOWIDE_DYN_LINK=1 diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index e058c66438d29d..e5520a7ed28f85 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -3,12 +3,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/nowide - REF boost-1.77.0 - SHA512 7af7a33aed8a8e88d8da37db302bb2d560e71dad57e2be23086dfca5260fb7b15ab4513807c566e91b3ebe27b10d58614e967895b922bc408c774550625d15cf + REF boost-1.78.0 + SHA512 115ec3a2c98e316ecc1c657467c79cdddb28a07181929d3ac496db34f1b29faad460dfd47d98f110374534f2257db4b52088ed234ff1feeabff15a52ff525426 HEAD_REF master - PATCHES 001-remove-checks.patch ) +file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) +string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") +file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-nowide requires a newer version of vcpkg in order to build.") endif() diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index 447705361d6be5..00befbddf6f82a 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-nowide", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", "dependencies": [ diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index cf4e640c595bcf..ab35aa1ac5f57c 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.77.0 - SHA512 fa72f79ff3111c99ccddfa1af55d154665974096bb7f3c76ef28b6137212c263f95891b369a089d04b2f382cfbfbfee217631edf10d634f71ab644ef71c44afc + REF boost-1.78.0 + SHA512 de22f330cfa890c2633f021500b1e6ad5836c93905bd6d228bb60acf52fde94783a7594d4722dfd645a957f5a1868f5e71510f7e359e0167bcc7b2161a369de7 HEAD_REF master ) diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json index 4d1bd9593116f4..2018aa80134c08 100644 --- a/ports/boost-numeric-conversion/vcpkg.json +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-numeric-conversion", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", "dependencies": [ diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index 568f2dfc0ee7fa..573353f4138136 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.77.0 - SHA512 33f06b5450855c35c719418ed320ddcdf926c5f27f03d18b345cdaa7921fa749d626dfb8c7c3fdcb102074499e96cf526cb7bdaac1e1a67f6e9f2db5ca3bf481 + REF boost-1.78.0 + SHA512 780e08bc8f36e3d6cb3c98dff10ae9c35f84ad468a9358d95238a08475c3091c7ed44d5b76067cc0a6db5ec1c364f3bc43ab58bd120e110353d6f39115022d93 HEAD_REF master ) diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index ffab599347768e..ef06fbd444e4a7 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-odeint", - "version": "1.77.0", - "port-version": 1, + "version": "1.78.0", "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", "dependencies": [ diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 83d100cff11e6c..3f42b4584b73c3 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.77.0 - SHA512 aca6c679125d3e924a5f77e97ae06abfb2bb1794c70f84e1e72f79e3b7520f8ebe8cd3d980beb09a71b49dd62f450da0e3ccfa418d30306a6651cd029f43ff3f + REF boost-1.78.0 + SHA512 490eadd8017595a5c019da8c0c3b0e2569829d58ab31b2b575a2bbf9f218b9fc7aa42dcec3f6e9178ca10c438966889bbd77bb6013bf749bde9ba49e7fba2d97 HEAD_REF master ) diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json index ba1c0e222bf2ee..488c9884740512 100644 --- a/ports/boost-optional/vcpkg.json +++ b/ports/boost-optional/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-optional", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", "dependencies": [ diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index 00c443393d0cd5..3749fb302e6041 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.77.0 - SHA512 de4e84b43c8906fe4059249a526ea80d805bd9458cc30d467dd232a5326d199b1c38973645bf9115f19933d75998d767d1fea06e2a10edee8bf4453335927505 + REF boost-1.78.0 + SHA512 39ed3377a61c72fcc30256359988df54370423c54bb2586e9e0d6a42157c1825828a0fb710ccc1b2c44a9cc93baae2a33f30fd5a86e4c759f0902081aa65fc64 HEAD_REF master ) diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json index 7088f3e340e2f4..eeea24f3a328c9 100644 --- a/ports/boost-outcome/vcpkg.json +++ b/ports/boost-outcome/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-outcome", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", "dependencies": [ diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index 34cc9d90abb52b..bb0f0cd749cfa9 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.77.0 - SHA512 d3fb2f165cbb1917143ea92be4debbf5f02d43003d9f1ec2e1c19412e39b96e143ac9e0b64a7455d9ce05617f152f0b8b67fee737c92381f0cdbf8996c610b77 + REF boost-1.78.0 + SHA512 137929b7e257ace791e4b8a27ea481db986d7e47d1e105369bd44dacf6886c8b04cf7f95cb2cbe640e58e50fa33dd16df95034bf56a021ea8aad6a02e171db05 HEAD_REF master ) diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json index f82c3750efa0bd..e2a22c6e742983 100644 --- a/ports/boost-parameter-python/vcpkg.json +++ b/ports/boost-parameter-python/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-parameter-python", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", "supports": "!emscripten", @@ -10,7 +10,7 @@ "boost-preprocessor", { "name": "boost-python", - "platform": "!uwp & !(arm & windows) & !emscripten" + "platform": "!uwp & !emscripten & !ios & !android" }, "boost-vcpkg-helpers" ] diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index ba5c515792192c..caa8be6f0352d3 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.77.0 - SHA512 a9a46096b62af9a938403fe007cdf6ea7a0a5f1bd47bbecaad0e947c8175f848ccc44028a10470af3815157a604f4c2156ddc59d1dda07a1a0c1213728062932 + REF boost-1.78.0 + SHA512 9e524ed3627852962b6a7a8dd324341b1ef181aac5300e78065846ee20dc110cdcfab348e02050d4cd82ff800ef361c980a1b3c95da2c24372aedb581fe8478d HEAD_REF master ) diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json index 4d1a532871776d..9f89bcee1500ca 100644 --- a/ports/boost-parameter/vcpkg.json +++ b/ports/boost-parameter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-parameter", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", "dependencies": [ diff --git a/ports/boost-pfr/portfile.cmake b/ports/boost-pfr/portfile.cmake index 615a77b51586ad..31215172c5711e 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.77.0 - SHA512 2b77f879d9ac7f9c1d137d353c6a0665a243292adae75d71d3c324bba6ca3a22b4ef80b511757e95e33d3aa6a2597e86f67a6a70bf81089bbbb476bcbfe3ad06 + REF boost-1.78.0 + SHA512 0c333e25cb63e94b8119341ffe74b805373818e46a5048662152c3c8b23ad19c1efc16c8700a9efcb029b295cf7e853d4f3fd561b6d8569177b1a9d14dd1ddf3 HEAD_REF master ) diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json index ea10cd7b610b66..1007cd64d73589 100644 --- a/ports/boost-pfr/vcpkg.json +++ b/ports/boost-pfr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-pfr", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", "dependencies": [ diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 5ce6dfe70b01c4..878b8ed11d3bdf 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.77.0 - SHA512 d34a1625476dcb47afbb5f96c70d824bfb76b4fca287b09b491d1fe6396d827ecc984f5d2b9e87b6a868f25c5fa676524da9a7d0e37f7288a35595a44b8d9201 + REF boost-1.78.0 + SHA512 38d64222a205f76f94ca6822c9f67c41fad7001b0939548fdd725588cd0f95c0acbff64eb8ca93ca3184328d54d4b312bbf768237010ca20dff17c455589a9fc HEAD_REF master ) diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json index f4ea48609d3992..21f06c4036b5bb 100644 --- a/ports/boost-phoenix/vcpkg.json +++ b/ports/boost-phoenix/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-phoenix", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", "dependencies": [ diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index 9ced6b08a07179..a21f828324afb1 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.77.0 - SHA512 94871d93bd92fd05a7d68838b7db9f92c7c3814ea71f23364486890ba8099b6374e59288a666890727e161d5e05fad417085f44b049e942617c99c9c11232639 + REF boost-1.78.0 + SHA512 24bdc5bcda3b2da29cf34bbf97e47a97881c0e68bbcdb432939f7d25adb5c2994e1a02e5105e2e4b34a9e78d03e70ba7dccaa20b9510601bc4a30b5b2d1e3ab3 HEAD_REF master ) diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json index 8a8378ad7dd334..ff39ee3bf0e3dd 100644 --- a/ports/boost-poly-collection/vcpkg.json +++ b/ports/boost-poly-collection/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-poly-collection", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", "dependencies": [ diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index b0387c7b4424e0..3ea715734b484f 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.77.0 - SHA512 939529b812c97d3c40e2b0954da12f4aff867fc953dae6c44c7b60860ec665467e5856ef8f16cad8795e490c59b2e17d3539ea5575e401e552aab7511c93d6d8 + REF boost-1.78.0 + SHA512 9c03be93205e61b344493c5e40deeb59e42d4e47e45b27405c55b5bcdacbfc3a680400aa9c338440ef1fa6b366ffaab63e8a7a87ae2d6a9a7d3e135eb0bec7ad HEAD_REF master ) diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json index 1e0f3f14e20178..6d187908089c08 100644 --- a/ports/boost-polygon/vcpkg.json +++ b/ports/boost-polygon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-polygon", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", "dependencies": [ diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index 332836b926d202..826a97cdc6f206 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.77.0 - SHA512 8b72d2a17f7295fd60660c5b3ec8d79f2279f97e4f870d88ffee35978f226ce3d9028322b84a484cd4555be2c0506f97edaccce7bf0ec76e6d89fd9fe7bd0285 + REF boost-1.78.0 + SHA512 1cf8cd5659bf260f0bfc57c799bc37f8313e8420918c4b96ab8526caedca8ffe344bb7770d3c0c52b0ea421c360df038e1d5c1d2e882c8ab497996feb7d7d90e HEAD_REF master ) diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json index 6c8c3a451675b2..c477485f616dbc 100644 --- a/ports/boost-pool/vcpkg.json +++ b/ports/boost-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-pool", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", "dependencies": [ diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index dc4efd117e8b2c..74a5a6c0296a30 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.77.0 - SHA512 d3c6b0fc10200aa49d7b5db542e40a858f1697c457391fab777384a974718f2b855fc526f6f44fb329a74139b46e05cc17ce57db2e35fe0388c976ce80f1f964 + REF boost-1.78.0 + SHA512 96755a174f94565485976663d92cbb9bc61e9ec669c678161144f9f2010d98ab9df8eb1bc1afa4a72aa2b39cf876a65a17afd41e221d08709cab2053756c42bf HEAD_REF master ) diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json index 5f561935c837e5..c187728145cb36 100644 --- a/ports/boost-predef/vcpkg.json +++ b/ports/boost-predef/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-predef", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", "dependencies": [ diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index 09673725f6870c..a9c84034c03595 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.77.0 - SHA512 26d7487d9978551596cd243172c9ac6effd3f030244026fb73cac4dc64a458b5d1f0383ff4ac695492c598629d1bc93c186169b5be655d3cf700cf599cb22610 + REF boost-1.78.0 + SHA512 55bbc91f7745a66e1ac02e8cf151cd8e10c143f47fca3d8b65f2fb6caed232a6ed939b7344cffdc1d8ea49caa404d1043bde85efe9e0c17ee2c7cff055a9d657 HEAD_REF master ) diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json index 7660f620f38a72..a3a1f0d7ca4027 100644 --- a/ports/boost-preprocessor/vcpkg.json +++ b/ports/boost-preprocessor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-preprocessor", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", "dependencies": [ diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index efb0a5f91f6e1d..b8d41e445f8e5c 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.77.0 - SHA512 00eb27f702f092a20fdf1669b8c9c993b751971592d0bc5aa50b02d99d985a75361621b624aa51eb550c9e7905e15877168ae9d0feb1957fc85f99c264b152fd + REF boost-1.78.0 + SHA512 c7fadf8771f73ae620176eb6404b06233485cf827eacdb7220d18d50950e5649b3e30ad6060ad2abe1b92913ec0e775cb00955237e4393597eefd18ab538f94b HEAD_REF master PATCHES fix_include.patch ) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 84dd98d52064f7..44253f3b580964 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -1,16 +1,12 @@ { "name": "boost-process", - "version": "1.77.0", - "port-version": 2, + "version": "1.78.0", "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "supports": "!emscripten", "dependencies": [ "boost-algorithm", - { - "name": "boost-asio", - "platform": "!emscripten" - }, + "boost-asio", "boost-config", "boost-core", { diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index 1988be92705926..3402cb5206e0d2 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.77.0 - SHA512 9035f69d3b478db65c960e00887130ff1388d2af518ec7507dfc8708c601400aeefca091b693764dfeb539a1aa29583101360a55c6ae859053e1be88cb5e70aa + REF boost-1.78.0 + SHA512 485d09ab4281b6e13e500bb72d8e278a8bc68d70f90c008cf8970595828d2c3e8f5ae43a81440aca3aa6879a51491b2e1c10321eeea7aa689d71373c114e602e HEAD_REF master ) diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json index 28af65129ae361..6c025d5a26b729 100644 --- a/ports/boost-program-options/vcpkg.json +++ b/ports/boost-program-options/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-program-options", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", "dependencies": [ diff --git a/ports/boost-property-map-parallel/portfile.cmake b/ports/boost-property-map-parallel/portfile.cmake index fe15c5e8febb32..7ba20d5e8f03ff 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.77.0 - SHA512 e564ab747b9885002d983fd42196f2a84655ebf74a0fd42647067dca075b8a2462d5b88d65faa9e91284018a373c5b689749c42a9812922be222ebfb24064a91 + REF boost-1.78.0 + SHA512 f6c734ca16b19d249a6b6ee66348f9671ee1f3bbb3a33ac8872e236781ecd2139df4c8c77b7bca89c51df973ee84de254ae01c892770a5caa365571ab5e8e852 HEAD_REF master ) diff --git a/ports/boost-property-map-parallel/vcpkg.json b/ports/boost-property-map-parallel/vcpkg.json index accbd38746c614..7e0f7b64100405 100644 --- a/ports/boost-property-map-parallel/vcpkg.json +++ b/ports/boost-property-map-parallel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-property-map-parallel", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost property_map_parallel module", "homepage": "https://github.com/boostorg/property_map_parallel", "dependencies": [ diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index 8ba04af74875bb..e27f6ce5340423 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.77.0 - SHA512 3ba808996ebb148e328778cc59fc210b3cf75f9b7baa2b14ce615d43a9253febe1e54160a534dc13eaade1dda96f0c9f406c2229c0f621033678842621cb7727 + REF boost-1.78.0 + SHA512 0e381bc06ec61e9f6ac30341048c7183b97eb18fed4676a836c4f048cfa19b2e3e2331251bb4a5a66715f28426f8f9feefd85fbb1573b4109aadc0b6f8719be4 HEAD_REF master ) diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json index 1706a7c9432d2a..0283cd3c20c093 100644 --- a/ports/boost-property-map/vcpkg.json +++ b/ports/boost-property-map/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-property-map", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", "dependencies": [ diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index f3ad60b71ca7a4..f7788aab3a5850 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.77.0 - SHA512 60bbac071e1d62bf95e5f490e8ebde97313643ee0ad512f06247fddc89da9934322fe3351274233b7b32ac7d8602b80ae03e9161b2dbad477bdf2ff3f41aca22 + REF boost-1.78.0 + SHA512 4020376435cb0f7c3be8cf8e8d1745c91717dbbeb4f0b70b4fd391362bd41b167c9feda719283d451b0001f2fb24a06da0bfd08c55d9e188d6614408b7d5dc59 HEAD_REF master ) diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json index dceaf13214139b..833c4fef389749 100644 --- a/ports/boost-property-tree/vcpkg.json +++ b/ports/boost-property-tree/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-property-tree", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", "dependencies": [ diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index 1866bf5d3aa0e4..8c8b38b4e8ad44 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.77.0 - SHA512 2c50272ffbf1e0c69cec467238f77b4617ed7099a197a45c51232587f38e063b5397d3ab00ecd66dcb23ff0ab2ad22885d56569bc11093613de4e31b7f8d6a5a + REF boost-1.78.0 + SHA512 ff1ef7077f27f9527bbe03106ec2c2717b321702823078f49f3988e065294feb80b3f998d32a090c8920a082f3c937e7c6b83b79485ca8ffac4c4a5fb5954148 HEAD_REF master ) diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json index 7bfba355cb14a2..e50f5eebe1719a 100644 --- a/ports/boost-proto/vcpkg.json +++ b/ports/boost-proto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-proto", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", "dependencies": [ diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index 3ef8d6a1520a83..e523d8a3dbad4a 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.77.0 - SHA512 31075bef92e568c125e03177ad6222f8708f86f09e469a894c676036e4fb57cee6befb709b22f23d0949fb7e9f5280417e6109d3ba2b756ec6e735783222d531 + REF boost-1.78.0 + SHA512 fa22af9abf596cac89216a67deaf56927cff50c79383fc8ba327ddfc8d00093d05f736ed270dc5f458c0c4c6d94590276f823f5b61d6ec7f6671f930e862d5c4 HEAD_REF master ) diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json index 8b1c2ef5d33c91..8abc4b4f0e1e0b 100644 --- a/ports/boost-ptr-container/vcpkg.json +++ b/ports/boost-ptr-container/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ptr-container", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", "dependencies": [ diff --git a/ports/boost-python/b2-options.cmake b/ports/boost-python/b2-options.cmake deleted file mode 100644 index f9f2e0f6ae7f8c..00000000000000 --- a/ports/boost-python/b2-options.cmake +++ /dev/null @@ -1,38 +0,0 @@ -set(build_python_versions) - -if("python2" IN_LIST FEATURES) - # Find Python2 libraries. Can't use find_package here, but we already know where everything is - file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") - string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") - - string(APPEND USER_CONFIG_EXTRA_LINES - "using python : ${python2_version} : : \"${python2_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/lib\" ;\n" - "using python : ${python2_version} : : \"${python2_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/debug/lib\" : on ;\n") - list(APPEND build_python_versions "${python2_version}") -endif() - -if("python3" IN_LIST FEATURES) - # Find Python3 libraries. Can't use find_package here, but we already know where everything is - file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") - string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") - - string(APPEND USER_CONFIG_EXTRA_LINES - "using python : ${python3_version} : : \"${python3_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/lib\" ;\n" - "using python : ${python3_version} : : \"${python3_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/debug/lib\" : on ;\n") - list(APPEND build_python_versions "${python3_version}") -endif() - -if(NOT build_python_versions) - message(FATAL_ERROR "Boost.Python requires at least one Python specified as a feature.") -endif() - -string(REPLACE ";" "," build_python_versions "${build_python_versions}") -list(APPEND B2_OPTIONS - python=${build_python_versions} -) - -if(CMAKE_CXX_FLAGS_DEBUG MATCHES "BOOST_DEBUG_PYTHON" AND CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND B2_OPTIONS - python-debugging=on - ) -endif() diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index f8bcfccad20737..417dd5f71109b6 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.77.0 - SHA512 755a5636e9c65586d0459d017d93a88e5d9973da262ac1b60486d8159c9601c289b9e1acb45fd67bcd24b73e7c841d6e224729dedc9f7996bc9aea52baaeca80 + REF boost-1.78.0 + SHA512 781dedc6d5d2026232aa85a0083552b44b579b04d305e0e76ccda22fee1a336f862e49a544cddc1d394bcaeac67cf82472ae4ca5d3746cb53adc77aed1782e31 HEAD_REF master ) @@ -12,9 +12,6 @@ if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-python requires a newer version of vcpkg in order to build.") endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) -boost_modular_build( - SOURCE_PATH ${SOURCE_PATH} - BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" -) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index 51d50389b48ffb..f6079ffb22827b 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,10 +1,9 @@ { "name": "boost-python", - "version": "1.77.0", - "port-version": 1, + "version": "1.78.0", "description": "Boost python module", "homepage": "https://github.com/boostorg/python", - "supports": "!uwp & !(arm & windows) & !emscripten", + "supports": "!uwp & !emscripten & !ios & !android", "dependencies": [ "boost-align", "boost-bind", @@ -47,6 +46,7 @@ "features": { "python2": { "description": "Build with Python2 support", + "supports": "!(arm & windows)", "dependencies": [ "python2" ] diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index 2ced66419075b7..ab2f253ea6e9fa 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.77.0 - SHA512 23cc5a83a056270ec46e2e4a405da9319d08c551cec6011ecb0af67ce21bc6e0f2d992e2257c96de7bf5256910d527ad365afc3d2d9dfe16513ddfd4456eadf9 + REF boost-1.78.0 + SHA512 904a640ca479b94ae5da1d57bd40f6845e281f5a47b26a884c51b9fa3fff7d385fe89104a53cf2e4a59b0190fea83d89a895293609b41481dc38df26d8bee9c4 HEAD_REF master ) diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json index 2a92183a57066f..720a36f9c2e0dc 100644 --- a/ports/boost-qvm/vcpkg.json +++ b/ports/boost-qvm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-qvm", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", "dependencies": [ diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index 587d4db9da93c4..60b92053e11221 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.77.0 - SHA512 74b9bc57e685e79310c46d168f88cc04cff3bb58f37e66658b726d96e7ea3405ee8e3c50f6261e65d2dac2bf8edfa4fe30e987ce7d5cb31ed1cdf74ea4326814 + REF boost-1.78.0 + SHA512 64657eaf3c7d91730bc9f4fdac16095709a3b9425661bbb6501efe97f1e39e4f4586b81693b12ceda3cccb704969b468c8b1f27bbfbe668709252e172d554e5f HEAD_REF master ) diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json index d2e9e6c4ff3244..2167dcc10832b1 100644 --- a/ports/boost-random/vcpkg.json +++ b/ports/boost-random/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-random", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost random module", "homepage": "https://github.com/boostorg/random", "dependencies": [ diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index 605832012ef3c6..5161fc148fb8af 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.77.0 - SHA512 502dfd6f4c08fd653fee6a9fac14c717ddcd53d3e9ff68c43b80ccac73b88bb98bfb92e88508b82eb8eafa96e29914fe43b0ab550f62e6708d5ea0465ae9d51e + REF boost-1.78.0 + SHA512 d4614a4a6900cbda998574a43d48a8a0604b4fb2e4eb31a2a0ea33cafa9d018c6901af204b665f66abf3fbc0adb1bdab1ffb7d4ee8a125551ea5f66f6fb6bb24 HEAD_REF master ) diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json index 254fc05370e37d..6258f6a860b5d8 100644 --- a/ports/boost-range/vcpkg.json +++ b/ports/boost-range/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-range", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost range module", "homepage": "https://github.com/boostorg/range", "dependencies": [ diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 352cbbe17e729b..4c46d6cb7c540e 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.77.0 - SHA512 aa575893c00eac177cef6a5e8817747a457bae1ef83cd32b81d950b9f13cdc1b744e0f8336773361727f4cc374d4731e973aa3f33f19ef53830f2b0818bc8b0d + REF boost-1.78.0 + SHA512 2a17342379066361ef0187fc0e69734231afdc14463a26d20ed851e679989e9ee55619f1cd3694791d00dbe1c55da69d220db18c69df7493bcf7b47de563afc6 HEAD_REF master ) diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json index 3638387894cadd..afa3e8b7fa49c0 100644 --- a/ports/boost-ratio/vcpkg.json +++ b/ports/boost-ratio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ratio", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", "dependencies": [ diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index 915af079212486..944497a9804cb9 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.77.0 - SHA512 aa5328efb8b614ebbb7e4997c4b6fb1888110ece16d2ccd003ee5a284f16f59c5088c6d2750f766c99beeeefc95eba47aed6e6861ebc04bd9b7c10a2b1feccdc + REF boost-1.78.0 + SHA512 faf1ced934d98a7acbb78fe66d4b10f57f6f225a00f4b71eed7d46fa8f4b7995a37855a68390001a8374d4cbbe1ead4c2d64318a749b1c3392701c31aafb1f89 HEAD_REF master ) diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json index 566d04c56b4f19..3472141fbbb324 100644 --- a/ports/boost-rational/vcpkg.json +++ b/ports/boost-rational/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-rational", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", "dependencies": [ diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index 658d78cd3c95f9..6a7c56faf58b48 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.77.0 - SHA512 1723747db78ff927b5e713604cedf5c8a2eb436ccb2b8e36691376bbf814438ed3e6a4862539f6b85aff27cc3690e0d37b0af7c6925e60b755a907e4ac51378c + REF boost-1.78.0 + SHA512 2ffb36c9652fd497c22852e332397c5fff7752c2919d1566833da9d2a64462292c03aceb2601515d590a939ffa4967e590bc5fa8cbaccd6d73555b47e703a74c HEAD_REF master ) diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index 131e77673466a8..c0d9678ab2e224 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-regex", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "dependencies": [ diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index 986b9853b0614d..d582dfe6f9908f 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.77.0 - SHA512 780fc1c03763ff43f50c4672489427b61eed92168618ca7199160c0124ca79be4da5e1e3691ee85bf7b7f1e1d79897412b0bac6280f224ce6d4e7dea4862a363 + REF boost-1.78.0 + SHA512 750b3e6abbc13b23d08bc2ce3397809ca7fd769aad7e366b50df6d9a4f40e78d7f852f7a79cec8d31872b83d6f3d9c0c30196b8b426f116714e178f3b8f76aeb HEAD_REF master ) diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json index d328b0575bc361..41759e88a76b77 100644 --- a/ports/boost-safe-numerics/vcpkg.json +++ b/ports/boost-safe-numerics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-safe-numerics", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", "dependencies": [ diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index 92047249581e8a..87f9cbd7b46679 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.77.0 - SHA512 f0a73ba219f2c47ff6e1dc6c9648708e6d31b11c85f4579ba35a6cfa4b633390effcc3508d269370101f776c1217f087b2f677f2e6bb1b9f07b33240f2ce3c77 + REF boost-1.78.0 + SHA512 53e3f418727d80895e35cb483bcf2358e82c2ff221a0138e292dcd0648cf1b7065cd3dcbbb69d33b04ae0671b0d23038bedf6ad20e81bf4a8af4ab8b2e28e918 HEAD_REF master ) diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json index 98eec990818d96..e79b470aa818ff 100644 --- a/ports/boost-scope-exit/vcpkg.json +++ b/ports/boost-scope-exit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-scope-exit", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", "dependencies": [ diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index 51fe27f7707b23..5ca1c9995ca148 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.77.0 - SHA512 107264f536f3068415b7abbb30103defb9a51ef75b09132000381a8092cccc8f2796d39769a70b911c7b4aa8dc4ba1d987107a653f9dc6360769d5ecc525fc8d + REF boost-1.78.0 + SHA512 12ae48c01fea6102267cc642727fc091ddb30224ecfb302911089dd2904fb7e52a03d5154059bb15d903753fd3863de8185612b1848418775f23e2a50378ed82 HEAD_REF master ) diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json index f75fe3b5fa0253..099c8937d2e638 100644 --- a/ports/boost-serialization/vcpkg.json +++ b/ports/boost-serialization/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-serialization", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", "dependencies": [ diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index 49c102fcaaea33..db0feaadb90e2b 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.77.0 - SHA512 7391cff74532df1df43c107070bba15324d3511066ec6eb5062775f3bc1ca6be0846e1719dc638a9920e09ca7f2c943909434e8d36758d6535e192d7e5a4c298 + REF boost-1.78.0 + SHA512 0aa8bcdb9e0c948ab4c372919388110da33f225c8437eb0d25066efe2f60f6c9dca27110bfa5c768738499c78482cf88264e7744e6acec339252df20908ba399 HEAD_REF master ) diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json index 4e3e790a8feaf1..7e150d68496d7a 100644 --- a/ports/boost-signals2/vcpkg.json +++ b/ports/boost-signals2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-signals2", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", "dependencies": [ diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index 479c4c63b0caec..d0a827ce08ef97 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.77.0 - SHA512 b34396f4e1b5660391b850b84393c8df8f207f5a8bb753af3f4ebc7f27d867e300d29e977ecd2f307089b3666949059ce3df64b68ab492873dfa5776b099b172 + REF boost-1.78.0 + SHA512 96f5d910dae54441d8d85ffab6a3dc3711ebb69325152a16185822e95be683548575f8074b13b64123da5ec6ca666ca33f26984c931fd642b8c9373ed682181e HEAD_REF master ) diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json index a3b85edc9d3948..675d97b362aa2e 100644 --- a/ports/boost-smart-ptr/vcpkg.json +++ b/ports/boost-smart-ptr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-smart-ptr", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", "dependencies": [ diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index eb6f92a64aeb2d..5f985ba61073cd 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.77.0 - SHA512 b27b58ea45a0392b8d2151e2d39899383f3c5d2a487de67433c64d89d529eaa8d7ca07559b944f0b93986e70f1de8d366d2d726e0a425c973ad9d98e1f8946cd + REF boost-1.78.0 + SHA512 4bb1626f58bfbd69bb0ae9d7844b5d1e3d5c55cc62e1ba0398d00775151704a3c2a83916ac166f3821ed96f7565f3bfd546af28157ab6a1b8ea64820550cad26 HEAD_REF master ) diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json index 03e7f7b519b4bb..93dc9d71444104 100644 --- a/ports/boost-sort/vcpkg.json +++ b/ports/boost-sort/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-sort", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", "dependencies": [ diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index b5367ece548138..145e8d66903f7e 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.77.0 - SHA512 6fa466b084daf1a8b7191114217345be45226316e178e6b6ba6154493e674c584d903bd9d0a4f88104f60e5b47a99ad7e44052fe9ac2bc86d9be3f68bde42897 + REF boost-1.78.0 + SHA512 ae813e9abba8aa80b93ee5b089dcb4165be3970355d15f2ecdf4d7a552903b5f42081667a4b03d59018baca39b0f0e090daac1be5b3cc001b65cf800ebe69a24 HEAD_REF master ) diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json index 081c5af52cab83..eae68de944c761 100644 --- a/ports/boost-spirit/vcpkg.json +++ b/ports/boost-spirit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-spirit", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", "dependencies": [ @@ -9,7 +9,6 @@ "boost-config", "boost-core", "boost-endian", - "boost-foreach", "boost-function", "boost-function-types", "boost-fusion", diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index a849f0ccddeb0a..ad4b4ca7becb7d 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.77.0 - SHA512 bb4605b14ab1e1fbb2a593f8723ed5a3ef9258b21d7d0860f75773faca6c696792a8818f2a24c60f52b65e679067ac372d7a229682e52e05430555ed8e475b15 + REF boost-1.78.0 + SHA512 edf10d4050e168b5eac7d19ff6afe3c54a3f237c65a6de974235446514ea1fae683ad01435649bd41120a51f05ae59644793c317066f5e946c02c471097e05ac HEAD_REF master ) diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index 4398affb7edccb..ee33444a92d153 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-stacktrace", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", "supports": "!uwp", diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index c11e60481a78c4..c4855d2738e1bb 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.77.0 - SHA512 6bbe4a45ae1ff8ec76282d4bf2579a7882fe4682531facd97743096da33c715ea800fbf5e006c0d5b19a96b273fd297ee15c83a1ef90f1e0984aff66977ecbf1 + REF boost-1.78.0 + SHA512 81f9148126b2dc09f2e51cc2607247a1bf3f099d87f4c402ca47543a6339c0da0139040e28c4465030e0056aeb7e3e160926b3a7e49b4f91faf8275e63715e27 HEAD_REF master ) diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json index 0664a3a7d6006c..a6abf8df4d7d46 100644 --- a/ports/boost-statechart/vcpkg.json +++ b/ports/boost-statechart/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-statechart", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", "dependencies": [ diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 418975fbb8fde2..5643c92605abc4 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.77.0 - SHA512 465b6af0f0eb66b0587f97dd1869d86c31dcdb9eb2d7d55249d4dc2d4c77eca0a501d1ccb82e0f93fc3be80ed2983b1b854a116ec965654eac43bdaaa9d4b2dc + REF boost-1.78.0 + SHA512 213098d7fae87af6ee0919de1e3e5110f96eb6238ff200e9080d18e355ea3403b24b8eab318bde1dab8c32d7ee780ded46e39056e625bf5f6bcca9b48fdfee7d HEAD_REF master ) diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json index 73445511f2014c..cc7392a07722d4 100644 --- a/ports/boost-static-assert/vcpkg.json +++ b/ports/boost-static-assert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-static-assert", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_assert", "dependencies": [ diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index 67e382249d1c38..09fdc066312145 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.77.0 - SHA512 62e8f014e1b073282a56136591f3eebde2e43574f4d12a638483740483f768e844d2f9f741d31ba7acf9d541c6ac68c1b54f30741763d029091e7d4d1c64bd37 + REF boost-1.78.0 + SHA512 979d079e1b9749701200944f056747253dc0993f217b8dc7e4fb2c94c67d002037c465c0bdd1f939b24be5a51bbd4790f9d0d0e8c8da1d5bfa0349ba402aa953 HEAD_REF master ) diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json index ee2674cadf8a14..c7e19e5cca235d 100644 --- a/ports/boost-static-string/vcpkg.json +++ b/ports/boost-static-string/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-static-string", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", "dependencies": [ diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index 7d92dd19dfd9df..46ab4c42da0b18 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.77.0 - SHA512 df752f05d8c6125cf93b79a5b2b2722e3890fba888e729fba5503500da75a930ee29f654225028d3874107e3d1d0c4ecb165656ecf90ab4ba456fa435fe60b18 + REF boost-1.78.0 + SHA512 78b3afa7d9e781734ee4ea82b6e0f55834983899018b76a295d0b8a999a6aa3257ad8da40b730115abd2fa1ea2afa51e2b9e8e7d6c756521a8db863ebb3aaad0 HEAD_REF master ) diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json index 922a5f330e36a6..1cc10cdcf1fdc7 100644 --- a/ports/boost-stl-interfaces/vcpkg.json +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-stl-interfaces", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", "dependencies": [ diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index bbae650e885c21..222f390ff48e4b 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.77.0 - SHA512 d546f9f46d3b3723f7f2e26f7378e700fff2a81d1da93e0f45feb9efbe6ebb5cb072f5b783765f48d39ce5e7cf57414d0cb69590f37a7eea6c181991f038ad55 + REF boost-1.78.0 + SHA512 104574dd982281b7888a894feac4e76844b69c39cbe502ed62a6c75f1bb7fa6265f5212e152b3e3f1d739d216e3f02abd1077f07ff5681aa4dc9b24e88f08ab0 HEAD_REF master ) diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json index 6ac3905da4f429..41f935ca950f93 100644 --- a/ports/boost-system/vcpkg.json +++ b/ports/boost-system/vcpkg.json @@ -1,9 +1,10 @@ { "name": "boost-system", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost system module", "homepage": "https://github.com/boostorg/system", "dependencies": [ + "boost-assert", { "name": "boost-build", "host": true @@ -13,6 +14,8 @@ "name": "boost-modular-build-helper", "host": true }, + "boost-throw-exception", + "boost-variant2", "boost-vcpkg-helpers", "boost-winapi", { diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 79cc825047314c..d48046ce02ae54 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -3,16 +3,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.77.0 - SHA512 017807e1af6aec76211e6b452f5bdeba6d8df47916c4e9f119fd38b184bb380f97e4584febf6c60305f6de9386888bbac3c59fb93be2368338e4d4bbb293f916 + REF boost-1.78.0 + SHA512 0a2611fee4d8f361f172375b21c9bc3825c105fdbd8a1b17364bb92654c631df508fb6a5d086c0aa3f8d5004b672ecf496f846b79eecba8e007dd581ebd47956 HEAD_REF master ) file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../predef/check/predef" "import predef/check/predef" _contents "${_contents}") +string(REPLACE "import ../../predef/check/predef" "import ../predef/check/predef" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/build/predef") - +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/predef") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-test requires a newer version of vcpkg in order to build.") endif() diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json index 5187f8f638d022..9506fb481b79f4 100644 --- a/ports/boost-test/vcpkg.json +++ b/ports/boost-test/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-test", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost test module", "homepage": "https://github.com/boostorg/test", "supports": "!uwp", diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index 2fa7472644891e..39db33463676fd 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.77.0 - SHA512 b23a35190f0b57b057ddfb035c8b0ed33ff876ee35e9b1998fb429be370f8476e99bae9462906b40b7a0fa7e67d00cd9aba9a2e891786b5e5ebdb9f219492cff + REF boost-1.78.0 + SHA512 567951a14780358d32ee2b9397df8261fc20bf2dfa55473dd163aa79c448c3ecff2a3799473e88742831f929d61813809efa6211c2dc43e808c94789bae6f443 HEAD_REF master ) diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index b91791b014fc98..e710c4430b67d4 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-thread", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", "dependencies": [ diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index c2f1f091473a21..bf6b0bc81e8fc9 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.77.0 - SHA512 26f6f8269c597f15a1c9ab78ee1244befa41448e9a9f8549b6ee149d495d0258dad83471507228162b6532dd9f8144b584bbdecfb0ef7c934f460faae9e3a373 + REF boost-1.78.0 + SHA512 055170a0434cd4b0059e052c6904030ef1e298a619fab65709f88c258df00d93af406f9f27923be8a73356d91f3f91331c08d77a48ea0f368e1ea26d23c5a1ca HEAD_REF master ) diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json index b543770aec786e..8b66324f499878 100644 --- a/ports/boost-throw-exception/vcpkg.json +++ b/ports/boost-throw-exception/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-throw-exception", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", "dependencies": [ diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index 455aae9d571680..762dd996c6a325 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.77.0 - SHA512 39b4081fc8a19565493687c7c438597ad14b93523a901b2909412c41fa46bc97d300caa509d4651b5985ec9c7f4272be888b4570c0aff622bdb89ddc75af2bff + REF boost-1.78.0 + SHA512 92feda5587a5a28f3ebb2902ac442e253d9497c80bef9310ddc452265eefedb03737504e06d7d60b7e5798509af092a15a37d435e357dd06b9d53e5c258c3e62 HEAD_REF master ) diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json index 3c6d96c800d27b..b29d8c9cf1b081 100644 --- a/ports/boost-timer/vcpkg.json +++ b/ports/boost-timer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-timer", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", "dependencies": [ diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index 837dcda6baca7d..5ef5083c787a60 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.77.0 - SHA512 3e271ba5fd74ba532cb9fb37c9aabb2c37c7221d780dbcd20ac372109e8a93aae591b5bbdcf901325d3fa2e3bfb5f564601d9920397a78fe0a3a9efe58e992ad + REF boost-1.78.0 + SHA512 e29fb1eedd967c3a1450fad55054a9b07f866f5202058c900b31923127b78eb7a4b7f433a14b9eb6dc5e9bbde8f4be17e940f08f5df200a2df73e0c2132325d5 HEAD_REF master ) diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json index 93e53cb376d4ae..558c4712e05fa5 100644 --- a/ports/boost-tokenizer/vcpkg.json +++ b/ports/boost-tokenizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tokenizer", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", "dependencies": [ diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index 18564ada6c926f..a9a785037a5cec 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.77.0 - SHA512 15a9237f78b2686aad1ddf215c3d49f2711add13cb5b5b5b591778776c17f2aa7a6fe7e4e5da5660fc58db1d24a9ea6f97fb6d1a8fe3bb5a66ef26c44d20e3e9 + REF boost-1.78.0 + SHA512 6b2a3c02c7b8d0bb498a72784ef185a344536c8818a012c4fedeba65a8863fcb6559730ab5b398acba4801a6fb5f8c16c10b8e01bd89f814d0748e70fb91dd10 HEAD_REF master ) diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json index ae20d2496a98ac..a3681e5b0d3a71 100644 --- a/ports/boost-tti/vcpkg.json +++ b/ports/boost-tti/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tti", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", "dependencies": [ diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index 270379b957f522..ae3b005a46f931 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.77.0 - SHA512 01ac85a757d96b3b7ec337bb43de202db3a3a7212c4e1eea740d83a0dfc947666e9ad713332751bafd0f1395da12600cd8354b6e23ec00818dde61114dee4c45 + REF boost-1.78.0 + SHA512 354c9406001251793004fb07ae4f57ca61329eb90ec48f5446134425413fd755730981110d09c042cb85666ea629bad319088d6d6a2861e9153fb38a5c0998f9 HEAD_REF master ) diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json index 48d98c5214e932..b4d57cfa61d86e 100644 --- a/ports/boost-tuple/vcpkg.json +++ b/ports/boost-tuple/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tuple", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", "dependencies": [ diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 625b6671f57c78..33cbef353b8865 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.77.0 - SHA512 ed875163ee10eb9c25ae190933efbebdec0f5c8962e8cb6fc717bd036e2d0405bca2cd2613b8984dad348b0f54c87617e64882e7b8b00ef77a1fc533cdede76d + REF boost-1.78.0 + SHA512 6ef919c93f1bc1c3ff12feeb22371288dd3999b7b31aa4537fda86373bf1ab0e5f2cf5de888fedcbd462483ecb9020053a120040243acb1d71c42c4fdd8af619 HEAD_REF master ) diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json index 48919ee7befa45..8c04fc77341cc6 100644 --- a/ports/boost-type-erasure/vcpkg.json +++ b/ports/boost-type-erasure/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-erasure", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", "dependencies": [ diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index d554a0b06c33aa..92bc4df152a21a 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.77.0 - SHA512 b2f15d95fc0a357264f1dc90a334b926a53d8dfbb1eb2f0efdebc586e96a1071467e4785e2e36eb335071a6da6b1aa9cb56bdb99f86a561d7d7041f845a5fe4a + REF boost-1.78.0 + SHA512 d57bc583f6d601835c5887e99e46a388144d3a8074fa7bb01cee11bad4c5ec82f88722867448d01c4c6b899601b9675e6d45ab93f7c5c6416d3894e2fa3c2ebc HEAD_REF master ) diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json index 6b919889beccac..2589f3de3d2b20 100644 --- a/ports/boost-type-index/vcpkg.json +++ b/ports/boost-type-index/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-index", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", "dependencies": [ diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index 0bbde14fbbe6fd..b19ed2bbc43639 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.77.0 - SHA512 3509a752e476ebcd19a7f17d3f7b709df82459659ab91976e5979fdfa14726d2840e7e59a50d47b3b489f86fb44153def13e0e009bfa0db33c1f6ed4e952f1b5 + REF boost-1.78.0 + SHA512 27c10bec741e0ba9fcec3b49b4f62eeee798e41ca67b51aedf37ce8b360520a7640f7f7cf56def61d709dd7c5dbd32bdc2680b8fac5c52522b93f30e319991f4 HEAD_REF master ) diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json index 6858974585a970..42f3e6980a17d7 100644 --- a/ports/boost-type-traits/vcpkg.json +++ b/ports/boost-type-traits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-traits", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", "dependencies": [ diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index d8ce3c67251bcd..761cdb6cfdcb63 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.77.0 - SHA512 4e1e4fc50d323d7604c9535eca11158dcd5fd8e3b7851316e9f6614b9c60f7f398c06d30b02a5699cd2d01941bec423824376623c98dbeff83c295b07dcf96d2 + REF boost-1.78.0 + SHA512 cf0070cf2ed522138bc44136eee5bf08f0d1b9d1363442d7cae6f38978d536d099dc674708d7307ee4b9d9b934694aa40a11d9d57c1afe8b55f180302ad3cc7c HEAD_REF master ) diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json index d3977ed533f0b5..058de2f0ca114a 100644 --- a/ports/boost-typeof/vcpkg.json +++ b/ports/boost-typeof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-typeof", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", "dependencies": [ diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 93df8d66531fec..3086b5abc70c4f 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.77.0 - SHA512 7be4845bebb317181667a3b2b284bc9098ad68a2751b187054c6f051af625a4f0c7754943b12cfda2a7268bedec2b12cfaf8fba5e58084b836993850ea5af942 + REF boost-1.78.0 + SHA512 1c4d94b31ce54a0a215c878654cf3a436f857913ec138a6801589b26527d97dc83dbd1908501328b3522d0d4ee18eaddace12187cb8a4146c6acb12dda1e2204 HEAD_REF master ) diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json index ebccbb631cccd2..866c06f5dcb760 100644 --- a/ports/boost-ublas/vcpkg.json +++ b/ports/boost-ublas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ublas", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", "dependencies": [ diff --git a/ports/boost-uninstall/vcpkg.json b/ports/boost-uninstall/vcpkg.json index 09aa7f2f383990..ceb10a10b9c2dc 100644 --- a/ports/boost-uninstall/vcpkg.json +++ b/ports/boost-uninstall/vcpkg.json @@ -1,5 +1,5 @@ { "name": "boost-uninstall", - "version": "1.77.0", + "version": "1.78.0", "description": "Internal vcpkg port used to uninstall Boost" } diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index 3a4afc42bee612..619ee451f9fea4 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.77.0 - SHA512 a3667c3e4f15e7612ed96f386aa05eafcb2448340c7000f4f2bd840b13bc326780a5700fb171db8535396ccc5d6342114953f3c3cc6da2b729964b3db683e1d5 + REF boost-1.78.0 + SHA512 192142782fbb800d6ae475acc3c639d18090e668efce8fd3c17353f8b6db5fa7da3814e5bb76b65c500963c4cc89d9d79bfed750efeb3a952d3510a601442d07 HEAD_REF master ) diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json index c0fcd1274df853..a7e093ceb5d064 100644 --- a/ports/boost-units/vcpkg.json +++ b/ports/boost-units/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-units", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost units module", "homepage": "https://github.com/boostorg/units", "dependencies": [ diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index b8cf77da97d0f5..4b51de2b20ebfd 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/unordered - REF boost-1.77.0 - SHA512 a561c3b26142c870c15dcf6f38635a5035671c4beedd66877582dc9459ee658eddf067e0ee642d90ec292a6dbde8ff86ecbec66e1d1dd635ee699cbfa418aab4 + REF boost-1.78.0 + SHA512 49aa2d33e709919da03d2038eddaedaf6c91e18039e398bbc319ef6a798f425065b4e8e218b7d84c20c5409fd3968c43f6ea116e5bf77878880498f1a96548e6 HEAD_REF master ) diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json index b1084f5c3145fc..3c89abc0fa033c 100644 --- a/ports/boost-unordered/vcpkg.json +++ b/ports/boost-unordered/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-unordered", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", "dependencies": [ diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index 0702ca049e49d1..fb069dccbff152 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.77.0 - SHA512 2461e9b91b59df84ba7dc19c86c5f52b95780d9e5998575755144b5d1885da4e584b35b27694030eb6a2520c0891b5370b2ff19e657a05a81e1a3eaffaee2ac9 + REF boost-1.78.0 + SHA512 6c7a3bc70b3e11a2d5911eaf810e90a694ea87d8338b60218c8cdb8f732e7ee402abb41bd292e252b2c824428dad11cd0e8bfe5791843e172032e945b2a5ad44 HEAD_REF master ) diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json index da333b8348f863..d7e947a1915717 100644 --- a/ports/boost-utility/vcpkg.json +++ b/ports/boost-utility/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-utility", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", "dependencies": [ diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index 89f4a492f011c9..9e723bd2573239 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.77.0 - SHA512 5548d3eed3f263595d9bb1babbd6f15d37b327c2c0e9ebd539e8d5f85e2fb59e7c9c932df615eb3eefcc2b48fa8e3c741a46a3b2ffad46b40a1a0cd4dde70c3f + REF boost-1.78.0 + SHA512 8f2dd8057d6e54d9540ed905018b167c5211380f3cc0b0a0fb4753ec74007f1ae6cfeea080e4cb7a073aaa0182a088ce7658cd4bcaf3ca8ae64bf711aa1a0a7b HEAD_REF master ) diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json index 73dbcda7504115..dd62596341977e 100644 --- a/ports/boost-uuid/vcpkg.json +++ b/ports/boost-uuid/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-uuid", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", "dependencies": [ diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index c571ce509bc51d..b57faca796e20d 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.77.0 - SHA512 60c5f185c183a9d186ffa00d9809aed79ef60d5d2731ad36275a0e9a0a239b682878d3c00ba9760621eb817601c0ca848794c7f2c4f34bced4a4bbcf9e71c95c + REF boost-1.78.0 + SHA512 456ad20b949a49622cd6ccaf2be896b2ca976b90535f95e1c59efc27e7a02b9c56b6843464586f065c889be149d2afae80368e810a36aa5cd2314e2e64ca1842 HEAD_REF master ) diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json index 771b5d8a025b96..dc704f13ceb4aa 100644 --- a/ports/boost-variant/vcpkg.json +++ b/ports/boost-variant/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-variant", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", "dependencies": [ diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index e28c1022ea6041..31cb580cd6afa6 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.77.0 - SHA512 0f4741e29288b2856eaa09c33557117faab71900b50e12f76bc89fea711cf1319ebff4aa9b3efd4012e510192e22c006bf1179c37798b386c7cecc955819dd96 + REF boost-1.78.0 + SHA512 bcfd19db60eab579a80b5cfd49bfc70ac325dfcf45b0c4a759abd943b6bed22351cfd1eea5e828dc32d516ca2af2ade5ac2621f01b22596e5c072eade778119a HEAD_REF master ) diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json index a823020a80bbb5..5493d71c73de00 100644 --- a/ports/boost-variant2/vcpkg.json +++ b/ports/boost-variant2/vcpkg.json @@ -1,9 +1,10 @@ { "name": "boost-variant2", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", "dependencies": [ + "boost-assert", "boost-config", "boost-mp11", "boost-vcpkg-helpers" diff --git a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake index 73350f053280ad..6cb052392c52cc 100644 --- a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake +++ b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake @@ -1,26 +1,20 @@ function(boost_modular_headers) cmake_parse_arguments(_bm "" "SOURCE_PATH" "" ${ARGN}) - set(BOOST_VERSION 1.77.0) - if(NOT DEFINED _bm_SOURCE_PATH) message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_headers.") endif() - message(STATUS "Packaging headers") - + message(STATUS "Copying headers") file( COPY ${_bm_SOURCE_PATH}/include/boost DESTINATION ${CURRENT_PACKAGES_DIR}/include ) + message(STATUS "Copying headers done") - message(STATUS "Packaging headers done") - - vcpkg_download_distfile(ARCHIVE - URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/LICENSE_1_0.txt" - FILENAME "boost_LICENSE_1_0.txt" - SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 + file(INSTALL + ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/usage + ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/copyright + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} ) - file(INSTALL ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) endfunction() diff --git a/ports/boost-vcpkg-helpers/portfile.cmake b/ports/boost-vcpkg-helpers/portfile.cmake index 0233bda5aa7b1a..3737f927382f0a 100644 --- a/ports/boost-vcpkg-helpers/portfile.cmake +++ b/ports/boost-vcpkg-helpers/portfile.cmake @@ -1,8 +1,17 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(BOOST_VERSION 1.78.0) -file(COPY +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} ) -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +vcpkg_download_distfile(LICENSE + URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/LICENSE_1_0.txt" + FILENAME "boost_LICENSE_1_0.txt" + SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 +) + +file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/boost-vcpkg-helpers/vcpkg.json b/ports/boost-vcpkg-helpers/vcpkg.json index 3b73dbb6c45148..8987cc0bad5b6e 100644 --- a/ports/boost-vcpkg-helpers/vcpkg.json +++ b/ports/boost-vcpkg-helpers/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-vcpkg-helpers", - "version": "1.77.0", + "version": "1.78.0", + "port-version": 1, "description": "Internal vcpkg port used to modularize Boost", "dependencies": [ "boost-uninstall" diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index 1af24d81373f2f..259a0fc2928207 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.77.0 - SHA512 2c7a5a631c78ff94a4557f102643f41add507b2bc80baed1705fbf13f76ae70672a4789cd310a3817e48d85e90477a8a81c68aab110aca53f714400dde438a7b + REF boost-1.78.0 + SHA512 344353e4a43957df0b1be78e5de8dc51928d98c1ed940e24efd506ef5574895b63b67149f335657dae781e4ea7ee35ae53b4d41aaee89418ce93b4d755e55c3d HEAD_REF master ) diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json index cc21a448a0d604..815a1870fb83b2 100644 --- a/ports/boost-vmd/vcpkg.json +++ b/ports/boost-vmd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-vmd", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", "dependencies": [ diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index a874786a820a07..afd8329f13f563 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.77.0 - SHA512 d7b940086776a54ab2907277bbdc6be40b99dd358fde333802076d1a7e671aaf09326fb1a3742f9d23036666e34efc0c9c58b7a421edd93f6807e10a1886d880 + REF boost-1.78.0 + SHA512 4de422e47415d4abff3ef8002a9489ddf10578fa51bb681e273b585acea5e3d055a12a084813f37103765d9372d1a0cf9a43fb224fb54cc76116f17d28193719 HEAD_REF master ) diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json index 761743a56514cd..ae2613755ece1b 100644 --- a/ports/boost-wave/vcpkg.json +++ b/ports/boost-wave/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-wave", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", "supports": "!uwp", diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index e959cbb1987009..8c75df590be10c 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.77.0 - SHA512 a14aefe991dfb9f4845734990bcd567ef55f431658cabe8fb61a4380e323b5149652b8b2ed53e73215009b4e5672bac51bd5207d073a80d89dcbdaa736315f4e + REF boost-1.78.0 + SHA512 431d0091574e857f895a9b8659a474e5aaf7ba0e80f0a15da445f2ed3612e192bdd0763e024a62ad94f8a0efbfadbd00c7caf20836409fb46fb0dc1520236dd6 HEAD_REF master ) diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json index 1e457e8be9fa5a..9af116ed27d942 100644 --- a/ports/boost-winapi/vcpkg.json +++ b/ports/boost-winapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-winapi", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", "dependencies": [ diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index dd1f8f7def1609..776242d1a079d6 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.77.0 - SHA512 79fcb6050c770590b0756d6cc2980bf6c8a4824affb56e41e3cbbefadcf1b5bfb04476691ebda57c61c8511eb2a50ee9618fdd8f8f75a7617ddabbda551531b1 + REF boost-1.78.0 + SHA512 9d9235e29d6ed07ab3ed88aedc8736093c93fad3507360fb506c7ed6cb5e9cdf115d6a2ebf5a1c5022189329b172b79e5dc64d63b6a0edea94c25820d3c138d9 HEAD_REF master ) diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json index 3f11022987540c..11f75889f6cab1 100644 --- a/ports/boost-xpressive/vcpkg.json +++ b/ports/boost-xpressive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-xpressive", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", "dependencies": [ diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index 17b4dc1622b80d..c8bf4bd74f3e3c 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.77.0 - SHA512 95a65b2961ce0df5ac5a544d1fe83dc7a74992a032a3f6c707b84aad04402ec32fa4b872117632dea7133bedb651d6fbcfcd826b3ceac79fafd372a8852a8291 + REF boost-1.78.0 + SHA512 7cb6c90ad0d7c1303dfaea14ddc6cafd3343b93d00f41ece57fbc38ae5ee923fc5f0abe51eb28d1b336b6f66a5b7778b063e5583738ef409acffb4253e831a8d HEAD_REF master ) diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json index bdc57e0d11f8bd..734cec34a858cf 100644 --- a/ports/boost-yap/vcpkg.json +++ b/ports/boost-yap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-yap", - "version": "1.77.0", + "version": "1.78.0", "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", "dependencies": [ diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index 9dca95aea8e42c..d97ca5c2a8c61e 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost", - "version": "1.77.0", - "port-version": 2, + "version": "1.78.0", "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "dependencies": [ @@ -10,10 +9,7 @@ "boost-align", "boost-any", "boost-array", - { - "name": "boost-asio", - "platform": "!emscripten" - }, + "boost-asio", "boost-assert", "boost-assign", "boost-atomic", @@ -142,7 +138,7 @@ "boost-ptr-container", { "name": "boost-python", - "platform": "!uwp & !(arm & windows) & !emscripten" + "platform": "!uwp & !emscripten & !ios & !android" }, "boost-qvm", "boost-random", diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index 71cef4ed35058f..e604c6a34a4ed9 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") message(FATAL_ERROR "Can't build BoringSSL if OpenSSL is installed. Please remove OpenSSL, and try to install BoringSSL again if you need it. Build will continue since BoringSSL is a drop-in replacement for OpenSSL") endif() @@ -24,7 +22,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/boringssl - REF 479adf98d54a21c1d154aac59b2ce120e1d1a6d6 + REF 479adf98d54a21c1d154aac59b2ce120e1d1a6d6 SHA512 74b5d001c0f5c1846b8818e9e668fa35de5171fc21a8f713d241f57b3e8abe42426fdc66b085cca1853b904def6f4bea573dfed40b8b1422894cca85b0b1a44a HEAD_REF master PATCHES diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json index e3aaec032fd75d..d8d9f7ac2d8fb8 100644 --- a/ports/boringssl/vcpkg.json +++ b/ports/boringssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boringssl", "version-date": "2021-06-23", + "port-version": 1, "description": "BoringSSl is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", diff --git a/ports/botan/embed-debug-info.patch b/ports/botan/embed-debug-info.patch new file mode 100644 index 00000000000000..09a17202e0dd17 --- /dev/null +++ b/ports/botan/embed-debug-info.patch @@ -0,0 +1,17 @@ +diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt +index 2306a4485..977e2e958 100644 +--- a/src/build-data/cc/msvc.txt ++++ b/src/build-data/cc/msvc.txt +@@ -17,10 +17,10 @@ optimization_flags "/O2 /Oi" + size_optimization_flags "/O1 /Os" + + # for debug info in the object file: +-#debug_info_flags "/Z7" ++debug_info_flags "/Z7" + + # for using a PDB file: +-debug_info_flags "/Zi /FS" ++#debug_info_flags "/Zi /FS" + + preproc_flags "/nologo /EP" + diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index ab66cf27532109..1852eb55e21f65 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-generate-build-path.patch + embed-debug-info.patch ) if(CMAKE_HOST_WIN32) @@ -51,6 +52,7 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES amalgamation BOTAN_AMALGAMATION + zlib BOTAN_WITH_ZLIB ) function(BOTAN_BUILD BOTAN_BUILD_TYPE) @@ -80,14 +82,24 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) "--distribution-info=vcpkg ${TARGET_TRIPLET}" --prefix=${BOTAN_FLAG_PREFIX} --with-pkg-config - --link-method=copy) + --link-method=copy + --with-debug-info) if(CMAKE_HOST_WIN32) list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX}) endif() + if(VCPKG_CXX_FLAGS) + list(APPEND configure_arguments --extra-cxxflags ${VCPKG_CXX_FLAGS}) + endif() + if("-DBOTAN_AMALGAMATION=ON" IN_LIST FEATURE_OPTIONS) list(APPEND configure_arguments --amalgamation) endif() + if("-DBOTAN_WITH_ZLIB=ON" IN_LIST FEATURE_OPTIONS) + list(APPEND configure_arguments --with-zlib) + list(APPEND configure_arguments --with-external-includedir="${CURRENT_INSTALLED_DIR}/include") + list(APPEND configure_arguments --with-external-libdir="${CURRENT_INSTALLED_DIR}/lib") + endif() vcpkg_execute_required_process( COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments} @@ -129,14 +141,27 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc") + if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc" + [[\lib]] + [[/lib]] + ) + endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc" [[${prefix}/include/botan-2]] [[${prefix}/include]] ) endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc") + if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc" + [[\lib]] + [[/lib]] + ) + endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc" [[${prefix}/include/botan-2]] [[${prefix}/include]] @@ -163,6 +188,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_PREFIX R\"(${CURRENT_PACKAGES_DIR})\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}\\lib)\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}/lib)\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "--prefix=${CURRENT_PACKAGES_DIR}" "") diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 1c2d7e1a30ebb2..1bb8d4cb4c30fa 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,13 +1,20 @@ { "name": "botan", "version": "2.18.1", - "port-version": 4, + "port-version": 10, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", + "license": "BSD-2-Clause", "supports": "!(windows & arm)", "features": { "amalgamation": { "description": "Do an amalgamation build of the library" + }, + "zlib": { + "description": "Build with zlib. Enable compression pipes.", + "dependencies": [ + "zlib" + ] } } } diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake index e6004f07951690..e209c85a3cd544 100644 --- a/ports/box2d/portfile.cmake +++ b/ports/box2d/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/box2d/vcpkg.json b/ports/box2d/vcpkg.json index 38535d8fa8bfdf..b1b4b140159e10 100644 --- a/ports/box2d/vcpkg.json +++ b/ports/box2d/vcpkg.json @@ -1,7 +1,7 @@ { "name": "box2d", "version-semver": "2.4.1", - "port-version": 1, + "port-version": 2, "description": "An open source C++ engine for simulating rigid bodies in 2D", "homepage": "https://box2d.org", "supports": "!uwp" diff --git a/ports/breakpad/CMakeLists.txt b/ports/breakpad/CMakeLists.txt index 3ff4bf3cd00ce7..e7edf4b6bda0a9 100644 --- a/ports/breakpad/CMakeLists.txt +++ b/ports/breakpad/CMakeLists.txt @@ -112,7 +112,7 @@ if(INSTALL_HEADERS) elseif(APPLE) set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/sender|/testapp|/*proj|/gcov") else() - set(HEADER_EXCLUDE_REGEX "/apple|/ios|/client/linux/data|/client/linux/sender|/windows|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") + set(HEADER_EXCLUDE_REGEX "/apple|/ios|/windows|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") install( DIRECTORY src/third_party/lss DESTINATION include/third_party diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake index 41a34342d178e2..9e083c42e591e3 100644 --- a/ports/breakpad/portfile.cmake +++ b/ports/breakpad/portfile.cmake @@ -18,23 +18,23 @@ if(VCPKG_HOST_IS_LINUX OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) REF 7bde79cc274d06451bf65ae82c012a5d3e476b5a ) - file(RENAME ${LSS_SOURCE_PATH} ${SOURCE_PATH}/src/third_party/lss) + file(RENAME "${LSS_SOURCE_PATH}" "${SOURCE_PATH}/src/third_party/lss") endif() -file( - COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc - DESTINATION ${SOURCE_PATH} -) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DINSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/client/linux/data" "${CURRENT_PACKAGES_DIR}/include/client/linux/sender") -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-breakpad TARGET_PATH share/unofficial-breakpad) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-breakpad CONFIG_PATH share/unofficial-breakpad) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json index fc9efed3df96be..59d1b8f7853841 100644 --- a/ports/breakpad/vcpkg.json +++ b/ports/breakpad/vcpkg.json @@ -1,10 +1,19 @@ { "name": "breakpad", - "version-string": "2020-09-14", - "port-version": 3, + "version-date": "2020-09-14", + "port-version": 5, "description": "a set of client and server components which implement a crash-reporting system.", "homepage": "https://github.com/google/breakpad", + "supports": "!uwp", "dependencies": [ - "libdisasm" + "libdisasm", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/brpc/fix-protobuf-deprecated.patch b/ports/brpc/fix-protobuf-deprecated.patch deleted file mode 100644 index 564724c63bbf6f..00000000000000 --- a/ports/brpc/fix-protobuf-deprecated.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/brpc/protocol.cpp b/src/brpc/protocol.cpp -index 11297ea..c998edb 100644 ---- a/src/brpc/protocol.cpp -+++ b/src/brpc/protocol.cpp -@@ -203,7 +203,7 @@ BUTIL_FORCE_INLINE bool ParsePbFromZeroCopyStreamInlined( - // According to source code of pb, SetTotalBytesLimit is not a simple set, - // avoid calling the function when the limit is definitely unreached. - if (PB_TOTAL_BYETS_LIMITS < FLAGS_max_body_size) { -- decoder.SetTotalBytesLimit(INT_MAX, -1); -+ decoder.SetTotalBytesLimit(INT_MAX); - } - return msg->ParseFromCodedStream(&decoder) && decoder.ConsumedEntireMessage(); - } diff --git a/ports/brpc/portfile.cmake b/ports/brpc/portfile.cmake index b78f6e4ccc2489..ed0ff3acfabe6a 100644 --- a/ports/brpc/portfile.cmake +++ b/ports/brpc/portfile.cmake @@ -1,4 +1,8 @@ -vcpkg_fail_port_install(ON_TARGET "windows") +vcpkg_download_distfile(patch1679 + URLS "https://patch-diff.githubusercontent.com/raw/apache/incubator-brpc/pull/1679.diff" + FILENAME "apache-incubator-brpc-1679.diff" + SHA512 4b1e5717b44aa6a741ddd49b1408e3e556f6d845d5e8a5cfccf2f2d7ebe39aed19c3dad703db7a9ebd0446ac1f225e7dbdd2ff1f23f34fd60c3ef59aaa07b789 +) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -9,26 +13,25 @@ vcpkg_from_github( PATCHES fix_boost_ptr.patch fix_thrift.patch - fix-protobuf-deprecated.patch + ${patch1679} ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITH_THRIFT=ON -DWITH_MESALINK=OFF -DWITH_GLOG=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/butil/third_party/superfasthash") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json index 8d7e722c7b4e2b..67c0e3119786c3 100644 --- a/ports/brpc/vcpkg.json +++ b/ports/brpc/vcpkg.json @@ -1,14 +1,18 @@ { "name": "brpc", - "version-string": "0.9.7", - "port-version": 3, + "version": "0.9.7", + "port-version": 7, "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", - "supports": "!windows", + "license": "Apache-2.0", + "supports": "!windows & !arm", "dependencies": [ "gflags", "glog", - "leveldb", + { + "name": "leveldb", + "default-features": false + }, "openssl", { "name": "protobuf", @@ -16,6 +20,10 @@ "zlib" ] }, - "thrift" + "thrift", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/brynet/portfile.cmake b/ports/brynet/portfile.cmake index f07030c495b88b..43e28bdb7740a7 100644 --- a/ports/brynet/portfile.cmake +++ b/ports/brynet/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IronsDu/brynet - REF b33f44df85ca56ca315a560239db3a09a1aef4d7 # v1.11.0 - SHA512 0eaa212ab75a7b51ab546dbca10357d1cbb611ccfe09e3246050518c808a65cecb1374b60e2289023462b96f8b67aa8d19010f446364fecbec64115752234e60 + REF 1a48a74ba5c6074cf6f478d6a52e3c37ce3b9cc8 # v1.11.1 + SHA512 5f04ee74a1ba8955ddb355286aa2bcd29d50b2a8bb7c2c3296fd000ab5e2060ceb3a5254e54e48f6c090f16883aea07178001532da39f28dcafbcf8df7a7304c HEAD_REF master ) diff --git a/ports/brynet/vcpkg.json b/ports/brynet/vcpkg.json index 79dec2c58202d2..173ca0bd92ed6f 100644 --- a/ports/brynet/vcpkg.json +++ b/ports/brynet/vcpkg.json @@ -1,6 +1,6 @@ { "name": "brynet", - "version-string": "1.11.0", + "version-string": "1.11.1", "port-version": 1, "description": "A C++ header only cross platform high performance tcp network library, and support SSL/HTTP/Websocket.", "homepage": "https://github.com/IronsDu/brynet" diff --git a/ports/buck-yeh-bux-mariadb-client/portfile.cmake b/ports/buck-yeh-bux-mariadb-client/portfile.cmake index 4f675457dfa778..2b7f7c7fd270d2 100644 --- a/ports/buck-yeh-bux-mariadb-client/portfile.cmake +++ b/ports/buck-yeh-bux-mariadb-client/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "uwp" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux-mariadb-client diff --git a/ports/buck-yeh-bux-mariadb-client/vcpkg.json b/ports/buck-yeh-bux-mariadb-client/vcpkg.json index 2ec1976a4c3cfc..1f70c38e1550f1 100644 --- a/ports/buck-yeh-bux-mariadb-client/vcpkg.json +++ b/ports/buck-yeh-bux-mariadb-client/vcpkg.json @@ -1,6 +1,7 @@ { "name": "buck-yeh-bux-mariadb-client", "version": "1.0.1", + "port-version": 1, "description": "Loose-coupled throw-on-error C++20 wrapper classes and utilities over mysql/mariadb Connector/C API", "homepage": "https://github.com/buck-yeh/bux-mariadb-client", "supports": "!(arm | uwp | osx)", diff --git a/ports/buck-yeh-bux/fix-errorC7595.patch b/ports/buck-yeh-bux/fix-errorC7595.patch new file mode 100644 index 00000000000000..1f9ff4768ddf01 --- /dev/null +++ b/ports/buck-yeh-bux/fix-errorC7595.patch @@ -0,0 +1,15 @@ +diff --git a/src/XException.cpp b/src/XException.cpp +index 6a66347..53a0087 100644 +--- a/src/XException.cpp ++++ b/src/XException.cpp +@@ -49,8 +49,8 @@ LONG WINAPI usrSEH(_EXCEPTION_POINTERS *pInfo) + RUNTIME_ERROR("code 0x{:x}, flags 0x{:x}, extra 0x{:x}, ip 0x{:x}, arg#{:x}", + er->ExceptionCode, + er->ExceptionFlags, +- static_cast(er->ExceptionRecord), +- static_cast(er->ExceptionAddress), ++ (size_t)static_cast(er->ExceptionRecord), ++ (size_t)static_cast(er->ExceptionAddress), + er->NumberParameters); + } + return EXCEPTION_CONTINUE_SEARCH; diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake index 890792d81886bc..78dc069d3c59a5 100644 --- a/ports/buck-yeh-bux/portfile.cmake +++ b/ports/buck-yeh-bux/portfile.cmake @@ -1,10 +1,10 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux REF 8788509f0281e9a2af34c0399a45a5c9e66a4664 # v1.6.3 SHA512 a7045a93d91e497ca2b60965bb2f098eae714d00feef0d252747178739cdd981f44cb8983278c679761f61e037da05889f22fa161d26fca05af511fc56c1ac8f HEAD_REF main + PATCHES fix-errorC7595.patch ) vcpkg_cmake_configure( diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json index 36fc610cc5e2fc..2275629c2c861a 100644 --- a/ports/buck-yeh-bux/vcpkg.json +++ b/ports/buck-yeh-bux/vcpkg.json @@ -1,6 +1,7 @@ { "name": "buck-yeh-bux", "version": "1.6.3", + "port-version": 1, "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", "homepage": "https://github.com/buck-yeh/bux", "supports": "!(arm | uwp | osx)", diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index 79bcf0cda88bd4..d7531f57edac5c 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -1,7 +1,3 @@ -if (NOT VCPKG_TARGET_IS_OSX) - vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") -endif() - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/bullet3/vcpkg.json b/ports/bullet3/vcpkg.json index 6de08ff9fcb08f..6c6013512a97bc 100644 --- a/ports/bullet3/vcpkg.json +++ b/ports/bullet3/vcpkg.json @@ -1,10 +1,10 @@ { "name": "bullet3", "version": "3.17", - "port-version": 3, + "port-version": 4, "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", "homepage": "https://github.com/bulletphysics/bullet3", - "supports": "!((windows | linux) & (arm | uwp))", + "supports": "osx | !(arm | uwp)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index 4e9ee82663d265..29451a9a7c7cac 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO c-ares/c-ares diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json index da731a90c76ef3..dea85af0bfb55c 100644 --- a/ports/c-ares/vcpkg.json +++ b/ports/c-ares/vcpkg.json @@ -1,7 +1,7 @@ { "name": "c-ares", "version-semver": "1.17.2", - "port-version": 1, + "port-version": 2, "description": "A C library for asynchronous DNS requests", "homepage": "https://github.com/c-ares/c-ares", "supports": "!uwp", diff --git a/ports/c-dbg-macro/portfile.cmake b/ports/c-dbg-macro/portfile.cmake new file mode 100644 index 00000000000000..95dd96ceb679d7 --- /dev/null +++ b/ports/c-dbg-macro/portfile.cmake @@ -0,0 +1,14 @@ +# single header file library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eerimoq/dbg-macro + REF 78b7655bd0cfc2389fe96a3b6584d2930eb7ebd7 + SHA512 f755c8cf17b422f43f09dcd4f8232b6130a5933d0ce537ce4874ecb886ad2fd5dee26fe12c10cb1554a3720a1263d0ce07252c0893de395b8c9042c9330e60be + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/include/dbg.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/c-dbg-macro/vcpkg.json b/ports/c-dbg-macro/vcpkg.json new file mode 100644 index 00000000000000..0891d40d9e2f7c --- /dev/null +++ b/ports/c-dbg-macro/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "c-dbg-macro", + "version-date": "2020-02-29", + "description": "A dbg(...) macro for C", + "homepage": "https://github.com/eerimoq/dbg-macro" +} diff --git a/ports/c89stringutils/portfile.cmake b/ports/c89stringutils/portfile.cmake new file mode 100644 index 00000000000000..ae15441cb25e53 --- /dev/null +++ b/ports/c89stringutils/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offscale/c89stringutils + REF 375c87aaf50a945b17a76727f3314eb217897caf + SHA512 395d942a133209daf510094814830e35daf2047c35b0ff15b17051d7095e4598fd830e0e7f763cac6929b867ff3b0c03c5350c4c3cfc68ed98b69c9c68c04be0 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTS=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/cmake/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/c89stringutils" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/c89stringutils/vcpkg.json b/ports/c89stringutils/vcpkg.json new file mode 100644 index 00000000000000..7a14d20460ba8e --- /dev/null +++ b/ports/c89stringutils/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "c89stringutils", + "version": "0.0.1", + "description": "string functions from newer standards / common non-standards for C89", + "license": "Apache-2.0 OR MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/caf/fix_dependency.patch b/ports/caf/fix_dependency.patch new file mode 100644 index 00000000000000..10636ba71bac1c --- /dev/null +++ b/ports/caf/fix_dependency.patch @@ -0,0 +1,11 @@ +diff --git a/cmake/CAFConfig.cmake.in b/cmake/CAFConfig.cmake.in +index 1a2348c..6c0d0b2 100644 +--- a/cmake/CAFConfig.cmake.in ++++ b/cmake/CAFConfig.cmake.in +@@ -5,5 +5,6 @@ include(CMakeFindDependencyMacro) + set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_dependency(Threads) ++find_dependency(OpenSSL REQUIRED) + + include("${CMAKE_CURRENT_LIST_DIR}/CAFTargets.cmake") diff --git a/ports/caf/openssl-version-override.patch b/ports/caf/openssl-version-override.patch deleted file mode 100644 index 5a03371341754e..00000000000000 --- a/ports/caf/openssl-version-override.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d908e8..d270297 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -495,6 +495,9 @@ if(NOT CAF_NO_OPENSSL) - message(STATUS - "Disable OpenSSL. Required >= 1.0.1 due to TLSv1.2 support.") - set(CAF_NO_OPENSSL yes) -+ elseif(CAF_OPENSSL_VERSION_OVERRIDE) -+ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR}) -+ add_optional_caf_lib(openssl) - else() - if(NOT CMAKE_CROSSCOMPILING) - # Check if openssl headers and library versions match diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index 1c40312af350d3..128eb5bee5b150 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -1,45 +1,36 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework - REF f7d4fc7ac679e18ba385f64434f8015c3cea9cb5 # 0.17.6 - SHA512 8b4719c26dfad68eed6f2528263702e42f9865bb7a9f2d40909dc6c3fc20bb7259fe44a5f89390ba714c7f9359db2d171ff44685641962c24a70f4e2aa3f3f65 + REF c2be26e7f9e3e84ef14730590fc4e7b25fb9d29a # 0.18.5 + SHA512 e8d1e9417ea71c4f92f51f4f7dbb7bcc9d0468623d2202be9b4ed4411406a3b6f6fc903309b74bb130e7cf1c7a0ec349d8bc2ac8f216a28216d1c808c1bde039 HEAD_REF master PATCHES - openssl-version-override.patch + fix_dependency.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON - -DCAF_BUILD_STATIC=ON - -DCAF_BUILD_STATIC_ONLY=ON - -DCAF_NO_TOOLS=ON - -DCAF_NO_EXAMPLES=ON - -DCAF_NO_BENCHMARKS=ON - -DCAF_NO_UNIT_TESTS=ON - -DCAF_NO_PROTOBUF_EXAMPLES=ON - -DCAF_NO_QT_EXAMPLES=ON - -DCAF_NO_OPENCL=ON - -DCAF_NO_OPENSSL=OFF - -DCAF_NO_CURL_EXAMPLES=ON - -DCAF_OPENSSL_VERSION_OVERRIDE=ON + -DCAF_ENABLE_CURL_EXAMPLES=OFF + -DCAF_ENABLE_PROTOBUF_EXAMPLES=OFF + -DCAF_ENABLE_QT6_EXAMPLES=OFF + -DCAF_ENABLE_RUNTIME_CHECKS=OFF + -DCAF_ENABLE_ACTOR_PROFILER=OFF + -DCAF_ENABLE_EXAMPLES=OFF + -DCAF_ENABLE_TESTING=OFF + -DCAF_ENABLE_TOOLS=OFF + -DCAF_ENABLE_IO_MODULE=ON + -DCAF_ENABLE_EXCEPTIONS=ON -DCAF_ENABLE_UTILITY_TARGETS=OFF ) -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_cmake_install() -file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -file(COPY ${SOURCE_PATH}/cmake/FindCAF.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -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}) +vcpkg_cmake_config_fixup(PACKAGE_NAME CAF CONFIG_PATH lib/cmake/CAF) vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/caf/usage b/ports/caf/usage deleted file mode 100644 index 10083d8de8fdf7..00000000000000 --- a/ports/caf/usage +++ /dev/null @@ -1,5 +0,0 @@ -The package caf provides CMake targets: - - find_package(CAF REQUIRED COMPONENTS core io) - target_include_directories(main PRIVATE ${CAF_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${CAF_LIBRARIES}) \ No newline at end of file diff --git a/ports/caf/vcpkg-cmake-wrapper.cmake b/ports/caf/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index b01e408550c646..00000000000000 --- a/ports/caf/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(CAF_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) - -_find_package(${ARGS}) - -set(CMAKE_MODULE_PATH ${CAF_PREV_MODULE_PATH}) diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json index fea50a3a51c0b8..71bb3846858999 100644 --- a/ports/caf/vcpkg.json +++ b/ports/caf/vcpkg.json @@ -1,10 +1,17 @@ { "name": "caf", - "version-string": "0.17.6", - "port-version": 2, - "description": "an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.", + "version": "0.18.5", + "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.", "homepage": "https://github.com/actor-framework/actor-framework", "dependencies": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/cairo/meson-fix-bfd.patch b/ports/cairo/meson-fix-bfd.patch new file mode 100644 index 00000000000000..a0bf0fd5f0b920 --- /dev/null +++ b/ports/cairo/meson-fix-bfd.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -656,7 +656,7 @@ endif + + # Untested, libiberty.h is in a libiberty subfolder for me + # FIXME: automagic +-bfd_dep = cc.find_library('bfd', required: false) ++bfd_dep = cc.find_library('', required: false) + if bfd_dep.found() and cc.has_function('bfd_openr', dependencies: [bfd_dep]) + if cc.has_header('libiberty.h') + conf.set('HAVE_BFD', 1) diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 61a7108b177eb2..5c19ffc469bce0 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_gitlab( HEAD_REF master PATCHES 0001-meson-fix-macOS-build-and-add-macOS-ci.patch cairo_static_fix.patch + meson-fix-bfd.patch ) if("fontconfig" IN_LIST FEATURES) @@ -33,7 +34,7 @@ else() list(APPEND OPTIONS -Dxlib=disabled) endif() list(APPEND OPTIONS -Dxcb=disabled) -list(APPEND OPTIONS -Dxlib-xcb=disabled) +#list(APPEND OPTIONS -Dxlib-xcb=disabled) don't forget this option with the next update! if("gobject" IN_LIST FEATURES) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -55,7 +56,6 @@ vcpkg_configure_meson( -Dzlib=enabled -Dpng=enabled -Dspectre=auto - -Dsymbol-lookup=disabled -Dgtk2-utils=disabled ) vcpkg_install_meson() diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index e7de197c48ad64..7b9e476aefffba 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cairo", "version": "1.17.4", - "port-version": 2, + "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", "dependencies": [ @@ -11,6 +11,10 @@ "lzo", "pixman", "pthread", + { + "name": "vcpkg-tool-meson", + "host": true + }, "zlib" ], "default-features": [ diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json index d760825a0ea7b7..b1f937ba6cb2b0 100644 --- a/ports/cairomm/vcpkg.json +++ b/ports/cairomm/vcpkg.json @@ -1,10 +1,15 @@ { "name": "cairomm", "version": "1.16.0", + "port-version": 1, "description": "A C++ wrapper for the cairo graphics library", "homepage": "https://www.cairographics.org", "dependencies": [ "cairo", - "libsigcpp" + "libsigcpp", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/calceph/makefilevc.patch b/ports/calceph/makefilevc.patch deleted file mode 100755 index 796eeb2026c506..00000000000000 --- a/ports/calceph/makefilevc.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/doc/Makefile.vc b/doc/Makefile.vc -index 60c7eee..1e783a0 100644 ---- a/doc/Makefile.vc -+++ b/doc/Makefile.vc -@@ -62,7 +62,7 @@ - # - - install: -- copy calceph_c.pdf $(DESTDIR)\doc -- copy calceph_fortran2003.pdf $(DESTDIR)\doc -- copy calceph_fortran77.pdf $(DESTDIR)\doc -- copy calceph_python.pdf $(DESTDIR)\doc -+ copy calceph_c.pdf "$(DESTDIR)"\doc -+ copy calceph_fortran2003.pdf "$(DESTDIR)"\doc -+ copy calceph_fortran77.pdf "$(DESTDIR)"\doc -+ copy calceph_python.pdf "$(DESTDIR)"\doc -diff --git a/mexapi/src/Makefile.vc b/mexapi/src/Makefile.vc -index 68e5d45..803c12f 100644 ---- a/mexapi/src/Makefile.vc -+++ b/mexapi/src/Makefile.vc -@@ -62,10 +62,10 @@ - # - - install: -- copy interfacemex.c $(DESTDIR)\libexec\calceph\mex -- copy CalcephBin.m $(DESTDIR)\libexec\calceph\mex -- copy calceph_compilemex.m $(DESTDIR)\libexec\calceph\mex -- copy Constants.m $(DESTDIR)\libexec\calceph\mex -- copy calceph_getversion_str.m $(DESTDIR)\libexec\calceph\mex -- copy NaifId.m $(DESTDIR)\libexec\calceph\mex -- copy calceph_seterrorhandler.m $(DESTDIR)\libexec\calceph\mex -+ copy interfacemex.c "$(DESTDIR)"\libexec\calceph\mex -+ copy CalcephBin.m "$(DESTDIR)"\libexec\calceph\mex -+ copy calceph_compilemex.m "$(DESTDIR)"\libexec\calceph\mex -+ copy Constants.m "$(DESTDIR)"\libexec\calceph\mex -+ copy calceph_getversion_str.m "$(DESTDIR)"\libexec\calceph\mex -+ copy NaifId.m "$(DESTDIR)"\libexec\calceph\mex -+ copy calceph_seterrorhandler.m "$(DESTDIR)"\libexec\calceph\mex -diff --git a/src/Makefile.vc b/src/Makefile.vc -index 730b4a7..9e790b1 100644 ---- a/src/Makefile.vc -+++ b/src/Makefile.vc -@@ -111,9 +111,9 @@ clean: - # install target: "nmake /f Makefile.vc install DESTDIR=xxx" to perform the installation. - # - install: all $(F2003INSTALL) -- copy f90calceph.h $(DESTDIR)\include -- copy calceph.h $(DESTDIR)\include -- copy $(LIBRARY) $(DESTDIR)\lib -+ copy f90calceph.h "$(DESTDIR)"\include -+ copy calceph.h "$(DESTDIR)"\include -+ copy $(LIBRARY) "$(DESTDIR)"\lib - - f2003install : -- copy f2003calceph.mod $(DESTDIR)\include -+ copy f2003calceph.mod "$(DESTDIR)"\include diff --git a/ports/calceph/portfile.cmake b/ports/calceph/portfile.cmake index 42acc5e59a4f13..ecd7636e4d22fa 100755 --- a/ports/calceph/portfile.cmake +++ b/ports/calceph/portfile.cmake @@ -1,7 +1,5 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - -set(CALCEPH_VERSION "3.5.0") -set(CALCEPH_HASH 12bb269d846aab93799656919cd9ca5a995248fb806727ea95667374b9380ca8f52c57dc6a5930c6995c13749bff1459c430eb2908b1533a8804fcb6b95c3de9) +set(CALCEPH_VERSION "3.5.1") +set(CALCEPH_HASH 5e83bb46b92a0b53f2cae717363cb4497d5c9cb57b3903e70d9e2c50176ca7d234212d0209fd3fcb5feebfd0980313be17e2ad4e69482504bfe8686f93216b67) vcpkg_download_distfile(ARCHIVE URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${CALCEPH_VERSION}.tar.gz" @@ -12,11 +10,10 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES makefilevc.patch ) if (VCPKG_TARGET_IS_WINDOWS) - + vcpkg_install_nmake( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -29,7 +26,9 @@ if (VCPKG_TARGET_IS_WINDOWS) ) file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/include/calceph.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/debug/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/debug/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() file(REMOVE_RECURSE "${CURRENT_INSTALLED_DIR}/calceph") else() # Build in UNIX @@ -40,10 +39,10 @@ else() # Build in UNIX --enable-fortran=no --enable-thread=yes ) - + vcpkg_install_make() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - + endif() file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME readme.rst) diff --git a/ports/calceph/vcpkg.json b/ports/calceph/vcpkg.json index 72c91d1d9a79d8..1c5b7b196e9545 100755 --- a/ports/calceph/vcpkg.json +++ b/ports/calceph/vcpkg.json @@ -1,8 +1,9 @@ { "name": "calceph", - "version": "3.5.0", + "version": "3.5.1", "description": "C library to access the binary planetary ephemeris files.", "homepage": "https://www.imcce.fr/inpop/calceph/", "documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html", + "license": "CECILL-2.1 OR CECILL-B OR CECILL-C", "supports": "!uwp" } diff --git a/ports/camport3/portfile.cmake b/ports/camport3/portfile.cmake index a46d4ded934d6c..8a2333469984e6 100644 --- a/ports/camport3/portfile.cmake +++ b/ports/camport3/portfile.cmake @@ -1,13 +1,3 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static") - vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_fail_port_install(ON_ARCH "arm" "arm64" "wasm32") -elseif(VCPKG_TARGET_IS_LINUX) - vcpkg_fail_port_install(ON_ARCH "wasm32") -else() - vcpkg_fail_port_install(ALWAYS) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO percipioxyz/camport3 @@ -17,7 +7,7 @@ vcpkg_from_github( ) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -file(COPY +file(COPY ${SOURCE_PATH}/include/TYApi.h ${SOURCE_PATH}/include/TYCoordinateMapper.h ${SOURCE_PATH}/include/TYImageProc.h @@ -58,7 +48,7 @@ elseif(VCPKG_TARGET_IS_LINUX) else() set (CAMPORT3_ARCH ${VCPKG_TARGET_ARCHITECTURE}) endif() - + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) file(COPY diff --git a/ports/camport3/vcpkg.json b/ports/camport3/vcpkg.json index 0bf92791f34cf6..d301a871166a31 100644 --- a/ports/camport3/vcpkg.json +++ b/ports/camport3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "camport3", "version-string": "1.5.3", - "port-version": 1, + "port-version": 2, "description": "percipio.xyz cameras SDK", "homepage": "https://github.com/percipioxyz/camport3", "supports": "((windows & !uwp & !arm & !arm64 & !static) | linux) & !wasm32" diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index 7e12093501067f..a425280b33493c 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -1,8 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET UWP) -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_ARCH arm arm64) -endif() - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/capnproto/vcpkg.json b/ports/capnproto/vcpkg.json index 97a39f16cee938..2a2c4f48274c58 100644 --- a/ports/capnproto/vcpkg.json +++ b/ports/capnproto/vcpkg.json @@ -1,10 +1,10 @@ { "name": "capnproto", "version": "0.9.1", - "port-version": 1, + "port-version": 2, "description": "Data interchange format and capability-based RPC system", "homepage": "https://capnproto.org/", - "supports": "!uwp & !((arm | arm64) & windows)", + "supports": "!windows | (!uwp & !arm)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/capstone/portfile.cmake b/ports/capstone/portfile.cmake index bd28511cfec6ca..c1d2551f109d83 100644 --- a/ports/capstone/portfile.cmake +++ b/ports/capstone/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CS_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CS_BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -28,29 +29,32 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "diet" CAPSTONE_BUILD_DIET ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if ("osxkernel" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "Feature 'osxkernel' only supported in OSX") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCAPSTONE_BUILD_STATIC=${CS_BUILD_STATIC} -DCAPSTONE_BUILD_SHARED=${CS_BUILD_SHARED} -DCAPSTONE_BUILD_TESTS=OFF -DCAPSTONE_BUILD_CSTOOL=OFF - -DCAPSTONE_BUILD_STATIC_RUNTIME=OFF -DCAPSTONE_X86_ONLY=OFF + -DCAPSTONE_BUILD_STATIC_RUNTIME=${STATIC_CRT} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") if(EXES) file(REMOVE ${EXES}) endif() 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() -file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/capstone/vcpkg.json b/ports/capstone/vcpkg.json index 770f479438cb16..85a10568039437 100644 --- a/ports/capstone/vcpkg.json +++ b/ports/capstone/vcpkg.json @@ -1,9 +1,19 @@ { "name": "capstone", "version": "4.0.2", - "port-version": 2, + "port-version": 3, "description": "Multi-architecture disassembly framework", "homepage": "https://github.com/aquynh/capstone", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "arm": { "description": "Capstone disassembly support for ARM" diff --git a/ports/cargs/portfile.cmake b/ports/cargs/portfile.cmake new file mode 100644 index 00000000000000..6f42c08712c93a --- /dev/null +++ b/ports/cargs/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO likle/cargs + REF v1.0.3 + SHA512 4f82f6857af6ae7bd1263f4c812a770fa3c3f94c84d5a0ba6256289a3d3084cd35b3aca6769241451d2acd57577ccc6638327b5bb70328800e9c3c4f5054f7de + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cargs) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cargs/vcpkg.json b/ports/cargs/vcpkg.json new file mode 100644 index 00000000000000..6a2d24f67abf8f --- /dev/null +++ b/ports/cargs/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "cargs", + "version": "1.0.3", + "description": "A lightweight cross-platform getopt alternative that works on Linux, Windows and macOS. Command line argument parser library for C/C++. Can be used to parse argv and argc parameters.", + "homepage": "https://likle.github.io/cargs/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index ce781eb5d9b273..11bc847a4c109c 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v2.13.7 - SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed + REF v2.13.8 + SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e HEAD_REF devel PATCHES fix-install-path.patch diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index ee720b8647594e..ad094b7e9d1964 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "catch2", - "version-semver": "2.13.7", - "port-version": 2, + "version-semver": "2.13.8", "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "dependencies": [ diff --git a/ports/cello/vcpkg.json b/ports/cello/vcpkg.json index ebb509e68f4ac3..67e817b41a0c16 100644 --- a/ports/cello/vcpkg.json +++ b/ports/cello/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cello", - "version-string": "2019-07-23", - "port-version": 1, + "version-date": "2019-07-23", + "port-version": 2, "description": "Higher level programming in C", - "homepage": "http://libcello.org/" + "homepage": "https://libcello.org/" } diff --git a/ports/cereal/portfile.cmake b/ports/cereal/portfile.cmake index 833655e6d1f294..9c44ab2719153d 100644 --- a/ports/cereal/portfile.cmake +++ b/ports/cereal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO USCiLab/cereal - REF v1.3.0 - SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72 + REF v1.3.1 + SHA512 5beafdd95b16344d5db43a0e26fd670a770e2c2a661ae117c9593db86697ca1034e2bf004fe6dc3c2a690e8a682f60d8b6121211d898009e59361ebef33f6fc9 HEAD_REF master ) @@ -16,10 +16,11 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/cereal) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cereal) # Clean file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cereal) diff --git a/ports/cereal/vcpkg.json b/ports/cereal/vcpkg.json index 432b330e26a826..9582616edc8f74 100644 --- a/ports/cereal/vcpkg.json +++ b/ports/cereal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cereal", - "version-string": "1.3.0", - "port-version": 1, + "version": "1.3.1", "description": "a header-only C++11 serialization library (built in support for binary, XML and JSon)", - "homepage": "https://github.com/USCiLab/cereal" + "homepage": "https://github.com/USCiLab/cereal", + "license": "BSD-3-Clause" } diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index d0500faef27a05..498774cd5b7b08 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -1,7 +1,7 @@ set(MSVC_USE_STATIC_CRT_VALUE OFF) if(VCPKG_CRT_LINKAGE STREQUAL "static") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - message(FATAL_ERROR "Ceres does not currently support mixing static CRT and dynamic library linkage") + message(FATAL_ERROR "Ceres does not support mixing static CRT and dynamic library linkage") endif() set(MSVC_USE_STATIC_CRT_VALUE ON) endif() @@ -20,11 +20,11 @@ vcpkg_from_github( find-package-required.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/FindCXSparse.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/FindGlog.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake) +file(REMOVE "${SOURCE_PATH}/cmake/FindCXSparse.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindGflags.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindGlog.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindEigen.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindSuiteSparse.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -35,9 +35,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "tools" GFLAGS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DEXPORT_BUILD_DIR=ON @@ -50,37 +49,17 @@ vcpkg_configure_cmake( -DLIB_SUFFIX=${LIB_SUFFIX} ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib${LIB_SUFFIX}/cmake/Ceres) + vcpkg_cmake_config_fixup(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres") endif() -file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_CONFIG) -string(REPLACE "set_target_properties(ceres PROPERTIES INTERFACE_LINK_LIBRARIES Ceres::ceres)" - "set_target_properties(ceres PROPERTIES INTERFACE_LINK_LIBRARIES Ceres::ceres) - set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON)" CERES_CONFIG "${CERES_CONFIG}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_CONFIG}") vcpkg_copy_pdbs() -# Changes target search path -if(VCPKG_TARGET_IS_WINDOWS) - file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_TARGETS) - string(REPLACE "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${CERES_CURRENT_CONFIG_DIR}/../" - "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${CERES_CURRENT_CONFIG_DIR}/../../" CERES_TARGETS "${CERES_TARGETS}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_TARGETS}") -else() - file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_TARGETS) - string(REPLACE "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${CERES_CURRENT_CONFIG_DIR}/../../../" - "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${CERES_CURRENT_CONFIG_DIR}/../../" CERES_TARGETS "${CERES_TARGETS}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_TARGETS}") -endif() - -# Clean -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +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) diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index b1be6bde6f749c..4194d3ecdfb09f 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -1,12 +1,20 @@ { "name": "ceres", "version-semver": "2.0.0", - "port-version": 5, + "port-version": 6, "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", "dependencies": [ "eigen3", - "glog" + "glog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cxsparse": { diff --git a/ports/cfitsio/portfile.cmake b/ports/cfitsio/portfile.cmake index 05821771a0b3a5..e75a109454c609 100644 --- a/ports/cfitsio/portfile.cmake +++ b/ports/cfitsio/portfile.cmake @@ -1,5 +1,5 @@ vcpkg_download_distfile(ARCHIVE - URLS "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz" + URLS "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz" FILENAME "cfitsio-3.49.tar.gz" SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15 ) diff --git a/ports/cfitsio/vcpkg.json b/ports/cfitsio/vcpkg.json index fe2794b54221db..9ecf0be86ed143 100644 --- a/ports/cfitsio/vcpkg.json +++ b/ports/cfitsio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cfitsio", "version": "3.49", - "port-version": 1, + "port-version": 2, "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/cgal/portfile.cmake b/ports/cgal/portfile.cmake index fcbbeb12c1f1c1..c58abc40d06673 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF v5.3 - SHA512 b4093b5f1b4802cffe5dd6a47a7382a59ed83d30bb8cafa5f3fa8daef4579c9f3caf208bc2a58b7a41cf61ed825d0e549c7c442e9f5977bd82f553b2dfe8748f + REF v5.4 + SHA512 c9cdacc74844a6eca94980d0350ae6defb99462ef70ddc3e15e825f06b171a21571efd9246a4abac16a6efc350aa9fa79330d2e89dcec24fc6ecff51905efdeb HEAD_REF master ) @@ -13,18 +13,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS qt WITH_CGAL_Qt5 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCGAL_HEADER_ONLY=ON -DCGAL_INSTALL_CMAKE_DIR=share/cgal ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json index 7883bf7c6ded50..83dae13a90b1e8 100644 --- a/ports/cgal/vcpkg.json +++ b/ports/cgal/vcpkg.json @@ -1,8 +1,9 @@ { "name": "cgal", - "version": "5.3", + "version": "5.4", "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.", "homepage": "https://github.com/CGAL/cgal", + "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0", "dependencies": [ "boost-accumulators", "boost-algorithm", @@ -47,6 +48,14 @@ "boost-variant", "gmp", "mpfr", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 62277ecebe3f95..5cbe8e57082c03 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -1,7 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET osx uwp) -if(WIN32) - vcpkg_fail_port_install(ON_CRT_LINKAGE static ON_LIBRARY_LINKAGE static) -endif() vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( @@ -49,7 +45,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") list(APPEND configs "debug") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "-j=${VCPKG_CONCURRENCY}" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT @@ -62,7 +58,7 @@ else() 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}" + 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 diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index 316fefa0a97c7b..df0c0ffee0104a 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,7 +1,8 @@ { "name": "chakracore", - "version-string": "2021-04-22", + "version-date": "2021-04-22", + "port-version": 2, "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", - "supports": "!osx & !uwp & (linux | !static)" + "supports": "!osx & !uwp & (linux | (!static & !staticcrt))" } diff --git a/ports/charls/portfile.cmake b/ports/charls/portfile.cmake index bbb9038c2062c9..6b32b5683a1230 100644 --- a/ports/charls/portfile.cmake +++ b/ports/charls/portfile.cmake @@ -1,25 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO team-charls/charls - REF 0bafe4ecdc591f633303ad0d32f3f6c38d099802 #v2.2.0 - SHA512 56acb0085a4f653660166c11982934d7f8c8836db63339aaca700aabade2bf7cff8cba77f9f04a68bbc119b5b15800bf01ffb10628703fb2188f6e654d0e5f22 + REF 662d4f2a0238357ccc4d89cd14b1fa67d2597ff1 #v2.3.4 + SHA512 f022d025ae1d5ff624982ceb61ee88c5a42ee958afcff39fbc3e698030092b6667c3a685b66b7fd16ab7c3d3af1d44b773f761e2eefd7f026432b80176b6894b HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCHARLS_BUILD_TESTS=OFF -DCHARLS_BUILD_SAMPLES=OFF -DCHARLS_BUILD_FUZZ_TEST=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/charls) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/charls) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/charls/vcpkg.json b/ports/charls/vcpkg.json index 3f07ca3c2eba0e..805b20f15a8a0c 100644 --- a/ports/charls/vcpkg.json +++ b/ports/charls/vcpkg.json @@ -1,7 +1,17 @@ { "name": "charls", - "version-string": "2.2.0", - "port-version": 2, + "version": "2.3.4", "description": "CharLS, a C++ JPEG-LS library implementation.", - "homepage": "https://github.com/team-charls/charls" + "homepage": "https://github.com/team-charls/charls", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/chartdir/vcpkg.json b/ports/chartdir/vcpkg.json index f10b4d17111695..0d5298fd671ecd 100644 --- a/ports/chartdir/vcpkg.json +++ b/ports/chartdir/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chartdir", "version": "7.0.0", - "port-version": 1, + "port-version": 2, "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.", "homepage": "https://www.advsofteng.com/" } diff --git a/ports/chromium-base/portfile.cmake b/ports/chromium-base/portfile.cmake index 6f6d9728cd6b1b..f7fd3a013aa791 100644 --- a/ports/chromium-base/portfile.cmake +++ b/ports/chromium-base/portfile.cmake @@ -1,7 +1,3 @@ -vcpkg_fail_port_install( - ON_ARCH "x86" "arm" "arm64" - ON_TARGET "UWP") - # Patches may be provided at the end function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") @@ -12,7 +8,7 @@ function(checkout_in_path PATH URL REF) endif() file(REMOVE_RECURSE "${PATH}") endif() - + vcpkg_from_git( OUT_SOURCE_PATH DEP_SOURCE_PATH URL "${URL}" @@ -29,26 +25,26 @@ file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party") set(CHROMIUM_GIT "https://chromium.googlesource.com/chromium/src") checkout_in_path( - "${SOURCE_PATH}/base" - "${CHROMIUM_GIT}/base" + "${SOURCE_PATH}/base" + "${CHROMIUM_GIT}/base" "25ce73258703a5ac018da0e203fb3d4a98c2136e" res/0001-base.patch) checkout_in_path( - "${SOURCE_PATH}/build" - "${CHROMIUM_GIT}/build" + "${SOURCE_PATH}/build" + "${CHROMIUM_GIT}/build" "312532ee66abdacbe58afb5df7ddf05e3a6399f9" res/0002-build.patch) checkout_in_path( - "${SOURCE_PATH}/third_party/apple_apsl" - "${CHROMIUM_GIT}/third_party/apple_apsl" + "${SOURCE_PATH}/third_party/apple_apsl" + "${CHROMIUM_GIT}/third_party/apple_apsl" "4cc25bbf65194f6726f7f10da0a885818e35d53e") checkout_in_path( - "${SOURCE_PATH}/third_party/ced" - "${CHROMIUM_GIT}/third_party/ced" + "${SOURCE_PATH}/third_party/ced" + "${CHROMIUM_GIT}/third_party/ced" "4cd87a44674edd9fe1f01c4cb5f1b73907ce4236") checkout_in_path( - "${SOURCE_PATH}/third_party/modp_b64" - "${CHROMIUM_GIT}/third_party/modp_b64" + "${SOURCE_PATH}/third_party/modp_b64" + "${CHROMIUM_GIT}/third_party/modp_b64" "509f005fa65e652dc4a6f636da6fa1002b6dce16") set(RES "${CMAKE_CURRENT_LIST_DIR}/res") @@ -92,7 +88,7 @@ if(CLANG MATCHES "-NOTFOUND") endif() get_filename_component(CLANG "${CLANG}" DIRECTORY) get_filename_component(CLANG "${CLANG}" DIRECTORY) -if((WIN32 AND NOT EXISTS "${CLANG}/bin/clang-cl.exe") OR +if((WIN32 AND NOT EXISTS "${CLANG}/bin/clang-cl.exe") OR (APPLE AND NOT EXISTS "${CLANG}/bin/clang")) message(FATAL_ERROR "Clang needs to be inside a bin directory.") endif() @@ -125,9 +121,9 @@ set(NINJA_REBUILD "build build.ninja: gn\n generator = 1\n depfile = build.nin vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja" "${NINJA_REBUILD}" "") vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja" "${NINJA_REBUILD}" "") -set(TARGETS +set(TARGETS base base:base_static - base/third_party/dynamic_annotations + base/third_party/dynamic_annotations base/third_party/double_conversion) if(WIN32) diff --git a/ports/chromium-base/vcpkg.json b/ports/chromium-base/vcpkg.json index 6ca5e8a9e14dc1..a96735ba3a4a81 100644 --- a/ports/chromium-base/vcpkg.json +++ b/ports/chromium-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chromium-base", "version-string": "86.0.4199.1", - "port-version": 2, + "port-version": 3, "description": "Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.", "homepage": "https://chromium.googlesource.com/chromium/src", "supports": "x64 & (osx | windows | linux) & !uwp" diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake index 7a0837a8bc657d..1797bf08356995 100644 --- a/ports/civetweb/portfile.cmake +++ b/ports/civetweb/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(MESSAGE "${PORT} does not currently support UWP" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO civetweb/civetweb diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json index f39eea59c5374c..e804454c36c09e 100644 --- a/ports/civetweb/vcpkg.json +++ b/ports/civetweb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "civetweb", "version": "1.15", + "port-version": 1, "description": "Easy to use, powerful, C/C++ embeddable web server.", "homepage": "https://github.com/civetweb/civetweb", "supports": "!uwp", diff --git a/ports/clamav/portfile.cmake b/ports/clamav/portfile.cmake index ceb1ce7f573101..3697306a1fb5cf 100644 --- a/ports/clamav/portfile.cmake +++ b/ports/clamav/portfile.cmake @@ -1,10 +1,9 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Cisco-Talos/clamav-devel - REF clamav-0.103.0 + REF clamav-0.103.0 SHA512 e7ff4d98e0615a9fec0752bbfa2b882ae95034a8e01d0f7cc635ee520ff917c3be2a2d3273caa2fc1598e7d5ec4fd60d59b517cb439c5454d32447f8c8d7ba5a FILE_DISAMBIGUATOR 1 HEAD_REF master diff --git a/ports/clamav/vcpkg.json b/ports/clamav/vcpkg.json index dd6cbc928755da..ca212c5768ad02 100644 --- a/ports/clamav/vcpkg.json +++ b/ports/clamav/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clamav", "version-semver": "0.103.0", - "port-version": 2, + "port-version": 3, "description": "ClamAV is an open-source anti-virus toolkit.", "homepage": "https://www.clamav.net", "supports": "!uwp & !static", diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index 986335e6d0a489..d84c864e207ee6 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -5,7 +5,7 @@ endif() vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz" + URLS "https://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz" FILENAME "clapack-3.2.1.tgz" SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49 ) diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index f0fd61e8f63342..78b840f56495cd 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clapack", - "version-string": "3.2.1", - "port-version": 19, + "version": "3.2.1", + "port-version": 20, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", "dependencies": [ diff --git a/ports/clblas/portfile.cmake b/ports/clblas/portfile.cmake index eeeb71c3f75a4a..b173c90bdba203 100644 --- a/ports/clblas/portfile.cmake +++ b/ports/clblas/portfile.cmake @@ -11,13 +11,12 @@ vcpkg_from_github( # v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names # conflicting with the built-in, more modern FindOpenCL.cmake -file(REMOVE ${SOURCE_PATH}/src/FindOpenCL.cmake) +file(REMOVE "${SOURCE_PATH}/src/FindOpenCL.cmake") vcpkg_find_acquire_program(PYTHON3) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" OPTIONS -DBUILD_TEST=OFF -DBUILD_KTEST=OFF @@ -25,26 +24,27 @@ vcpkg_configure_cmake( -DPYTHON_EXECUTABLE=${PYTHON3} ) -vcpkg_install_cmake() +vcpkg_cmake_install() 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() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_TARGET_IS_WINDOWS) file(REMOVE - ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.pdb - ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.exe - ${CURRENT_PACKAGES_DIR}/bin/clBLAS-tune.exe + "${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.pdb" + "${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.exe" + "${CURRENT_PACKAGES_DIR}/bin/clBLAS-tune.exe" ) endif() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clBLAS) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clBLAS) endif() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clblas RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/clblas" RENAME copyright) diff --git a/ports/clblas/vcpkg.json b/ports/clblas/vcpkg.json index 975a0982bc7600..ee4c8bf7616416 100644 --- a/ports/clblas/vcpkg.json +++ b/ports/clblas/vcpkg.json @@ -1,9 +1,17 @@ { "name": "clblas", - "version-string": "2.12", - "port-version": 5, + "version": "2.12", + "port-version": 6, "description": "clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.", "dependencies": [ - "opencl" + "opencl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/clblast/portfile.cmake b/ports/clblast/portfile.cmake index ce749ae739fa43..72b414d9164107 100644 --- a/ports/clblast/portfile.cmake +++ b/ports/clblast/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_LIBRARY_LINKAGE static) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CNugteren/CLBlast @@ -39,4 +37,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/clblast/vcpkg.json b/ports/clblast/vcpkg.json index a5915a0daa69de..5f90075e1b1b78 100644 --- a/ports/clblast/vcpkg.json +++ b/ports/clblast/vcpkg.json @@ -1,6 +1,7 @@ { "name": "clblast", "version": "1.5.2", + "port-version": 1, "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.", "homepage": "https://github.com/CNugteren/CLBlast", "supports": "!static", diff --git a/ports/clfft/portfile.cmake b/ports/clfft/portfile.cmake index 592a84b1c50d21..79e83bf6da7522 100644 --- a/ports/clfft/portfile.cmake +++ b/ports/clfft/portfile.cmake @@ -8,25 +8,25 @@ vcpkg_from_github( tweak-install.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" OPTIONS -DBUILD_LOADLIBRARIES=OFF -DBUILD_EXAMPLES=OFF -DSUFFIX_LIB= ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clFFT) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clFFT) endif() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clfft/copyright) diff --git a/ports/clfft/vcpkg.json b/ports/clfft/vcpkg.json index c3e287507552c4..d20cfa8bc61d16 100644 --- a/ports/clfft/vcpkg.json +++ b/ports/clfft/vcpkg.json @@ -1,10 +1,18 @@ { "name": "clfft", - "version-string": "2.12.2", - "port-version": 3, + "version": "2.12.2", + "port-version": 4, "description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.", "homepage": "https://github.com/clMathLibraries/clFFT", "dependencies": [ - "opencl" + "opencl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/clrng/portfile.cmake b/ports/clrng/portfile.cmake index d6a390a3e3f670..1c9fe2bb3571c2 100644 --- a/ports/clrng/portfile.cmake +++ b/ports/clrng/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO clMathLibraries/clRNG @@ -20,9 +18,8 @@ endif() string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "x64" BUILD64) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBRARY) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" OPTIONS -DBUILD_SHARED_LIBRARY=${BUILD_SHARED_LIBRARY} -DBUILD64=${BUILD64} @@ -31,9 +28,9 @@ vcpkg_configure_cmake( ${R123_SSE_FLAG} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file( REMOVE_RECURSE @@ -41,8 +38,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clRNG) - +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clRNG) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/clrng/vcpkg.json b/ports/clrng/vcpkg.json index a7415ab0bf8832..9e90dccd0ba07f 100644 --- a/ports/clrng/vcpkg.json +++ b/ports/clrng/vcpkg.json @@ -1,11 +1,19 @@ { "name": "clrng", - "version-string": "2020-12-01", - "port-version": 1, + "version-date": "2020-12-01", + "port-version": 3, "description": "clRNG is a library for uniform random number generation in OpenCL.", "homepage": "https://github.com/clMathLibraries/clRNG", "supports": "!arm64", "dependencies": [ - "opencl" + "opencl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/cnats/portfile.cmake b/ports/cnats/portfile.cmake new file mode 100644 index 00000000000000..22bc7cd6c293d7 --- /dev/null +++ b/ports/cnats/portfile.cmake @@ -0,0 +1,76 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nats-io/nats.c + REF v3.2.0 + SHA512 570bbd5b6ed25db17755f4cbd2df9449bf1f838450e29aaa1483c11e6131293490d302031e3039d710bbbc3563ce72fb72cd3ad2c98618977a4858a5a3f2abe3 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "streaming" NATS_BUILD_STREAMING +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + list(APPEND OPTIONS -DNATS_BUILD_LIB_SHARED=ON) + list(APPEND OPTIONS -DNATS_BUILD_LIB_STATIC=OFF) + list(APPEND OPTIONS -DBUILD_TESTING=OFF) + list(APPEND OPTIONS -DNATS_BUILD_USE_SODIUM=ON) +else() + list(APPEND OPTIONS -DNATS_BUILD_LIB_SHARED=OFF) + list(APPEND OPTIONS -DNATS_BUILD_LIB_STATIC=ON) + list(APPEND OPTIONS -DBUILD_TESTING=ON) + if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -DNATS_BUILD_USE_SODIUM=OFF) + else() + list(APPEND OPTIONS -DNATS_BUILD_USE_SODIUM=ON) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + ${OPTIONS} + -DNATS_BUILD_TLS_USE_OPENSSL_1_1_API=ON + -DNATS_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +if(VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/nats.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/nats.dll" "${CURRENT_PACKAGES_DIR}/bin/nats.dll") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/natsd.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/natsd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/natsd.dll") + endif() + endif() +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +if(VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(EXISTS "${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-debug.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-debug.cmake" + "\${_IMPORT_PREFIX}/debug/lib/natsd.dll" "\${_IMPORT_PREFIX}/debug/bin/natsd.dll") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-release.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-release.cmake" + "\${_IMPORT_PREFIX}/lib/nats.dll" "\${_IMPORT_PREFIX}/bin/nats.dll") + endif() + endif() +endif() + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/cnats/vcpkg.json b/ports/cnats/vcpkg.json new file mode 100644 index 00000000000000..8ea3c811388723 --- /dev/null +++ b/ports/cnats/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "cnats", + "version": "3.2.0", + "description": "A C client for the NATS messaging system", + "homepage": "https://github.com/nats-io/nats.c", + "license": "Apache-2.0", + "dependencies": [ + "libsodium", + "openssl", + "protobuf-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "streaming": { + "description": "Include NATS Streaming APIs in the NATS library", + "supports": "!windows" + } + } +} diff --git a/ports/co/portfile.cmake b/ports/co/portfile.cmake index 9e7dd7e1996c36..0015715fb66c72 100644 --- a/ports/co/portfile.cmake +++ b/ports/co/portfile.cmake @@ -1,39 +1 @@ -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - vcpkg_fail_port_install(ON_ARCH "arm" ON_TAREGT "uwp") -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO idealvin/co - REF 25915760f5cbcde1c5af625dd4d19a632ae43f12 #v2.0.2 - SHA512 892d70923409306ab548cf4568f15ffd13949047a5a7810c68d60c1afd184eafd2076f62eb6249ae64b38c409255cb873fa28740ceab37b908b70174ddf6d077 - HEAD_REF master - PATCHES - install-dll.patch - fix-event-destruct.patch -) - -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - libcurl WITH_LIBCURL - openssl WITH_OPENSSL -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DSTATIC_VS_CRT=${STATIC_CRT} - DISABLE_PARALLEL_CONFIGURE -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" -) - -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/co/vcpkg.json b/ports/co/vcpkg.json index e9f94ed5f75f0e..6bbd685889e3e5 100644 --- a/ports/co/vcpkg.json +++ b/ports/co/vcpkg.json @@ -1,34 +1,11 @@ { "name": "co", - "version-semver": "2.0.2", + "version-semver": "2.0.3", "port-version": 1, "description": "A go-style coroutine library in C++11 and more", - "homepage": "https://github.com/idealvin/co", + "homepage": "https://github.com/idealvin/cocoyaxi", "supports": "!uwp & !(arm & windows)", "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ], - "features": { - "libcurl": { - "description": "libcurl with OpenSSL support", - "dependencies": [ - { - "name": "curl", - "default-features": false, - "features": [ - "openssl" - ] - } - ] - }, - "openssl": { - "description": "SSL support (OpenSSL)", - "dependencies": [ - "openssl" - ] - } - } + "cocoyaxi" + ] } diff --git a/ports/co/fix-event-destruct.patch b/ports/cocoyaxi/fix-event-destruct.patch similarity index 100% rename from ports/co/fix-event-destruct.patch rename to ports/cocoyaxi/fix-event-destruct.patch diff --git a/ports/co/install-dll.patch b/ports/cocoyaxi/install-dll.patch similarity index 100% rename from ports/co/install-dll.patch rename to ports/cocoyaxi/install-dll.patch diff --git a/ports/cocoyaxi/portfile.cmake b/ports/cocoyaxi/portfile.cmake new file mode 100644 index 00000000000000..309011b71284fb --- /dev/null +++ b/ports/cocoyaxi/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO idealvin/cocoyaxi + REF 3fd22601de4d7a06548ca4d24ac36b4f82cde8c5 #v2.0.3 + SHA512 15a7fbd934b44ffd981067c18a66bf07423d8ded102d0c15b79c2f451192f17541b9c1a3d4eb913d9f8c7a55e051e4e1968e16a1113fa81038b3ad9534c57874 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libcurl WITH_LIBCURL + openssl WITH_OPENSSL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DSTATIC_VS_CRT=${STATIC_CRT} + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cocoyaxi/vcpkg.json b/ports/cocoyaxi/vcpkg.json new file mode 100644 index 00000000000000..37ecc51c7ed051 --- /dev/null +++ b/ports/cocoyaxi/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "cocoyaxi", + "version-semver": "2.0.3", + "port-version": 2, + "description": "A go-style coroutine library in C++11 and more", + "homepage": "https://github.com/idealvin/cocoyaxi", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "libcurl": { + "description": "libcurl with OpenSSL support", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "openssl" + ] + } + ] + }, + "openssl": { + "description": "SSL support (OpenSSL)", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/ports/coin/portfile.cmake b/ports/coin/portfile.cmake index 19ac9f120c032b..22f97663dc4f3b 100644 --- a/ports/coin/portfile.cmake +++ b/ports/coin/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Coin3D/coin @@ -45,5 +43,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Coin/profiler) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json index fbe97369e885e9..02430c7651a32a 100644 --- a/ports/coin/vcpkg.json +++ b/ports/coin/vcpkg.json @@ -1,7 +1,7 @@ { "name": "coin", "version-string": "4.0.0", - "port-version": 4, + "port-version": 5, "description": "A high-level 3D visualization library with Open Inventor 2.1 API", "homepage": "https://github.com/coin3d/coin", "supports": "!(arm | arm64 | uwp)", diff --git a/ports/colmap/fix-dependency-freeimage.patch b/ports/colmap/fix-dependencies.patch similarity index 59% rename from ports/colmap/fix-dependency-freeimage.patch rename to ports/colmap/fix-dependencies.patch index 29b591e34127fa..62650bd8ba83cb 100644 --- a/ports/colmap/fix-dependency-freeimage.patch +++ b/ports/colmap/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b05097c..cdd8ca4 100644 +index 4759a94..3d25164 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -96,7 +96,8 @@ find_package(Boost REQUIRED COMPONENTS +@@ -98,9 +98,11 @@ find_package(Boost REQUIRED COMPONENTS find_package(Eigen3 REQUIRED) @@ -10,5 +10,9 @@ index b05097c..cdd8ca4 100644 +find_package(freeimage CONFIG REQUIRED) +set(FREEIMAGE_LIBRARIES freeimage::FreeImage) +-find_package(Metis REQUIRED) ++find_package(metis CONFIG REQUIRED) ++set(METIS_LIBRARIES metis) + find_package(Glog REQUIRED) diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 4ab35bbc32a882..a9971e6cc27a60 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -1,12 +1,13 @@ -set(COLMAP_REF "3.6") +set(COLMAP_REF "29a1e3642a3b00734a52b21e597ea4d576485fe6") # 3.7 fix vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO colmap/colmap REF ${COLMAP_REF} - SHA512 9a4b4f2a49891ce8ac32ab1f2e9b859336326bada889e6de49c017a069884bb6c8ab8a2ae430d955e58fc22377c63e8fba9ce80ff959713e2878e29814d44632 + SHA512 c22511592dadd1fce51baeaa5ab3ca48b0df5f1c02f9e2a97593ea1b01c5aea0e1054063a5665e2653f2c7b1b7525ce4c62ae35fb4197df614112861045b76fd HEAD_REF dev - PATCHES fix-dependency-freeimage.patch + PATCHES + fix-dependencies.patch ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) @@ -38,9 +39,9 @@ if("tests" IN_LIST FEATURES) set(TESTS_ENABLED ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DCUDA_ENABLED=${CUDA_ENABLED} -DCUDA_ARCHS=${CUDA_ARCHS} @@ -49,9 +50,9 @@ vcpkg_configure_cmake( -DGIT_COMMIT_DATE=${COLMAP_GIT_COMMIT_DATE} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file(GLOB TOOL_FILENAMES "${CURRENT_PACKAGES_DIR}/bin/*") foreach(TOOL_FILENAME ${TOOL_FILENAMES}) @@ -63,28 +64,20 @@ vcpkg_copy_tools(TOOL_NAMES ${COLMAP_TOOL_NAMES} AUTO_CLEAN) # remove empty folders and unused files file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/include/colmap/exe - ${CURRENT_PACKAGES_DIR}/debug/include/colmap/lib/Graclus/multilevelLib - ${CURRENT_PACKAGES_DIR}/debug/include/colmap/tools - ${CURRENT_PACKAGES_DIR}/debug/include/colmap/ui/media - ${CURRENT_PACKAGES_DIR}/debug/include/colmap/ui/shaders - ${CURRENT_PACKAGES_DIR}/include/colmap/exe - ${CURRENT_PACKAGES_DIR}/include/colmap/lib/Graclus/multilevelLib - ${CURRENT_PACKAGES_DIR}/include/colmap/tools - ${CURRENT_PACKAGES_DIR}/include/colmap/ui/media - ${CURRENT_PACKAGES_DIR}/include/colmap/ui/shaders - ${CURRENT_PACKAGES_DIR}/COLMAP.bat - ${CURRENT_PACKAGES_DIR}/RUN_TESTS.bat - ${CURRENT_PACKAGES_DIR}/debug/COLMAP.bat - ${CURRENT_PACKAGES_DIR}/debug/RUN_TESTS.bat - ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/include/colmap/exe" + "${CURRENT_PACKAGES_DIR}/include/colmap/lib/Graclus/multilevelLib" + "${CURRENT_PACKAGES_DIR}/include/colmap/tools" + "${CURRENT_PACKAGES_DIR}/include/colmap/ui/media" + "${CURRENT_PACKAGES_DIR}/include/colmap/ui/shaders" + "${CURRENT_PACKAGES_DIR}/COLMAP.bat" + "${CURRENT_PACKAGES_DIR}/RUN_TESTS.bat" + "${CURRENT_PACKAGES_DIR}/debug/COLMAP.bat" + "${CURRENT_PACKAGES_DIR}/debug/RUN_TESTS.bat" + "${CURRENT_PACKAGES_DIR}/debug/bin" ) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index 5a43d64f86129f..f1f0a09b63162d 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,7 +1,6 @@ { "name": "colmap", - "version-string": "3.6", - "port-version": 1, + "version-date": "2022-03-14", "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", @@ -9,7 +8,6 @@ "boost-filesystem", "boost-graph", "boost-program-options", - "boost-regex", "boost-system", "boost-test", { @@ -31,7 +29,15 @@ "glew", "glog", "qt5-base", - "suitesparse" + "suitesparse", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cuda": { @@ -47,7 +53,7 @@ ] }, "tests": { - "description": "Enable TESTS." + "description": "Build all tests." } } } diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake index 3ec544e2fb4816..0ea8ef0457c5cc 100644 --- a/ports/comms/portfile.cmake +++ b/ports/comms/portfile.cmake @@ -1,5 +1,4 @@ #header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/comms_champion @@ -17,11 +16,6 @@ vcpkg_check_features( tools CC_INSTALL_TOOLS ) -# check before configure -if("tools" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static" MESSAGE "Feature 'Tools' can't be built statically") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -42,7 +36,8 @@ if("tools" IN_LIST FEATURES) TOOL_NAMES cc_dump cc_view AUTO_CLEAN ) - file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/CommsChampion/plugin" + + file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/CommsChampion/plugin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/lib/CommsChampion/plugin") vcpkg_cmake_config_fixup(PACKAGE_NAME "CommsChampion" CONFIG_PATH "lib/CommsChampion/cmake") diff --git a/ports/comms/vcpkg.json b/ports/comms/vcpkg.json index 677032b1179745..fe4c58918ebdc0 100644 --- a/ports/comms/vcpkg.json +++ b/ports/comms/vcpkg.json @@ -1,6 +1,7 @@ { "name": "comms", "version-semver": "3.4.0", + "port-version": 1, "description": "COMMS is the C++(11) headers only, platform independent library, which makes the implementation of a communication protocol to be an easy and relatively quick process.", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/comms_champion", @@ -17,6 +18,7 @@ "features": { "tools": { "description": "Builds CommsChampion tools", + "supports": "!static", "dependencies": [ "qt5-base" ] diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake index 60cb2bbbc1116e..e7131d93a85067 100644 --- a/ports/commsdsl/portfile.cmake +++ b/ports/commsdsl/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/commsdsl diff --git a/ports/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json index ebfbd0c7254d43..84ceafc77305ff 100644 --- a/ports/commsdsl/vcpkg.json +++ b/ports/commsdsl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "commsdsl", "version-semver": "3.6.4", + "port-version": 1, "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", diff --git a/ports/coroutine/gsl-4_0_0.patch b/ports/coroutine/gsl-4_0_0.patch new file mode 100644 index 00000000000000..466d3ff13d74bb --- /dev/null +++ b/ports/coroutine/gsl-4_0_0.patch @@ -0,0 +1,80 @@ +diff --git a/interface/coroutine/net.h b/interface/coroutine/net.h +index 17b70a8..3c44827 100644 +--- a/interface/coroutine/net.h ++++ b/interface/coroutine/net.h +@@ -344,7 +344,7 @@ void poll_net_tasks(uint64_t nano) noexcept(false); + * @ingroup Network + */ + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept; + + /** +@@ -361,7 +361,7 @@ uint32_t get_address(const addrinfo& hint, // + * @ingroup Network + */ + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept; + + /** +@@ -377,7 +377,7 @@ uint32_t get_address(const addrinfo& hint, // + * @ingroup Network + */ + uint32_t get_name(const sockaddr_in& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags = NI_NUMERICHOST | NI_NUMERICSERV) noexcept; + + /** +@@ -392,7 +392,7 @@ uint32_t get_name(const sockaddr_in& addr, // + * @ingroup Network + */ + uint32_t get_name(const sockaddr_in6& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags = NI_NUMERICHOST | NI_NUMERICSERV) noexcept; + + } // namespace coro +diff --git a/modules/net/resolver.cpp b/modules/net/resolver.cpp +index 21a9800..5328939 100644 +--- a/modules/net/resolver.cpp ++++ b/modules/net/resolver.cpp +@@ -9,7 +9,7 @@ namespace coro { + + GSL_SUPPRESS(type .1) + uint32_t get_name(const sockaddr_in& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags) noexcept { + const auto* ptr = reinterpret_cast(addressof(addr)); + return ::getnameinfo(ptr, sizeof(sockaddr_in), // +@@ -20,7 +20,7 @@ uint32_t get_name(const sockaddr_in& addr, // + + GSL_SUPPRESS(type .1) + uint32_t get_name(const sockaddr_in6& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags) noexcept { + const auto* ptr = reinterpret_cast(addressof(addr)); + return ::getnameinfo(ptr, sizeof(sockaddr_in6), // +@@ -58,7 +58,7 @@ auto get_address(addrinfo* list, sockaddr_in6 addr) noexcept + } + + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept { + addrinfo* list = nullptr; + if (const auto ec = ::getaddrinfo(host, serv, // +@@ -74,7 +74,7 @@ uint32_t get_address(const addrinfo& hint, // + } + + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept { + addrinfo* list = nullptr; + if (const auto ec = ::getaddrinfo(host, serv, // diff --git a/ports/coroutine/portfile.cmake b/ports/coroutine/portfile.cmake index 1326b5a7dd5993..f01475086cf72a 100644 --- a/ports/coroutine/portfile.cmake +++ b/ports/coroutine/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - if(VCPKG_TARGET_IS_LINUX) message("Warning: `coroutine` requires libc++ and Clang or GCC 10+ on Linux") endif() @@ -13,6 +11,7 @@ vcpkg_from_github( PATCHES fix-errorC7651.patch add-noexcept-to-frame.patch + gsl-4_0_0.patch ) vcpkg_configure_cmake( diff --git a/ports/coroutine/vcpkg.json b/ports/coroutine/vcpkg.json index 8c557f6fa91578..e1b0a5d77f1793 100644 --- a/ports/coroutine/vcpkg.json +++ b/ports/coroutine/vcpkg.json @@ -1,7 +1,7 @@ { "name": "coroutine", - "version-string": "1.5.0", - "port-version": 2, + "version": "1.5.0", + "port-version": 4, "description": "C++ 20 Coroutines helper/example library", "homepage": "https://github.com/luncliff/coroutine", "supports": "!uwp", diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index 07c0cfda97b7de..349a0d68553ea7 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib - REF v0.9.7 - SHA512 7c12ff7b5cfba1a814cb14bdc28c949a97817668e1e6cee030fe1ea5e8748460677908ddb83fd1d06d96dd79a910004071076d1486d39103b6280f628ba38e2d + REF d73395e1dc652465fa9524266cd26ad57365491f #v0.10.3 + SHA512 cace318611a1e306b774b4bb08e0312ad06fc10acb829b1df6d5cef9c1d6b018c0c5ebb8e3859fa2bee974dbd51fc5df90a43aa81107c97377d55bb36595b67d HEAD_REF master ) diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index 20b17553942e17..ebbccb3f1d22b9 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpp-httplib", - "version": "0.9.7", + "version": "0.10.3", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", - "homepage": "https://github.com/yhirose/cpp-httplib" + "homepage": "https://github.com/yhirose/cpp-httplib", + "license": "MIT" } diff --git a/ports/cpp-ipc/portfile.cmake b/ports/cpp-ipc/portfile.cmake index 4842897fb51201..d48a25f7d58666 100644 --- a/ports/cpp-ipc/portfile.cmake +++ b/ports/cpp-ipc/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mutouyun/cpp-ipc @@ -36,4 +34,4 @@ vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/cpp-ipc/vcpkg.json b/ports/cpp-ipc/vcpkg.json index b0d59447b46208..0be5856372b452 100644 --- a/ports/cpp-ipc/vcpkg.json +++ b/ports/cpp-ipc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpp-ipc", "version": "1.0.1", + "port-version": 1, "description": "C++ IPC Library: A high-performance inter-process communication using shared memory on Linux/Windows.", "homepage": "https://github.com/mutouyun/cpp-ipc", "supports": "!osx", diff --git a/ports/cpp-netlib/portfile.cmake b/ports/cpp-netlib/portfile.cmake index adfe9ad29b46d0..4674917b6220fc 100644 --- a/ports/cpp-netlib/portfile.cmake +++ b/ports/cpp-netlib/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/cpp-netlib/vcpkg.json b/ports/cpp-netlib/vcpkg.json index 22a7c7b9ed3087..40f200d781c1a3 100644 --- a/ports/cpp-netlib/vcpkg.json +++ b/ports/cpp-netlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpp-netlib", "version-string": "0.13.0", - "port-version": 5, + "port-version": 6, "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/cppad/portfile.cmake b/ports/cppad/portfile.cmake index 3de2570379bb4d..23ddddb601d2ec 100644 --- a/ports/cppad/portfile.cmake +++ b/ports/cppad/portfile.cmake @@ -1,7 +1,3 @@ -# the compilation fails on arm and uwp. Please check the related issue: -# https://github.com/microsoft/vcpkg/pull/12560#issuecomment-668412073 -vcpkg_fail_port_install(ON_TARGET "uwp" and "arm") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO coin-or/CppAD diff --git a/ports/cppad/vcpkg.json b/ports/cppad/vcpkg.json index 48ae8fa4eb06fa..494ccdfa54a32f 100644 --- a/ports/cppad/vcpkg.json +++ b/ports/cppad/vcpkg.json @@ -1,7 +1,8 @@ { + "$comment": "See related issue for compilation failure on UWP and ARM: https://github.com/microsoft/vcpkg/pull/12560#issuecomment-668412073", "name": "cppad", "version-string": "20210000.7", - "port-version": 2, + "port-version": 3, "description": "CppAD: A Package for Differentiation of C++ Algorithms", "homepage": "https://github.com/coin-or/CppAD", "supports": "!(arm | uwp)", diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index d25c1b18ef6328..54bc5703970e7d 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install( ON_TARGET "linux" "osx") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( diff --git a/ports/cppcms/vcpkg.json b/ports/cppcms/vcpkg.json index 0991668efc1a9d..601d5755041cdb 100644 --- a/ports/cppcms/vcpkg.json +++ b/ports/cppcms/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppcms", "version-string": "1.2.1", - "port-version": 3, + "port-version": 4, "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development", "homepage": "https://github.com/artyom-beilis/cppcms", "supports": "!(linux | osx)", diff --git a/ports/cppcoro/portfile.cmake b/ports/cppcoro/portfile.cmake index 7938a65ba067c3..39c110e2a483e1 100644 --- a/ports/cppcoro/portfile.cmake +++ b/ports/cppcoro/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if(VCPKG_TARGET_IS_LINUX) diff --git a/ports/cppcoro/vcpkg.json b/ports/cppcoro/vcpkg.json index e5e116dc85e503..794309e34db813 100644 --- a/ports/cppcoro/vcpkg.json +++ b/ports/cppcoro/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppcoro", - "version-string": "2020-2-28", - "port-version": 2, + "version-date": "2020-02-28", + "port-version": 3, "description": "A library of C++ coroutine abstractions for the Coroutines TS", "homepage": "https://github.com/lewissbaker/cppcoro", "supports": "!uwp" diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 476d68956f38e3..e9fbd00335f9da 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cppgraphqlgen - REF v3.6.0 - SHA512 148751b1db1b3e917e74ef93fe3533a29153f0b5d1a20544eda32d0376e2c6f5cfc2d60fbc9d077d595e7072d0b6a36dbf8f2524903db40b576ee48196b2c3e8 + REF v4.1.1 + SHA512 20987f03719558cec2fac8aee5a94e59c5e833a318361aef802f39bc369af141fef0c7f2d3bb35324d44d289843564c2f7e890419f871bfd8e5d7d5de53b363e HEAD_REF main ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DGRAPHQL_BUILD_TESTS=OFF -DGRAPHQL_UPDATE_VERSION=OFF @@ -22,16 +21,14 @@ vcpkg_configure_cmake( -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/debug/tools ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() vcpkg_copy_tools( - TOOL_NAMES schemagen + TOOL_NAMES schemagen clientgen SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json index ace8b4ea886daf..6bed1ba31124be 100644 --- a/ports/cppgraphqlgen/vcpkg.json +++ b/ports/cppgraphqlgen/vcpkg.json @@ -1,11 +1,20 @@ { "name": "cppgraphqlgen", - "version-semver": "3.6.0", + "version-semver": "4.1.1", "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", + "license": "MIT", "dependencies": [ "boost-program-options", "pegtl", - "rapidjson" + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/cppunit/portfile.cmake b/ports/cppunit/portfile.cmake index 01522579ffb3f9..5daefd732252bf 100644 --- a/ports/cppunit/portfile.cmake +++ b/ports/cppunit/portfile.cmake @@ -1,8 +1,5 @@ -# UWP is not supported -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_download_distfile(ARCHIVE - URLS "http://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz" + URLS "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz" FILENAME "cppunit-1.15.1.tar.gz" SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691 ) @@ -62,4 +59,4 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CppUnitConfig.cmake" DESTINATION "${CURR file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" -) \ No newline at end of file +) diff --git a/ports/cppunit/vcpkg.json b/ports/cppunit/vcpkg.json index 221f330a05e254..15fef69b685a57 100644 --- a/ports/cppunit/vcpkg.json +++ b/ports/cppunit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppunit", "version": "1.15.1", - "port-version": 1, + "port-version": 3, "description": "Unit testing framework module for the C++ programming language", "homepage": "https://www.freedesktop.org/wiki/Software/cppunit", "supports": "!uwp", diff --git a/ports/cppxaml/portfile.cmake b/ports/cppxaml/portfile.cmake new file mode 100644 index 00000000000000..0a76e0e7ab70d3 --- /dev/null +++ b/ports/cppxaml/portfile.cmake @@ -0,0 +1,11 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO asklar/xaml-islands + REF 0.0.16 + SHA512 30fba1ef9264bf2eeaf0e48898c6b138adef9ee98d758ac91bcc7f2c90e50f00ec35925705347c3fc5c84b97652caeece7b3854be5b468a02e51fed23eda8007 + HEAD_REF main +) + +file(INSTALL "${SOURCE_PATH}/inc/cppxaml" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cppxaml/vcpkg.json b/ports/cppxaml/vcpkg.json new file mode 100644 index 00000000000000..d99f003879c2fd --- /dev/null +++ b/ports/cppxaml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cppxaml", + "version": "0.0.16", + "description": "CppXaml is a library to facilitate usage of the XAML UI framework in C++ Windows apps.", + "homepage": "https://asklar.github.io/xaml-islands", + "supports": "windows" +} diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch index 0b972c9b046b2f..7d8dc593354756 100644 --- a/ports/cpr/001-cpr-config.patch +++ b/ports/cpr/001-cpr-config.patch @@ -1,32 +1,23 @@ diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index 8061a14..e8daf19 100644 +index d43fc1d..d6a3992 100644 --- a/cpr/CMakeLists.txt +++ b/cpr/CMakeLists.txt -@@ -21,6 +21,7 @@ add_library(cpr - - add_library(cpr::cpr ALIAS cpr) - -+target_include_directories(cpr PUBLIC $) - target_link_libraries(cpr PUBLIC CURL::libcurl) # todo should be private, but first dependencys in ssl_options need to be removed - - # Set version for shared libraries. -@@ -29,4 +30,18 @@ set_target_properties(cpr +@@ -29,6 +29,10 @@ set_target_properties(cpr + PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) - --install(TARGETS cpr) -+set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -+install(TARGETS cpr -+ EXPORT ${TARGETS_EXPORT_NAME} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ -+install( -+ EXPORT ${TARGETS_EXPORT_NAME} -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" -+) -+ ++ +if (NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include) +endif() + + # Import GNU common install directory variables + include(GNUInstallDirs) +@@ -37,6 +41,7 @@ if(CPR_FORCE_USE_SYSTEM_CURL) + install(TARGETS cpr + EXPORT cprTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + # Include CMake helpers for package config files diff --git a/ports/cpr/cprConfig.cmake b/ports/cpr/cprConfig.cmake deleted file mode 100644 index 85e433c4b94700..00000000000000 --- a/ports/cpr/cprConfig.cmake +++ /dev/null @@ -1,31 +0,0 @@ -####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() ####### -####### Any changes to this file will be overwritten by the next CMake run #### -####### The input file was Config.cmake.in ######## - -get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) - -macro(set_and_check _var _file) - set(${_var} "${_file}") - if(NOT EXISTS "${_file}") - message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !") - endif() -endmacro() - -macro(check_required_components _NAME) - foreach(comp ${${_NAME}_FIND_COMPONENTS}) - if(NOT ${_NAME}_${comp}_FOUND) - if(${_NAME}_FIND_REQUIRED_${comp}) - set(${_NAME}_FOUND FALSE) - endif() - endif() - endforeach() -endmacro() - -#################################################################################### - -include("${CMAKE_CURRENT_LIST_DIR}/cprTargets.cmake") -check_required_components("cpr") - -include(CMakeFindDependencyMacro) -find_dependency(ZLIB REQUIRED) -find_dependency(CURL REQUIRED) diff --git a/ports/cpr/fix-uwp.patch b/ports/cpr/fix-uwp.patch deleted file mode 100644 index e91eb62b5f8f45..00000000000000 --- a/ports/cpr/fix-uwp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8575b2f..87de55c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,7 @@ message(STATUS "=======================================================") - include(GNUInstallDirs) - include(FetchContent) - include(cmake/code_coverage.cmake) --include(cmake/sanitizer.cmake) -+#include(cmake/sanitizer.cmake) - include(cmake/gcc_analyze.cmake) - - # SSL diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 49c6ef4dfcc75e..ad7ecc0bdd1868 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -1,22 +1,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if(VCPKG_TARGET_IS_UWP) - set(UWP_PATCH fix-uwp.patch) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF 1.6.2 - SHA512 77afd1dc81274aa1d37bf17abaf2614b63802f17fc08bdf8453d96d8fa2bd4b025511db9fadbde51160d7dde31a0363694422d3407ca9cdac3cd79b744a82888 + REF 1.7.2 + SHA512 b2af6ab13a5dab435cc298c74ba79c365569c1e5ccfaffeea9dab0ad28cd918a198f83446761ac2e2101abb4be3a2f669f991e854e541851c1d250f34e16c414 HEAD_REF master PATCHES 001-cpr-config.patch - ${UWP_PATCH} ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCPR_BUILD_TESTS=OFF -DCPR_FORCE_USE_SYSTEM_CURL=ON @@ -26,12 +21,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/cprConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/lib/cmake/cpr) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpr) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 27b1a87af4fc1e..9ff4893cbe2a14 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cpr", - "version-semver": "1.6.2", - "port-version": 1, + "version-semver": "1.7.2", "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", "homepage": "https://github.com/libcpr/cpr", "dependencies": [ diff --git a/ports/cpu-features/portfile.cmake b/ports/cpu-features/portfile.cmake index 0e7602fdc4e397..4b4ca71d2c4374 100644 --- a/ports/cpu-features/portfile.cmake +++ b/ports/cpu-features/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/cpu-features/vcpkg.json b/ports/cpu-features/vcpkg.json index 8980a30b5db2e5..e44c320170d28c 100644 --- a/ports/cpu-features/vcpkg.json +++ b/ports/cpu-features/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpu-features", "version": "0.6.0", + "port-version": 1, "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", diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake index 306ccd5ac4025f..6f38ec89bb7fa4 100644 --- a/ports/cpuid/portfile.cmake +++ b/ports/cpuid/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json index a2ae5e99bfd2bc..1e77b381c83f0e 100644 --- a/ports/cpuid/vcpkg.json +++ b/ports/cpuid/vcpkg.json @@ -1,10 +1,10 @@ { "name": "cpuid", "version": "0.5.1", - "port-version": 2, + "port-version": 3, "description": "Provides CPU identification for the x86 (and x86_64)", "homepage": "https://github.com/anrieff/libcpuid", - "supports": "x86 | x64", + "supports": "(x86 | x64) & !uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index 30026d5c151a0a..1764fc99ac0a12 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -1,7 +1,3 @@ -vcpkg_fail_port_install( - ON_ARCH "x86" "arm" "arm64" - ON_TARGET "UWP" "LINUX") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( @@ -14,7 +10,7 @@ function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") return() endif() - + vcpkg_from_git( OUT_SOURCE_PATH DEP_SOURCE_PATH URL "${URL}" @@ -116,8 +112,8 @@ install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base") install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build") # remove empty directories -file(REMOVE_RECURSE - "${PACKAGES_INCLUDE_DIR}/util/net/testdata" +file(REMOVE_RECURSE + "${PACKAGES_INCLUDE_DIR}/util/net/testdata" "${PACKAGES_INCLUDE_DIR}/build/ios") configure_file("${CMAKE_CURRENT_LIST_DIR}/crashpadConfig.cmake.in" diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index a470314994806f..d244f5987365bb 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "crashpad", - "version-string": "2020-03-18", - "port-version": 1, + "version-date": "2020-03-18", + "port-version": 2, "description": [ "Crashpad is a crash-reporting system.", "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." diff --git a/ports/crashrpt/portfile.cmake b/ports/crashrpt/portfile.cmake index ffc83aa98b1976..a4265e0f8acb56 100644 --- a/ports/crashrpt/portfile.cmake +++ b/ports/crashrpt/portfile.cmake @@ -1,11 +1,9 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux" "UWP") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) set(ARCH_DIR "") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(ARCH_DIR "x64/") else() - vcpkg_fail_port_install(MESSAGE "${PORT} only supports x86 and x64 architectures" ALWAYS) + message(FATAL_ERROR "${PORT} only supports x86 and x64 architectures") endif() vcpkg_from_git( diff --git a/ports/crashrpt/vcpkg.json b/ports/crashrpt/vcpkg.json index 3ed55e7312b515..4b36fcda6b4ccb 100644 --- a/ports/crashrpt/vcpkg.json +++ b/ports/crashrpt/vcpkg.json @@ -1,9 +1,10 @@ { "name": "crashrpt", "version": "1.4.3", - "port-version": 1, + "port-version": 2, "description": "A crash reporting system for Windows applications", "homepage": "http://crashrpt.sourceforge.net/", + "supports": "!osx & !linux & !uwp & (x86 | x64)", "dependencies": [ "dbghelp", "libjpeg-turbo", diff --git a/ports/crfsuite/portfile.cmake b/ports/crfsuite/portfile.cmake index 19b2399bed3e21..14e3392163644a 100644 --- a/ports/crfsuite/portfile.cmake +++ b/ports/crfsuite/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET uwp) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -10,7 +8,6 @@ vcpkg_from_github( HEAD_REF master ) - list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs.lib") list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs_debug.lib") diff --git a/ports/crfsuite/vcpkg.json b/ports/crfsuite/vcpkg.json index aa62f95bf1b0ba..5899466d52bf20 100644 --- a/ports/crfsuite/vcpkg.json +++ b/ports/crfsuite/vcpkg.json @@ -1,9 +1,9 @@ { "name": "crfsuite", "version-date": "2019-07-21", - "port-version": 1, + "port-version": 3, "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.", - "homepage": "http://www.chokkan.org/software/crfsuite/", + "homepage": "https://www.chokkan.org/software/crfsuite/", "supports": "!uwp", "dependencies": [ "liblbfgs" diff --git a/ports/croncpp/no-test.patch b/ports/croncpp/no-test.patch new file mode 100644 index 00000000000000..0860e3f10a49a7 --- /dev/null +++ b/ports/croncpp/no-test.patch @@ -0,0 +1,17 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index a82e605..405f306 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,3 +1,4 @@ ++if(BUILD_TESTS) + cmake_minimum_required(VERSION 3.7.0) + project(test_croncpp) + +@@ -9,7 +10,6 @@ file(GLOB SOURCES "*.cpp" "include/*.cpp") + + add_executable(test_croncpp ${SOURCES} ${headers}) + +-if(BUILD_TESTS) + enable_testing() + + add_test(NAME "test_croncpp" COMMAND "test_croncpp" "-r compact") diff --git a/ports/croncpp/portfile.cmake b/ports/croncpp/portfile.cmake index ebf35895bc3732..bfdd2f84fd7614 100644 --- a/ports/croncpp/portfile.cmake +++ b/ports/croncpp/portfile.cmake @@ -5,19 +5,22 @@ vcpkg_from_github( REF 11cce4666a06c40346c7ba380ddd90c53806809d #master on 9/4/2020 SHA512 8f4d892ce90d8eca3711b21728bb599bf64857b20c0b143c5277687d0b6e5d5b8bf3e6dc7f9e8d028ba4e5ee711a5a9e750bcc2f771177d2f659c0c19e12207a HEAD_REF master - PATCHES 0001-fix-cmake.patch + PATCHES + 0001-fix-cmake.patch + no-test.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/croncpp RENAME copyright) +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/croncpp/vcpkg.json b/ports/croncpp/vcpkg.json index d1b9e05dea43a6..e41db7b7732997 100644 --- a/ports/croncpp/vcpkg.json +++ b/ports/croncpp/vcpkg.json @@ -1,7 +1,18 @@ { "name": "croncpp", - "version-string": "2020-09-04", - "port-version": 2, + "version-date": "2020-09-04", + "port-version": 3, "description": "croncpp is a C++17 header-only cross-platform library for handling CRON expressions.", - "homepage": "https://github.com/mariusbancila/croncpp" + "homepage": "https://github.com/mariusbancila/croncpp", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/crossguid/portfile.cmake b/ports/crossguid/portfile.cmake index aaea8334587b52..5be5064d167d64 100644 --- a/ports/crossguid/portfile.cmake +++ b/ports/crossguid/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF ca1bf4b810e2d188d04cb6286f957008ee1b7681 #2021-10-22 SHA512 f0a80d8e99b10473bcfdfde3d1c5fd7b766959819f0d1c0595ac84ce46db9007a5fbfde9a55aca60530c46cb7f8ef4c7e472c6191559ded92f868589c141ccaf HEAD_REF master + PATCHES + warnings.patch ) vcpkg_cmake_configure( diff --git a/ports/crossguid/vcpkg.json b/ports/crossguid/vcpkg.json index e086c4585b647d..aa9aecd85893ad 100644 --- a/ports/crossguid/vcpkg.json +++ b/ports/crossguid/vcpkg.json @@ -1,12 +1,12 @@ { "name": "crossguid", "version-date": "2021-10-22", - "port-version": 1, + "port-version": 2, "description": "CrossGuid is a minimal, cross platform, C++ GUID library.", "dependencies": [ { "name": "libuuid", - "platform": "!windows & !uwp & !osx & !android" + "platform": "!windows & !osx & !android" }, { "name": "vcpkg-cmake", diff --git a/ports/crossguid/warnings.patch b/ports/crossguid/warnings.patch new file mode 100644 index 00000000000000..d0ffc790aaf6cb --- /dev/null +++ b/ports/crossguid/warnings.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 76b5a62..174d981 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,15 +40,6 @@ else() + target_compile_definitions(crossguid PRIVATE GUID_LIBUUID) + endif() + +-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- set(WARNINGS "-Werror" "-Wall") +-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(WARNINGS "-Werror" "-Wall") +-elseif(MSVC) +- set(WARNINGS "/WX" "/W4") +-endif() +-target_compile_options(crossguid PRIVATE ${WARNINGS}) +- + set_target_properties(crossguid + PROPERTIES + VERSION ${PROJECT_VERSION} diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake index c1b710fffeea44..8f4e275dce7827 100644 --- a/ports/crow/portfile.cmake +++ b/ports/crow/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CrowCpp/crow - REF a166a6d3cb08b10e9b00b57fd2216b9c4329d4e6 #0.3+3 - SHA512 5a32f66c96376c9c17f82492a7bc6f77417aa9dd808c082a2aeae983d05e895c27c2a01c46f8b5fdf9d30267ad14e8ba64a629ba354dce6ce0f7a2ff5d0a7fb2 + REF 87adb19e43caf5a060674a9b67a86c8ced944892 #0.3+4 + SHA512 286ff8cc2167a9c828130e4c9587bf62574502cca22da586bcefb4f317112b8bd9c1628976452fc2503042869f961bc08670d261a9e4595388b354c9b32b9a1a FILE_DISAMBIGUATOR 1 HEAD_REF master ) diff --git a/ports/crow/vcpkg.json b/ports/crow/vcpkg.json index dc57251d7c302f..db4cf47a441941 100644 --- a/ports/crow/vcpkg.json +++ b/ports/crow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "crow", - "version": "0.3.3", + "version": "0.3.4", "description": "Very fast and easy to use C++ micro web framework", "homepage": "https://github.com/CrowCpp/crow" } diff --git a/ports/cryptopp/cmake.patch b/ports/cryptopp/cmake.patch index 8502ff17c0183e..b0839bca7e2f14 100644 --- a/ports/cryptopp/cmake.patch +++ b/ports/cryptopp/cmake.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1683961..f63c71e 100644 +index fb43b95..c39e470 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -395,6 +395,10 @@ if (MSVC) - list(APPEND CRYPTOPP_COMPILE_OPTIONS /FI winapifamily.h) +@@ -451,6 +451,10 @@ if (MSVC) + endif() endif () +if(WINDOWS_STORE) @@ -13,3 +13,17 @@ index 1683961..f63c71e 100644 # Enable PIC for all target machines except 32-bit i386 due to register pressures. if (NOT CRYPTOPP_I386) SET(CMAKE_POSITION_INDEPENDENT_CODE 1) +@@ -1022,10 +1026,10 @@ endif () + # add_compile_definitions added in CMake 3.12 + if (${CMAKE_VERSION} VERSION_LESS "3.12") + # https://stackoverflow.com/q/61250087 +- add_definitions("${CMAKE_CPP_FLAGS}" "${CMAKE_CXX_FLAGS}" "${CRYPTOPP_COMPILE_DEFINITIONS}" "${CRYPTOPP_COMPILE_OPTIONS}") ++ add_definitions(${CMAKE_CPP_FLAGS} ${CRYPTOPP_COMPILE_DEFINITIONS} ${CRYPTOPP_COMPILE_OPTIONS}) + else() +- add_compile_definitions("${CMAKE_CPP_FLAGS}" "${CRYPTOPP_COMPILE_DEFINITIONS}") +- add_compile_options("${CMAKE_CXX_FLAGS}" "${CRYPTOPP_COMPILE_OPTIONS}") ++ add_compile_definitions(${CRYPTOPP_COMPILE_DEFINITIONS}) ++ add_compile_options(${CMAKE_CPP_FLAGS} ${CRYPTOPP_COMPILE_OPTIONS}) + endif() + + #============================================================================ diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index 03612d3057aeb7..584eb7144637d1 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO noloader/cryptopp-cmake - REF CRYPTOPP_8_5_0 - SHA512 758633786c81f5a34ade0ab99983b3262bb3a028b086e734b1f8ddb618c801453d517f67176178936f87ec36a91fca93fba9bcaec4301705138954e6eb49d136 + REF CRYPTOPP_8_6_0 + SHA512 655107b8a41e1e6603a6b3ed2ddc95fad22b646c071c7251c3c7e2151afe439de848679235a3790fe540263424324f06c922687719da6dfea341bc2a75337bdc HEAD_REF master PATCHES cmake.patch @@ -13,8 +13,8 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO weidai11/cryptopp - REF CRYPTOPP_8_5_0 - SHA512 e8dd210c9e9d4925edc456e4d68780deaa224d85e11394ad5da835dcb1a1e6b3e899aa473acf20449f9721116960884b6d88b29335479b305bb7e29faa87e6c0 + REF CRYPTOPP_8_6_0 + SHA512 ccb4baa6674cd830cddb779216ce702b3cdba6de8a3d627c218861507c36bddd2861b0d0e8cad35001a1e9f0c3d5020404684c87dd05d85264ac166fa7f70589 HEAD_REF master PATCHES patch.patch ) @@ -51,9 +51,8 @@ endif() # https://www.cryptopp.com/wiki/Visual_Studio#Dynamic_Runtime_Linking # https://www.cryptopp.com/wiki/Visual_Studio#The_DLL -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_SHARED=OFF -DBUILD_STATIC=ON @@ -62,8 +61,8 @@ vcpkg_configure_cmake( -DDISABLE_ASM=${CRYPTOPP_DISABLE_ASM} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cryptopp) +vcpkg_cmake_install () +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cryptopp) # There is no way to suppress installation of the headers and resource files in debug build. file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/cryptopp/vcpkg.json b/ports/cryptopp/vcpkg.json index e75fa21625bf38..02ffa51b16b412 100644 --- a/ports/cryptopp/vcpkg.json +++ b/ports/cryptopp/vcpkg.json @@ -1,9 +1,18 @@ { "name": "cryptopp", - "version-string": "8.5.0", - "port-version": 1, + "version": "8.6.0", "description": "Crypto++ is a free C++ class library of cryptographic schemes.", "homepage": "https://github.com/weidai11/cryptopp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "pem-pack": { "description": "Crypto++ with PEM pack" diff --git a/ports/cspice/CMakeLists.txt b/ports/cspice/CMakeLists.txt index 899a94033bb727..042a7af81e7be0 100644 --- a/ports/cspice/CMakeLists.txt +++ b/ports/cspice/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1) project(cspice LANGUAGES C) -set(SOVERSION 66) +set(SOVERSION 67) # Include all *.c files from the library file(GLOB CSPICE_SOURCE ${PROJECT_SOURCE_DIR}/cspice/src/cspice/*.c) @@ -29,7 +29,7 @@ endif () if (NOT _SKIP_HEADERS) file(GLOB SPICE_HEADERS ${INCLUDE_PATH}/*.h) - install(FILES ${SPICE_HEADERS} DESTINATION include) + install(FILES ${SPICE_HEADERS} DESTINATION include/cspice) endif() set_target_properties( diff --git a/ports/cspice/portfile.cmake b/ports/cspice/portfile.cmake index 667785cac5a019..33d481d7b056a9 100644 --- a/ports/cspice/portfile.cmake +++ b/ports/cspice/portfile.cmake @@ -1,45 +1,35 @@ -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Windows_VisualC_32bit/packages/cspice.zip" - FILENAME "cspice_32bit.zip" - SHA512 4f6129b26543729f4eb4f8240b43ca87530db9c6d9a5c0e3f43faf30561eaad95dcf507e3fecfd1c3d4388ccaa4e22a76df7bf7945b6ce9a68eb3b4893885992 - ) - elseif (VCPKG_TARGET_IS_OSX) - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacIntel_OSX_AppleC_32bit/packages/cspice.tar.Z" - FILENAME "cspice_32bit.tar.Z" - SHA512 bd5cc20206e48b3712c5077a2beb05c98cd58a25ce374ed363699a04998eb8ba93e42b5f7c2104c5296db95b3bccdc7cc9b6a2ba45875454d0c3914834aa4c42 - ) - else () - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Linux_GCC_32bit/packages/cspice.tar.Z" - FILENAME "cspice_32bit.tar.Z" - SHA512 b387bc2cfca4deccc451d198af49564ea0b19cf665ba143d39196ed532639cbc11aad7e1d63f71f1bb88d72c0e6ac30757b6e1babca9e0ee3b92f9c205c1b908 - ) +if (VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(SUBPATH "PC_Windows_VisualC_32bit/packages/cspice.zip") + set(SHA512 1949fd12b30ca0e42f53311a97d8571e68737f6a667a56946d3415ee715dda0a1adca9bfc985b9b9447084189c50d261f2c00960cbe2ddf6a1d1d92cf8fa17ab) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(SUBPATH "PC_Windows_VisualC_64bit/packages/cspice.zip") + set(SHA512 5457f24279fb485b0ac92713dab026d1c1ed766a358fcf7d9ce3f70693e75da85a656e72b1ada4dc334e9e68d6c0eb42b2a31f3ad0c83b491dd3afc79e5cda98) + endif() +elseif(VCPKG_TARGET_IS_OSX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(SUBPATH "MacIntel_OSX_AppleC_64bit/packages/cspice.tar.Z") + set(SHA512 ea9a32c763cd54303de180b4895a195cd5ef6774051f18a1812f2fff39adc0ca9d5dd7878853af40e766882e79a0f542a45139656fb79fb4b436c4bc5bdecddc) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(SUBPATH "MacM1_OSX_clang_64bit/packages/cspice.tar.Z") + set(SHA512 a64f028ec1935dbc7f8d03c903fbfa40cfff097ec4aa0ca4aa1d2ee08561833000e7caf99d6550b06d2a0874cbaf1767382e7a9aea6a39228f3eaa89c6c31a6d) endif() else() - if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Windows_VisualC_64bit/packages/cspice.zip" - FILENAME "cspice_64bit.zip" - SHA512 7b5353c638fdba67ed2e9fd21c4f78ac56c0afba408caa70f910f23bb025f6dc822fbaa7d6d7fa277d1038f835e6a962563f4b11a6adf63150d48354959e3c62 - ) - elseif (VCPKG_TARGET_IS_OSX) - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacIntel_OSX_AppleC_64bit/packages/cspice.tar.Z" - FILENAME "cspice_64bit.tar.Z" - SHA512 0d4ef95dfa65d127c1d6f9cf1f637d41ca6680660ee3003f357652f12ed9d04a21888ef796f347ba90354a445b5aea9ffca7dedc6c1617f253b0002683d54a0f - ) - else () - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Linux_GCC_64bit/packages/cspice.tar.Z" - FILENAME "cspice_64bit.tar.Z" - SHA512 7d090e9196596436740b53180a7c6ca885c12e301771a83fc62d625a63691129c69012cb0385a6c8f246cc5edf1c1af57ffac8a9d766061e1bde8584c57c6ca4 - ) + if ((VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") OR (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) + set(SUBPATH "PC_Linux_GCC_32bit/packages/cspice.tar.Z") + set(SHA512 22a6250376e9f98d75ecc8682c5432a07a89addc9812010ad97059491e2c19cab418d7aa3f591bded9df132fcfb6865686f0ecfe70821ad31061ae2f7b165f2b) + elseif((VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") OR (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) + set(SUBPATH "PC_Linux_GCC_64bit/packages/cspice.tar.Z") + set(SHA512 59946f628284cd31c75a23c152d725ae7e01b179f97c52b98518eceeda54bc38875b1dd93dc17574c0bf00e706e0ee35d06ecb5d7871d49633baa8f16eb6c7c8) endif() endif() +set(VERSION 67) +set(URL "https://naif.jpl.nasa.gov/pub/naif/misc/toolkit_N00${VERSION}/C/${SUBPATH}") +get_filename_component(ext "${SUBPATH}" EXT) +string(SUBSTRING "${SHA512}" 0 6 subsha) +vcpkg_download_distfile(ARCHIVE URLS "${URL}" FILENAME "cspice-${subsha}${ext}" SHA512 "${SHA512}") + set(PATCHES isatty.patch) if (NOT VCPKG_TARGET_IS_WINDOWS) set(PATCHES ${PATCHES} mktemp.patch) @@ -63,14 +53,13 @@ if (VCPKG_TARGET_IS_UWP) set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -D_STATIC_BUILD=${_STATIC_BUILD} OPTIONS_DEBUG -D_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/cspice/vcpkg.json b/ports/cspice/vcpkg.json index abbf6dfaf58792..d84c24ae016695 100644 --- a/ports/cspice/vcpkg.json +++ b/ports/cspice/vcpkg.json @@ -1,7 +1,19 @@ { "name": "cspice", - "version-string": "66", - "port-version": 5, + "version": "67", + "port-version": 2, "description": "NASA C SPICE toolkit", - "homepage": "https://naif.jpl.nasa.gov/naif/toolkit_C.html" + "homepage": "https://naif.jpl.nasa.gov/naif/toolkit_C.html", + "license": null, + "supports": "!((arm | arm64) & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/ctemplate/vcpkg.json b/ports/ctemplate/vcpkg.json index 2f3d6bd4133236..7a8c84bbf1806f 100644 --- a/ports/ctemplate/vcpkg.json +++ b/ports/ctemplate/vcpkg.json @@ -1,7 +1,8 @@ { "name": "ctemplate", "version-date": "2020-09-14", - "port-version": 2, + "port-version": 3, "description": "C++ CTemplate system", - "homepage": "https://github.com/OlafvdSpek/ctemplate" + "homepage": "https://github.com/OlafvdSpek/ctemplate", + "supports": "!arm" } diff --git a/ports/cuda/vcpkg.json b/ports/cuda/vcpkg.json index a448794d30090d..e6e874a57ebbe2 100644 --- a/ports/cuda/vcpkg.json +++ b/ports/cuda/vcpkg.json @@ -1,7 +1,8 @@ { "name": "cuda", "version-string": "10.1", - "port-version": 8, + "port-version": 9, "description": "A parallel computing platform and programming model", - "homepage": "https://developer.nvidia.com/cuda-toolkit" + "homepage": "https://developer.nvidia.com/cuda-toolkit", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))" } diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index c1572624a3775f..e31cb9fbf62904 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -2,15 +2,14 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 62b7b33..8a4bd71 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -107,6 +107,10 @@ endif() - - target_link_libraries(${LIB_NAME} ${CURL_LIBS}) - -+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -+ add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) -+endif() -+ - if(WIN32) - add_definitions(-D_USRDLL) - endif() - +@@ -115,6 +115,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) + set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_USRDLL") diff --git a/ports/curl/0005_remove_imp_suffix.patch b/ports/curl/0005_remove_imp_suffix.patch index 83ec1051336796..e52da2585b61ea 100644 --- a/ports/curl/0005_remove_imp_suffix.patch +++ b/ports/curl/0005_remove_imp_suffix.patch @@ -2,13 +2,11 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1d71e14..62b7b33 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -128,7 +128,7 @@ if(CURL_HAS_LTO) - INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE) - endif() - --if(WIN32) -+if(WIN32 AND 0) - if(BUILD_SHARED_LIBS) - if(MSVC) - # Add "_imp" as a suffix before the extension to avoid conflicting with - # the statically linked "libcurl.lib" +@@ -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() + endif() diff --git a/ports/curl/0006_fix_tool_depends.patch b/ports/curl/0006_fix_tool_depends.patch deleted file mode 100644 index a918b08e2d752c..00000000000000 --- a/ports/curl/0006_fix_tool_depends.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 26e3cfe..74d00dd 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -61,6 +61,8 @@ if(MSVC) - list(APPEND CURL_FILES curl.rc) - endif() - -+find_package(ZLIB REQUIRED) -+ - # CURL_FILES comes from Makefile.inc - add_executable( - ${EXE_NAME} -@@ -91,7 +93,7 @@ include_directories( - ) - - #Build curl executable --target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS}) -+target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS} ZLIB::ZLIB) - - ################################################################################ - diff --git a/ports/curl/0007_disable_tool_export_curl_target.patch b/ports/curl/0007_disable_tool_export_curl_target.patch deleted file mode 100644 index 689104a938cc18..00000000000000 --- a/ports/curl/0007_disable_tool_export_curl_target.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 74d00dd..5838805 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -103,8 +103,8 @@ target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS} ZLIB::ZLIB) - - #INCLUDE(ModuleInstall OPTIONAL) - --install(TARGETS ${EXE_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) --export(TARGETS ${EXE_NAME} -- APPEND FILE ${PROJECT_BINARY_DIR}/curl-target.cmake -- NAMESPACE ${PROJECT_NAME}:: --) -+install(TARGETS ${EXE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) -+#export(TARGETS ${EXE_NAME} -+# APPEND FILE ${PROJECT_BINARY_DIR}/curl-target.cmake -+# NAMESPACE ${PROJECT_NAME}:: -+#) diff --git a/ports/curl/0011_fix_static_build.patch b/ports/curl/0011_fix_static_build.patch deleted file mode 100644 index a50fa287f54cfe..00000000000000 --- a/ports/curl/0011_fix_static_build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 8a4bd71..1927fb0 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -111,7 +111,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) - endif() - --if(WIN32) -+if(WIN32 AND BUILD_SHARED_LIBS) - add_definitions(-D_USRDLL) - endif() - diff --git a/ports/curl/0012-fix-dependency-idn2.patch b/ports/curl/0012-fix-dependency-idn2.patch index 9388f91a0b2497..e1d59bf5dae32e 100644 --- a/ports/curl/0012-fix-dependency-idn2.patch +++ b/ports/curl/0012-fix-dependency-idn2.patch @@ -7,7 +7,7 @@ index 9f6de81..6702845 100644 set(HAVE_LIBIDN2 OFF) if(USE_LIBIDN2) + set(HAVE_LIBIDN2 TRUE) -+ list(APPEND CURL_LIBS ${LIBIDN2_LIBRARIES}) ++ list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES}) +elseif(0) check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) endif() diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch index 73e042ca236641..21eab0933baf2d 100644 --- a/ports/curl/0020-fix-pc-file.patch +++ b/ports/curl/0020-fix-pc-file.patch @@ -2,58 +2,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b2e428..ea430f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1462,7 +1462,26 @@ set(includedir "\${prefix}/include") +@@ -1505,7 +1505,9 @@ set(includedir "\${prefix}/include") set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") set(LIBCURL_LIBS "") set(libdir "${CMAKE_INSTALL_PREFIX}/lib") -foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) -+function(flatten input output) -+ set(output_libs "${${output}}") -+ set(input_libs "${${input}}") -+ while(input_libs) -+ list(POP_BACK input_libs lib) -+ if(NOT "${lib}" IN_LIST output_libs) -+ if(TARGET "${lib}") -+ get_target_property(link_libs "${lib}" INTERFACE_LINK_LIBRARIES) -+ if(link_libs) -+ flatten(link_libs output_libs) -+ endif() -+ endif() -+ list(PREPEND output_libs "${lib}") -+ endif() -+ endwhile() -+ set("${output}" "${output_libs}" PARENT_SCOPE) -+endfunction() +set(CURL_LIBS_FLAT "") -+flatten(CURL_LIBS CURL_LIBS_FLAT) ++vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT) +foreach(_lib ${CURL_LIBS_FLAT}) if(TARGET "${_lib}") set(_libname "${_lib}") get_target_property(_imported "${_libname}" IMPORTED) -@@ -1503,12 +1523,26 @@ foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) - # Assume the user won't need this information in the .pc file. - continue() - endif() -+ set(_lib NOTFOUND) -+ if(DEFINED CMAKE_BUILD_TYPE) -+ string(TOUPPER "${CMAKE_BUILD_TYPE}" config) -+ get_target_property(_lib "${_libname}" IMPORTED_LOCATION_${config}) -+ endif() -+ if(NOT _lib) - get_target_property(_lib "${_libname}" LOCATION) -+ endif() - if(NOT _lib) - message(WARNING "Bad lib in library list: ${_libname}") - continue() - endif() - endif() -+ if(_lib MATCHES "^(.*)/([^/]*)[.]framework$") -+ if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) -+ set(_lib "-framework ${CMAKE_MATCH_2}") -+ else() -+ set(_lib "-framework ${_lib}") -+ endif() -+ endif() - if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-") - set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}") - else() diff --git a/ports/curl/0022-deduplicate-libs.patch b/ports/curl/0022-deduplicate-libs.patch index bd027d4cb41442..16cc0498a3b179 100644 --- a/ports/curl/0022-deduplicate-libs.patch +++ b/ports/curl/0022-deduplicate-libs.patch @@ -10,16 +10,3 @@ index 09d82f1..f0d99e6 100644 endif() # "a" (Linux) or "lib" (Windows) string(REPLACE "." "" libext "${CMAKE_STATIC_LIBRARY_SUFFIX}") -diff --git a/curl-config.in b/curl-config.in -index 8b4a29a..e756ae8 100644 ---- a/curl-config.in -+++ b/curl-config.in -@@ -172,7 +172,7 @@ while test $# -gt 0; do - - --static-libs) - if test "X@ENABLE_STATIC@" != "Xno" ; then -- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ -+ echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_NO_SHARED@ - else - echo "curl was built with static libraries disabled" >&2 - exit 1 diff --git a/ports/curl/0023-fix-static-libs-export.patch b/ports/curl/0023-fix-static-libs-export.patch deleted file mode 100644 index de12b38b5f78af..00000000000000 --- a/ports/curl/0023-fix-static-libs-export.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 158d7a5..ae7b388 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1534,6 +1534,9 @@ foreach(_lib ${CURL_LIBS_FLAT}) - set(_lib "-framework ${_lib}") - endif() - endif() -+ if(_lib MATCHES ".*/${CMAKE_STATIC_LIBRARY_PREFIX}([^/]*)${CMAKE_STATIC_LIBRARY_SUFFIX}") -+ set(_lib -l${CMAKE_MATCH_1}) -+ endif() - if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-") - set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}") - else() diff --git a/ports/curl/cmake-project-include.cmake b/ports/curl/cmake-project-include.cmake new file mode 100644 index 00000000000000..27254864c20ce2 --- /dev/null +++ b/ports/curl/cmake-project-include.cmake @@ -0,0 +1,82 @@ +# Process the libs and targets in the variable named by `input` +# into a flat list of libs in the variable named by `output`. +# Simplify -framework elements. +# Use -l where possible. +# Avoid duplicates. +function(vcpkg_curl_flatten input output) + set(output_libs "${${output}}") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + string(REGEX REPLACE ";optimized;[^;]*|;debug" "" input_libs "VCPKG;${${input}}") + else() + string(REGEX REPLACE ";debug;[^;]*|;optimized" "" input_libs "VCPKG;${${input}}") + endif() + list(REMOVE_AT input_libs 0) + while(input_libs) + list(POP_BACK input_libs lib) + if(TARGET "${lib}") + set(import_lib "") + set(import_location "") + get_target_property(type "${lib}" TYPE) + if(NOT type STREQUAL "INTERFACE_LIBRARY") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + get_target_property(link_libs "${lib}" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG) + get_target_property(import_lib "${lib}" IMPORTED_IMPLIB_DEBUG) + get_target_property(import_location "${lib}" IMPORTED_LOCATION_DEBUG) + else() + get_target_property(link_libs "${lib}" IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) + get_target_property(import_lib "${lib}" IMPORTED_IMPLIB_RELEASE) + get_target_property(import_location "${lib}" IMPORTED_LOCATION_RELEASE) + endif() + if(link_libs) + vcpkg_curl_flatten(link_libs output_libs) + endif() + get_target_property(link_libs "${lib}" IMPORTED_LINK_INTERFACE_LIBRARIES) + if(link_libs) + vcpkg_curl_flatten(link_libs output_libs) + endif() + if(NOT import_lib) + get_target_property(import_lib "${lib}" IMPORTED_IMPLIB) + endif() + if(NOT import_location) + get_target_property(import_location "${lib}" IMPORTED_LOCATION) + endif() + endif() + get_target_property(link_libs "${lib}" INTERFACE_LINK_LIBRARIES) + if(link_libs) + vcpkg_curl_flatten(link_libs output_libs) + endif() + if(import_lib) + set(lib "${import_lib}") + elseif(import_location) + set(lib "${import_location}") + endif() + endif() + if(lib MATCHES "^(.*)/([^/]*)[.]framework$") + if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + set(lib "-framework ${CMAKE_MATCH_2}") + else() + set(lib "-framework ${lib}") + endif() + elseif(WIN32 AND lib MATCHES ".*/${CMAKE_IMPORT_LIBRARY_PREFIX}([^/]*)${CMAKE_IMPORT_LIBRARY_SUFFIX}") + set(lib -l${CMAKE_MATCH_1}) + elseif(lib MATCHES ".*/${CMAKE_STATIC_LIBRARY_PREFIX}([^/]*)${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(lib -l${CMAKE_MATCH_1}) + endif() + if(NOT "${lib}" IN_LIST output_libs) + list(PREPEND output_libs "${lib}") + endif() + endwhile() + set("${output}" "${output_libs}" PARENT_SCOPE) +endfunction() + +if(CURL_USE_LIBSSH2) + find_package(Libssh2 CONFIG REQUIRED) + set(LIBSSH2_FOUND TRUE) + get_target_property(LIBSSH2_INCLUDE_DIR Libssh2::libssh2 INTERFACE_INCLUDE_DIRECTORIES) + set(LIBSSH2_LIBRARY Libssh2::libssh2) +endif() + +if(USE_LIBIDN2) + find_package(PkgConfig REQUIRED) + pkg_check_modules(LIBIDN2 REQUIRED libidn2) +endif() diff --git a/ports/curl/export-components.patch b/ports/curl/export-components.patch new file mode 100644 index 00000000000000..1a727e5deaccf5 --- /dev/null +++ b/ports/curl/export-components.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 874a237..3974956 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1617,8 +1617,17 @@ if(CURL_ENABLE_EXPORT_TARGET) + ) + endif() + ++set(components_file "${CMAKE_CURRENT_BINARY_DIR}/CURLConfigComponents.cmake") ++file(CONFIGURE OUTPUT "${components_file}" CONTENT [[ ++foreach(z_vcpkg_curl_component IN ITEMS @SUPPORT_FEATURES@ @SUPPORT_PROTOCOLS@) ++ if(z_vcpkg_curl_component MATCHES "^[-_a-zA-Z0-9]*$") ++ set(CURL_${z_vcpkg_curl_component}_FOUND TRUE) ++ endif() ++endforeach() ++]] @ONLY) ++ + install( +- FILES ${version_config} ${project_config} ++ FILES ${version_config} ${project_config} ${components_file} + DESTINATION ${CURL_INSTALL_CMAKE_DIR} + ) + diff --git a/ports/curl/mbedtls-ws2_32.patch b/ports/curl/mbedtls-ws2_32.patch new file mode 100644 index 00000000000000..37e4f18c94e69a --- /dev/null +++ b/ports/curl/mbedtls-ws2_32.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/FindMbedTLS.cmake b/CMake/FindMbedTLS.cmake +index 7bdb197..c8c5a73 100644 +--- a/CMake/FindMbedTLS.cmake ++++ b/CMake/FindMbedTLS.cmake +@@ -26,6 +26,9 @@ find_library(MBEDX509_LIBRARY mbedx509) + find_library(MBEDCRYPTO_LIBRARY mbedcrypto) + + set(MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}") ++if(WIN32) ++ list(APPEND MBEDTLS_LIBRARIES ws2_32) ++endif() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(MbedTLS DEFAULT_MSG diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index ce8b7570546ab6..f81d0c491d410c 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,20 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF 9e560d11aad028de74addc0d1edfefa5667884f4 #curl-7_80_0 - SHA512 f920f151e31f26de8d9a0f8f22aebe98435b0165c52bc169a1204f84f38671dea1eaa2833feceb8495e619b8b9becac0c8ad335ec6fe0c2c59e458bf9014c6c2 + REF curl-7_82_0 + SHA512 5b42e3c520e540059113fb4a5da2bbb82a4eea88e05ba17d661ab04e16e4b1f5f0ac2d16e51e17c9c2c4f5aca07e23015564a11bd0d034e1544c6f603b800c21 HEAD_REF master PATCHES 0002_fix_uwp.patch 0005_remove_imp_suffix.patch - 0006_fix_tool_depends.patch - 0007_disable_tool_export_curl_target.patch - 0011_fix_static_build.patch 0012-fix-dependency-idn2.patch 0020-fix-pc-file.patch 0021-normaliz.patch # for mingw on case-sensitive file system 0022-deduplicate-libs.patch - 0023-fix-static-libs-export.patch + mbedtls-ws2_32.patch + export-components.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) @@ -40,15 +38,15 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES # Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. http2 USE_NGHTTP2 - openssl CMAKE_USE_OPENSSL - mbedtls CMAKE_USE_MBEDTLS - ssh CMAKE_USE_LIBSSH2 + openssl CURL_USE_OPENSSL + mbedtls CURL_USE_MBEDTLS + ssh CURL_USE_LIBSSH2 tool BUILD_CURL_EXE c-ares ENABLE_ARES sspi CURL_WINDOWS_SSPI brotli CURL_BROTLI - schannel CMAKE_USE_SCHANNEL - sectransp CMAKE_USE_SECTRANSP + schannel CURL_USE_SCHANNEL + sectransp CURL_USE_SECTRANSP idn2 USE_LIBIDN2 winidn USE_WIN32_IDN winldap USE_WIN32_LDAP @@ -57,23 +55,21 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS winldap CURL_DISABLE_LDAP # Only WinLDAP support ATM ) +set(OPTIONS "") set(OPTIONS_RELEASE "") set(OPTIONS_DEBUG "") if("idn2" IN_LIST FEATURES) - x_vcpkg_pkgconfig_get_modules(PREFIX libidn2 MODULES libidn2 LIBS) - list(APPEND OPTIONS_RELEASE "-DLIBIDN2_LIBRARIES=${libidn2_LIBS_RELEASE}") - list(APPEND OPTIONS_DEBUG "-DLIBIDN2_LIBRARIES=${libidn2_LIBS_DEBUG}") + vcpkg_find_acquire_program(PKGCONFIG) + list(APPEND OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") endif() -set(SECTRANSP_OPTIONS "") if("sectransp" IN_LIST FEATURES) - set(SECTRANSP_OPTIONS -DCURL_CA_PATH=none) + list(APPEND OPTIONS -DCURL_CA_PATH=none) endif() # UWP targets -set(UWP_OPTIONS "") if(VCPKG_TARGET_IS_UWP) - set(UWP_OPTIONS + list(APPEND OPTIONS -DCURL_DISABLE_TELNET=ON -DENABLE_IPV6=OFF -DENABLE_UNIX_SOCKETS=OFF @@ -83,9 +79,9 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" ${FEATURE_OPTIONS} - ${UWP_OPTIONS} - ${SECTRANSP_OPTIONS} + ${OPTIONS} -DBUILD_TESTING=OFF -DENABLE_MANUAL=OFF -DCURL_STATICLIB=${CURL_STATICLIB} @@ -133,6 +129,7 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/curl-config") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/curl/vcpkg-cmake-wrapper.cmake b/ports/curl/vcpkg-cmake-wrapper.cmake index 955d9353aca299..526cb515c20b7d 100644 --- a/ports/curl/vcpkg-cmake-wrapper.cmake +++ b/ports/curl/vcpkg-cmake-wrapper.cmake @@ -1,14 +1,16 @@ -list(REMOVE_ITEM ARGS "NO_MODULE") -list(REMOVE_ITEM ARGS "CONFIG") -list(REMOVE_ITEM ARGS "MODULE") - +cmake_policy(PUSH) cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) +cmake_policy(SET CMP0057 NEW) -_find_package(${ARGS} CONFIG) +if(NOT CMAKE_VERSION VERSION_LESS 3.14 AND COMPONENTS IN_LIST ARGS) + include("${CMAKE_CURRENT_LIST_DIR}/CURLConfigComponents.cmake") +endif() -if(TARGET CURL::libcurl) - set(CURL_FOUND TRUE) +list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE") +_find_package(${ARGS} CONFIG) +if(CURL_FOUND) get_target_property(_curl_include_dirs CURL::libcurl INTERFACE_INCLUDE_DIRECTORIES) get_target_property(_curl_link_libraries CURL::libcurl INTERFACE_LINK_LIBRARIES) @@ -23,7 +25,11 @@ if(TARGET CURL::libcurl) endif() if(NOT _curl_link_libraries) - set(_curl_link_libraries) + set(_curl_link_libraries "") + endif() + + if("Libssh2::libssh2" IN_LIST _curl_link_libraries) + find_package(Libssh2 CONFIG QUIET) endif() set(CURL_INCLUDE_DIRS "${_curl_include_dirs}") @@ -37,8 +43,9 @@ if(TARGET CURL::libcurl) set(CURL_LIBRARIES ${CURL_LIBRARY} ${_curl_link_libraries}) set(CURL_VERSION_STRING "${CURL_VERSION}") - set(_curl_include_dirs) - set(_curl_link_libraries) - set(_curl_location_debug) - set(_curl_location_release) + unset(_curl_include_dirs) + unset(_curl_link_libraries) + unset(_curl_location_debug) + unset(_curl_location_release) endif() +cmake_policy(POP) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 63879df0f79375..fd52ac3942660e 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "curl", - "version": "7.80.0", + "version": "7.82.0", "description": "A library for transferring data with URLs", - "homepage": "https://github.com/curl/curl", + "homepage": "https://curl.se/", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", @@ -68,11 +69,7 @@ "idn2": { "description": "idn2 support (libidn2)", "dependencies": [ - "libidn2", - { - "name": "vcpkg-pkgconfig-get-modules", - "host": true - } + "libidn2" ] }, "mbedtls": { diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake index f52c2b575f3f4e..8a2652fc4b5f63 100644 --- a/ports/curlpp/portfile.cmake +++ b/ports/curlpp/portfile.cmake @@ -24,13 +24,17 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" ) -elseif(VCPKG_TARGET_IS_WINDOWS) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_LIBRARY_LINKAGE STREQUAL static)) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + endif() endif() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/doc/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") +file(INSTALL "${SOURCE_PATH}/doc/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/curlpp/vcpkg.json b/ports/curlpp/vcpkg.json index 0fbbe9fe64b77f..00b45a3f3dcc9f 100644 --- a/ports/curlpp/vcpkg.json +++ b/ports/curlpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "curlpp", "version-date": "2018-06-15", - "port-version": 6, + "port-version": 7, "description": "C++ wrapper around libcURL", "dependencies": [ "curl", diff --git a/ports/cutelyst2/portfile.cmake b/ports/cutelyst2/portfile.cmake index 98d84ed31f020e..10a5d4d344ba37 100644 --- a/ports/cutelyst2/portfile.cmake +++ b/ports/cutelyst2/portfile.cmake @@ -12,38 +12,42 @@ if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) set(BUILD_WIN_STATIC ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS:BOOL=OFF -DBUILD_WIN_STATIC=${BUILD_WIN_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Move CMake config files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Cutelyst2Qt5 TARGET_PATH share/cutelyst2qt5) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Cutelyst2Qt5) -file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/cutelyst2 ${CURRENT_PACKAGES_DIR}/bin/cutelyst2-wsgi ${CURRENT_PACKAGES_DIR}/bin/cutelyst2.exe ${CURRENT_PACKAGES_DIR}/bin/cutelyst-wsgi2.exe) -file(GLOB DEBUG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2 ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2-wsgi ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2.exe ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst-wsgi2.exe) +file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/cutelyst2" "${CURRENT_PACKAGES_DIR}/bin/cutelyst2-wsgi" "${CURRENT_PACKAGES_DIR}/bin/cutelyst2.exe" "${CURRENT_PACKAGES_DIR}/bin/cutelyst-wsgi2.exe") +file(GLOB DEBUG_EXES "${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2" "${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2-wsgi" "${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst-wsgi2.exe") if(EXES OR DEBUG_EXES) - file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/cutelyst2) + file(COPY ${EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/cutelyst2") file(REMOVE ${EXES} ${DEBUG_EXES}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cutelyst2) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/cutelyst2") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cutelyst2-plugins/ActionREST.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cutelyst2-plugins ${CURRENT_PACKAGES_DIR}/bin/cutelyst2-plugins) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cutelyst2-plugins/ActionREST.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cutelyst2-plugins" "${CURRENT_PACKAGES_DIR}/bin/cutelyst2-plugins") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/cutelyst2-plugins/ActionREST.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cutelyst2-plugins ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2-plugins) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/cutelyst2-plugins/ActionREST.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cutelyst2-plugins" "${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2-plugins") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/cutelyst2/copyright COPYONLY) +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/cutelyst2/copyright" COPYONLY) vcpkg_copy_pdbs() +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +else() + vcpkg_fixup_pkgconfig() +endif() diff --git a/ports/cutelyst2/vcpkg.json b/ports/cutelyst2/vcpkg.json index 2a0bdda3f7d737..928b6140ef38b9 100644 --- a/ports/cutelyst2/vcpkg.json +++ b/ports/cutelyst2/vcpkg.json @@ -1,12 +1,20 @@ { "name": "cutelyst2", - "version-string": "2.12.0", - "port-version": 1, + "version": "2.12.0", + "port-version": 2, "description": "A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework", "dependencies": [ { "name": "qt5-base", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/dartsim/portfile.cmake b/ports/dartsim/portfile.cmake index 707d9336eb6947..0a12d6a14f64e4 100644 --- a/ports/dartsim/portfile.cmake +++ b/ports/dartsim/portfile.cmake @@ -22,6 +22,9 @@ vcpkg_cmake_configure( -DDART_SKIP_NLOPT=ON -DDART_SKIP_OPENGL=ON -DDART_SKIP_pagmo=ON + -Durdfdom_headers_VERSION_MAJOR=1 + -Durdfdom_headers_VERSION_MINOR=0 + -Durdfdom_headers_VERSION_PATCH=4 ) vcpkg_cmake_install() diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json index 60c7660a6a7a35..6bc7403f1884e1 100644 --- a/ports/dartsim/vcpkg.json +++ b/ports/dartsim/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dartsim", "version": "6.11.0", - "port-version": 2, + "port-version": 3, "description": "Dynamic Animation and Robotics Toolkit", "homepage": "https://dartsim.github.io/", "dependencies": [ diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index b06d29f923ba4d..0882961fc4507f 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HowardHinnant/date REF v3.0.1 - SHA512 6BDC7CBA821D66E17A559250CC0CE0095808E9DB81CEC9E16EAA4C31ABDFA705299C67B72016D9B06B302BC306D063E83A374EB00728071B83A5AD650D59034F + SHA512 6bdc7cba821d66e17a559250cc0ce0095808e9db81cec9e16eaa4c31abdfa705299c67b72016d9b06b302bc306d063e83a374eb00728071b83a5ad650d59034f HEAD_REF master PATCHES 0001-fix-uwp.patch diff --git a/ports/date/vcpkg.json b/ports/date/vcpkg.json index 46e059b5e8a0b3..5b2aa172d50466 100644 --- a/ports/date/vcpkg.json +++ b/ports/date/vcpkg.json @@ -1,6 +1,7 @@ { "name": "date", "version": "3.0.1", + "port-version": 1, "description": "A date and time library based on the C++17 header", "homepage": "https://github.com/HowardHinnant/date", "dependencies": [ diff --git a/ports/dav1d/portfile.cmake b/ports/dav1d/portfile.cmake index cc109ff43926d7..cd727622586ce0 100644 --- a/ports/dav1d/portfile.cmake +++ b/ports/dav1d/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "x86" ON_TARGET "uwp") - vcpkg_from_gitlab( GITLAB_URL https://code.videolan.org OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/dav1d/vcpkg.json b/ports/dav1d/vcpkg.json index aa63b1a8ceeff2..0a10cfc65b787d 100644 --- a/ports/dav1d/vcpkg.json +++ b/ports/dav1d/vcpkg.json @@ -1,11 +1,14 @@ { "name": "dav1d", "version-semver": "0.8.2", - "port-version": 1, + "port-version": 3, "description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.", "homepage": "https://code.videolan.org/videolan/dav1d", "supports": "!(uwp | arm | x86)", "dependencies": [ - "tool-meson" + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/dbghelp/portfile.cmake b/ports/dbghelp/portfile.cmake index 832bec6d74c498..1b902cff347a75 100644 --- a/ports/dbghelp/portfile.cmake +++ b/ports/dbghelp/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_get_windows_sdk(WINDOWS_SDK) diff --git a/ports/dbghelp/vcpkg.json b/ports/dbghelp/vcpkg.json index cb7786a83e03b1..85c4d7c8fbfaf9 100644 --- a/ports/dbghelp/vcpkg.json +++ b/ports/dbghelp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dbghelp", - "version-string": "0.0", - "port-version": 1, + "version": "0", + "port-version": 2, "description": "Windows Debug Help Library", "supports": "windows" } diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 10616156b799d6..8f0d893d0c87ca 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dcmtk", - "version-string": "3.6.6", - "port-version": 2, + "version": "3.6.6", + "port-version": 3, "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.", + "supports": "!arm", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/decimal-for-cpp/portfile.cmake b/ports/decimal-for-cpp/portfile.cmake index cbb464ad10b709..c84b65c5c83d97 100644 --- a/ports/decimal-for-cpp/portfile.cmake +++ b/ports/decimal-for-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vpiotr/decimal_for_cpp - REF 375633343aa0af812a3ebf4bd06adaeff112ead4 - SHA512 7692fbb1643ed77b0b44fee1cf9a603fa257a5cf64ea66193c571fca61d138c6465a359db21955a4e2a234677f1806d47e05811daf2954004b108e09d3c8d4fa + REF 98265a57385ec14ae84fc0b2b0f15c770b30f548 + SHA512 b8779ffb81567309ab07fa17eb6d3eb8bb94f77f5a388fd395433a304923ccf75e753a5822f36e5ad9d8959ee1a92b660639367d3a443f353e3e22d36a056f4d HEAD_REF master ) diff --git a/ports/decimal-for-cpp/vcpkg.json b/ports/decimal-for-cpp/vcpkg.json index 16ba18fc3a9a3a..0aec858a597307 100644 --- a/ports/decimal-for-cpp/vcpkg.json +++ b/ports/decimal-for-cpp/vcpkg.json @@ -1,6 +1,5 @@ { "name": "decimal-for-cpp", - "version-string": "1.16", - "port-version": 2, + "version-string": "1.18", "description": "Decimal data type support, for COBOL-like fixed-point operations on currency values." } diff --git a/ports/detours/portfile.cmake b/ports/detours/portfile.cmake index c09d61b7f84732..f583d287c2c464 100644 --- a/ports/detours/portfile.cmake +++ b/ports/detours/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( ) vcpkg_build_nmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "src" PROJECT_NAME "Makefile" OPTIONS "PROCESSOR_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" diff --git a/ports/detours/vcpkg.json b/ports/detours/vcpkg.json index 269215381c0937..ba134218d1183f 100644 --- a/ports/detours/vcpkg.json +++ b/ports/detours/vcpkg.json @@ -1,7 +1,8 @@ { "name": "detours", - "version-string": "4.0.1", - "port-version": 4, + "version": "4.0.1", + "port-version": 5, "description": "Detours is a software package for monitoring and instrumenting API calls on Windows.", - "homepage": "https://github.com/microsoft/Detours" + "homepage": "https://github.com/microsoft/Detours", + "supports": "windows" } diff --git a/ports/devicenameresolver/portfile.cmake b/ports/devicenameresolver/portfile.cmake index c62478202a6a05..b08e2f681d90e4 100644 --- a/ports/devicenameresolver/portfile.cmake +++ b/ports/devicenameresolver/portfile.cmake @@ -9,20 +9,17 @@ vcpkg_from_bitbucket( PATCHES add-string-headfile.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/include/DeviceNameResolver.h _contents) -string(REPLACE "__declspec(dllexport)" "" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/include/DeviceNameResolver.h "${_contents}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/DeviceNameResolver.h" "__declspec(dllexport)" "") -file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/devicenameresolver RENAME copyright) +file(INSTALL "${SOURCE_PATH}/readme.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/devicenameresolver" RENAME copyright) diff --git a/ports/devicenameresolver/vcpkg.json b/ports/devicenameresolver/vcpkg.json index b52d9c4fd4a569..0647d0831645d9 100644 --- a/ports/devicenameresolver/vcpkg.json +++ b/ports/devicenameresolver/vcpkg.json @@ -1,6 +1,13 @@ { "name": "devicenameresolver", "version-string": "2016-06-26-0850d88fa6", - "port-version": 2, - "description": "a little library that resolves a path from a (virtual) device name." + "port-version": 3, + "description": "a little library that resolves a path from a (virtual) device name.", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/dimcli/fix-build.patch b/ports/dimcli/fix-build.patch new file mode 100644 index 00000000000000..0ec5659c863281 --- /dev/null +++ b/ports/dimcli/fix-build.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 509e634..8b5a30b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -392,7 +392,7 @@ if(MSVC) + set(CMAKE_CXX_FLAGS "\ + /EHsc /GF /nologo /std:c++latest /utf-8 /W4 /WX \ + /Zc:inline /Zc:rvalueCast /Zc:strictStrings \ +- /Fa$(IntDir)") ++ /Fa${CMAKE_SOURCE_DIR}/libs/dimcli") + if(NOT MSVC_VERSION LESS 1910) + # /permissive- // reject non-conforming backward compatibility-isms + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-") +@@ -431,8 +431,8 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) + if(BUILD_COVERAGE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") + endif() +-elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang) ++elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z") + else() +@@ -533,7 +533,6 @@ endforeach() + # test targets + if(BUILD_TESTING) + enable_testing() +-endif() + file(GLOB allnames tests/*) + foreach(var ${allnames}) + if(IS_DIRECTORY "${var}") +@@ -548,6 +547,7 @@ foreach(var ${allnames}) + endif() + endif() + endforeach() ++endif() + + # update deps file + update_deps_file(${deps}) diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index ceb07c04466756..af02f77058f0b9 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -4,22 +4,25 @@ vcpkg_from_github( REF a4dbb4b1c8a3825fc304bbbad3438dbe1840feae # v5.0.2 SHA512 25cc9002fd46856854545934f385d8578f207b1ce01802a172e49e008cdf1db0db11db7cefeef18258b99c13570af9193e83f5826613d8b0a118d7bae3f0d03f HEAD_REF master + PATCHES fix-build.patch ) -set(staticCrt OFF) -if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(staticCrt ON) -endif() +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" staticCrt) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DLINK_STATIC_RUNTIME:BOOL=${staticCrt} -DINSTALL_LIBS:BOOL=ON -DBUILD_PROJECT_NAME=dimcli + -DBUILD_TESTING=OFF + -DINSTALL_TOOLS=OFF + -DINSTALL_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() # Remove includes from ${CMAKE_INSTALL_PREFIX}/debug file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/dimcli/vcpkg.json b/ports/dimcli/vcpkg.json index 6845445db5ea1e..3de3fc1b42e5e3 100644 --- a/ports/dimcli/vcpkg.json +++ b/ports/dimcli/vcpkg.json @@ -1,7 +1,14 @@ { "name": "dimcli", "version-semver": "5.0.2", - "port-version": 2, + "port-version": 3, "description": "C++ command line parser toolkit", - "homepage": "https://github.com/gknowles/dimcli" + "homepage": "https://github.com/gknowles/dimcli", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake index 8d1bb0beb68916..93ec93f09c30de 100644 --- a/ports/directx-headers/portfile.cmake +++ b/ports/directx-headers/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectX-Headers diff --git a/ports/directx-headers/vcpkg.json b/ports/directx-headers/vcpkg.json index 66658e2f48d721..b0723567c13f00 100644 --- a/ports/directx-headers/vcpkg.json +++ b/ports/directx-headers/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directx-headers", "version": "1.4.9", + "port-version": 1, "description": "Official DirectX 12 Headers", "homepage": "https://devblogs.microsoft.com/directx/", "supports": "windows | linux" diff --git a/ports/directxmath/portfile.cmake b/ports/directxmath/portfile.cmake index b9a509edafcf5e..f3f336669da183 100644 --- a/ports/directxmath/portfile.cmake +++ b/ports/directxmath/portfile.cmake @@ -1,19 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMath - REF jan2021 - SHA512 8288f9e4d30b4947e98122f298ca25b8e2f82091c1257d3a0fd4d8de44c4c9a97d4549c105b388afbefad11ad6f30429e875e3e70eb4aa7865be6d4c08d6d1f3 - HEAD_REF master - FILE_DISAMBIGUATOR 2 + REF jan2022 + SHA512 8defaa693c8b8aed05791c83b99fa73aac2fc18475b0d51337a81f7d9807b53e426fdf530ed6f1d2d0ebd259e87cc42ac881bdb168387d883998f58a5c0a4886 + HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if(NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile( diff --git a/ports/directxmath/vcpkg.json b/ports/directxmath/vcpkg.json index e0ffe0e44029fe..e41e6c6c20fd1b 100644 --- a/ports/directxmath/vcpkg.json +++ b/ports/directxmath/vcpkg.json @@ -1,9 +1,18 @@ { "name": "directxmath", - "version-string": "jan2021", - "port-version": 1, + "version-date": "2022-01-18", "description": "DirectXMath SIMD C++ math library", "homepage": "https://github.com/Microsoft/DirectXMath", - "documentation": "https://docs.microsoft.com/en-us/windows/win32/dxmath/directxmath-portal", - "license": "MIT" + "documentation": "https://docs.microsoft.com/windows/win32/dxmath/directxmath-portal", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 6cd9c3180fa017..aaee42dc10e0dd 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF nov2021b - SHA512 be2137c02c7a5973eaf91eaacfc9174148ec6dc68b163507d8146beb87c1ffff512e2593f7fd000ea7be440529ed2deda415e0dacd53e4c7d9679e97c6440d3d - HEAD_REF master + REF feb2022 + SHA512 7a34ff8a484e5693efbc3e3f1ecb32978b32d71c6d795c0de14ee29fc61230213448039ac30f74d9836e1703cbcd6026b285e85984f0e30d8005c034d5419809 + HEAD_REF main ) vcpkg_check_features( @@ -37,9 +35,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MESHCONVERT_EXE - URLS "https://github.com/Microsoft/DirectXMesh/releases/download/nov2021/meshconvert.exe" - FILENAME "meshconvert-nov2021.exe" - SHA512 0f97ac49ce292b1cb90372884f1d6a4fc10eb3e92125a854ee9b7030fd9d0564536cdd88199aa4838832ae2a1e9c2df2c9e32c106705b6b06f156994b9476360 + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/feb2022/meshconvert.exe" + FILENAME "meshconvert-feb2022.exe" + SHA512 687bec9c9f6c5fc08fc86370bb5b247f751c96fbbf047293364c75c43ec63a769ad737898a3b36acd95f7c3f6b0e97c756043d7a7ccdf750090594e1e2b97271 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") @@ -48,7 +46,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${MESHCONVERT_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-nov2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-feb2022.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index 545ca0f9ec0b0a..42cb9610bb5e3e 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-date": "2021-11-08", + "version-date": "2022-02-28", "description": "DirectXMesh geometry processing library", "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", diff --git a/ports/directxsdk/portfile.cmake b/ports/directxsdk/portfile.cmake index 67551cffa3b045..3e38e42e1ed4bd 100644 --- a/ports/directxsdk/portfile.cmake +++ b/ports/directxsdk/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm") - if(EXISTS "${CURRENT_INSTALLED_DIR}/share/dxsdk-d3dx/copyright") message(FATAL_ERROR "Can't build ${PORT} if dxsdk-d3dx is installed. Please remove dxsdk-d3dx, and try to install ${PORT} again if you need it.") endif() diff --git a/ports/directxsdk/vcpkg.json b/ports/directxsdk/vcpkg.json index 0d093e5bb658ca..178026f01520a9 100644 --- a/ports/directxsdk/vcpkg.json +++ b/ports/directxsdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "directxsdk", "version-string": "jun10", - "port-version": 4, + "port-version": 5, "description": "Legacy DirectX SDK", "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-", "supports": "windows & !uwp & !arm", diff --git a/ports/directxtex/enable_openexr_support.patch b/ports/directxtex/enable_openexr_support.patch index 2fef1f9d7dfefe..2a7141371152a5 100644 --- a/ports/directxtex/enable_openexr_support.patch +++ b/ports/directxtex/enable_openexr_support.patch @@ -1,5 +1,5 @@ diff --git a/DirectXTexEXR.cpp b/DirectXTexEXR.cpp -index 9ac601f..204bde2 100644 +index 17bd171..825cfe4 100644 --- a/DirectXTex/DirectXTexEXR.cpp +++ b/DirectXTex/DirectXTexEXR.cpp @@ -8,7 +8,7 @@ @@ -11,7 +11,7 @@ index 9ac601f..204bde2 100644 #include "DirectXTexEXR.h" -@@ -56,7 +56,7 @@ using namespace DirectX; +@@ -57,7 +57,7 @@ using namespace DirectX; using PackedVector::XMHALF4; // Comment out this first anonymous namespace if you add the include of DirectXTexP.h above @@ -19,4 +19,4 @@ index 9ac601f..204bde2 100644 +#if 0 namespace { - struct handle_closer { void operator()(HANDLE h) { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; + struct handle_closer { void operator()(HANDLE h) noexcept { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index aa9f572f0c7d9c..1a69224b023223 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -1,34 +1,32 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF nov2021b - SHA512 7f9b17e265836933c02b98c613e7c0503a74a6c3c1d97552bfbaf2f060b500019c74def80694f5e2ad6250f8bcceeac17677f264f677ff46851a9020ab604353 - HEAD_REF master + REF feb2022 + SHA512 7e30e38f97e944e49f5d2a6d3035d201016ac7ec5ca1042475485f7cbac165d66f4c5a2c84f2a47dad755c59b3f8947e1251b00b3e577fbc3e58f1957d8a224e + HEAD_REF main ) if("openexr" IN_LIST FEATURES) vcpkg_download_distfile( DIRECTXTEX_EXR_HEADER URLS "https://raw.githubusercontent.com/wiki/Microsoft/DirectXTex/DirectXTexEXR.h" - FILENAME "DirectXTexEXR-2.h" - SHA512 54163820996f7f3c47d0e34da7d717ba51a4363458d77e8f3750d2b6b38bcf803f199b913b4fd7b8dcdd3f520cd0c2bb42a9f79d30f5805fccdece6af368dd12 + FILENAME "DirectXTexEXR-3.h" + SHA512 b4c75fa0e3365d63beba0ba471f0ded124b2f0e20f2c11cef76a88e6af1582889abcf5aa2ec74270d7b9bde7f7b4bc36fd17f030357b4139d8c83c35060344be ) vcpkg_download_distfile( DIRECTXTEX_EXR_SOURCE URLS "https://raw.githubusercontent.com/wiki/Microsoft/DirectXTex/DirectXTexEXR.cpp" - FILENAME "DirectXTexEXR-2.cpp" - SHA512 fbf5a330961f3ac80e4425e8451e9a696240cd89fabca744a19f1f110ae188bae7d8eb5b058aaf66015066d919d4f581b14494d78d280147b23355d8a32745b9 + FILENAME "DirectXTexEXR-3.cpp" + SHA512 9192cfea01654b1537b444cc6e3369de2f721959ad749551ad06ba92a12fa61e12f2169cf412788b0156220bb8bacf531160f924a4744e43e875163463586620 ) file(COPY ${DIRECTXTEX_EXR_HEADER} DESTINATION "${SOURCE_PATH}/DirectXTex") file(COPY ${DIRECTXTEX_EXR_SOURCE} DESTINATION "${SOURCE_PATH}/DirectXTex") - file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-2.h" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.h") - file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-2.cpp" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.cpp") + file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-3.h" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.h") + file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-3.cpp" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.cpp") vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}" PATCHES enable_openexr_support.patch) endif() @@ -64,23 +62,23 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( TEXASSEMBLE_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texassemble.exe" - FILENAME "texassemble-nov2021.exe" - SHA512 a31151d368d41f50b58b417e8d27987fe0e3caa2c4e0d0abe7bef472db51429526277b0c554df2825c6892bb2021111f59d3d8f321ad68c71c0a153852d2c81f + URLS "https://github.com/Microsoft/DirectXTex/releases/download/feb2022/texassemble.exe" + FILENAME "texassemble-feb2022.exe" + SHA512 ea1f9fff62a5ebc9c33221852a843063d58405be7529f663e4567b138bca79e73e47b1e0fb6054c4e024a630323c72aba505eee35414cf14970c331afa9ff43f ) vcpkg_download_distfile( TEXCONV_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texconv.exe" - FILENAME "texconv-nov2021.exe" - SHA512 7cb70b3cbf46c78b99aa18c28b043fc5930b6b254729efd447868fcf8cb8b77987d41b570082bdfb3bab01452e67d17e81b966bf2534036a3415fa918ddc2956 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/feb2022/texconv.exe" + FILENAME "texconv-feb2022.exe" + SHA512 1565f5a4bd08de88e01ece59df6658975bfd8551a912d65ac03c0ddd5ab536c8794811d3e49d14e8fe4c61fa2a6c9d50994d372f5d3efab7d9aeb6f3f92d56c9 ) vcpkg_download_distfile( TEXDIAG_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texdiag.exe" - FILENAME "texdiag-nov2021.exe" - SHA512 7826c594fa42978da8a15bd771fafe4d4f5b97d611ce62a806ddff77204cabf63eea6ac24e3409c2720631681260b7e3fa6ad5f33b2162d2266457462e6b13c9 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/feb2022/texdiag.exe" + FILENAME "texdiag-feb2022.exe" + SHA512 5dd93da696eff959b5c93ba8ac763ff6df52fbfc6ca3a3adf1b9da0121beaea2c16008e097f74d562b7a69ed20ada50fd5d35d47311338e6c819e3483bc54ee3 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") @@ -91,9 +89,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXDIAG_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index cca22a250ca676..0bf007aa309625 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-date": "2021-11-08", + "version-date": "2022-02-28", "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 32d30522ce23f4..701d0abc59ba44 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF nov2021b - SHA512 d1c99cc7d1a95939b4dc28ee5c757e3b4eae2b7f923031b44f988b1ca93838e765d702f125a9a9fb38e6f5304721f88843e961b6ba9591066b511b530aad5280 - HEAD_REF master + REF feb2022 + SHA512 18105ccf037b96b198fae086b17e678063efbed38c4212bc0c224090e7b6cd8c4197ae514f22c4b8da78f6a3e5cf6a6cd7437a79ff363baa740f01e3b1eed89b + HEAD_REF main ) vcpkg_check_features( @@ -35,16 +33,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2021/MakeSpriteFont.exe" - FILENAME "makespritefont-nov2021.exe" - SHA512 0aab40aced022588d9c1089c5b2f297b0521497d0ae559ead98f99e1e73f2daf9f38ebecadb413095abd2a6c207183fbca582d47528c6f21258df3ac391134e5 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/feb2022/MakeSpriteFont.exe" + FILENAME "makespritefont-feb2022.exe" + SHA512 d3454c679db269a29e845382f5cd9cceab2452aa91486238e38f79e71666718ea5d9fa1e676ffbe6875ee69310e17018690998dfb741530ea068fb0616fa4886 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2021/XWBTool.exe" - FILENAME "xwbtool-nov2021.exe" - SHA512 f2f291c496500e593c0a4795fee9fafc685666682f23a38a25546bb67ec083533a26f2ce0562b819abea44bd8b403a2f246fbf978e366c457eb8a0f836fd5a2e + URLS "https://github.com/Microsoft/DirectXTK/releases/download/feb2022/XWBTool.exe" + FILENAME "xwbtool-feb2022.exe" + SHA512 f27170227be1268591757caaccda65d46ad81a2ac38ab1772d9e2d5c722a1d094a9b891f66fc6673d96a6b980a45c8fde501e2d9681f557039f8084ddf648aea ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -54,8 +52,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") elseif(NOT VCPKG_TARGET_IS_UWP) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index a5b784ead88497..24cc30972c5dda 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-date": "2021-11-08", + "version-date": "2022-02-28", "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", diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 5f053692ad5e29..05defae6f0f53c 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF nov2021b - SHA512 32afd3e3e6c122c80a4b1980482b6092e2723c2d691657385d699a01a6edb8339efd482f1c20ae32c5c6d3619f48ea749d5826b730952c619a6b053e6b780596 - HEAD_REF master + REF feb2022 + SHA512 e61acd191b9ee5c7d76293f2feb158207f9e63d8f3d5a30144c04367c15d0c1d6a17d6905843d2ca80e9af713a83fa2ab2f52c206569993943997653ae6ad729 + HEAD_REF main ) vcpkg_cmake_configure( @@ -21,16 +19,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2021/MakeSpriteFont.exe" - FILENAME "makespritefont-nov2021.exe" - SHA512 0aab40aced022588d9c1089c5b2f297b0521497d0ae559ead98f99e1e73f2daf9f38ebecadb413095abd2a6c207183fbca582d47528c6f21258df3ac391134e5 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/feb2022/MakeSpriteFont.exe" + FILENAME "makespritefont-feb2022.exe" + SHA512 d3454c679db269a29e845382f5cd9cceab2452aa91486238e38f79e71666718ea5d9fa1e676ffbe6875ee69310e17018690998dfb741530ea068fb0616fa4886 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2021/XWBTool.exe" - FILENAME "xwbtool-nov2021.exe" - SHA512 f2f291c496500e593c0a4795fee9fafc685666682f23a38a25546bb67ec083533a26f2ce0562b819abea44bd8b403a2f246fbf978e366c457eb8a0f836fd5a2e + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/feb2022/XWBTool.exe" + FILENAME "xwbtool-feb2022.exe" + SHA512 f27170227be1268591757caaccda65d46ad81a2ac38ab1772d9e2d5c722a1d094a9b891f66fc6673d96a6b980a45c8fde501e2d9681f557039f8084ddf648aea ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -40,8 +38,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index 9b4ef1df56ad67..e1db3a877a4de9 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-date": "2021-11-08", + "version-date": "2022-02-28", "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", diff --git a/ports/discord-game-sdk/portfile.cmake b/ports/discord-game-sdk/portfile.cmake index ab85a7d72b7aa4..ab3bec66bb71a6 100644 --- a/ports/discord-game-sdk/portfile.cmake +++ b/ports/discord-game-sdk/portfile.cmake @@ -1,8 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "android" "uwp") -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(MESSAGE "The GameSDK only supports x86 on Windows." ALWAYS) -endif() - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE @@ -15,8 +10,8 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} NO_REMOVE_ONE_LEVEL - PATCHES - include-cstdint.patch # allows compiling on newer versions of GCC + PATCHES + include-cstdint.patch # allows compiling on newer versions of GCC ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION ${SOURCE_PATH}) diff --git a/ports/discord-game-sdk/vcpkg.json b/ports/discord-game-sdk/vcpkg.json index 3a35dc4592c66e..5282f601ecc474 100644 --- a/ports/discord-game-sdk/vcpkg.json +++ b/ports/discord-game-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "discord-game-sdk", "version": "2.5.6", - "port-version": 3, + "port-version": 4, "description": "The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game.", "homepage": "https://discord.com/developers/docs/game-sdk/sdk-starter-guide", "supports": "((x64 & (windows | osx | linux)) | (x86 & windows)) & !uwp & !static" diff --git a/ports/dlfcn-win32/portfile.cmake b/ports/dlfcn-win32/portfile.cmake index 1e1fdccb1414ce..29726bcc3be8d6 100644 --- a/ports/dlfcn-win32/portfile.cmake +++ b/ports/dlfcn-win32/portfile.cmake @@ -8,23 +8,22 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(READ ${CURRENT_PACKAGES_DIR}/debug/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake dlfcn-win32_DEBUG_MODULE) +file(READ "${CURRENT_PACKAGES_DIR}/debug/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake" dlfcn-win32_DEBUG_MODULE) string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" dlfcn-win32_DEBUG_MODULE "${dlfcn-win32_DEBUG_MODULE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake "${dlfcn-win32_DEBUG_MODULE}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake" "${dlfcn-win32_DEBUG_MODULE}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/ports/dlfcn-win32/vcpkg.json b/ports/dlfcn-win32/vcpkg.json index 505674d5b232c0..e4d0b1651e60c4 100644 --- a/ports/dlfcn-win32/vcpkg.json +++ b/ports/dlfcn-win32/vcpkg.json @@ -1,7 +1,14 @@ { "name": "dlfcn-win32", - "version-string": "1.1.1", - "port-version": 5, + "version": "1.1.1", + "port-version": 6, "description": "dlfcn-win32 is an implementation of dlfcn for Windows.", - "homepage": "https://github.com/dlfcn-win32/dlfcn-win32" + "homepage": "https://github.com/dlfcn-win32/dlfcn-win32", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/dlib/find_blas.patch b/ports/dlib/find_blas.patch index 3ea8d30aebd915..47b07a483209ac 100644 --- a/ports/dlib/find_blas.patch +++ b/ports/dlib/find_blas.patch @@ -1,8 +1,10 @@ +diff --git a/dlib/cmake_utils/find_blas.cmake b/dlib/cmake_utils/find_blas.cmake +index 806b938..507f871 100644 --- a/dlib/cmake_utils/find_blas.cmake +++ b/dlib/cmake_utils/find_blas.cmake -@@ -414,7 +414,7 @@ +@@ -438,7 +438,7 @@ endif() + # If using lapack, determine whether to mangle functions if (lapack_found) - include(CheckFunctionExists) include(CheckFortranFunctionExists) - set(CMAKE_REQUIRED_LIBRARIES ${lapack_libraries}) + set(CMAKE_REQUIRED_LIBRARIES ${lapack_libraries} ${blas_libraries}) diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index 29a43c144e189e..8df6a8c2bf2080 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO davisking/dlib - REF v19.21 - SHA512 57133cdcbc5017d324a368ff36a628de55001f1ec0b3ac078b4ad49a63c8c9fb48674617c6a5838ca4e381a6b001fe4aa5a7b3353eb288c58062d2a8fc7b171e + REF 074ab8bdbadbee1afb95653c3ce46867ed32dfa1 #v19.23 + SHA512 da7942cf006566bafdd7079cc31ac445cd66e300714e522c53dfcf6b1a811de4cf2188c9a75c978388b09554bccc4164d40afc907bf9e6f75a17f8ca10ee0355 HEAD_REF master PATCHES fix-sqlite3-fftw-linkage.patch @@ -12,9 +12,9 @@ vcpkg_from_github( find_blas.patch ) -file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libjpeg) -file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libpng) -file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/zlib) +file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/libjpeg") +file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/libpng") +file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/zlib") # This fixes static builds; dlib doesn't pull in the needed transitive dependencies file(READ "${SOURCE_PATH}/dlib/CMakeLists.txt" DLIB_CMAKE) @@ -28,9 +28,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "cuda" DLIB_USE_CUDA ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DDLIB_PNG_SUPPORT=ON @@ -45,37 +44,35 @@ vcpkg_configure_cmake( #-DDLIB_ENABLE_STACK_TRACE=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dlib) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/dlib) + +vcpkg_fixup_pkgconfig() # There is no way to suppress installation of the headers and resource files in debug build. -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Remove other files not required in package -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/all) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/appveyor) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/test) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/travis) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_neon) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cudnn) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cuda) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cpp11) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_avx) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_sse4) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libjpeg) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libpng) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/all") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/appveyor") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/test") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/travis") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_neon") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cudnn") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cuda") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cpp11") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_avx") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_sse4") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libjpeg") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libpng") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm") # Dlib encodes debug/release in its config.h. Patch it to respond to the NDEBUG macro instead. -file(READ ${CURRENT_PACKAGES_DIR}/include/dlib/config.h _contents) -string(REPLACE "/* #undef ENABLE_ASSERTS */" "#if defined(_DEBUG)\n#define ENABLE_ASSERTS\n#endif" _contents ${_contents}) -string(REPLACE "#define DLIB_DISABLE_ASSERTS" "#if !defined(_DEBUG)\n#define DLIB_DISABLE_ASSERTS\n#endif" _contents ${_contents}) -file(WRITE ${CURRENT_PACKAGES_DIR}/include/dlib/config.h "${_contents}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dlib/config.h" "/* #undef ENABLE_ASSERTS */" "#if defined(_DEBUG)\n#define ENABLE_ASSERTS\n#endif") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dlib/config.h" "#define DLIB_DISABLE_ASSERTS" "#if !defined(_DEBUG)\n#define DLIB_DISABLE_ASSERTS\n#endif") # Handle copyright -file(INSTALL ${SOURCE_PATH}/dlib/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/dlib/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json index a67b77498f7428..fa7907dec0ca6d 100644 --- a/ports/dlib/vcpkg.json +++ b/ports/dlib/vcpkg.json @@ -1,14 +1,22 @@ { "name": "dlib", - "version": "19.21", - "port-version": 6, + "version": "19.23", "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++", "homepage": "https://github.com/davisking/dlib", + "license": "BSL-1.0", "dependencies": [ "blas", "lapack", "libjpeg-turbo", - "libpng" + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "fftw3", diff --git a/ports/dmlc/portfile.cmake b/ports/dmlc/portfile.cmake index 3e4c7baeb39e13..bae56fc77e00f1 100644 --- a/ports/dmlc/portfile.cmake +++ b/ports/dmlc/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dmlc/dmlc-core diff --git a/ports/dmlc/vcpkg.json b/ports/dmlc/vcpkg.json index 36a4e03953a68a..d5f74b3d7791c5 100644 --- a/ports/dmlc/vcpkg.json +++ b/ports/dmlc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dmlc", "version-date": "2019-08-12", - "port-version": 6, + "port-version": 7, "description": "DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.", "homepage": "https://github.com/dmlc/dmlc-core", "supports": "!uwp", diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index 170c48578a6ffb..2f78fb5b35e96c 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.4.6 - SHA512 A5CCCF085AF946003140AF688F071A6407D42FC685324A537E3B704EF9DE0F2228BD06EABFD1DF8DA70DEC001420DD0B2813E5E4320B5C1DA450CB0AADD63788 + REF v2.4.8 + SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c HEAD_REF master ) diff --git a/ports/doctest/vcpkg.json b/ports/doctest/vcpkg.json index 060fecff60039d..8b838d4503abee 100644 --- a/ports/doctest/vcpkg.json +++ b/ports/doctest/vcpkg.json @@ -1,6 +1,6 @@ { "name": "doctest", - "version": "2.4.6", - "description": "The fastest feature-rich C++ single-header testing framework for unit tests and TDD", + "version": "2.4.8", + "description": "The fastest feature-rich C++11/14/17/20 single-header testing framework", "homepage": "https://github.com/onqtam/doctest" } diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake index 5ede45da1add0f..39f311e136f34e 100644 --- a/ports/double-conversion/portfile.cmake +++ b/ports/double-conversion/portfile.cmake @@ -3,26 +3,25 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/double-conversion - REF v3.1.5 - SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a + REF 9e0c13564e17362aad8a32c1344a2214f71952c6 #v3.2.0 + SHA512 4579ae02196a2722cbce2888a404d026d62523256aa5f726c4b46aa25aa76d3caaf653848afb88939aac697049afc8968ddecda8a093520b392c9f963559a992 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Rename exported target files into something vcpkg_fixup_cmake_targets expects -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/double-conversion) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") endif() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/double-conversion/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/double-conversion/vcpkg.json b/ports/double-conversion/vcpkg.json index 541bf7701b881c..604189dedf5612 100644 --- a/ports/double-conversion/vcpkg.json +++ b/ports/double-conversion/vcpkg.json @@ -1,7 +1,16 @@ { "name": "double-conversion", - "version-string": "3.1.5", - "port-version": 1, + "version": "3.2.0", "description": "Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.", - "homepage": "https://github.com/google/double-conversion" + "homepage": "https://github.com/google/double-conversion", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/drogon/Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch b/ports/drogon/Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch deleted file mode 100644 index 70adbe2ea73a02..00000000000000 --- a/ports/drogon/Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e2eb67478157bbdf5ff91ca5dea2f9435af4488f Mon Sep 17 00:00:00 2001 -From: Martin Chang -Date: Thu, 21 Oct 2021 19:43:53 +0800 -Subject: [PATCH] Fix Drogon not building caused by FindFilesystem (#1056) - -* fix FindFilesystem not using the correct header for printf - -* fix FS not found on Yocto ---- - CMakeLists.txt | 6 +++++- - cmake_modules/FindFilesystem.cmake | 7 ++++++- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b2b8d4..3f929a4 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -191,7 +191,11 @@ if(NEED_BOOST_FS) - option(HAS_STD_FILESYSTEM_PATH "use boost::filesystem" OFF) - else() - option(HAS_STD_FILESYSTEM_PATH "use std::filesystem" ON) -- target_link_libraries(${PROJECT_NAME} PUBLIC std::filesystem) -+ # HACK: Needed to be compiled on Yocto Linux -+ get_property(CAN_LINK_FS TARGET std::filesystem PROPERTY INTERFACE_LINK_LIBRARIES DEFINED) -+ if ( CAN_LINK_FS ) -+ target_link_libraries(${PROJECT_NAME} PUBLIC std::filesystem) -+ endif() - endif() - - # jsoncpp -diff --git a/cmake_modules/FindFilesystem.cmake b/cmake_modules/FindFilesystem.cmake -index c8d9a57..73dd763 100644 ---- a/cmake_modules/FindFilesystem.cmake -+++ b/cmake_modules/FindFilesystem.cmake -@@ -194,7 +194,7 @@ set(_found FALSE) - if(CXX_FILESYSTEM_HAVE_FS) - # We have some filesystem library available. Do link checks - string(CONFIGURE [[ -- #include -+ #include - #include <@CXX_FILESYSTEM_HEADER@> - - int main() { -@@ -204,6 +204,11 @@ if(CXX_FILESYSTEM_HAVE_FS) - } - ]] code @ONLY) - -+ # HACK: Needed to compile correctly on Yocto Linux -+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GCC" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" -+ OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") -+ set(CMAKE_REQUIRED_FLAGS ${prev_req_flags} -std=c++17) -+ endif () - # Check a simple filesystem program without any linker flags - _cmcm_check_cxx_source("${code}" CXX_FILESYSTEM_NO_LINK_NEEDED) - --- -2.33.0 - diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index fcb2dc25d7ac2e..4f24228c3e34ec 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.7.3 - SHA512 20146bf59898704f3b44778fa46e919d9124ef8a33eb1cfcce7f437507c20920829a0074e1c9e2493a1764b8a36b1a91b03f117fd78e740253b15d2146dca628 + REF v1.7.5 + SHA512 8be77961026d13b55dbfcc2e43972b4fb8f1cd9a6bfb8098d5bdfc8b60ff67c2d3ede4bdb5815614a8233dc184cbf3aa363a9d33eed96b9f748544e20b15f2c7 HEAD_REF master PATCHES vcpkg.patch drogon_config.patch static-brotli.patch - Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch + use-libmariadb.patch ) vcpkg_check_features( @@ -56,7 +56,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -# Handle copyright +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) # Copy pdb files diff --git a/ports/drogon/usage b/ports/drogon/usage new file mode 100644 index 00000000000000..7887e3474216ff --- /dev/null +++ b/ports/drogon/usage @@ -0,0 +1,4 @@ +The package drogon provides CMake targets: + + find_package(Drogon CONFIG REQUIRED) + target_link_libraries(main PRIVATE Drogon::Drogon) diff --git a/ports/drogon/use-libmariadb.patch b/ports/drogon/use-libmariadb.patch new file mode 100644 index 00000000000000..71ca89892f1d73 --- /dev/null +++ b/ports/drogon/use-libmariadb.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 146d2b8..f180498 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -360,12 +360,8 @@ endif (BUILD_POSTGRESQL) + + if (BUILD_MYSQL) + # Find mysql, only mariadb client library is supported +- find_package(MySQL QUIET) + find_package(unofficial-libmariadb QUIET) +- if (MySQL_FOUND) +- target_link_libraries(${PROJECT_NAME} PRIVATE MySQL_lib) +- set(DROGON_FOUND_MYSQL TRUE) +- elseif (unofficial-libmariadb_FOUND) ++ if (unofficial-libmariadb_FOUND) + target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::libmariadb) + set(DROGON_FOUND_MYSQL TRUE) + endif () +diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in +index 199cfb9..a3fbde0 100644 +--- a/cmake/templates/DrogonConfig.cmake.in ++++ b/cmake/templates/DrogonConfig.cmake.in +@@ -25,7 +25,7 @@ if(@SQLite3_FOUND@) + find_dependency(SQLite3) + endif() + if(@MySQL_FOUND@) +-find_dependency(MySQL) ++find_dependency(unofficial-libmariadb CONFIG REQUIRED) + endif() + if(@Boost_FOUND@) + find_dependency(Boost) diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index 7130dca81141d5..f6e70f75dc9963 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "drogon", - "version-semver": "1.7.3", + "version-semver": "1.7.5", "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/", @@ -10,7 +10,7 @@ "jsoncpp", { "name": "libuuid", - "platform": "!windows" + "platform": "!windows & !osx" }, "trantor", { @@ -72,7 +72,8 @@ "features": [ "orm" ] - } + }, + "hiredis" ] }, "sqlite3": { diff --git a/ports/duilib/portfile.cmake b/ports/duilib/portfile.cmake index 272691914c7bc0..06d536cfa3d4fa 100644 --- a/ports/duilib/portfile.cmake +++ b/ports/duilib/portfile.cmake @@ -12,26 +12,25 @@ vcpkg_from_github( "enable-unicode-for-vcpkg.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/DuiLib - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/DuiLib" NO_CHARSET_FLAG ) -vcpkg_build_cmake() +vcpkg_cmake_build() -file(INSTALL ${SOURCE_PATH}/DuiLib DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(INSTALL "${SOURCE_PATH}/DuiLib" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") else() - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/duilib/vcpkg.json b/ports/duilib/vcpkg.json index 6c08b75db2ad4b..3c9946e1cdc77f 100644 --- a/ports/duilib/vcpkg.json +++ b/ports/duilib/vcpkg.json @@ -1,7 +1,14 @@ { "name": "duilib", - "version-string": "2019-4-28", - "port-version": 4, + "version-date": "2019-04-28", + "port-version": 5, "description": "Duilib is a free open source DirectUI interface library under Windows. It is widely accepted by major Internet companies due to its simple and easy to expand design and stable and efficient implementation. It is widely used in IM, video client, stock market software, navigation software, and mobile phone assistive software. Duilib is still evolving, and will continue to improve in many aspects such as documentation, examples, animations, and rendering engines.", - "homepage": "https://github.com/duilib/duilib" + "homepage": "https://github.com/duilib/duilib", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/dxsdk-d3dx/portfile.cmake b/ports/dxsdk-d3dx/portfile.cmake index 71ff4d33249c5f..cc2fc254852e43 100644 --- a/ports/dxsdk-d3dx/portfile.cmake +++ b/ports/dxsdk-d3dx/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm") - if(EXISTS "${CURRENT_INSTALLED_DIR}/share/directxsdk/copyright") message(FATAL_ERROR "Can't build ${PORT} if directxsdk is installed. Please remove directxsdk, and try to install ${PORT} again if you need it.") endif() diff --git a/ports/dxsdk-d3dx/vcpkg.json b/ports/dxsdk-d3dx/vcpkg.json index bc50df96521c5f..6e7e0e6fb62492 100644 --- a/ports/dxsdk-d3dx/vcpkg.json +++ b/ports/dxsdk-d3dx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dxsdk-d3dx", "version": "9.29.952.8", - "port-version": 1, + "port-version": 2, "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.", "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/", "supports": "windows & !arm & !uwp & !static" diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake index 118bedd7b35238..a8cd6ceb1be1df 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/DXUT diff --git a/ports/dxut/vcpkg.json b/ports/dxut/vcpkg.json index ede994b81c61cd..777546f3460ed9 100644 --- a/ports/dxut/vcpkg.json +++ b/ports/dxut/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dxut", "version": "11.26", + "port-version": 1, "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications", "homepage": "https://github.com/Microsoft/DXUT", "documentation": "https://github.com/microsoft/DXUT/wiki", diff --git a/ports/earcut-hpp/portfile.cmake b/ports/earcut-hpp/portfile.cmake new file mode 100644 index 00000000000000..7cdb44ea22e050 --- /dev/null +++ b/ports/earcut-hpp/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/earcut.hpp + REF v2.2.3 + SHA512 f87f0084dbbcda85b409c326587a376d443f2484b6a69c216d2ad94ea8ea238912dfe1174b464b08faec10ea5c29ebae6478e7abfe5ff682a7b043784c1e3acf + HEAD_REF master +) + +# This is a header only library +file(INSTALL "${SOURCE_PATH}/include/mapbox/earcut.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/mapbox") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/earcut-hpp/vcpkg.json b/ports/earcut-hpp/vcpkg.json new file mode 100644 index 00000000000000..053a57abe2aedd --- /dev/null +++ b/ports/earcut-hpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "earcut-hpp", + "version": "2.2.3", + "description": "earcut.hpp is a C++ port of earcut.js, a fast, header-only polygon triangulation library.", + "homepage": "https://github.com/mapbox/earcut.hpp", + "license": "ISC" +} diff --git a/ports/eastl/Fix-error-C2338.patch b/ports/eastl/Fix-error-C2338.patch new file mode 100644 index 00000000000000..61d75dddc6461a --- /dev/null +++ b/ports/eastl/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/portfile.cmake b/ports/eastl/portfile.cmake index d362ac0f41d1d5..04ba63fc55c9a6 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_cmake_install.patch + 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 e496d68076cd63..b2c97ba50c24c0 100644 --- a/ports/eastl/vcpkg.json +++ b/ports/eastl/vcpkg.json @@ -1,9 +1,10 @@ { "name": "eastl", "version-string": "3.18.00", - "port-version": 1, + "port-version": 2, "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", "dependencies": [ "eabase", { diff --git a/ports/easyhook/portfile.cmake b/ports/easyhook/portfile.cmake index 9b34f51a9c4735..d67dc1d8fd5926 100644 --- a/ports/easyhook/portfile.cmake +++ b/ports/easyhook/portfile.cmake @@ -1,6 +1,4 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" ON_LIBRARY_LINKAGE "static") - -message(WARNING ".Net framework 4.0 is required, please install it before install easyhook.") +message(WARNING ".Net framework 4.7.2 is required, please install it before installing easyhook.") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -40,6 +38,40 @@ foreach(VCXPROJ IN ITEMS ) endforeach() +# Use modern .NET Framework +foreach(CSPROJ IN ITEMS + "${SOURCE_PATH}/EasyHook/EasyHook.csproj" + "${SOURCE_PATH}/EasyHookSvc/EasyHookSvc.csproj" + "${SOURCE_PATH}/EasyLoad/EasyLoad.csproj" + "${SOURCE_PATH}/Examples/FileMon/FileMon.csproj" + "${SOURCE_PATH}/Examples/FileMonInject/FileMonInject.csproj" + "${SOURCE_PATH}/Examples/FileMonitorController/FileMonitorController.csproj" + "${SOURCE_PATH}/Examples/FileMonitorInterceptor/FileMonitorInterceptor.csproj" + "${SOURCE_PATH}/Examples/FileMonitorInterface/FileMonitorInterface.csproj" + "${SOURCE_PATH}/Examples/ProcessMonitor/ProcessMonitor.csproj" + "${SOURCE_PATH}/Examples/ProcMonInject/ProcMonInject.csproj" + "${SOURCE_PATH}/Test/ComplexParameterInject/ComplexParameterInject.csproj" + "${SOURCE_PATH}/Test/ComplexParameterTest/ComplexParameterTest.csproj" + "${SOURCE_PATH}/Test/EasyHook.Tests/EasyHook.Tests.csproj" + "${SOURCE_PATH}/Test/ManagedTarget/ManagedTarget.csproj" + "${SOURCE_PATH}/Test/ManagedTest/ManagedTest.csproj" + "${SOURCE_PATH}/Test/MultipleHooks/MultipleHooks/MultipleHooks.csproj" + "${SOURCE_PATH}/Test/MultipleHooks/SimpleHook1/SimpleHook1.csproj" + "${SOURCE_PATH}/Test/MultipleHooks/SimpleHook2/SimpleHook2.csproj" + "${SOURCE_PATH}/Test/TestFuncHooks/TestFuncHooks.csproj") + + vcpkg_replace_string( + "${CSPROJ}" + "v4.0" + "4.7.2" + ) + vcpkg_replace_string( + "${CSPROJ}" + "Client" + "" + ) +endforeach() + vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH EasyHook.sln diff --git a/ports/easyhook/vcpkg.json b/ports/easyhook/vcpkg.json index 610d874fcf0a56..0a894137ad4d21 100644 --- a/ports/easyhook/vcpkg.json +++ b/ports/easyhook/vcpkg.json @@ -1,8 +1,8 @@ { "name": "easyhook", "version": "2.7.7097.0", - "port-version": 3, + "port-version": 5, "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.", "homepage": "https://github.com/EasyHook/EasyHook", - "supports": "windows & !(static | arm | uwp)" + "supports": "windows & !static & !uwp & (x86 | x64)" } diff --git a/ports/eathread/portfile.cmake b/ports/eathread/portfile.cmake index 5d4d9669a91d15..421f7c591a7e01 100644 --- a/ports/eathread/portfile.cmake +++ b/ports/eathread/portfile.cmake @@ -1,5 +1,4 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -7,7 +6,7 @@ vcpkg_from_github( REF e4367a36f2e55d10b2b994bfbae8edf21f15bafd SHA512 cd5a2aa6cdfe6fa538067919aa49e5ecd901898e12929dc852068ce66efe386032eb1fe667ea7d9b7a3d73a7bef1d90a683c0b90b6fb0d6d9a27950b05c4ab6a HEAD_REF master - PATCHES + PATCHES fix_cmake_install.patch ) diff --git a/ports/eathread/vcpkg.json b/ports/eathread/vcpkg.json index b5ad4d3cf3f6a9..4f18b4c7a326a8 100644 --- a/ports/eathread/vcpkg.json +++ b/ports/eathread/vcpkg.json @@ -1,9 +1,10 @@ { "name": "eathread", "version-string": "1.32.09", - "port-version": 2, + "port-version": 3, "description": "Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.", "homepage": "https://github.com/electronicarts/EAThread", + "supports": "!uwp & x64", "dependencies": [ "eabase", "eastl" diff --git a/ports/ecm/fix_generateqmltypes.patch b/ports/ecm/fix_generateqmltypes.patch new file mode 100644 index 00000000000000..5ed5dc525b3fe4 --- /dev/null +++ b/ports/ecm/fix_generateqmltypes.patch @@ -0,0 +1,31 @@ +diff --git a/modules/ECMGenerateQmlTypes.cmake b/modules/ECMGenerateQmlTypes.cmake +index d6e124266308028b8533203da63f572f6e99b308..7d7cecb5201521019764102eba0da2abf8b4d911 100644 +--- a/modules/ECMGenerateQmlTypes.cmake ++++ b/modules/ECMGenerateQmlTypes.cmake +@@ -1,4 +1,5 @@ + # SPDX-FileCopyrightText: 2017 Aleix Pol Gonzalez ++# SPDX-FileCopyrightText: 2021 Dawid Wrobel + # + # SPDX-License-Identifier: BSD-3-Clause + +@@ -18,10 +19,7 @@ our project offers. These files offer introspection upon our plugin and are + useful for integrating with IDE language support of our plugin. It offers + information about the objects its methods and their argument types. + +-The developer will be in charge of making sure that these files are up to date. +-The plugin.qmltypes file will sit in the source directory. This function will +-include the code that installs the file in the right place and a small unit +-test named qmltypes-pluginname-version that makes sure that it doesn't need updating. ++This function installs the file in DESTINATION folder. + + + Since 5.33.0 +@@ -40,7 +38,7 @@ function(ecm_generate_qmltypes) + set(targetname "qmltypes-${ARG_UNPARSED_ARGUMENTS}") + string(REPLACE ";" - targetname "${targetname}") + +- set(generatedFile ${CMAKE_CURRENT_SOURCE_DIR}/plugins.qmltypes) ++ set(generatedFile plugins.qmltypes) + add_custom_target(${targetname} + BYPRODUCTS ${generatedFile} + COMMAND qmlplugindump -nonrelocatable ${ARG_UNPARSED_ARGUMENTS} ${KDE_INSTALL_QMLDIR} > ${generatedFile} diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index b8ac1869d1b08b..63ab654f93d92e 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -1,12 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/extra-cmake-modules - REF v5.87.0 - SHA512 024dd6631d975228d3a2b681266d84bf336bd3152b88d641761a18f5367e740f968240517040ec0d97135b69fd16f4de607e01e76c2c689f65d96ebd520feed5 + REF v5.89.0 + SHA512 1c3f6ad5dbe1485d1602e297989d6cd53e7646aa99dc28ac1159d0aa22134c97efd74b2c01923e74732f59c861ce05486adb7cff7de050237a35b0980e92cbcf HEAD_REF master PATCHES - fix_canberra.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/187 - fix_libmount.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/200 + fix_canberra.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/187 + fix_libmount.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/200 + fix_generateqmltypes.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/201 ) vcpkg_cmake_configure( @@ -29,4 +30,3 @@ file(INSTALL "${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS" DESTINATION "${CURRENT_PACKA # Allow empty include directory set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) - diff --git a/ports/ecm/vcpkg.json b/ports/ecm/vcpkg.json index 4af353b1f3c4dd..a744a9bcfdf2e0 100644 --- a/ports/ecm/vcpkg.json +++ b/ports/ecm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ecm", - "version": "5.87.0", + "version": "5.89.0", "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", "homepage": "https://github.com/KDE/extra-cmake-modules", "dependencies": [ diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 5cbf085bf81e51..98f5c2e134500a 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -1,5 +1,3 @@ - -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "UWP" "Linux" "OSX") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(PLATFORM x86) endif() diff --git a/ports/ecsutil/vcpkg.json b/ports/ecsutil/vcpkg.json index fc372275695bda..1e909e92224fb5 100644 --- a/ports/ecsutil/vcpkg.json +++ b/ports/ecsutil/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ecsutil", "version-string": "1.0.7.15", - "port-version": 1, + "port-version": 2, "description": "Native Windows SDK for accessing ECS via the S3 HTTP protocol.", "homepage": "https://github.com/EMCECS/ecs-object-client-windows-cpp", "supports": "windows & (x64 | x86)", diff --git a/ports/effects11/portfile.cmake b/ports/effects11/portfile.cmake index e5ebf84abc7af0..798d3554d88e4d 100644 --- a/ports/effects11/portfile.cmake +++ b/ports/effects11/portfile.cmake @@ -1,7 +1,4 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "ANDROID") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/FX11 diff --git a/ports/effects11/vcpkg.json b/ports/effects11/vcpkg.json index 4edddcd8d3cae0..a5bd57af49427f 100644 --- a/ports/effects11/vcpkg.json +++ b/ports/effects11/vcpkg.json @@ -1,7 +1,7 @@ { "name": "effects11", "version": "11.26", - "port-version": 1, + "port-version": 2, "description": "Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.", "homepage": "https://github.com/Microsoft/FX11", "documentation": "https://github.com/microsoft/FX11/wiki", diff --git a/ports/efsw/portfile.cmake b/ports/efsw/portfile.cmake index 289d4354d403a9..450443fa167d98 100644 --- a/ports/efsw/portfile.cmake +++ b/ports/efsw/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SpartanJ/efsw diff --git a/ports/efsw/vcpkg.json b/ports/efsw/vcpkg.json index a001ada8f61327..f992dc8a5b7b58 100644 --- a/ports/efsw/vcpkg.json +++ b/ports/efsw/vcpkg.json @@ -1,7 +1,7 @@ { "name": "efsw", - "version-string": "2020-06-08", - "port-version": 2, + "version-date": "2020-06-08", + "port-version": 3, "description": "efsw is a C++ cross-platform file system watcher and notifier.", "homepage": "https://github.com/SpartanJ/efsw", "supports": "!uwp" diff --git a/ports/eigen3/disable_pkgconfig_absolute_path_check.patch b/ports/eigen3/disable_pkgconfig_absolute_path_check.patch deleted file mode 100644 index cfa96434059774..00000000000000 --- a/ports/eigen3/disable_pkgconfig_absolute_path_check.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dbb9bcf..84c413c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -407,11 +407,13 @@ set(PKGCONFIG_INSTALL_DIR - CACHE STRING "The directory relative to CMAKE_PREFIX_PATH where eigen3.pc is installed" - ) - -+if(0) - foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) - if(IS_ABSOLUTE "${${var}}") - message(FATAL_ERROR "${var} must be relative to CMAKE_PREFIX_PATH. Got: ${${var}}") - endif() - endforeach() -+endif() - - # similar to set_target_properties but append the property instead of overwriting it - macro(ei_add_target_property target prop value) diff --git a/ports/eigen3/fix-cuda-error.patch b/ports/eigen3/fix-cuda-error.patch deleted file mode 100644 index 9123806df07563..00000000000000 --- a/ports/eigen3/fix-cuda-error.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Eigen/src/Core/arch/CUDA/Half.h b/Eigen/src/Core/arch/CUDA/Half.h -index 755e620..85e445b 100644 ---- a/Eigen/src/Core/arch/CUDA/Half.h -+++ b/Eigen/src/Core/arch/CUDA/Half.h -@@ -209,7 +209,11 @@ namespace half_impl { - // conversion steps back and forth. - - EIGEN_STRONG_INLINE __device__ half operator + (const half& a, const half& b) { -+#if defined(EIGEN_CUDACC_VER) && EIGEN_CUDACC_VER >= 90000 -+ return __hadd(::__half(a), ::__half(b)); -+#else - return __hadd(a, b); -+#endif - } - EIGEN_STRONG_INLINE __device__ half operator * (const half& a, const half& b) { - return __hmul(a, b); -@@ -218,9 +222,13 @@ EIGEN_STRONG_INLINE __device__ half operator - (const half& a, const half& b) { - return __hsub(a, b); - } - EIGEN_STRONG_INLINE __device__ half operator / (const half& a, const half& b) { -+#if defined(EIGEN_CUDACC_VER) && EIGEN_CUDACC_VER >= 90000 -+ return __hdiv(a, b); -+#else - float num = __half2float(a); - float denom = __half2float(b); - return __float2half(num / denom); -+#endif - } - EIGEN_STRONG_INLINE __device__ half operator - (const half& a) { - return __hneg(a); diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 4b1a74f9ebd8f1..34dd3da7a2ed69 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -4,17 +4,14 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libeigen/eigen - REF 3.3.9 - SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46 + REF 3.4.0 + SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a HEAD_REF master - PATCHES - disable_pkgconfig_absolute_path_check.patch - fix-cuda-error.patch # issue https://gitlab.com/libeigen/eigen/-/issues/1526 + PATCHES remove_configure_checks.patch # This removes unnecessary configure checks. Eigen3 just installs headers not anything more. ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DEIGEN_BUILD_PKGCONFIG=ON @@ -26,13 +23,13 @@ vcpkg_configure_cmake( -DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() -file(GLOB INCLUDES ${CURRENT_PACKAGES_DIR}/include/eigen3/*) +file(GLOB INCLUDES "${CURRENT_PACKAGES_DIR}/include/eigen3/*") # Copy the eigen header files to conventional location for user-wide MSBuild integration -file(COPY ${INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(COPY ${INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING.README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/eigen3/remove_configure_checks.patch b/ports/eigen3/remove_configure_checks.patch new file mode 100644 index 00000000000000..3e434a40521ccc --- /dev/null +++ b/ports/eigen3/remove_configure_checks.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f3e69b845..12fb2188d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,12 +66,14 @@ option(EIGEN_TEST_CXX11 "Enable testing with C++11 and C++11 features (e.g. Tens + + + macro(ei_add_cxx_compiler_flag FLAG) ++ if(FALSE) # Since eigen3 is header only and vcpkg does not build tests this can be disabled by default. + string(REGEX REPLACE "-" "" SFLAG1 ${FLAG}) + string(REGEX REPLACE "\\+" "p" SFLAG ${SFLAG1}) + check_cxx_compiler_flag(${FLAG} COMPILER_SUPPORT_${SFLAG}) + if(COMPILER_SUPPORT_${SFLAG}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}") + endif() ++ endif() + endmacro() + + check_cxx_compiler_flag("-std=c++11" EIGEN_COMPILER_SUPPORT_CPP11) +@@ -142,7 +144,7 @@ endif() + + set(EIGEN_TEST_MAX_SIZE "320" CACHE STRING "Maximal matrix/vector size, default is 320") + +-if(NOT MSVC) ++if(NOT MSVC AND FALSE) + # We assume that other compilers are partly compatible with GNUCC + + # clang outputs some warnings for unknown flags that are not caught by check_cxx_compiler_flag +@@ -330,7 +332,7 @@ if(NOT MSVC) + endif() + endif() + +-else() ++elseif(FALSE) + + # C4127 - conditional expression is constant + # C4714 - marked as __forceinline not inlined (I failed to deactivate it selectively) diff --git a/ports/eigen3/vcpkg.json b/ports/eigen3/vcpkg.json index bf355b87c9e16e..022fe4facdf984 100644 --- a/ports/eigen3/vcpkg.json +++ b/ports/eigen3/vcpkg.json @@ -1,7 +1,18 @@ { "name": "eigen3", - "version-string": "3.3.9", + "version": "3.4.0", "port-version": 1, "description": "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.", - "homepage": "http://eigen.tuxfamily.org" + "homepage": "http://eigen.tuxfamily.org", + "license": "MPL-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/elfio/portfile.cmake b/ports/elfio/portfile.cmake index cee90231bbd68a..0e7f1ad2bd3813 100644 --- a/ports/elfio/portfile.cmake +++ b/ports/elfio/portfile.cmake @@ -1,17 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO serge1/ELFIO - REF Release_3.9 - SHA512 479c4132ac3575940bd1e8190ba5253e54ae57f38319d7bca75ea85ee2f744f5d5b460d2d4ceb17eca0d0561c6e281673f050bbdab2f5ff526c031c220876bf1) + REF Release_3.10 + SHA512 f609fe5162d1609d1d65f441dbf01011ca5ae36195d8b3a74dec2b72891e9f8f90d3fdbc9bf893f7186494071606e898e5519fda18665fc88ae9781c504cd4a9) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/elfio/vcpkg.json b/ports/elfio/vcpkg.json index c49ffbe49529fc..d1a7eadb44ba5e 100644 --- a/ports/elfio/vcpkg.json +++ b/ports/elfio/vcpkg.json @@ -1,6 +1,17 @@ { "name": "elfio", - "version": "3.9", + "version": "3.10", "description": "A header-only C++ library intended for reading and generating files in the ELF binary format.", - "homepage": "https://github.com/serge1/ELFIO" + "homepage": "https://github.com/serge1/ELFIO", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/elfutils/configure.ac.patch b/ports/elfutils/configure.ac.patch index f3372b01626ed8..bd750407de7055 100644 --- a/ports/elfutils/configure.ac.patch +++ b/ports/elfutils/configure.ac.patch @@ -35,12 +35,10 @@ index 5a2dc373e..b1928831e 100644 # We need this since bzip2 doesn't have a pkgconfig file. BZ2_LIB="$LIBS" AC_SUBST([BZ2_LIB]) --eu_ZIPLIB(lzma,LZMA,lzma,lzma_auto_decoder,[LZMA (xz)]) -+eu_ZIPLIB(lzma,LZMA,[lzma lzmad],lzma_auto_decoder,[LZMA (xz)]) + eu_ZIPLIB(lzma,LZMA,lzma,lzma_auto_decoder,[LZMA (xz)]) AS_IF([test "x$with_lzma" = xyes], [LIBLZMA="liblzma"], [LIBLZMA=""]) AC_SUBST([LIBLZMA]) --eu_ZIPLIB(zstd,ZSTD,zstd,ZSTD_decompress,[ZSTD (zst)]) -+eu_ZIPLIB(zstd,ZSTD,[zstd zstdd zstd_static zstd_staticd],ZSTD_decompress,[ZSTD (zst)]) + eu_ZIPLIB(zstd,ZSTD,zstd,ZSTD_decompress,[ZSTD (zst)]) AS_IF([test "x$with_zstd" = xyes], [LIBZSTD="libzstd"], [LIBLZSTD=""]) AC_SUBST([LIBZSTD]) -zip_LIBS="$LIBS" diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake index 7b7aae50e13240..58480ef4195984 100644 --- a/ports/elfutils/portfile.cmake +++ b/ports/elfutils/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://sourceware.org/git/elfutils - REF 25d048684a82f9ba701c6939b7f28c3543bb7991 #elfutils-0.182 + REF ca4a785fc3061c7d136b198e9ffe0b14cf90c2be #elfutils-0.186 PATCHES configure.ac.patch ) @@ -29,6 +29,8 @@ vcpkg_configure_make( vcpkg_install_make() file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libdebuginfod.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libdebuginfod.pc") #--disable-debuginfod +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc/debuginfod" "${CURRENT_PACKAGES_DIR}/etc/debuginfod") + vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -37,11 +39,11 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/locale) # Remove files with wrong linkage if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(_lib_suffix "${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") -else() set(_lib_suffix "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") +else() + set(_lib_suffix "${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") endif() -file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}") +file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}.*" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}.*") file(REMOVE ${TO_REMOVE}) # # Handle copyright diff --git a/ports/elfutils/vcpkg.json b/ports/elfutils/vcpkg.json index ba686648fb8fd4..1e8588f325761f 100644 --- a/ports/elfutils/vcpkg.json +++ b/ports/elfutils/vcpkg.json @@ -1,9 +1,10 @@ { "name": "elfutils", - "version-string": "0.182", - "port-version": 1, + "version": "0.186", + "port-version": 2, "description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.", "homepage": "https://sourceware.org/elfutils/", + "license": null, "supports": "!windows", "dependencies": [ "bzip2", diff --git a/ports/embree2/vcpkg.json b/ports/embree2/vcpkg.json index e7fdad98dc3a0f..e89bc2b2edc284 100644 --- a/ports/embree2/vcpkg.json +++ b/ports/embree2/vcpkg.json @@ -1,9 +1,10 @@ { "name": "embree2", "version-semver": "2.17.7", - "port-version": 3, + "port-version": 4, "description": "High Performance Ray Tracing Kernels.", "homepage": "https://github.com/embree/embree", + "supports": "!arm", "dependencies": [ "tbb", { diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake index 2e1a71e1e123a6..301f3fd7c264bb 100644 --- a/ports/ensmallen/portfile.cmake +++ b/ports/ensmallen/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mlpack/ensmallen - REF 9bd4bc25275066fa03173f65e1cbd789472e8f9b # 2.17.0 - SHA512 8b665e6307e73ad3273eb28c17ec62e8d0d968623d41b5460771be41a74f6a8088ddadb1764b9b4dc496dbceae6e791895cee0997de8614dc9a7426b6db663e0 + REF bf42276c5a44eed31e5bacec95d166d01d65f9a4 #v2.18.1 + SHA512 09f96b2f0e0bd34245c34ee727e633bbb3957c2ab8076cfac66f976ba4e327096e2e76fadcc729dfffe73b56348bcc14fa61e3bb59a7ca0e17221f8f4cd0d59c HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF ) @@ -15,7 +15,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ensmallen) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${SOURCE_PATH}/COPYRIGHT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ensmallen/vcpkg.json b/ports/ensmallen/vcpkg.json index f5648353cbf4b3..614ae574332455 100644 --- a/ports/ensmallen/vcpkg.json +++ b/ports/ensmallen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ensmallen", - "version-semver": "2.17.0", + "version-semver": "2.18.1", "description": "A header-only C++ library for mathematical optimization", "homepage": "https://github.com/mlpack/ensmallen", "dependencies": [ diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index f683c1a096f7f8..7b04105f68b3e0 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -8,26 +8,25 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt - REF 2d5a3f24aa6dc38ed0c4eee9d4d625586d8e921e #v3.8.0 - SHA512 36b7be2550be5a919548e5c91db218ed9b062804d4f43073d6fc6b432fa2d358b5d36098490359ca2392370b2bf1b99d20e564504eaac619f5cd7f9612d91e2e + REF v3.9.0 + SHA512 b318ea06deb69350a00b3e824462a22fe443f4c778d0934857b68e43f0e6f1fe30c281889c14e3456067629e62a2bbb54491458c43d52ef543b2db8903133922 HEAD_REF master ) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DENTT_BUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/EnTT/cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/EnTT/cmake) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) diff --git a/ports/entt/vcpkg.json b/ports/entt/vcpkg.json index 43beae304f298c..27a59d978510b0 100644 --- a/ports/entt/vcpkg.json +++ b/ports/entt/vcpkg.json @@ -1,9 +1,18 @@ { "name": "entt", - "version": "3.8.0", - "port-version": 1, + "version": "3.9.0", "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", "homepage": "https://github.com/skypjack/entt", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "experimental": { "description": "Use experimental features right away" diff --git a/ports/eve/portfile.cmake b/ports/eve/portfile.cmake new file mode 100644 index 00000000000000..621fe8a3ccef58 --- /dev/null +++ b/ports/eve/portfile.cmake @@ -0,0 +1,15 @@ +message(WARNING "EVE requires a C++ 20 compliant compiler. GCC-11 and clang-12 are known to work.") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jfalcou/eve + REF v2021.10.0 + SHA512 bdac483d07c968cfe2cd2e0f26df68f0e3b6cd83fbfe4b89650dc58fb534fd37c5540682283a2ee29a82e87bdfc678beac3651e40cde5b4cf30c20ea8304c72c + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/eve" RENAME copyright) diff --git a/ports/eve/vcpkg.json b/ports/eve/vcpkg.json new file mode 100644 index 00000000000000..24d27832a9e825 --- /dev/null +++ b/ports/eve/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "eve", + "version-date": "2021-10-16", + "description": "EVE - the Expressive Vector Engine", + "homepage": "https://github.com/jfalcou/eve", + "documentation": "https://jfalcou.github.io/eve/html/pages.html", + "supports": "!windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/eventpp/portfile.cmake b/ports/eventpp/portfile.cmake new file mode 100644 index 00000000000000..bd689e51c482e6 --- /dev/null +++ b/ports/eventpp/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wqking/eventpp + REF v0.1.2 + SHA512 01fd536024dfef8c4025fc184f6b6326a901849dbf73d81430d7cfadeff25c9c140ab6a28b0143a4090703668c1d9e743a54e874c0321c3453cf40aeb4583db3 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/eventpp") +vcpkg_fixup_pkgconfig() +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) diff --git a/ports/eventpp/vcpkg.json b/ports/eventpp/vcpkg.json new file mode 100644 index 00000000000000..a2740ba56d504b --- /dev/null +++ b/ports/eventpp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "eventpp", + "version-semver": "0.1.2", + "description": "C++ library for event dispatcher and callback list", + "homepage": "https://github.com/wqking/eventpp", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/exiv2/fix-find_expat.patch b/ports/exiv2/fix-find_expat.patch new file mode 100644 index 00000000000000..a2de4228af4815 --- /dev/null +++ b/ports/exiv2/fix-find_expat.patch @@ -0,0 +1,64 @@ +diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake +index ec3a43f..d8637cc 100644 +--- a/cmake/findDependencies.cmake ++++ b/cmake/findDependencies.cmake +@@ -42,7 +42,8 @@ if (EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP) + message(FATAL_ERROR "EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP are mutually exclusive. You can only choose one of them") + else() + if (EXIV2_ENABLE_XMP) +- find_package(EXPAT REQUIRED) ++ find_package(expat CONFIG REQUIRED) ++ set(EXPAT_FOUND 1) + elseif (EXIV2_ENABLE_EXTERNAL_XMP) + find_package(XmpSdk REQUIRED) + endif () +diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt +index de8aa1d..524724c 100644 +--- a/samples/CMakeLists.txt ++++ b/samples/CMakeLists.txt +@@ -77,11 +77,10 @@ if( EXPAT_FOUND ) + target_link_libraries(geotag + PRIVATE + exiv2-xmp +- ${EXPAT_LIBRARIES} ++ expat::expat + ) + target_include_directories(geotag PRIVATE ${CMAKE_BINARY_DIR}) # exv_conf.h + target_include_directories(geotag PRIVATE ${CMAKE_SOURCE_DIR}/include) # +- target_include_directories(geotag PRIVATE ${EXPAT_INCLUDE_DIR}) + target_include_directories(geotag PRIVATE ${CMAKE_SOURCE_DIR}/src) # To find unused.h + + if (WIN32) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 26e5a95..5dc722c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -154,8 +154,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_LIBRARIES}) ++ target_link_libraries(exiv2lib PRIVATE expat::expat) + + if (WIN32) + target_compile_definitions(exiv2lib PRIVATE XML_STATIC) +diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt +index a22698f..55102ce 100644 +--- a/xmpsdk/CMakeLists.txt ++++ b/xmpsdk/CMakeLists.txt +@@ -28,13 +28,12 @@ add_library(exiv2-xmp STATIC + + target_link_libraries(exiv2-xmp + PRIVATE +- $ ++ $ + ) + + target_include_directories(exiv2-xmp + PRIVATE + $ +- ${EXPAT_INCLUDE_DIR} + ) + + # Prevent a denial-service-attack related to XML entity expansion diff --git a/ports/exiv2/fix-ninja-error.patch b/ports/exiv2/fix-ninja-error.patch deleted file mode 100644 index 71f52f5615e62e..00000000000000 --- a/ports/exiv2/fix-ninja-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c52b352..b19c438 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -149,7 +149,7 @@ set_target_properties( exiv2lib_int PROPERTIES - - target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR}) - target_include_directories(exiv2lib PRIVATE -- $ -+ ${PROJECT_SOURCE_DIR}/xmpsdk/include - ${ZLIB_INCLUDE_DIR} - ) - -@@ -215,7 +215,7 @@ else() - endif() - - if( EXIV2_ENABLE_PNG ) -- target_link_libraries( exiv2lib PRIVATE $) -+ target_link_libraries( exiv2lib PRIVATE ${ZLIB_LIBRARIES}) - endif() - - if( EXIV2_ENABLE_NLS ) -diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt -index a22698f..ca6ffe0 100644 ---- a/xmpsdk/CMakeLists.txt -+++ b/xmpsdk/CMakeLists.txt -@@ -27,13 +27,12 @@ add_library(exiv2-xmp STATIC - ) - - target_link_libraries(exiv2-xmp -- PRIVATE -- $ -+ PRIVATE ${EXPAT_LIBRARY} - ) - - target_include_directories(exiv2-xmp - PRIVATE -- $ -+ ${PROJECT_SOURCE_DIR}/xmpsdk/include - ${EXPAT_INCLUDE_DIR} - ) - diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index ff544138e5448c..661431c79e470b 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -1,14 +1,11 @@ -#https://github.com/Exiv2/exiv2/issues/1063 -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 - REF 15098f4ef50cc721ad0018218acab2ff06e60beb #v0.27.4 - SHA512 4be0a9c4c64c65a9ca85291ba2cf54efacc5a88dae534c2d9252986df4e12212899c33093b07695369108e3763b3d74592a6153d832743694ec95c9a03c7e2c3 + REF ad5484cb1eaba3ad0e49b290d244f6b1ee9ff076 #v0.27.5 + SHA512 33b8c60990b05f1599860974d6fe44baba8369356acd2cab3ce4919a48bb44348ed0496ffc4581d9fd5eb8a1b36d48a0eaa3fafe4584bfd655d0a88e7a9458ef HEAD_REF master PATCHES - fix-ninja-error.patch + fix-find_expat.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -26,9 +23,10 @@ if("unicode" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "Feature unicode only supports Windows platform.") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DEXIV2_BUILD_EXIV2_COMMAND=OFF @@ -49,8 +47,8 @@ vcpkg_configure_cmake( -DEXIV2_TEAM_USE_SANITIZERS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/exiv2) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/exiv2) vcpkg_fixup_pkgconfig() if("nls" IN_LIST FEATURES) @@ -67,12 +65,12 @@ configure_file( vcpkg_copy_pdbs() # Clean -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/exiv2 ${CURRENT_PACKAGES_DIR}/lib/exiv2) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/exiv2" "${CURRENT_PACKAGES_DIR}/lib/exiv2") 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() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json index 5ed357690aab2e..6bbb69c997e82b 100644 --- a/ports/exiv2/vcpkg.json +++ b/ports/exiv2/vcpkg.json @@ -1,18 +1,32 @@ { "name": "exiv2", - "version": "0.27.4", - "port-version": 2, + "version": "0.27.5", + "port-version": 1, "description": "Image metadata library and tools", "homepage": "https://www.exiv2.org", "supports": "!uwp", "dependencies": [ - "libiconv" + "libiconv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "nls": { "description": "Build native language support", "dependencies": [ - "gettext" + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + } ] }, "png": { diff --git a/ports/exprtk/copyright b/ports/exprtk/copyright index f360b8332b9f60..f52eae229b5a4d 100644 --- a/ports/exprtk/copyright +++ b/ports/exprtk/copyright @@ -1,5 +1,5 @@ -Copyright 1999-2021 Arash Partow -http://www.partow.net/programming/exprtk/index.html +Copyright 1999-2022 Arash Partow +https://www.partow.net/programming/exprtk/index.html Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/ports/exprtk/portfile.cmake b/ports/exprtk/portfile.cmake index 8ebab1b62db09a..3217882ebd973f 100644 --- a/ports/exprtk/portfile.cmake +++ b/ports/exprtk/portfile.cmake @@ -1,8 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArashPartow/exprtk - REF ca5c577917646ddba3f71ce6d5dd7d01f351ee80 - SHA512 bb4e36cec74c5e583c417000e4b20dc878572f0eeceffdae021dcdc0cc3e4186be150ca446722ce6a497c9cd4f8bbe51098894207ce711b33139fffb5dd2f6a4 + REF 806C519C91FD08BA4FA19380DBF3F6E42DE9E2D1 + SHA512 A323CCAF161FD0087FD8208D1B24C2A3FD422F8875E29B22AE70E6DD2F10F396F6BF1AD36D3FFDC10D32314AE8F83749974301A349BE0F27733292BCF5193640 + HEAD_REF master ) file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/exprtk/vcpkg.json b/ports/exprtk/vcpkg.json index 9a1d1a1a288028..90bc3a4283a571 100644 --- a/ports/exprtk/vcpkg.json +++ b/ports/exprtk/vcpkg.json @@ -1,7 +1,8 @@ { "name": "exprtk", - "version-string": "2021-01-01", - "port-version": 1, + "version-date": "2022-01-01", + "port-version": 2, "description": "Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine.", - "homepage": "http://www.partow.net/programming/exprtk/index.html" + "homepage": "https://www.partow.net/programming/exprtk/index.html", + "license": "MIT" } diff --git a/ports/faad2/CMakeLists.txt b/ports/faad2/CMakeLists.txt index 70f9c587974464..10305eb005ed9f 100644 --- a/ports/faad2/CMakeLists.txt +++ b/ports/faad2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.7.2) project (faad VERSION 2.9.1) option(FAAD_BUILD_BINARIES "Build faad2 binaries" OFF) diff --git a/ports/faad2/vcpkg.json b/ports/faad2/vcpkg.json index f456d0b2d3093b..f2d6031f7395e1 100644 --- a/ports/faad2/vcpkg.json +++ b/ports/faad2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "faad2", "version": "2.9.1", - "port-version": 4, + "port-version": 5, "description": "Freeware Advanced Audio (AAC) Decoder", "homepage": "https://sourceforge.net/projects/faac/", "supports": "windows", diff --git a/ports/faiss/portfile.cmake b/ports/faiss/portfile.cmake index f2670da79aca36..505609f68d35d7 100644 --- a/ports/faiss/portfile.cmake +++ b/ports/faiss/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_fail_port_install(ON_ARCH "x86" ON_TARGET "uwp" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookresearch/faiss - REF cff072b78ef019998990c6ba02df83dd7d3c8d38 # v1.7.1 - SHA512 08d4acf30b6a2a0f326cb71035b58e65f05e70817edbf9dda7d5f8b53d4fb722909c2412d42dca4d88d0576a3da528c2db869fb4fd6fb2343b7acad80066051d + REF v1.7.2 + SHA512 dddf55af3cc73a15fbbd104ab75942194a4d5d088611bd98b11e459e034ba5df1d9247eb8c8b9f4631cc64c6ed284b2cf407041be7b6095f9395f9ac29d78df4 HEAD_REF master PATCHES fix-dependencies.patch diff --git a/ports/faiss/vcpkg.json b/ports/faiss/vcpkg.json index dfc5e14b17f442..27f35e0352d579 100644 --- a/ports/faiss/vcpkg.json +++ b/ports/faiss/vcpkg.json @@ -1,6 +1,6 @@ { "name": "faiss", - "version-semver": "1.7.1", + "version-semver": "1.7.2", "description": "Faiss is a library for efficient similarity search and clustering of dense vectors.", "homepage": "https://github.com/facebookresearch/faiss", "license": "MIT", diff --git a/ports/fakeit/portfile.cmake b/ports/fakeit/portfile.cmake index 9e649c04ba65e4..6b02ad63dc56de 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 514ca290b78d15f4fb46e1696f47189cf2524376 #v2.0.9 - SHA512 679808f5f7e036bdb465a4a8ded79e539e4d9992f27e87de1a23be221bc983146183c26087f16a8c7dafab58e337a050b78402c23189ce02cad0afc7ab7718b5 + REF 98979d2784d270514c3d4cde18d4370d1381d866 #v2.1.0 + SHA512 f824d9f2171b2453b43a19ebaf203527ca2e943af9cf5caef435c31dcb3af74ccc9ea6e09cd14875652b887d68e9d1a006cd9543c099b4606e68eeae1ce042f7 HEAD_REF master ) diff --git a/ports/fakeit/vcpkg.json b/ports/fakeit/vcpkg.json index 8be673e3e3c9e3..2f3dfbc5fbe873 100644 --- a/ports/fakeit/vcpkg.json +++ b/ports/fakeit/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fakeit", - "version": "2.0.9", + "version": "2.1.0", "description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.", - "homepage": "https://github.com/eranpeer/FakeIt" + "homepage": "https://github.com/eranpeer/FakeIt", + "license": "MIT" } diff --git a/ports/fastcgi/portfile.cmake b/ports/fastcgi/portfile.cmake index 61d0fc839f58af..27b8c85cc04b3d 100644 --- a/ports/fastcgi/portfile.cmake +++ b/ports/fastcgi/portfile.cmake @@ -29,14 +29,19 @@ if (VCPKG_TARGET_IS_WINDOWS) "${NMAKE_OPTIONS_DBG}" ) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME ${PORT}) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - if (NOT VCPKG_CRT_LINKAGE STREQUAL static) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME ${PORT}) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + if (NOT VCPKG_CRT_LINKAGE STREQUAL static) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + endif() + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + if (NOT VCPKG_CRT_LINKAGE STREQUAL static) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() endif() - elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX # Check build system first if(VCPKG_TARGET_IS_OSX) @@ -45,7 +50,6 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n libtool-bin\n\nIt can be installed with apt-get install gettext automake libtool libtool-bin") endif() - vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG @@ -62,7 +66,7 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() else() # Other build system - vcpkg_fail_port_install(ALWAYS) + message(FATAL_ERROR "fastcgi only supports Windows, Linux, and MacOS.") endif() # Handle copyright diff --git a/ports/fastcgi/vcpkg.json b/ports/fastcgi/vcpkg.json index 957dcfa21551d1..035242158dbfe3 100644 --- a/ports/fastcgi/vcpkg.json +++ b/ports/fastcgi/vcpkg.json @@ -1,7 +1,8 @@ { "name": "fastcgi", "version-date": "2020-09-11", - "port-version": 2, + "port-version": 4, "description": "The FastCGI interface combines the best aspects of CGI and vendor APIs. Like CGI, FastCGI applications run in separate, isolated processes.", - "homepage": "https://fastcgi-archives.github.io/" + "homepage": "https://fastcgi-archives.github.io/", + "license": "OML" } diff --git a/ports/fbgemm/portfile.cmake b/ports/fbgemm/portfile.cmake index ee0da8e8081363..d7c443c0afebea 100644 --- a/ports/fbgemm/portfile.cmake +++ b/ports/fbgemm/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" ON_TARGET "uwp") - # The project's CMakeLists.txt uses Python to select source files. Check if it is available in advance. vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/fbgemm/vcpkg.json b/ports/fbgemm/vcpkg.json index aeddbfe0dc1f91..42d1375eaee085 100644 --- a/ports/fbgemm/vcpkg.json +++ b/ports/fbgemm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fbgemm", "version-date": "2021-03-18", - "port-version": 2, + "port-version": 3, "description": "FB (Facebook) + GEMM (General Matrix-Matrix Multiplication)", "homepage": "https://code.fb.com/ml-applications/fbgemm/", "supports": "!(x86 | uwp)", diff --git a/ports/fbthrift/add-missing-algorithm-include.patch b/ports/fbthrift/add-missing-algorithm-include.patch new file mode 100644 index 00000000000000..311a8f09619890 --- /dev/null +++ b/ports/fbthrift/add-missing-algorithm-include.patch @@ -0,0 +1,28 @@ +From f2151fa730058a1baf23ed3dc082c91df6351da1 Mon Sep 17 00:00:00 2001 +From: "Zeyi (Rice) Fan" +Date: Fri, 4 Feb 2022 15:17:53 -0800 +Subject: [PATCH] fix build failure on Windows + +Summary: Fix a build error on Windows where `std::mismatch` is not found. + +Reviewed By: xavierd + +Differential Revision: D34012963 + +fbshipit-source-id: 9f5aa21d03a92fdadf5bc83943a159a2f7872144 +--- + thrift/compiler/generate/build_templates.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/thrift/compiler/generate/build_templates.cc b/thrift/compiler/generate/build_templates.cc +index 56f13e8dde8..acd9dd30a75 100644 +--- a/thrift/compiler/generate/build_templates.cc ++++ b/thrift/compiler/generate/build_templates.cc +@@ -14,6 +14,7 @@ + * limitations under the License. + */ + ++#include + #include + #include + #include diff --git a/ports/fbthrift/fix-sodium-target.patch b/ports/fbthrift/fix-sodium-target.patch deleted file mode 100644 index 89d32e53db647d..00000000000000 --- a/ports/fbthrift/fix-sodium-target.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake -index c664ccbe3..3c3f1245c 100644 ---- a/build/fbcode_builder/CMake/FindSodium.cmake -+++ b/build/fbcode_builder/CMake/FindSodium.cmake -@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS) - else() - set(_LIB_TYPE SHARED) - endif() --add_library(sodium ${_LIB_TYPE} IMPORTED) -+ -+if(NOT TARGET sodium) -+ add_library(sodium ${_LIB_TYPE} IMPORTED) -+endif() - - set_target_properties(sodium PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}" diff --git a/ports/fbthrift/fix-zlib.patch b/ports/fbthrift/fix-zlib.patch deleted file mode 100644 index d9a185ad1ffeaa..00000000000000 --- a/ports/fbthrift/fix-zlib.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 150671504a9..7b248a0105e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,7 +106,7 @@ if(lib_only OR build_all) - find_package(fizz CONFIG REQUIRED) - find_package(fmt CONFIG REQUIRED) - find_package(wangle CONFIG REQUIRED) -- find_package(Zlib REQUIRED) -+ find_package(ZLIB REQUIRED) - find_package(Zstd REQUIRED) - # https://cmake.org/cmake/help/v3.9/module/FindThreads.html - set(THREADS_PREFER_PTHREAD_FLAG ON) -@@ -115,7 +115,6 @@ if(lib_only OR build_all) - ${LIBGFLAGS_INCLUDE_DIR} - ${GLOG_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIR} -- ${ZLIB_INCLUDE_DIRS} - ${ZSTD_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} - ) -diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in -index 69b29b948c5..e1297ed18c3 100644 ---- a/thrift/cmake/FBThriftConfig.cmake.in -+++ b/thrift/cmake/FBThriftConfig.cmake.in -@@ -28,6 +28,8 @@ else() - set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") - endif() - -+find_dependency(ZLIB REQUIRED) -+ - if (NOT TARGET FBThrift::thriftcpp2) - include("${FBTHRIFT_CMAKE_DIR}/FBThriftTargets.cmake") - endif() -diff --git a/thrift/cmake/FindZlib.cmake b/thrift/cmake/FindZlib.cmake -deleted file mode 100644 -index c15525b411f..00000000000 ---- a/thrift/cmake/FindZlib.cmake -+++ /dev/null -@@ -1,46 +0,0 @@ --# Copyright (c) Facebook, Inc. and its affiliates. --# --# Licensed under the Apache License, Version 2.0 (the "License"); --# you may not use this file except in compliance with the License. --# You may obtain a copy of the License at --# --# http://www.apache.org/licenses/LICENSE-2.0 --# --# Unless required by applicable law or agreed to in writing, software --# distributed under the License is distributed on an "AS IS" BASIS, --# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --# See the License for the specific language governing permissions and --# limitations under the License. -- --# --# - Try to find Facebook zstd library --# This will define --# ZLIB_FOUND --# ZLIB_INCLUDE_DIR --# ZLIB_LIBRARIES --# -- --find_path( -- ZLIB_INCLUDE_DIRS zlib.h -- HINTS -- $ENV{ZLIB_ROOT}/include -- ${ZLIB_ROOT}/include --) -- --find_library( -- ZLIB_LIBRARIES z zlib -- HINTS -- $ENV{ZLIB_ROOT}/lib -- ${ZLIB_ROOT}/lib --) -- --# For some reason ZLIB_FOUND is never marked as TRUE --set(ZLIB_FOUND TRUE) --mark_as_advanced(ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES) -- --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(Zstd ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES) -- --if(ZLIB_FOUND AND NOT ZLIB_FIND_QUIETLY) -- message(STATUS "ZLIB: ${ZLIB_INCLUDE_DIRS}") --endif() -diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt -index 681622594c9..3df0b5717db 100644 ---- a/thrift/lib/cpp/CMakeLists.txt -+++ b/thrift/lib/cpp/CMakeLists.txt -@@ -77,8 +77,8 @@ target_link_libraries( - thrift-core - rpcmetadata - Folly::folly -+ ZLIB::ZLIB - ${OPENSSL_LIBRARIES} -- ${ZLIB_LIBRARIES} - ${ZSTD_LIBRARIES} - ) - diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 016fac181af6a6..bd757eaaca6cd3 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -1,56 +1,53 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm") - vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift - REF v2021.06.14.00 - SHA512 e59465adcd57722626e5a4407529b164472cde3942bd100b3d6e92c5057f88f1a8544b7181a01e05ed3077ffd2b3811b687aa6741d08aedef6b79aea02305798 + REF v2022.01.31.00 + SHA512 159457398fdc0c89c34364b8a89068127c3519ce35af349776016e0ae37ae9508689853e0e371c2065fd715451f466e37c7e3799e054eca02cbc4717809150ab HEAD_REF master PATCHES - fix-sodium-target.patch # fixed in master - fix-zlib.patch # fixed in master + add-missing-algorithm-include.patch # https://github.com/facebook/fbthrift/commit/f2151fa730058a1baf23ed3dc082c91df6351da1 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBISON_EXECUTABLE=${BISON} - -DFLEX_EXECUTABLE=${FLEX} + "-DBISON_EXECUTABLE=${BISON}" + "-DFLEX_EXECUTABLE=${FLEX}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fbthrift) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fbthrift) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # There should be no empty directories in vcpkg/packages/fbthrift_x64-linux 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/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 - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation + "${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/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" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation" ) vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN) vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 4e9237e2c5f6ed..d7869115b6a758 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,9 +1,10 @@ { "name": "fbthrift", - "version-string": "2021.06.14.00", + "version-string": "2022.01.31.00", + "port-version": 1, "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", - "supports": "x64", + "supports": "x64 & static", "dependencies": [ "boost-context", "boost-filesystem", @@ -17,6 +18,14 @@ "gflags", "glog", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "wangle", "zlib", "zstd" diff --git a/ports/ffmpeg/0004-fix-debug-build.patch b/ports/ffmpeg/0004-fix-debug-build.patch index f1ea01e6b513e5..513dc966bab960 100644 --- a/ports/ffmpeg/0004-fix-debug-build.patch +++ b/ports/ffmpeg/0004-fix-debug-build.patch @@ -12,22 +12,19 @@ index bd2de34..fba948a 100755 *) optname="${opt%%=*}" optname="${optname#--}" -@@ -6152,8 +6153,13 @@ +@@ -6152,7 +6153,11 @@ enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion || check_lib zlib zlib.h zlibVersion -lz; } -enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 --enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma +if enabled debug_configure; then + enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2d -+ enabled lzma && check_lib lzma lzma.h lzma_version_number -llzmad +else + enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 -+ enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma +fi + enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma # On some systems dynamic loading requires no extra linker flags - check_lib libdl dlfcn.h "dlopen dlsym" || check_lib libdl dlfcn.h "dlopen dlsym" -ldl @@ -6350,7 +6350,11 @@ enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8 enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init || diff --git a/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch b/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch index 7a0fb4bcacc7f6..f3c5bf04d6f51f 100644 --- a/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch +++ b/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch @@ -12,7 +12,7 @@ diff --git a/configure b/configure index ede8f9777b..b35728aace 100755 --- a/configure +++ b/configure -@@ -6535,11 +6535,9 @@ enabled libvpx && { +@@ -6535,11 +6535,8 @@ enabled libvpx && { enabled libwebp && { enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } @@ -22,8 +22,7 @@ index ede8f9777b..b35728aace 100755 - require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && - check_cpp_condition libx262 x264.h "X264_MPEG2" +enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && -+ require_cpp_condition libx264 x264.h "X264_BUILD >= 158" && -+ check_cpp_condition libx264 x264.h "X264_MPEG2" ++ require_cpp_condition libx264 x264.h "X264_BUILD >= 158" enabled libx265 && { check_pkg_config libx265 x265 x265.h x265_api_get || { { 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++"; } && diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 668f07e414874c..7a879dae1ad1f8 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -1,132 +1,3 @@ -#Check for unsupported features - -if("ffmpeg" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffmpeg' does not support 'uwp'") -endif() - -if("ffplay" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffplay' does not support 'uwp'") -endif() - -if("ffprobe" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffprobe' does not support 'uwp'") -endif() - - -if("aom" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'aom' does not support 'uwp | arm'") - endif() -endif() - -if("ass" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'ass' does not support 'uwp | arm'") - endif() -endif() - -if("avisynthplus" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (NOT VCPKG_TARGET_IS_WINDOWS) OR (VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | arm | uwp | static'") - endif() -endif() - -if("dav1d" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "Feature 'dav1d' does not support 'uwp | arm | x86 | osx'") - endif() -endif() - -if("fontconfig" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - message(FATAL_ERROR "Feature 'fontconfig' does not support 'uwp | arm | (windows & static)'") - endif() -endif() - -if("fribidi" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'fribidi' does not support 'uwp | arm'") - endif() -endif() - -if("ilbc" IN_LIST FEATURES) - if ((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'ilbc' does not support 'uwp & arm'") - endif() -endif() - -if("modplug" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'modplug' does not support 'uwp'") - endif() -endif() - -if("nvcodec" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR ((NOT VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_LINUX))) - message(FATAL_ERROR "Feature 'nvcodec' does not support '!(windows | linux) | uwp | arm'") - endif() -endif() - -if("opencl" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'opencl' does not support 'uwp'") -endif() - -if("opengl" IN_LIST FEATURES) - if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm)") - endif() -endif() - -if("openh264" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'openh264' does not support 'uwp'") -endif() - -if("sdl2" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "OSX" MESSAGE "Feature 'sdl2' does not support 'osx'") -endif() - -if("ssh" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature 'ssh' does not support 'uwp | arm | static'") - endif() -endif() - -if("tensorflow" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - message(FATAL_ERROR "Feature 'tensorflow' does not support 'x86 | arm | uwp | static'") - endif() -endif() - -if("tesseract" IN_LIST FEATURES) - if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature 'tesseract' does not support 'uwp | (windows & arm) | static'") - endif() -endif() - -if("wavpack" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - message(FATAL_ERROR "Feature 'wavpack' does not support 'arm'") - endif() -endif() - -if("x264" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - message(FATAL_ERROR "Feature 'x264' does not support 'arm'") - endif() -endif() - -if("x265" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'x265' does not support 'uwp | arm'") - endif() -endif() - -if("xml2" IN_LIST FEATURES) - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature 'xml2' does not support 'static'") - endif() -endif() - if(VCPKG_TARGET_IS_WINDOWS) set(PATCHES 0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch) # https://trac.ffmpeg.org/ticket/9019 endif() @@ -147,9 +18,9 @@ vcpkg_from_github( 0011-Fix-x265-detection.patch 0012-Fix-ssl-110-detection.patch 0013-define-WINVER.patch - 0014-avfilter-dependency-fix.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-February/275819.html + 0014-avfilter-dependency-fix.patch # https://ffmpeg.org/pipermail/ffmpeg-devel/2021-February/275819.html 0015-Fix-xml2-detection.patch - 0016-configure-dnn-needs-avformat.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html + 0016-configure-dnn-needs-avformat.patch # https://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html ${PATCHES} 0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch 0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch @@ -274,6 +145,10 @@ else() set(OPTIONS "${OPTIONS} --disable-ffprobe") endif() +if (NOT "alsa" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --disable-alsa") +endif() + if("avcodec" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-avcodec") set(ENABLE_AVCODEC ON) @@ -590,7 +465,7 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}") endforeach(GAS_PATH) - elseif(VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}") # VCPKG_TARGET_ARCHITECTURE = arm64 + elseif(VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") # get the number of architectures requested list(LENGTH VCPKG_OSX_ARCHITECTURES ARCHITECTURE_COUNT) @@ -618,7 +493,7 @@ if(VCPKG_TARGET_IS_UWP) set(OPTIONS_CROSS " --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}") endif() -set(OPTIONS_DEBUG "--debug") # Note: --disable-optimizations can't be used due to http://ffmpeg.org/pipermail/libav-user/2013-March/003945.html +set(OPTIONS_DEBUG "--debug") # Note: --disable-optimizations can't be used due to https://ffmpeg.org/pipermail/libav-user/2013-March/003945.html set(OPTIONS_RELEASE "") set(OPTIONS "${OPTIONS} ${OPTIONS_CROSS}") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index b0f9d372a08777..b217c8908d1a64 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,12 +1,13 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 1, + "port-version": 10, "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." ], "homepage": "https://ffmpeg.org", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", @@ -54,6 +55,7 @@ "vorbis", "vpx", "webp", + "xml2", "zlib" ] }, @@ -61,23 +63,23 @@ "name": "ffmpeg", "default-features": false, "features": [ - "sdl2" + "alsa" ], - "platform": "!osx" + "platform": "linux" }, { "name": "ffmpeg", "default-features": false, "features": [ - "modplug" + "sdl2" ], - "platform": "!uwp" + "platform": "!osx" }, { "name": "ffmpeg", "default-features": false, "features": [ - "opencl" + "ass" ], "platform": "!uwp" }, @@ -85,7 +87,7 @@ "name": "ffmpeg", "default-features": false, "features": [ - "openh264" + "fontconfig" ], "platform": "!uwp" }, @@ -93,81 +95,81 @@ "name": "ffmpeg", "default-features": false, "features": [ - "xml2" + "fribidi" ], - "platform": "!static" + "platform": "!uwp" }, { "name": "ffmpeg", "default-features": false, "features": [ - "ilbc" + "modplug" ], - "platform": "!(arm & uwp)" + "platform": "!uwp" }, { "name": "ffmpeg", "default-features": false, "features": [ - "aom" + "opencl" ], - "platform": "!(uwp | arm)" + "platform": "!uwp" }, { "name": "ffmpeg", "default-features": false, "features": [ - "ass" + "openh264" ], - "platform": "!(uwp | arm)" + "platform": "!uwp" }, { "name": "ffmpeg", "default-features": false, "features": [ - "fribidi" + "ilbc" ], - "platform": "!(uwp | arm)" + "platform": "!(arm & uwp)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "dav1d" + "ssh" ], - "platform": "!(uwp | arm | x86 | osx)" + "platform": "!(uwp | arm)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "ssh" + "tensorflow" ], - "platform": "!(uwp | arm) & !static" + "platform": "x64 & !static & !uwp" }, { "name": "ffmpeg", "default-features": false, "features": [ - "opengl" + "aom" ], - "platform": "!uwp & !(windows & arm)" + "platform": "!(windows & arm & !uwp)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "tensorflow" + "dav1d" ], - "platform": "!(x86 | arm | uwp) & !static" + "platform": "!(uwp | arm | x86 | osx)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "nvcodec" + "opengl" ], - "platform": "(windows | linux) & !uwp & !arm" + "platform": "!uwp & !(arm64 & windows)" }, { "name": "ffmpeg", @@ -175,15 +177,15 @@ "features": [ "tesseract" ], - "platform": "!uwp & !(windows & arm) & !static" + "platform": "!(windows & arm) & !static & !uwp" }, { "name": "ffmpeg", "default-features": false, "features": [ - "fontconfig" + "nvcodec" ], - "platform": "!(windows & static) & !(uwp | arm)" + "platform": "linux | (!osx & !uwp & !(arm64 & windows))" } ] }, @@ -203,17 +205,17 @@ "name": "ffmpeg", "default-features": false, "features": [ - "x264" + "x265" ], - "platform": "!arm" + "platform": "!(uwp | arm)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "x265" + "x264" ], - "platform": "!arm & !uwp" + "platform": "!(arm & windows)" }, { "name": "ffmpeg", @@ -240,6 +242,12 @@ } ] }, + "alsa": { + "description": "Enable ALSA support", + "dependencies": [ + "alsa" + ] + }, "aom": { "description": "AV1 video encoding/decoding via libaom support in ffmpeg", "dependencies": [ @@ -285,6 +293,7 @@ }, "avisynthplus": { "description": "Reading of AviSynth script files", + "supports": "windows & !static", "dependencies": [ "avisynthplus", { @@ -307,6 +316,7 @@ }, "dav1d": { "description": "AV1 decoding via libdav1d", + "supports": "!osx", "dependencies": [ "dav1d" ] @@ -332,6 +342,7 @@ }, "ffmpeg": { "description": "Build the ffmpeg application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -346,6 +357,7 @@ }, "ffplay": { "description": "Build the ffplay application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -363,6 +375,7 @@ }, "ffprobe": { "description": "Build the ffprobe application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -430,18 +443,21 @@ }, "nvcodec": { "description": "Nvidia video decoding/encoding acceleration", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))", "dependencies": [ "ffnvcodec" ] }, "opencl": { "description": "OpenCL processing", + "supports": "!uwp", "dependencies": [ "opencl" ] }, "opengl": { "description": "OpenGL rendering", + "supports": "!uwp", "dependencies": [ "opengl", "opengl-registry" @@ -546,12 +562,14 @@ }, "tensorflow": { "description": "TensorFlow as a DNN module backend for DNN based filters like sr", + "supports": "!static", "dependencies": [ "tensorflow" ] }, "tesseract": { "description": "Tesseract, needed for ocr filter", + "supports": "!static", "dependencies": [ "tesseract" ] diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index 7ef678a4b8095c..47418dc0ce0063 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,7 +1,8 @@ { "name": "ffnvcodec", "version": "11.1.5.0", + "port-version": 1, "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", - "supports": "(windows | linux) & !uwp" + "supports": "linux | (!osx & !uwp & !(arm64 & windows))" } diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 45a9052e727d1a..7d3c75f1900fbb 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -1,5 +1,5 @@ vcpkg_download_distfile(ARCHIVE - URLS "http://www.fftw.org/fftw-3.3.10.tar.gz" + URLS "https://www.fftw.org/fftw-3.3.10.tar.gz" FILENAME "fftw-3.3.10.tar.gz" SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 ) diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index 53d4932318f809..99fe9ed0905eee 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 2, + "port-version": 3, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "dependencies": [ diff --git a/ports/fftwpp/vcpkg.json b/ports/fftwpp/vcpkg.json index e702a1b933d0af..175e29ab34f354 100644 --- a/ports/fftwpp/vcpkg.json +++ b/ports/fftwpp/vcpkg.json @@ -1,8 +1,8 @@ { "name": "fftwpp", - "version-string": "2019-12-19", - "port-version": 1, - "description": "FFTW++ is a C++ header/MPI transpose for Version 3 of the highly optimized FFTW (http://www.fftw.org) Fourier Transform library.", + "version-date": "2019-12-19", + "port-version": 2, + "description": "FFTW++ is a C++ header/MPI transpose for Version 3 of the highly optimized FFTW (https://www.fftw.org) Fourier Transform library.", "homepage": "https://www.fftw.org/", "dependencies": [ "fftw3" diff --git a/ports/field3d/0001_fix_build_errors.patch b/ports/field3d/0001_fix_build_errors.patch deleted file mode 100644 index 95149e39d893fd..00000000000000 --- a/ports/field3d/0001_fix_build_errors.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1610c2e..b012008 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,25 +31,17 @@ - - # Author : Nicholas Yue yue.nicholas@gmail.com - --CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) -+CMAKE_MINIMUM_REQUIRED( VERSION 3.17 ) - - PROJECT ( field3d ) - - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake ) - - FIND_PACKAGE (Doxygen) --FIND_PACKAGE (HDF5 COMPONENTS C) --IF ( CMAKE_HOST_WIN32 ) --# f3dinfo relies on program_options but don't include it, since --# for some reason, unlike all the other boost components, a link is --# forced via a pragma. --FIND_PACKAGE (Boost COMPONENTS regex thread) --ELSE () --FIND_PACKAGE (Boost COMPONENTS regex thread program_options system) --FIND_PACKAGE (MPI) --ENDIF () -+FIND_PACKAGE (HDF5 COMPONENTS C REQUIRED) -+FIND_PACKAGE (Boost COMPONENTS regex thread program_options system REQUIRED) - --FIND_PACKAGE (ILMBase) -+FIND_PACKAGE (OpenEXR REQUIRED) - - # Allow the developer to select if Dynamic or Static libraries are built - OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON) -@@ -79,26 +71,14 @@ IF ( CMAKE_HOST_UNIX ) - ENDIF ( ) - IF ( CMAKE_HOST_WIN32 ) - ADD_DEFINITIONS ( -- -D_HAS_ITERATOR_DEBUGGING=0 - -D_CRT_SECURE_NO_WARNINGS=1 - ) - ENDIF ( ) - - SET ( LIB_TYPE SHARED ) - IF ( NOT BUILD_SHARED_LIBS ) -- IF ( CMAKE_HOST_WIN32 ) -- # User wants to build static libraries, so change the LIB_TYPE variable to CMake keyword 'STATIC' - SET ( LIB_TYPE STATIC ) - ADD_DEFINITIONS( -DFIELD3D_STATIC ) -- ENDIF() --ELSE () -- IF ( CMAKE_HOST_WIN32 ) -- ADD_DEFINITIONS ( -- -DOPENEXR_DLL -- -D_HDF5USEDLL_ -- -DHDF5CPP_USEDLL -- ) -- ENDIF() - ENDIF ( NOT BUILD_SHARED_LIBS ) - - ADD_LIBRARY ( Field3D ${LIB_TYPE} -@@ -147,24 +128,22 @@ IF ( CMAKE_HOST_UNIX ) - ${MPI_LIBRARIES} ) - ENDIF ( MPI_FOUND ) - LIST ( APPEND Field3D_Libraries_Shared -- Iex Half IlmThread Imath - pthread dl z ) - SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} ) - SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared} - ${Boost_LIBRARIES} ) - ENDIF ( ) - IF ( CMAKE_HOST_WIN32 ) -- # Add OpenEXR and zlib release/debug -- FOREACH ( lib Iex Half IlmThread Imath zdll ) -+ FOREACH ( lib zlib ) - LIST ( APPEND Field3D_Libraries_Shared - optimized ${lib} -- debug ${lib}_d ) -+ debug ${lib}d ) - ENDFOREACH() - SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} Shlwapi.lib) - SET ( Field3D_BIN_Libraries Field3D ${Boost_LIBRARIES} ) - ENDIF () - --TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES}) -+TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES} OpenEXR::IlmImf) - - # Parase version and soversion from export/ns.h - -@@ -214,33 +193,7 @@ ADD_EXECUTABLE ( f3dinfo - - TARGET_LINK_LIBRARIES ( f3dinfo ${Field3D_BIN_Libraries} ) - --# field3d - sparse_field_io --ADD_EXECUTABLE ( sparse_field_io -- apps/sample_code/sparse_field_io/main.cpp -- ) -- --TARGET_LINK_LIBRARIES ( sparse_field_io ${Field3D_BIN_Libraries} ) -- --# field3d - read --ADD_EXECUTABLE ( read -- apps/sample_code/read/main.cpp -- ) - --TARGET_LINK_LIBRARIES ( read ${Field3D_BIN_Libraries} ) -- --# field3d - mixed_types --ADD_EXECUTABLE ( mixed_types -- apps/sample_code/mixed_types/main.cpp -- ) -- --TARGET_LINK_LIBRARIES ( mixed_types ${Field3D_BIN_Libraries} ) -- --# field3d - create_and_write --ADD_EXECUTABLE ( create_and_write -- apps/sample_code/create_and_write/main.cpp -- ) -- --TARGET_LINK_LIBRARIES ( create_and_write ${Field3D_BIN_Libraries} ) - - IF (DOXYGEN_FOUND) - ADD_CUSTOM_TARGET ( doc -@@ -249,7 +202,7 @@ IF (DOXYGEN_FOUND) - WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} - ) - IF (INSTALL_DOCS) -- INSTALL (DIRECTORY -+ INSTALL (DIRECTORY - ${CMAKE_HOME_DIRECTORY}/docs - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) -@@ -263,12 +216,11 @@ INSTALL ( TARGETS - - FILE(GLOB Field3d_Includes "${CMAKE_CURRENT_SOURCE_DIR}/export/*.h") - --INSTALL ( FILES -- ${Field3d_Includes} -+INSTALL ( FILES -+ ${Field3d_Includes} - DESTINATION include/Field3D - ) - --INSTALL ( TARGETS f3dinfo -+INSTALL ( TARGETS f3dinfo - RUNTIME DESTINATION bin - ) -- diff --git a/ports/field3d/0002_improve_win_compatibility.patch b/ports/field3d/0002_improve_win_compatibility.patch deleted file mode 100644 index 08167be692f4c0..00000000000000 --- a/ports/field3d/0002_improve_win_compatibility.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/include/UtilFoundation.h b/include/UtilFoundation.h -index 2eb6290..a449b5b 100644 ---- a/include/UtilFoundation.h -+++ b/include/UtilFoundation.h -@@ -90,6 +90,9 @@ - #ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN - #endif -+#ifndef NOMINMAX -+#define NOMINMAX -+#endif - - // needed for mutex stuff - #include -diff --git a/src/FieldMapping.cpp b/src/FieldMapping.cpp -index b1f1a1f..90612b1 100644 ---- a/src/FieldMapping.cpp -+++ b/src/FieldMapping.cpp -@@ -49,9 +49,6 @@ - #include "FieldMapping.h" - #include "Types.h" - --#ifdef WIN32 --#define isnan(__x__) _isnan(__x__) --#endif - - //----------------------------------------------------------------------------// - -diff --git a/src/Log.cpp b/src/Log.cpp -index f78229c..d095a50 100644 ---- a/src/Log.cpp -+++ b/src/Log.cpp -@@ -40,8 +40,9 @@ - */ - - //----------------------------------------------------------------------------// -- -+#ifndef _WIN32 - #include -+#endif - #include - #include - diff --git a/ports/field3d/0003_hdf5_api.patch b/ports/field3d/0003_hdf5_api.patch deleted file mode 100644 index 183a49c9e6e071..00000000000000 --- a/ports/field3d/0003_hdf5_api.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b57057f..e809880 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,6 +35,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 3.17 ) - - PROJECT ( field3d ) - -+add_definitions(-DH5_USE_110_API) - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake ) - - FIND_PACKAGE (Doxygen) diff --git a/ports/field3d/portfile.cmake b/ports/field3d/portfile.cmake deleted file mode 100644 index a23e042494b94a..00000000000000 --- a/ports/field3d/portfile.cmake +++ /dev/null @@ -1,35 +0,0 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO imageworks/Field3D - REF 0cf75ad982917e0919f59e5cb3d483517d06d7da - SHA512 e6f137013dd7b64b51b2ec3cc3ed8f4dbfadb85858946f08393653d78136cf8f93ae124716db11358e325c5e64ba04802afd4b89ca36ad65a14dd3db17f3072c - HEAD_REF master - PATCHES - 0001_fix_build_errors.patch - 0002_improve_win_compatibility.patch - 0003_hdf5_api.patch # Switches the HDF5 default API for this port to 1.10 -) - -file(REMOVE ${SOURCE_PATH}/cmake/FindILMBase.cmake) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - "-DINSTALL_DOCS:BOOL=OFF" -) - -vcpkg_install_cmake() - -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(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/field3d/vcpkg.json b/ports/field3d/vcpkg.json deleted file mode 100644 index 21ca20bdc1e486..00000000000000 --- a/ports/field3d/vcpkg.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "field3d", - "version-string": "1.7.3", - "port-version": 2, - "description": "An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk.", - "homepage": "https://github.com/imageworks/Field3D", - "supports": "!uwp", - "dependencies": [ - "boost-foreach", - "boost-format", - "boost-program-options", - "boost-regex", - "boost-system", - "boost-test", - "boost-thread", - "boost-timer", - "hdf5", - "openexr" - ] -} diff --git a/ports/fizz/0001-fix-libsodium.patch b/ports/fizz/0001-fix-libsodium.patch new file mode 100644 index 00000000000000..45496421227c7d --- /dev/null +++ b/ports/fizz/0001-fix-libsodium.patch @@ -0,0 +1,35 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index bb3e15e5..80c5051e 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -64,7 +64,7 @@ endif() + + include(CheckAtomic) + +-find_package(Sodium REQUIRED) ++find_package(unofficial-sodium CONFIG REQUIRED) + + SET(FIZZ_SHINY_DEPENDENCIES "") + SET(FIZZ_LINK_LIBRARIES "") +@@ -255,7 +255,7 @@ target_link_libraries(fizz + PUBLIC + ${FOLLY_LIBRARIES} + ${OPENSSL_LIBRARIES} +- sodium ++ unofficial-sodium::sodium + Threads::Threads + ZLIB::ZLIB + ${ZSTD_LIBRARY} +diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in +index 679b0e61..b28750fa 100644 +--- a/fizz/cmake/fizz-config.cmake.in ++++ b/fizz/cmake/fizz-config.cmake.in +@@ -26,7 +26,7 @@ endif() + set(FIZZ_LIBRARIES fizz::fizz) + + include(CMakeFindDependencyMacro) +-find_dependency(Sodium) ++find_dependency(unofficial-sodium CONFIG REQUIRED) + find_dependency(folly CONFIG) + find_dependency(ZLIB) + diff --git a/ports/fizz/0002-fix-libevent.patch b/ports/fizz/0002-fix-libevent.patch new file mode 100644 index 00000000000000..b07161d95ac801 --- /dev/null +++ b/ports/fizz/0002-fix-libevent.patch @@ -0,0 +1,30 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index 80c5051..9f2e3e6 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -92,10 +92,10 @@ endif() + + find_package(ZLIB REQUIRED) + +-find_package(Libevent CONFIG QUIET) +-if(TARGET event) ++find_package(Libevent CONFIG REQUIRED) ++if(TARGET libevent::core) + message(STATUS "Found libevent from package config") +- list(APPEND FIZZ_SHINY_DEPENDENCIES event) ++ list(APPEND FIZZ_SHINY_DEPENDENCIES libevent::core) + else() + find_package(Libevent MODULE REQUIRED) + list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB}) +diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in +index b28750f..282c42d 100644 +--- a/fizz/cmake/fizz-config.cmake.in ++++ b/fizz/cmake/fizz-config.cmake.in +@@ -29,6 +29,7 @@ include(CMakeFindDependencyMacro) + find_dependency(unofficial-sodium CONFIG REQUIRED) + find_dependency(folly CONFIG) + find_dependency(ZLIB) ++find_dependency(Libevent CONFIG) + + if (NOT fizz_FIND_QUIETLY) + message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}") diff --git a/ports/fizz/fix-zlib.patch b/ports/fizz/fix-zlib.patch deleted file mode 100644 index 88b6fabe9d727d..00000000000000 --- a/ports/fizz/fix-zlib.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt -index 485e38fc..471d61a5 100644 ---- a/fizz/CMakeLists.txt -+++ b/fizz/CMakeLists.txt -@@ -87,6 +87,8 @@ else() - list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR}) - endif() - -+find_package(ZLIB REQUIRED) -+ - find_package(Libevent CONFIG QUIET) - if(TARGET event) - message(STATUS "Found libevent from package config") -@@ -246,6 +248,7 @@ target_link_libraries(fizz - ${OPENSSL_LIBRARIES} - sodium - Threads::Threads -+ ZLIB::ZLIB - PRIVATE - ${GLOG_LIBRARIES} - ${GFLAGS_LIBRARIES} -diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in -index d9918469..679b0e61 100644 ---- a/fizz/cmake/fizz-config.cmake.in -+++ b/fizz/cmake/fizz-config.cmake.in -@@ -25,7 +25,10 @@ endif() - - set(FIZZ_LIBRARIES fizz::fizz) - -+include(CMakeFindDependencyMacro) - find_dependency(Sodium) -+find_dependency(folly CONFIG) -+find_dependency(ZLIB) - - if (NOT fizz_FIND_QUIETLY) - message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}") diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 8af6d336fdc7d8..bf0eb4a468b325 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -3,38 +3,38 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz - REF v2021.06.14.00 - SHA512 ff55f933d55031128b5355707fd025649ad90d261d91ec5f9d793433a77e63d3c2527a7f0111d6a3151667ab29f4117f96a505bcb80c1a4a99bd60346f05f4de + REF v2022.01.31.00 + SHA512 544f843f47cb6113d0ad804079e6d767f33723d9d529c2751c5c6317d65c35bd327b43852904b2a37c2af615276176fe2de667907a9a460c0dfc7593eca46459 HEAD_REF master PATCHES - fix-zlib.patch + 0001-fix-libsodium.patch + 0002-fix-libevent.patch ) # Prefer installed config files file(REMOVE + ${SOURCE_PATH}/fizz/cmake/FindGMock.cmake ${SOURCE_PATH}/fizz/cmake/FindGflags.cmake ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake + ${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/fizz" - PREFER_NINJA OPTIONS -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DINCLUDE_INSTALL_DIR:STRING=include ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fizz) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fizz) vcpkg_copy_pdbs() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake" "lib/cmake/fizz" "share/fizz") -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/fizz/tool/test" "${CURRENT_PACKAGES_DIR}/include/fizz/util/test") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index efc70e89783540..3688b945eb5f49 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,13 +1,24 @@ { "name": "fizz", - "version-string": "2021.06.14.00", + "version-string": "2022.01.31.00", + "port-version": 1, "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "dependencies": [ + "double-conversion", "fmt", "folly", + "libevent", "libsodium", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zstd" ] } diff --git a/ports/flann/fix-build-error.patch b/ports/flann/fix-build-error.patch index 4f48aee556607a..5b5530eb0d73f3 100644 --- a/ports/flann/fix-build-error.patch +++ b/ports/flann/fix-build-error.patch @@ -23,12 +23,12 @@ index f4b94d2..33b2c26 100644 # set output path for tests set(TEST_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/test) -+option(BUILD_DYNAMIC "Build shared version of libs" ON) -+option(BUILD_STATIC "Build static version of libs" ON) ++option(BUILD_SHARED_LIBS "Build shared version of libs" ON) ++option(WITH_HDF5 "Build hdf5 library" OFF) option(BUILD_C_BINDINGS "Build C bindings" ON) option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON) option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON) -@@ -146,8 +148,8 @@ if (BUILD_CUDA_LIB) +@@ -146,8 +148,9 @@ if (BUILD_CUDA_LIB) endif(CUDA_FOUND) endif(BUILD_CUDA_LIB) @@ -36,6 +36,7 @@ index f4b94d2..33b2c26 100644 -pkg_check_modules(LZ4 REQUIRED liblz4) +find_package(PkgConfig) +find_package(lz4 CONFIG REQUIRED) ++set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} liblz4") #set the C/C++ include path to the "include" directory include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp) @@ -43,13 +44,14 @@ diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in index 6b95a71..e8bb3f7 100644 --- a/cmake/Config.cmake.in +++ b/cmake/Config.cmake.in -@@ -1,5 +1,10 @@ +@@ -1,5 +1,11 @@ @PACKAGE_INIT@ +# Get definition of 'find_dependency' macro +include(CMakeFindDependencyMacro) +# Find lz4. This will create 'lz4::lz4' target +find_dependency(lz4) ++@CMAKE_EXTERNAL_DEPS@ + include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") check_required_components("flann") @@ -85,7 +87,7 @@ index b421abb..474cd7e 100644 - add_library(flann_cpp SHARED "") - set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) -+if(BUILD_STATIC) ++if(NOT BUILD_SHARED_LIBS) + add_library(flann_cpp_s STATIC ${CPP_SOURCES}) + target_link_libraries(flann_cpp_s PUBLIC lz4::lz4) + set_property(TARGET flann_cpp_s PROPERTY OUTPUT_NAME flann_cpp) @@ -103,7 +105,7 @@ index b421abb..474cd7e 100644 - if (BUILD_CUDA_LIB) - cuda_add_library(flann_cuda SHARED "") -+if(BUILD_DYNAMIC) ++if(BUILD_SHARED_LIBS) + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) + add_library(flann_cpp SHARED ${CPP_SOURCES}) + set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) @@ -170,7 +172,7 @@ index b421abb..474cd7e 100644 if (USE_MPI AND HDF5_IS_PARALLEL) - add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp) - target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) -+ if(BUILD_DYNAMIC) ++ if(BUILD_SHARED_LIBS) + add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp) + target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) @@ -188,7 +190,7 @@ index b421abb..474cd7e 100644 - if (BUILD_C_BINDINGS) -+ if(BUILD_STATIC) ++ if(NOT BUILD_SHARED_LIBS) add_library(flann_s STATIC ${C_SOURCES}) - target_link_libraries(flann_s -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + target_link_libraries(flann_s PUBLIC lz4::lz4) @@ -200,7 +202,7 @@ index b421abb..474cd7e 100644 - + endif() + -+ if(BUILD_DYNAMIC) ++ if(BUILD_SHARED_LIBS) if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) - add_library(flann SHARED "") + add_library(flann SHARED ${C_SOURCES}) @@ -236,12 +238,12 @@ index b421abb..474cd7e 100644 + endif() endif(WIN32) -+if(BUILD_STATIC) ++if(NOT BUILD_SHARED_LIBS) + list(APPEND FLANN_TARGETS_CPP "flann_cpp_s") + list(APPEND FLANN_TARGETS_C "flann_s") + list(APPEND FLANN_TARGETS_CUDA "flann_cuda_s") +endif() -+if(BUILD_DYNAMIC) ++if(BUILD_SHARED_LIBS) + list(APPEND FLANN_TARGETS_CPP "flann_cpp") + list(APPEND FLANN_TARGETS_C "flann") + list(APPEND FLANN_TARGETS_CUDA "flann_cuda") diff --git a/ports/flann/fix-dependency-hdf5.patch b/ports/flann/fix-dependency-hdf5.patch index 39df0a31302a63..1d5e6ee01e6269 100644 --- a/ports/flann/fix-dependency-hdf5.patch +++ b/ports/flann/fix-dependency-hdf5.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ff331a..155cabe 100644 +index 9f1dbcb74..5587c896e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -75,11 +75,17 @@ if (NOT PYTHON_EXECUTABLE) +@@ -77,11 +77,19 @@ if (NOT PYTHON_EXECUTABLE) endif() endif() +-find_hdf5() +if (WITH_HDF5) - find_hdf5() --if (NOT HDF5_FOUND) ++find_package(HDF5 CONFIG REQUIRED) + if (NOT HDF5_FOUND) - message(WARNING "hdf5 library not found, some tests will not be run") -+if (NOT hdf5_FOUND) + message(ERROR "hdf5 library not found") else() - include_directories(${HDF5_INCLUDE_DIR}) @@ -19,10 +19,13 @@ index 7ff331a..155cabe 100644 + elseif (TARGET hdf5::hdf5-static) + link_libraries(hdf5::hdf5-static) + endif() ++ set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} hdf5") ++ set(CMAKE_EXTERNAL_DEPS "find_dependency(HDF5)") +endif() endif() if (USE_MPI OR HDF5_IS_PARALLEL) + diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake index 8aef8e0..747414f 100644 --- a/cmake/flann_utils.cmake diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index 4c15477150e0e3..ce9bb2d3bc0de5 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -14,31 +14,24 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES hdf5 WITH_HDF5 - cuda WITH_CUDA + cuda BUILD_CUDA_LIB ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLANN_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLANN_BUILD_DYNAMIC) - -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} - -DBUILD_DYNAMIC=${FLANN_BUILD_DYNAMIC} - -DBUILD_STATIC=${FLANN_BUILD_STATIC} - -DBUILD_CUDA_LIB=${WITH_CUDA} -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_DOC=OFF -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_MATLAB_BINDINGS=OFF + OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d - -DHDF5_NO_FIND_PACKAGE_CONFIG_FILE=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/flann/vcpkg.json b/ports/flann/vcpkg.json index 0074e93dc6ef36..782fb321b00d64 100644 --- a/ports/flann/vcpkg.json +++ b/ports/flann/vcpkg.json @@ -1,11 +1,20 @@ { "name": "flann", "version-date": "2019-04-07", - "port-version": 3, + "port-version": 5, "description": "Fast Library for Approximate Nearest Neighbors", "homepage": "https://github.com/mariusmuja/flann", + "license": "BSD-3-Clause", "dependencies": [ - "lz4" + "lz4", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cuda": { diff --git a/ports/flash-runtime-extensions/README.md b/ports/flash-runtime-extensions/README.md new file mode 100644 index 00000000000000..6915690e59fd6f --- /dev/null +++ b/ports/flash-runtime-extensions/README.md @@ -0,0 +1,2 @@ +# flash-runtime-extensions +CMake port of FlashRuntimeExtensions for vcpkg diff --git a/ports/flash-runtime-extensions/portfile.cmake b/ports/flash-runtime-extensions/portfile.cmake new file mode 100644 index 00000000000000..9275d347c0cca7 --- /dev/null +++ b/ports/flash-runtime-extensions/portfile.cmake @@ -0,0 +1,23 @@ +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO al-sabr/FlashRuntimeExtensions + REF v2.4 + SHA512 16db340a9c8d868c64b9771e3ac9a20e775fa145f36158e798733b788fd99d1ac101bfae93b8f88b0e5a0a530e0261c1fbdf7d367031dd3108c14ee00a106c10 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") \ No newline at end of file diff --git a/ports/flash-runtime-extensions/vcpkg.json b/ports/flash-runtime-extensions/vcpkg.json new file mode 100644 index 00000000000000..0fdd91d7371b7c --- /dev/null +++ b/ports/flash-runtime-extensions/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "flash-runtime-extensions", + "version": "2.4", + "port-version": 1, + "description": "Adobe AIR Native Extension API for Windows/MacOS/Linux", + "homepage": "https://github.com/al-sabr/FlashRuntimeExtensions", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index e0feff81b6aeeb..5b879ad031cfb6 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -12,39 +12,40 @@ vcpkg_from_github( fix-uwp-build.patch ) -set(OPTIONS) -if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_IOS) - list(APPEND OPTIONS -DFLATBUFFERS_BUILD_FLATC=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF) +set(options "") +if(VCPKG_CROSSCOMPILING) + list(APPEND options -DFLATBUFFERS_BUILD_FLATC=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_BUILD_GRPCTEST=OFF - ${OPTIONS} + ${options} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/flatbuffers) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/flatbuffers) +vcpkg_fixup_pkgconfig() file(GLOB flatc_path ${CURRENT_PACKAGES_DIR}/bin/flatc*) if(flatc_path) - make_directory(${CURRENT_PACKAGES_DIR}/tools/flatbuffers) + make_directory("${CURRENT_PACKAGES_DIR}/tools/flatbuffers") get_filename_component(flatc_executable ${flatc_path} NAME) file( RENAME ${flatc_path} ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable} ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/flatbuffers") +else() + file(APPEND "${CURRENT_PACKAGES_DIR}/share/flatbuffers/FlatbuffersConfig.cmake" +"include(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/flatbuffers/vcpkg.json b/ports/flatbuffers/vcpkg.json index 911c5f189cb341..8eceb524c5dad6 100644 --- a/ports/flatbuffers/vcpkg.json +++ b/ports/flatbuffers/vcpkg.json @@ -1,10 +1,24 @@ { "name": "flatbuffers", - "version-string": "2.0.0", - "port-version": 2, + "version": "2.0.0", + "port-version": 3, "description": [ "Memory Efficient Serialization Library", "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility." ], - "homepage": "https://google.github.io/flatbuffers/" + "homepage": "https://google.github.io/flatbuffers/", + "dependencies": [ + { + "name": "flatbuffers", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/flint/portfile.cmake b/ports/flint/portfile.cmake index 1f78e896ae0789..cd8c8ed0366954 100644 --- a/ports/flint/portfile.cmake +++ b/ports/flint/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(FLINT_VERSION 2.8.0) set(FLINT_HASH "916285d13a55d12a041236195a9d7bbc5c1c3c30c3aa2f169efee6063b800d34f96ad3235f1c77285b04305ce685e5890169c984108d50d0c9ee7a77c3f6e73d") @@ -23,7 +21,7 @@ vcpkg_cmake_configure( OPTIONS -DPYTHON_EXECUTABLE=${PYTHON3} -DWITH_NTL=OFF - -DWITH_CBLAS=OFF + -DWITH_CBLAS=OFF ) vcpkg_cmake_install() @@ -36,4 +34,4 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) ) endif() -file(INSTALL "${SOURCE_PATH}/gpl-2.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/gpl-2.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/flint/vcpkg.json b/ports/flint/vcpkg.json index 533818fe55bbe2..9c85c6007f95a0 100644 --- a/ports/flint/vcpkg.json +++ b/ports/flint/vcpkg.json @@ -1,6 +1,7 @@ { "name": "flint", "version-semver": "2.8.0", + "port-version": 1, "description": "Fast Library for Number Theory", "homepage": "https://www.flintlib.org/", "supports": "!uwp", diff --git a/ports/fltk/fltk_version.dat b/ports/fltk/fltk_version.dat deleted file mode 100644 index 8ed486ab78b528..00000000000000 --- a/ports/fltk/fltk_version.dat +++ /dev/null @@ -1 +0,0 @@ -1.3.7 \ No newline at end of file diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index 9a32c019e3c0df..c9244652973ac7 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -1,13 +1,11 @@ # FLTK has many improperly shared global variables that get duplicated into every DLL vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fltk/fltk - REF release-1.3.7 - SHA512 aad131027e88fac3fe73d7e0abfc2602cdc195388f14b29b58d654cb49b780e6ff2ef4270935730b45cd3d366f9e8c8fa3c27a4f17b1f6e8c8fd1f9a0a73c308 + REF release-1.3.8 + SHA512 197848d3b80a65cca936daf4f0b74609f0fe8332a4cd11af53385fb2aa45ad698b1e239a48732b118cd3cb189bc531711b72fb2eeeb85be887dc6c5a558fa4b3 PATCHES findlibsfix.patch config-path.patch @@ -15,19 +13,14 @@ vcpkg_from_github( fix-system-link.patch ) -# Remove these 2 lines when the next update -file(COPY ${CMAKE_CURRENT_LIST_DIR}/fltk_version.dat DESTINATION ${SOURCE_PATH}) -file(REMOVE ${SOURCE_PATH}/VERSION) - if (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") set(OPTION_USE_GL "-DOPTION_USE_GL=OFF") else() set(OPTION_USE_GL "-DOPTION_USE_GL=ON") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFLTK_BUILD_TEST=OFF -DOPTION_LARGE_FILE=ON @@ -40,40 +33,43 @@ vcpkg_configure_cmake( ${OPTION_USE_GL} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/fltk) +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_OSX) vcpkg_copy_tools(TOOL_NAMES fluid.app fltk-config AUTO_CLEAN) elseif(VCPKG_TARGET_IS_WINDOWS) - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fltk-config ${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config) + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config") vcpkg_copy_tools(TOOL_NAMES fluid AUTO_CLEAN) else() vcpkg_copy_tools(TOOL_NAMES fluid fltk-config AUTO_CLEAN) endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/fltk/fltk-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/fltk/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/bin - ${CURRENT_PACKAGES_DIR}/bin + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" ) endif() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) foreach(FILE Fl_Export.H fl_utf8.h) - file(READ ${CURRENT_PACKAGES_DIR}/include/FL/${FILE} FLTK_HEADER) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - string(REPLACE "defined(FL_DLL)" "0" FLTK_HEADER "${FLTK_HEADER}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FL/${FILE}" "defined(FL_DLL)" "0") else() - string(REPLACE "defined(FL_DLL)" "1" FLTK_HEADER "${FLTK_HEADER}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FL/${FILE}" "defined(FL_DLL)" "1") endif() - file(WRITE ${CURRENT_PACKAGES_DIR}/include/FL/${FILE} "${FLTK_HEADER}") endforeach() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fltk/UseFLTK.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel;${SOURCE_PATH}" [[${CMAKE_CURRENT_LIST_DIR}/../../include]]) + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json index 0dcc3f21e4f099..cdcd1134aa0f10 100644 --- a/ports/fltk/vcpkg.json +++ b/ports/fltk/vcpkg.json @@ -1,11 +1,21 @@ { "name": "fltk", - "version": "1.3.7", + "version": "1.3.8", + "port-version": 1, "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.", "homepage": "https://www.fltk.org/", + "supports": "!uwp", "dependencies": [ "libjpeg-turbo", "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/fluidsynth/fix-dependencies.patch b/ports/fluidsynth/fix-dependencies.patch new file mode 100644 index 00000000000000..fd2e94824a2bd9 --- /dev/null +++ b/ports/fluidsynth/fix-dependencies.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4ea71c..df37028 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -517,8 +517,9 @@ else(NOT enable-pkgconfig) + find_package ( PkgConfig REQUIRED ) + + # Mandatory libraries: glib and gthread +- pkg_check_modules ( GLIB REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 ) ++ pkg_check_modules ( GLIB IMPORTED_TARGET REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 ) + list( APPEND PC_REQUIRES_PRIV "glib-2.0" "gthread-2.0") ++ set(GLIB_LIBRARIES PkgConfig::GLIB) + + if ( GLIB_glib-2.0_VERSION AND GLIB_glib-2.0_VERSION VERSION_LESS "2.26.0" ) + message ( WARNING "Your version of glib is very old. This may cause problems with fluidsynth's sample cache on Windows. Consider updating to glib 2.26 or newer!" ) diff --git a/ports/fluidsynth/force-x86-gentables.patch b/ports/fluidsynth/force-x86-gentables.patch deleted file mode 100644 index 7f909ec510d36c..00000000000000 --- a/ports/fluidsynth/force-x86-gentables.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 356bb73..b4c43d7 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -410,14 +410,23 @@ set (GENTAB_BDIR ${CMAKE_CURRENT_BINARY_DIR}/gentables) - # To fix cross-compiling fluidsynth from Win32 to ARM (using vcpkg), we need to pass the current generator - # on to the external project, otherwise (for some unknown reason) the target compiler will be used rather - # than the host compiler. --ExternalProject_Add(gentables -- DOWNLOAD_COMMAND "" -- SOURCE_DIR ${GENTAB_SDIR} -- BINARY_DIR ${GENTAB_BDIR} -- CONFIGURE_COMMAND -- "${CMAKE_COMMAND}" -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} -G "${CMAKE_GENERATOR}" -B "${GENTAB_BDIR}" "${GENTAB_SDIR}" -- BUILD_COMMAND -- "${CMAKE_COMMAND}" --build "${GENTAB_BDIR}" -- INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/" --) -+if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) -+ ExternalProject_Add(gentables -+ DOWNLOAD_COMMAND "" -+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables -+ BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gentables -+ CONFIGURE_COMMAND -+ "${CMAKE_COMMAND}" "${CMAKE_CURRENT_SOURCE_DIR}/gentables" -G "${CMAKE_GENERATOR}" -A Win32 -B "${CMAKE_CURRENT_BINARY_DIR}/gentables" -+ BUILD_COMMAND -+ "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/gentables" -+ INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentables/make_tables.exe "${CMAKE_BINARY_DIR}/" -+ ) -+else() -+ ExternalProject_Add(gentables -+ DOWNLOAD_COMMAND "" -+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables -+ BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gentables -+ INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentables/make_tables.exe "${CMAKE_BINARY_DIR}/" -+ ) -+endif() - add_dependencies(libfluidsynth-OBJ gentables) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index a92c17268b56fc..d237b8d4a30e46 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -1,42 +1,68 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth - REF 90a6c52e1c347d1c4283b0de9f860ed2fbc413bc #v2.2.1 - SHA512 311a078e95204baf9b348fb8c83370003982fad59553de945437fec7647c9237dd4382f9f8f70080ed472745c66fe528764cd898581d628ab4422427c3d58b3a + REF 6c807bdd37748411801e93c48fcd5789d5a6a278 #v2.2.4 + SHA512 5fab3b4d58fa47825cf6afc816828fb57879523b8d7659fb20deacdf5439e74fd4b0f2b3f03a8db89cc4106b3b36f2ec450a858e02af30245b6413db70060a11 HEAD_REF master PATCHES - force-x86-gentables.patch + fix-dependencies.patch + separate-gentables.patch ) +if ("buildtools" IN_LIST FEATURES) + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src/gentables" + LOGFILE_BASE configure-tools + ) + + vcpkg_cmake_build( + LOGFILE_BASE install-tools + TARGET install + ) + + vcpkg_copy_tools(TOOL_NAMES make_tables AUTO_CLEAN) + + vcpkg_add_to_path(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() + set(feature_list dbus jack libinstpatch libsndfile midishare opensles oboe oss sdl2 pulseaudio readline lash alsa systemd coreaudio coremidi dart) -set(FEATURE_OPTIONS) +vcpkg_list(SET FEATURE_OPTIONS) foreach(_feature IN LISTS feature_list) list(APPEND FEATURE_OPTIONS -Denable-${_feature}:BOOL=OFF) endforeach() +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") + vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} -DLIB_INSTALL_DIR=lib + -Denable-pkgconfig=ON + -Denable-framework=OFF # Needs system permission to install framework OPTIONS_DEBUG -Denable-debug:BOOL=ON + MAYBE_UNUSED_VARIABLES + enable-coreaudio + enable-coremidi + enable-dart ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() # Copy fluidsynth.exe to tools dir vcpkg_copy_tools(TOOL_NAMES fluidsynth AUTO_CLEAN) # Remove unnecessary files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") 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() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fluidsynth/separate-gentables.patch b/ports/fluidsynth/separate-gentables.patch new file mode 100644 index 00000000000000..3c018110a78d2b --- /dev/null +++ b/ports/fluidsynth/separate-gentables.patch @@ -0,0 +1,46 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e913cb2..570207e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -268,6 +268,9 @@ generate_product_version( + ) + endif ( WIN32 ) + ++find_program(GENTABLES make_tables REQUIRED) ++execute_process(COMMAND ${GENTABLES} "${CMAKE_BINARY_DIR}/") ++ + add_library ( libfluidsynth-OBJ OBJECT + ${config_SOURCES} + ${fluid_alsa_SOURCES} +@@ -413,6 +416,7 @@ else ( MACOSX_FRAMEWORK ) + install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} ) + endif ( MACOSX_FRAMEWORK ) + ++if (0) + # ******* Auto Generated Lookup Tables ****** + + include(ExternalProject) +@@ -435,3 +439,4 @@ ExternalProject_Add(gentables + INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/" + ) + add_dependencies(libfluidsynth-OBJ gentables) ++endif() +diff --git a/src/gentables/CMakeLists.txt b/src/gentables/CMakeLists.txt +index 638f299..e834e34 100644 +--- a/src/gentables/CMakeLists.txt ++++ b/src/gentables/CMakeLists.txt +@@ -15,7 +15,6 @@ project (gentables C) + set ( CMAKE_BUILD_TYPE Debug ) + + # hardcode ".exe" as suffix to the binary, else in case of cross-platform cross-compiling the calling cmake will not know the suffix used here and fail to find the binary +-set ( CMAKE_EXECUTABLE_SUFFIX ".exe" ) + + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}) +@@ -34,3 +33,5 @@ if ( WIN32 ) + else ( WIN32 ) + target_link_libraries (make_tables "m") + endif () ++ ++install(TARGETS make_tables DESTINATION bin) +\ No newline at end of file diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index c248a67cce37e0..19da38b9419270 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,10 +1,26 @@ { "name": "fluidsynth", - "version": "2.2.1", + "version": "2.2.4", "port-version": 1, "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", "dependencies": [ - "glib" - ] + { + "name": "fluidsynth", + "host": true, + "features": [ + "buildtools" + ] + }, + "glib", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "buildtools": { + "description": "Build tools gentables" + } + } } diff --git a/ports/fmt/fix-invalid-command.patch b/ports/fmt/fix-invalid-command.patch new file mode 100644 index 00000000000000..c554188bddf62a --- /dev/null +++ b/ports/fmt/fix-invalid-command.patch @@ -0,0 +1,11 @@ +diff --git a/include/fmt/locale.h b/include/fmt/locale.h +index 7571b52..0a34eb4 100644 +--- a/include/fmt/locale.h ++++ b/include/fmt/locale.h +@@ -1,2 +1,6 @@ + #include "xchar.h" ++#ifdef _WIN32 ++#pragma message ("fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead") ++#else + #warning fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead ++#endif diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 39208f6fb544a2..10362875e530c7 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF d141cdbeb0fb422a3fb7173b285fd38e0d1772dc # v8.0.1 - SHA512 1171f0305bed07497d2957b4053e8802030f448921c5bc1b066345dc1e77fbdb96d2c7f323452a32278ae4adb01e69e80b816119b0821e37d50980800e7406f8 + REF 8.1.1 + SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189 HEAD_REF master PATCHES fix-write-batch.patch + fix-invalid-command.patch ) vcpkg_cmake_configure( diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index 67e7d2041a63d0..7386b40b6620d9 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fmt", - "version-semver": "8.0.1", + "version": "8.1.1", + "port-version": 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", "dependencies": [ diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 0d195a0552a1ce..be3a59bf4866c7 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -1,9 +1,3 @@ -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm" "arm64") -else() - vcpkg_fail_port_install(ON_ARCH "x86" "arm") -endif() - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Required to run build/generate_escape_tables.py et al. @@ -14,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2021.06.14.00 - SHA512 aee5adc1a44d9b193f3f41b5fc9fa7575c677d8bf27ed3a3b612a2fbe53505f82481ce78f13fb41ae3ca81ca25446426fbdfdc578f503f919b4af5abe56ad71c + REF v2022.01.31.00 + SHA512 fef065c8a879e5b80eb521eaa09d2ac4eb22563e759834e60f665f07df5c2863c76217798680381bc51fad8c44f4b5d5abfb924a94c89635a41708abf6d70133 HEAD_REF main PATCHES reorder-glog-gflags.patch @@ -25,11 +19,11 @@ vcpkg_from_github( ) file(COPY - ${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake - ${CMAKE_CURRENT_LIST_DIR}/FindSnappy.cmake - DESTINATION ${SOURCE_PATH}/CMake/ + "${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake" + "${CMAKE_CURRENT_LIST_DIR}/FindSnappy.cmake" + DESTINATION "${SOURCE_PATH}/CMake/" ) -file(REMOVE ${SOURCE_PATH}/CMake/FindGFlags.cmake) +file(REMOVE "${SOURCE_PATH}/CMake/FindGFlags.cmake") if(VCPKG_CRT_LINKAGE STREQUAL static) set(MSVC_USE_STATIC_RUNTIME ON) @@ -54,9 +48,8 @@ feature(lz4 LZ4) feature(zstd Zstd) feature(snappy Snappy) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DMSVC_USE_STATIC_RUNTIME=${MSVC_USE_STATIC_RUNTIME} -DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON @@ -69,23 +62,23 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() # Release folly-targets.cmake does not link to the right libraries in debug mode. # We substitute with generator expressions so that the right libraries are linked for debug and release. set(FOLLY_TARGETS_CMAKE "${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake") FILE(READ ${FOLLY_TARGETS_CMAKE} _contents) -string(REPLACE "\${_IMPORT_PREFIX}/lib/zlib.lib" "ZLIB::ZLIB" _contents "${_contents}") -STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") -STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") +string(REPLACE "\${VCPKG_IMPORT_PREFIX}/lib/zlib.lib" "ZLIB::ZLIB" _contents "${_contents}") +STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/lib/" "\${VCPKG_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") +STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/debug/lib/" "\${VCPKG_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") string(REPLACE "-vc140-mt.lib" "-vc140-mt\$<\$:-gd>.lib" _contents "${_contents}") FILE(WRITE ${FOLLY_TARGETS_CMAKE} "${_contents}") -FILE(READ ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake _contents) -FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake +FILE(READ "${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake" _contents) +FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake" "include(CMakeFindDependencyMacro) find_dependency(Threads) find_dependency(glog CONFIG) @@ -93,9 +86,9 @@ find_dependency(gflags CONFIG REQUIRED) find_dependency(ZLIB) ${_contents}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 64d892bf556549..9c5c1941625b7e 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,10 +1,11 @@ { "name": "folly", - "version-string": "2021.06.14.00", - "port-version": 3, + "version-string": "2022.01.31.00", + "port-version": 1, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", - "supports": "x64 | (arm64 & !windows)", + "license": "Apache-2.0", + "supports": "(windows & x64 & !uwp) | (!windows & (x64 | arm64))", "dependencies": [ "boost-chrono", "boost-context", @@ -23,7 +24,15 @@ "gflags", "glog", "libevent", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "zlib" diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index b074cdc529682a..887846569ac269 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -67,7 +67,7 @@ file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share # Build the fontconfig cache -if(NOT VCPKG_TARGET_IS_WINDOWS) +if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_CROSSCOMPILING) set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts") set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf") vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index a383d2c24e7426..9d260f08db1052 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fontconfig", "version": "2.13.94", - "port-version": 3, + "port-version": 5, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "dependencies": [ @@ -15,6 +15,10 @@ "name": "libuuid", "platform": "!windows & !osx & !mingw" }, - "pthread" + "pthread", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/foxi/portfile.cmake b/ports/foxi/portfile.cmake new file mode 100644 index 00000000000000..5517378b896a24 --- /dev/null +++ b/ports/foxi/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO houseroad/foxi + REF c278588e34e535f0bb8f00df3880d26928038cad + SHA512 ad42cfd70e40ba0f0a9187b34ae9e3bd361c8c0038669f4c1591c4f7421d12ad93f76f42b33c2575eea1a3ddb3ff781da2895cdc636df5b60422598f450203c7 + PATCHES + remove-test-targets.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) diff --git a/ports/foxi/remove-test-targets.patch b/ports/foxi/remove-test-targets.patch new file mode 100644 index 00000000000000..9e53390bad1187 --- /dev/null +++ b/ports/foxi/remove-test-targets.patch @@ -0,0 +1,60 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b406d0f..c5d04d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ if(MSVC) + add_msvc_runtime_flag(foxi_loader) + endif() + +-if (NOT ANDROID AND NOT IOS) ++if (FALSE) + # ---[ FOXI wrapper + add_library(foxi_wrapper MODULE foxi/onnxifi_wrapper.c) + target_include_directories(foxi_wrapper PRIVATE +@@ -93,17 +93,6 @@ if (NOT ANDROID AND NOT IOS) + endif() + endif() + +-# ---[ FOXI dummy backend +-add_library(foxi_dummy SHARED foxi/onnxifi_dummy.c) +-target_include_directories(foxi_dummy PRIVATE +- $ +- $) +-target_link_libraries(foxi_dummy PUBLIC foxi ${CMAKE_DL_LIBS}) +-target_compile_definitions(foxi_dummy PRIVATE ONNXIFI_BUILD_LIBRARY=TRUE) +-if(MSVC) +- add_msvc_runtime_flag(foxi_dummy) +-endif() +- + install(DIRECTORY ${FOXI_ROOT}/foxi + DESTINATION include + FILES_MATCHING +@@ -114,10 +103,10 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/foxi + PATTERN "*.h") + + install(TARGETS +- foxi foxi_dummy foxi_loader ++ foxi_loader + EXPORT ONNXTargets DESTINATION lib) + +-if(NOT ANDROID AND NOT IOS) ++if(FALSE) + install(TARGETS foxi_wrapper + EXPORT ONNXTargets DESTINATION lib) + endif() + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5d04d5..cc7d18a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -61,9 +61,6 @@ set_target_properties(foxi_loader + C_EXTENSIONS + NO) + target_link_libraries(foxi_loader PUBLIC foxi ${CMAKE_DL_LIBS}) +-if(MSVC) +- add_msvc_runtime_flag(foxi_loader) +-endif() + + if (FALSE) + # ---[ FOXI wrapper + diff --git a/ports/foxi/vcpkg.json b/ports/foxi/vcpkg.json new file mode 100644 index 00000000000000..4fbccecb48101e --- /dev/null +++ b/ports/foxi/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "foxi", + "version-date": "2021-12-01", + "description": "ONNXIFI with Facebook Extension", + "homepage": "https://github.com/houseroad/foxi", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt index 2c2fb129ee4931..d31c8aa05149ca 100644 --- a/ports/freeimage/CMakeLists.txt +++ b/ports/freeimage/CMakeLists.txt @@ -9,15 +9,15 @@ if(MSVC) set(CMAKE_CXX_FLAGS "/wd4828 ${CMAKE_CXX_FLAGS}") endif() -find_package(ZLIB REQUIRED) -find_package(PNG REQUIRED) -find_package(JPEG REQUIRED) -find_package(TIFF REQUIRED) -find_package(OpenJPEG REQUIRED) -find_package(WebP REQUIRED) -find_package(JXR REQUIRED) -find_package(LibRaw REQUIRED) -find_package(OpenEXR REQUIRED) +find_package(ZLIB REQUIRED) +find_package(PNG REQUIRED) +find_package(JPEG REQUIRED) +find_package(TIFF REQUIRED) +find_package(OpenJPEG REQUIRED) +find_package(WebP CONFIG REQUIRED) +find_package(JXR REQUIRED) +find_package(LibRaw REQUIRED) +find_package(OpenEXR REQUIRED) option(BUILD_SHARED_LIBS "Build shared libraries" ON) option(INSTALL_HEADERS "Install the development headers" ON) @@ -93,7 +93,6 @@ target_include_directories(FreeImage PRIVATE ${REAL_SOURCE_DIR} ${TIFF_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${OPENJPEG_INCLUDE_DIRS} - ${WEBP_INCLUDE_DIRS} ${JXR_INCLUDE_DIRS} ${LibRaw_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} @@ -105,7 +104,7 @@ target_link_libraries(FreeImage ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${OPENJPEG_LIBRARIES} - ${WEBP_LIBRARIES} + WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder ${JXR_LIBRARIES} ${LibRaw_LIBRARIES} OpenEXR::IlmImf) @@ -150,7 +149,7 @@ find_dependency(PNG) find_dependency(JPEG) find_dependency(TIFF) find_dependency(OpenJPEG) -find_dependency(WebP) +find_dependency(WebP CONFIG) find_dependency(JXR) find_dependency(LibRaw) find_dependency(OpenEXR) diff --git a/ports/freeimage/vcpkg.json b/ports/freeimage/vcpkg.json index 3d68598ad5da2f..08fbf28d2c083f 100644 --- a/ports/freeimage/vcpkg.json +++ b/ports/freeimage/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freeimage", "version": "3.18.0", - "port-version": 21, + "port-version": 22, "description": "Support library for graphics image formats", "homepage": "https://sourceforge.net/projects/freeimage/", "dependencies": [ diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index ab17e6da0556af..f9ec5abfa0a138 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP - REF 647a48dfa7b19ef6bbfa68a69b5d87717541ef21 #2.4.0 - SHA512 c72072df6f2b3ebc1b632f2e3b40bdcc732e25e7c4ef97b93bc5c5351566b553f682b615e6383ac7c5a1b5ecf8ed0fa9a305ea8c904031d4c78d7c3179323032 + REF 2.5.0 + SHA512 7720306c8d0915578f6758f46ba0e0b8a81bbdcd1c80e08711576605142467f6735f644099e79a05113959fb30cd1070ca138a523537a41a7102880daf89c04c HEAD_REF master PATCHES DontInstallSystemRuntimeLibs.patch @@ -29,7 +29,7 @@ endif() get_filename_component(SOURCE_VERSION "${SOURCE_PATH}" NAME) file(WRITE "${SOURCE_PATH}/.source_version" "${SOURCE_VERSION}-vcpkg") -file(REMOVE ${SOURCE_PATH}/cmake/FindOpenSSL.cmake) # Remove outdated Module +file(REMOVE "${SOURCE_PATH}/cmake/FindOpenSSL.cmake") # Remove outdated Module vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -139,5 +139,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" ".") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}/" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}" "") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index a329f141ccbf9a..ef18342f946de9 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,9 +1,9 @@ { "name": "freerdp", - "version": "2.4.0", - "port-version": 2, + "version": "2.5.0", "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", + "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ { diff --git a/ports/freetds/portfile.cmake b/ports/freetds/portfile.cmake index c3f0b5f948e05a..41f2426b05f7b1 100644 --- a/ports/freetds/portfile.cmake +++ b/ports/freetds/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp" "linux" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO freetds/freetds diff --git a/ports/freetds/vcpkg.json b/ports/freetds/vcpkg.json index b653876fcb2600..498c5d5dd990ba 100644 --- a/ports/freetds/vcpkg.json +++ b/ports/freetds/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freetds", - "version-string": "1.2.11", - "port-version": 1, + "version": "1.2.11", + "port-version": 2, "description": "Implementation of the Tabular Data Stream protocol", "homepage": "https://www.freetds.org", "supports": "windows & !uwp", diff --git a/ports/freetype/fix-2.11-msvc-build.patch b/ports/freetype/fix-2.11-msvc-build.patch deleted file mode 100644 index 49b7e8f2cd6400..00000000000000 --- a/ports/freetype/fix-2.11-msvc-build.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c -index aedb74ddd..5d53dfb71 100644 ---- a/src/autofit/afglobal.c -+++ b/src/autofit/afglobal.c -@@ -19,6 +19,7 @@ - #include "afglobal.h" - #include "afranges.h" - #include "afshaper.h" -+#include "afws_dec.h" - #include - - -@@ -32,11 +33,6 @@ - #define FT_COMPONENT afglobal - - -- /* get writing system specific header files */ --#undef WRITING_SYSTEM --#define WRITING_SYSTEM( ws, WS ) /* empty */ --#include "afwrtsys.h" -- - #include "aferrors.h" - - -@@ -74,7 +70,7 @@ - af_writing_system_classes[] = - { - --#include "afwrtsys.h" -+#include "afws_itr.h" - - NULL /* do not remove */ - }; -diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h -index e76b103ed..a036a0f56 100644 ---- a/src/autofit/aftypes.h -+++ b/src/autofit/aftypes.h -@@ -198,7 +198,6 @@ extern void* _af_debug_hints; - * outline according to the results of the glyph analyzer. - */ - --#define AFWRTSYS_H_ /* don't load header files */ - #undef WRITING_SYSTEM - #define WRITING_SYSTEM( ws, WS ) \ - AF_WRITING_SYSTEM_ ## WS, -@@ -207,14 +206,12 @@ extern void* _af_debug_hints; - typedef enum AF_WritingSystem_ - { - --#include "afwrtsys.h" -+#include "afws_itr.h" - - AF_WRITING_SYSTEM_MAX /* do not remove */ - - } AF_WritingSystem; - --#undef AFWRTSYS_H_ -- - - typedef struct AF_WritingSystemClassRec_ - { -diff --git a/src/autofit/afws_dec.h b/src/autofit/afws_dec.h -new file mode 100644 -index 000000000..39e707c5a ---- /dev/null -+++ b/src/autofit/afws_dec.h -@@ -0,0 +1,30 @@ -+/**************************************************************************** -+ * -+ * afws_dec.h -+ * -+ * Auto-fitter writing systems (specification only). -+ * -+ * Copyright (C) 2013-2021 by -+ * David Turner, Robert Wilhelm, and Werner Lemberg. -+ * -+ * This file is part of the FreeType project, and may only be used, -+ * modified, and distributed under the terms of the FreeType project -+ * license, LICENSE.TXT. By continuing to use, modify, or distribute -+ * this file you indicate that you have read the license and -+ * understand and accept it fully. -+ * -+ */ -+ -+ -+#ifndef AFWS_DEC_H_ -+#define AFWS_DEC_H_ -+ -+ /* Since preprocessor directives can't create other preprocessor */ -+ /* directives, we have to include the header files manually. */ -+ -+#include "afdummy.h" -+#include "aflatin.h" -+#include "afcjk.h" -+#include "afindic.h" -+ -+#endif /* AFWS_DEC_H_ */ -diff --git a/src/autofit/afwrtsys.h b/src/autofit/afws_itr.h -similarity index 66% -rename from src/autofit/afwrtsys.h -rename to src/autofit/afws_itr.h -index 39aa12112..2da77d459 100644 ---- a/src/autofit/afwrtsys.h -+++ b/src/autofit/afws_itr.h -@@ -1,6 +1,6 @@ - /**************************************************************************** - * -- * afwrtsys.h -+ * afws_itr.h - * - * Auto-fitter writing systems (specification only). - * -@@ -15,23 +15,8 @@ - * - */ - -- --#ifndef AFWRTSYS_H_ --#define AFWRTSYS_H_ -- -- /* Since preprocessor directives can't create other preprocessor */ -- /* directives, we have to include the header files manually. */ -- --#include "afdummy.h" --#include "aflatin.h" --#include "afcjk.h" --#include "afindic.h" -- --#endif /* AFWRTSYS_H_ */ -- -- -- /* The following part can be included multiple times. */ -- /* Define `WRITING_SYSTEM' as needed. */ -+ /* This header may be included multiple times. */ -+ /* Define `WRITING_SYSTEM' as needed. */ - - - /* Add new writing systems here. The arguments are the writing system */ -diff --git a/src/autofit/rules.mk b/src/autofit/rules.mk -index 19b3bcadb..a5438ecba 100644 ---- a/src/autofit/rules.mk -+++ b/src/autofit/rules.mk -@@ -48,7 +48,8 @@ AUTOF_DRV_H := $(AUTOF_DRV_SRC:%c=%h) \ - $(AUTOF_DIR)/afscript.h \ - $(AUTOF_DIR)/afstyles.h \ - $(AUTOF_DIR)/aftypes.h \ -- $(AUTOF_DIR)/afwrtsys.h -+ $(AUTOF_DIR)/afws_dec.h \ -+ $(AUTOF_DIR)/afws_itr.h - - - # AUTOF driver object(s) diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 7cf312572fac44..a473ecc377b7fd 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -1,36 +1,35 @@ -set(FT_VERSION 2.11.0) +set(FT_VERSION 2.11.1) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO freetype/freetype2 REF ${FT_VERSION} FILENAME freetype-${FT_VERSION}.tar.xz - SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d + SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 PATCHES 0003-Fix-UWP.patch fix-bzip2-pc.patch # we have a bzip2 file that we can use - https://gitlab.freedesktop.org/freetype/freetype/-/commit/b2aeca5fda870751f3c9d645e0dca4c80fa1ae5a brotli-static.patch fix-exports.patch - fix-2.11-msvc-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - zlib FT_WITH_ZLIB - bzip2 FT_WITH_BZIP2 - png FT_WITH_PNG - brotli FT_WITH_BROTLI + zlib FT_REQUIRE_ZLIB + bzip2 FT_REQUIRE_BZIP2 + png FT_REQUIRE_PNG + brotli FT_REQUIRE_BROTLI INVERTED_FEATURES - zlib CMAKE_DISABLE_FIND_PACKAGE_ZLIB - bzip2 CMAKE_DISABLE_FIND_PACKAGE_BZip2 - png CMAKE_DISABLE_FIND_PACKAGE_PNG - brotli CMAKE_DISABLE_FIND_PACKAGE_BrotliDec + zlib FT_DISABLE_ZLIB + bzip2 FT_DISABLE_BZIP2 + png FT_DISABLE_PNG + brotli FT_DISABLE_BROTLI ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=ON + -DFT_DISABLE_HARFBUZZ=ON ${FEATURE_OPTIONS} ) diff --git a/ports/freetype/vcpkg.json b/ports/freetype/vcpkg.json index 23f9e81339e7e4..970cd829c5c704 100644 --- a/ports/freetype/vcpkg.json +++ b/ports/freetype/vcpkg.json @@ -1,7 +1,6 @@ { "name": "freetype", - "version-semver": "2.11.0", - "port-version": 2, + "version-semver": "2.11.1", "description": "A library to render fonts.", "homepage": "https://www.freetype.org/", "dependencies": [ diff --git a/ports/fribidi/meson-crosscompile.patch b/ports/fribidi/meson-crosscompile.patch new file mode 100644 index 00000000000000..07368a08791bd9 --- /dev/null +++ b/ports/fribidi/meson-crosscompile.patch @@ -0,0 +1,36 @@ +diff --git a/gen.tab/meson.build b/gen.tab/meson.build +index 8c21e98..1cd9960 100644 +--- a/gen.tab/meson.build ++++ b/gen.tab/meson.build +@@ -1,5 +1,10 @@ + # gen.tab + ++if get_option('pregenerated_tab') != '' ++ generated_tab_include_files = [] ++ fribidi_unicode_version_h = files() ++ add_project_arguments('-I' + get_option('pregenerated_tab'), language: 'c') ++else + native_cc = meson.get_compiler('c') + + # Don't pick up top-level config.h, as that has defines for the cross-compiler +@@ -75,7 +80,10 @@ foreach tab : tabs + input: gen_prog_inputs, + output: gen_prog_out, + command: [gen_exe, COMPRESSION, '@INPUT@', gen_prog_name], ++ install: true, ++ install_dir: 'share/fribidi/gen.tab', + capture: true) + + generated_tab_include_files += [tab_inc_file] + endforeach ++endif +diff --git a/meson_options.txt b/meson_options.txt +index f54a639..8f60205 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -8,3 +8,5 @@ option('tests', type : 'boolean', value : true, + description: 'Build tests') + option('fuzzer_ldflags', type : 'string', + description: 'Extra LDFLAGS used during linking of fuzzing binaries') ++option('pregenerated_tab', type: 'string', ++ description: 'Path to pregenerated table sources') diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index 351681839d5a8a..712d031049b6d5 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -4,11 +4,22 @@ vcpkg_from_github( REF v1.0.11 SHA512 9ddb0dbfb28ee4f1d9dd5d46fe1fff75c5446bfdacaabf8647847c36ef72eec823f6e6d6d1369d67c292d680004f7113c9e69114a8fae1d73ab11a58c66a8b8a HEAD_REF master + PATCHES meson-crosscompile.patch ) +set(gen_tab_subdir "share/${PORT}/gen.tab") + +set(options "") +if(VCPKG_CROSSCOMPILING) + set(gen_tab "${CURRENT_HOST_INSTALLED_DIR}/${gen_tab_subdir}") + cmake_path(NATIVE_PATH gen_tab gen_tab) + set(options "-Dpregenerated_tab=${gen_tab}") +endif() + vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${options} -Ddocs=false -Dbin=false -Dtests=false @@ -19,13 +30,27 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() # Define static macro -file(READ ${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h FRIBIDI_COMMON_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" FRIBIDI_COMMON_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 0" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}") else() string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 1" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h "${FRIBIDI_COMMON_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "${FRIBIDI_COMMON_H}") + +if(VCPKG_CROSSCOMPILING) + file( + COPY "${gen_tab}/fribidi-unicode-version.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/fribidi" + ) +else() + file( + COPY "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-unicode-version.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/${gen_tab_subdir}" + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fribidi/vcpkg.json b/ports/fribidi/vcpkg.json index 486571ca17b405..40ec254c5d8ce6 100644 --- a/ports/fribidi/vcpkg.json +++ b/ports/fribidi/vcpkg.json @@ -1,9 +1,17 @@ { "name": "fribidi", "version": "1.0.11", + "port-version": 3, "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)", - "supports": "!(uwp | arm)", + "supports": "!uwp", "dependencies": [ - "tool-meson" + { + "name": "fribidi", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake index bdb21781fc95c0..47fba7224e1917 100644 --- a/ports/ftxui/portfile.cmake +++ b/ports/ftxui/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArthurSonzogni/FTXUI - REF 3d5e4eb6ca11a0827bff68a04f4bf68ca9820e20 - SHA512 670b0e5d95f7e6132ca7115005efdb1dee645146af82566af3e48bfff64d82dbc058c2f524b8b9d1d92182e4835ff6024067f0eab8dd6204514efa0207b3d33c + REF 81b7207121e41c3b838eca6f54396e4f676fa3d8 # 2.0.0 + SHA512 44a0617e591f5340090866dd02d786af5de948829b00839c6fd0fdb67e8a5ec71fadecaa433892773b2073668fb9cef62652479d9793bdf323c91ebb9595c7e5 HEAD_REF master ) diff --git a/ports/ftxui/vcpkg.json b/ports/ftxui/vcpkg.json index 34557d19ac9c94..b8ea87a96ace31 100644 --- a/ports/ftxui/vcpkg.json +++ b/ports/ftxui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ftxui", - "version-date": "2021-06-17", + "version-semver": "2.0.0", + "port-version": 1, "description": "C++ Functional Terminal User Interface", "homepage": "https://github.com/ArthurSonzogni/FTXUI", "license": "MIT", diff --git a/ports/functions-framework-cpp/portfile.cmake b/ports/functions-framework-cpp/portfile.cmake index 58b21e9572e719..89123d06a96060 100644 --- a/ports/functions-framework-cpp/portfile.cmake +++ b/ports/functions-framework-cpp/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/functions-framework-cpp - REF v1.0.0 - SHA512 caaf39014cc651f0f929fce60059592ce17dfa67ac3d93104d97b96c7a1e06e85c0945dfdff6169ac5a5193be84631e27b35877a4d5b022a7319f6476efa17be + REF v1.1.0 + SHA512 2dcedbded84fdd604724b4f2482ee531aaa640ebdbb69f77978e1af8943d9d7746152953953ebd89d8304ed3efbc334c620890142b0ba2e1239862e43a158364 HEAD_REF main ) diff --git a/ports/functions-framework-cpp/vcpkg.json b/ports/functions-framework-cpp/vcpkg.json index dbb15a285e238d..ce0094b495dc19 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.0.0", - "port-version": 1, + "version": "1.1.0", "description": "Functions Framework for C++.", "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/", "license": "Apache-2.0", diff --git a/ports/g3log/portfile.cmake b/ports/g3log/portfile.cmake index a9dc7c4c44fad9..6cd6d0837dd056 100644 --- a/ports/g3log/portfile.cmake +++ b/ports/g3log/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KjellKod/g3log diff --git a/ports/g3log/vcpkg.json b/ports/g3log/vcpkg.json index 7770e4a22aa786..a1333a69b9f65b 100644 --- a/ports/g3log/vcpkg.json +++ b/ports/g3log/vcpkg.json @@ -1,7 +1,7 @@ { "name": "g3log", "version": "1.3.4", - "port-version": 1, + "port-version": 2, "description": "Asynchronous logger with Dynamic Sinks", "homepage": "https://github.com/KjellKod/g3log", "supports": "!(arm | uwp)" diff --git a/ports/gainput/fix-build.patch b/ports/gainput/fix-build.patch new file mode 100644 index 00000000000000..39fc9c777638af --- /dev/null +++ b/ports/gainput/fix-build.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a443b66..61ff7b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,11 +9,11 @@ option(GAINPUT_TESTS "Build Tests for Gainput" ON) + option(GAINPUT_BUILD_SHARED "BUILD_SHARED" ON) + option(GAINPUT_BUILD_STATIC "BUILD_STATIC" ON) + +-if(!WIN32) ++if(NOT WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra") + else() + set(XINPUT "Xinput9_1_0") +- if ( ${CMAKE_SYSTEM_VERSION} LESS 6.1 ) ++ if ( ${CMAKE_SYSTEM_VERSION} VERSION_LESS 6.1 ) + set(XINPUT, "xinput") + endif() + endif() +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index cb7232f..a6ae3d9 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -55,15 +55,21 @@ elseif(APPLE) + find_library(FOUNDATION Foundation) + find_library(IOKIT IOKit) + find_library(GAME_CONTROLLER GameController) ++ if (GAINPUT_BUILD_SHARED) + target_link_libraries(gainput ${FOUNDATION} ${IOKIT} ${GAME_CONTROLLER}) ++ endif() + if(IOS) + find_library(UIKIT UIKit) + find_library(COREMOTION CoreMotion) + find_library(QUARTZCORE QuartzCore) ++ if (GAINPUT_BUILD_SHARED) + target_link_libraries(gainput ${UIKIT} ${COREMOTION}) ++ endif() + else() + find_library(APPKIT AppKit) ++ if (GAINPUT_BUILD_SHARED) + target_link_libraries(gainput ${APPKIT}) ++ endif() + endif() + endif() + diff --git a/ports/gainput/portfile.cmake b/ports/gainput/portfile.cmake index 65ded761c2b5b4..33814724920d3e 100644 --- a/ports/gainput/portfile.cmake +++ b/ports/gainput/portfile.cmake @@ -1,3 +1,7 @@ +if (VCPKG_TARGET_IS_OSX) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkuhlmann/gainput @@ -5,23 +9,15 @@ vcpkg_from_github( SHA512 56fdc4c0613d7260861885b270ebe9e624e940175f41e3ac82516e2eb0d6d229e405fbcc2e54608e7d6751c1d8658b5b5e186153193badc6487274cb284a8cd6 HEAD_REF master PATCHES - "install_as_cmake_package.patch" + install_as_cmake_package.patch + fix-build.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(GAINPUT_BUILD_SHARED OFF) - set(GAINPUT_BUILD_STATIC ON) -else() - set(GAINPUT_BUILD_SHARED ON) - set(GAINPUT_BUILD_STATIC OFF) -endif() -if(APPLE) - set(GAINPUT_BUILD_SHARED ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GAINPUT_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GAINPUT_BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGAINPUT_BUILD_SHARED=${GAINPUT_BUILD_SHARED} -DGAINPUT_BUILD_STATIC=${GAINPUT_BUILD_STATIC} @@ -29,9 +25,10 @@ vcpkg_configure_cmake( -DGAINPUT_SAMPLES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-gainput TARGET_PATH share/unofficial-gainput) +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-gainput CONFIG_PATH share/unofficial-gainput) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gainput/vcpkg.json b/ports/gainput/vcpkg.json index 85da1c0d174149..5b8a8680bd02ec 100644 --- a/ports/gainput/vcpkg.json +++ b/ports/gainput/vcpkg.json @@ -1,7 +1,19 @@ { "name": "gainput", - "version-string": "1.0.0", - "port-version": 4, + "version": "1.0.0", + "port-version": 5, "description": "Gainput is a multiplatform C++ input library, supporting mouse, keyboard and controllers", - "homepage": "https://github.com/jkuhlmann/gainput" + "homepage": "https://github.com/jkuhlmann/gainput", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/gamedev-framework/portfile.cmake b/ports/gamedev-framework/portfile.cmake index efdd5f2d450d4d..1d32d1f967ca53 100644 --- a/ports/gamedev-framework/portfile.cmake +++ b/ports/gamedev-framework/portfile.cmake @@ -2,10 +2,6 @@ if (VCPKG_HOST_IS_LINUX) message(WARNING "gamedev-framework requires gcc version 8.3 or later.") endif() -vcpkg_fail_port_install( - ON_ARCH "arm" -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GamedevFramework/gf diff --git a/ports/gamedev-framework/vcpkg.json b/ports/gamedev-framework/vcpkg.json index e8b63f2126d85c..c00c80c351bb28 100644 --- a/ports/gamedev-framework/vcpkg.json +++ b/ports/gamedev-framework/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gamedev-framework", "version-semver": "0.20.0", - "port-version": 1, + "port-version": 2, "maintainers": [ "Julien Bernard ", "Arthur Hugeat " diff --git a/ports/gasol/portfile.cmake b/ports/gasol/portfile.cmake index 5d3ed6b59665ec..b535229653f7ec 100644 --- a/ports/gasol/portfile.cmake +++ b/ports/gasol/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/gasol/vcpkg.json b/ports/gasol/vcpkg.json index 8b979704f3cbed..aa06ae3c218dfc 100644 --- a/ports/gasol/vcpkg.json +++ b/ports/gasol/vcpkg.json @@ -1,7 +1,8 @@ { "name": "gasol", - "version-string": "2018-01-04", - "port-version": 1, + "version-date": "2018-01-04", + "port-version": 2, "description": "A general Genetic Algorithm Solver in C++", - "homepage": "https://github.com/PytLab/GASol " + "homepage": "https://github.com/PytLab/GASol", + "supports": "!uwp & !arm" } diff --git a/ports/gazebo/0001-Fix-deps.patch b/ports/gazebo/0001-Fix-deps.patch new file mode 100644 index 00000000000000..a933d6884f9b04 --- /dev/null +++ b/ports/gazebo/0001-Fix-deps.patch @@ -0,0 +1,102 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 4085b5aaeb..f89ac88333 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -179,7 +179,7 @@ if (PKG_CONFIG_FOUND) + # (needed, at least, for MacOS) + + # Use system installation on UNIX and Apple, and internal copy on Windows +- if (UNIX OR APPLE) ++ if (true) + message (STATUS "Using system tinyxml.") + set (USE_EXTERNAL_TINYXML True) + elseif(WIN32) +@@ -225,7 +225,7 @@ if (PKG_CONFIG_FOUND) + # (needed, at least, for MacOS) + + # Use system installation on UNIX and Apple, and internal copy on Windows +- if (UNIX OR APPLE) ++ if (true) + message (STATUS "Using system tinyxml2.") + set (USE_EXTERNAL_TINYXML2 True) + elseif(WIN32) +@@ -513,7 +513,7 @@ if (PKG_CONFIG_FOUND) + endif () + + if (libavutil_FOUND AND libavformat_FOUND AND libavcodec_FOUND AND +- libswscale_FOUND) ++ libswscale_FOUND AND FFMPEG_FEATURE) + set (HAVE_FFMPEG TRUE) + else () + set (HAVE_FFMPEG FALSE) +@@ -538,7 +538,7 @@ if (PKG_CONFIG_FOUND) + ######################################## + # Find GNU Triangulation Surface Library + pkg_check_modules(gts gts) +- if (gts_FOUND) ++ if (GTS_FEATURE) + message (STATUS "Looking for GTS - found") + set (HAVE_GTS TRUE) + else () +@@ -551,13 +551,14 @@ if (PKG_CONFIG_FOUND) + # First and preferred option is to look for bullet standard pkgconfig, + # so check it first. if it is not present, check for the OSRF + # custom bullet2.82.pc file +- pkg_check_modules(BULLET bullet>=2.82) ++ find_package(BULLET CONFIG 2.82) + if (NOT BULLET_FOUND) + pkg_check_modules(BULLET bullet2.82>=2.82) + endif() + + if (BULLET_FOUND) + set (HAVE_BULLET TRUE) ++ set(BULLET_VERSION ${BULLET_VERSION_STRING}) + add_definitions( -DLIBBULLET_VERSION=${BULLET_VERSION} ) + else() + set (HAVE_BULLET FALSE) +@@ -572,7 +573,7 @@ if (PKG_CONFIG_FOUND) + ######################################## + # Find libusb + pkg_check_modules(libusb-1.0 libusb-1.0) +- if (NOT libusb-1.0_FOUND) ++ if (NO_LIBUSB_FEATURE) + BUILD_WARNING ("libusb-1.0 not found. USB peripherals support will be disabled.") + set (HAVE_USB OFF CACHE BOOL "HAVE USB" FORCE) + else() +@@ -648,7 +649,7 @@ endif () + ######################################## + # Find gdal + include (FindGDAL) +-if (NOT GDAL_FOUND) ++if (NO_GDAL_FEATURE) + message (STATUS "Looking for libgdal - not found") + BUILD_WARNING ("GDAL not found, Digital elevation terrains support will be disabled.") + set (HAVE_GDAL OFF CACHE BOOL "HAVE GDAL" FORCE) +@@ -718,7 +719,7 @@ endif() + ######################################## + # Find graphviz + include (${gazebo_cmake_dir}/FindGraphviz.cmake) +-if (NOT GRAPHVIZ_FOUND) ++if (NO_GRAPHVIZ_FEATURE) + message (STATUS "Looking for libgraphviz-dev - not found") + BUILD_WARNING ("Graphviz not found, Model editor's schematic view will be disabled.") + set (HAVE_GRAPHVIZ OFF CACHE BOOL "HAVE GRAPHVIZ" FORCE) +diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in +index b57a90dd76..63ce97095e 100644 +--- a/cmake/gazebo-config.cmake.in ++++ b/cmake/gazebo-config.cmake.in +@@ -99,12 +99,13 @@ list(APPEND @PKG_NAME@_CFLAGS -I${GAZEBO_INSTALL_INCLUDE_DIR}/gazebo-@GAZEBO_MAJ + + if (GAZEBO_HAS_BULLET) + if (PKG_CONFIG_FOUND) +- pkg_check_modules(BULLET bullet>=2.82) ++ find_package(BULLET CONFIG 2.82) + if (NOT BULLET_FOUND) + pkg_check_modules(BULLET bullet2.82>=2.82) + endif() + + if (BULLET_FOUND) ++ set(BULLET_VERSION ${BULLET_VERSION_STRING}) + add_definitions(-DLIBBULLET_VERSION=${BULLET_VERSION}) + else() + message(FATAL_ERROR "Error: Bullet > 2.82 not found, please install libbullet2.82-dev.") diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake new file mode 100644 index 00000000000000..603eab88a00ef7 --- /dev/null +++ b/ports/gazebo/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO osrf/gazebo + REF 382dcc3f36095a8d79b5bc9c8b8ad346e867c51d + SHA512 57638cd0b23b5f2bfd32fdc159d6cd77ca34e3bd695c225591979aef4b7271eac93d3706fa1ffa2340f90013267a4171bebe1e4c142f19ad2bf67963dfed627e + HEAD_REF gazebo11 + PATCHES + 0001-Fix-deps.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openal HAVE_OPENAL + ffmpeg FFMPEG_FEATURE + gts GTS_FEATURE + INVERTED_FEATURES + simbody CMAKE_DISABLE_FIND_PACKAGE_Simbody + dart CMAKE_DISABLE_FIND_PACKAGE_DART + bullet CMAKE_DISABLE_FIND_PACKAGE_BULLET + libusb NO_LIBUSB_FEATURE + gdal NO_GDAL_FEATURE + graphviz NO_GRAPHVIZ_FEATURE +) + +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin") +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON + -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/gazebo") +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES gazebo gz gzclient gzserver + AUTO_CLEAN +) +set(EXTRA_OGRE_LIBS Codec_EXR Codec_FreeImage Codec_STBI OgreBites OgreMain OgreMeshLodGenerator OgreOverlay OgrePaging OgreProperty OgreRTShaderSystem OgreTerrain OgreVolume Plugin_BSPSceneManager Plugin_DotScene Plugin_OctreeSceneManager Plugin_OctreeZone Plugin_ParticleFX Plugin_PCZSceneManager RenderSystem_Direct3D11 RenderSystem_GL RenderSystem_GL3Plus) +foreach(LIB IN LISTS EXTRA_OGRE_LIBS) + set(FILE_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB}${CMAKE_SHARED_LIBRARY_SUFFIX}") + file(COPY "${CURRENT_INSTALLED_DIR}/bin/${FILE_NAME}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json new file mode 100644 index 00000000000000..8f4bd528696193 --- /dev/null +++ b/ports/gazebo/vcpkg.json @@ -0,0 +1,125 @@ +{ + "name": "gazebo", + "version-date": "2022-01-20", + "description": "Open source robotics simulator.", + "homepage": "http://gazebosim.org", + "license": "Apache-2.0", + "dependencies": [ + "boost-asio", + "boost-date-time", + "boost-filesystem", + "boost-format", + "boost-interprocess", + "boost-iostreams", + "boost-program-options", + "boost-property-tree", + "boost-regex", + "boost-system", + "boost-thread", + "boost-uuid", + "ccd", + { + "name": "hdf5", + "features": [ + "cpp" + ] + }, + "ignition-common3", + "ignition-fuel-tools4", + "ignition-math6", + "ignition-msgs5", + "ignition-transport8", + "ogre", + { + "name": "pkgconf", + "host": true + }, + "protobuf", + "qwt", + "sdformat9", + "tbb", + "tiny-process-library", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "bullet", + "dart", + "ffmpeg", + "gdal", + "graphviz", + "gts", + "libusb", + "openal", + "simbody" + ], + "features": { + "bullet": { + "description": "Use the bullet physics engine", + "dependencies": [ + "bullet3" + ] + }, + "dart": { + "description": "Use the dart physics engine", + "dependencies": [ + "dartsim" + ] + }, + "ffmpeg": { + "description": "Enable audio-video capabilities", + "dependencies": [ + { + "name": "ffmpeg", + "features": [ + "avcodec", + "avformat", + "swscale" + ] + } + ] + }, + "gdal": { + "description": "Enable digital elevation terrains support", + "dependencies": [ + "gdal" + ] + }, + "graphviz": { + "description": "Enable model editor's schematic view", + "dependencies": [ + "graphviz" + ] + }, + "gts": { + "description": "Enable CSG support", + "dependencies": [ + "gts" + ] + }, + "libusb": { + "description": "Enable USB peripheral support", + "dependencies": [ + "libusb" + ] + }, + "openal": { + "description": "Enable audio support", + "dependencies": [ + "openal-soft" + ] + }, + "simbody": { + "description": "Use the simbody physics engine", + "dependencies": [ + "simbody" + ] + } + } +} diff --git a/ports/gdal/0005-Fix-configure.patch b/ports/gdal/0005-Fix-configure.patch index 771f2c3d3fc588..517047bc1ad7c7 100644 --- a/ports/gdal/0005-Fix-configure.patch +++ b/ports/gdal/0005-Fix-configure.patch @@ -73,6 +73,18 @@ index 30cd613..43f1daf 100644 if test "$HAVE_SQLITE3" = "yes"; then LIBS="$SQLITE3_LDFLAGS $LIBS" +@@ -1571,6 +1584,11 @@ HAVE_SPATIALITE=no + if test -z "$with_spatialite" -o "$with_spatialite" = "no"; then + AC_MSG_RESULT(disabled) + elif test "$with_spatialite" = "yes"; then ++ PKG_CHECK_MODULES([SPATIALITE],[spatialite >= 5],[HAVE_SPATIALITE=yes],AC_MSG_ERROR([vcpkg libspatialite not found])) ++ SPATIALITE_INC="$SPATIALITE_CFLAGS" ++ LIBS="$LIBS $SPATIALITE_LIBS" ++ ac_cv_lib_spatialite_spatialite_target_cpu=yes ++elif false; then + AC_CHECK_HEADERS(sqlite3.h) + if test "$ac_cv_header_sqlite3_h" = "yes"; then + AC_MSG_CHECKING([for spatialite.h in /usr/include or /usr/local/include]) @@ -1639,6 +1652,19 @@ dnl --------------------------------------------------------------------------- AC_ARG_WITH(liblzma,[ --with-liblzma[=ARG] Include liblzma support (ARG=yes/no)],,) @@ -203,8 +215,8 @@ index 30cd613..43f1daf 100644 dnl Expat 1.95.0 released in 2000-09-28 EXPAT_REQ_VERSION="1.95.0" -AX_LIB_EXPAT($EXPAT_REQ_VERSION) -+AC_CHECK_LIB(expat,XML_ParserCreate,HAVE_EXPAT=yes,AC_MSG_ERROR([vcpkg expat not found])) -+EXPAT_LDFLAGS="-lexpat" ++PKG_CHECK_MODULES([EXPAT],[expat],[HAVE_EXPAT=yes],[AC_MSG_ERROR([vcpkg expat not found])]) ++EXPAT_LDFLAGS="$EXPAT_LIBS" +EXPAT_INCLUDE="" if test "$HAVE_EXPAT" = "yes"; then diff --git a/ports/gdal/0009-poppler-cxx17.patch b/ports/gdal/0009-poppler-cxx17.patch new file mode 100644 index 00000000000000..ec82353eab623f --- /dev/null +++ b/ports/gdal/0009-poppler-cxx17.patch @@ -0,0 +1,17 @@ +diff --git a/gdal/frmts/pdf/GNUmakefile b/gdal/frmts/pdf/GNUmakefile +index aa42769477fc..56c2cd775d05 100644 +--- a/gdal/frmts/pdf/GNUmakefile ++++ b/gdal/frmts/pdf/GNUmakefile +@@ -11,6 +11,12 @@ LD_SHARED = $(LD) -bundle + endif + + ifeq ($(HAVE_POPPLER),yes) ++# Poppler 2022.1 requires c++17 ++ifeq ($(shell test $(POPPLER_MAJOR_VERSION) -gt 21; echo $$?),0) ++CXX := $(subst -std=c++11,,${CXX}) ++CXX := $(subst -std=c++14,,${CXX}) ++CXX := ${CXX} -std=c++17 ++endif + CPPFLAGS += -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) -DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION) + endif + diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake index c72851a26a26db..b31ed35461914c 100644 --- a/ports/gdal/dependency_win.cmake +++ b/ports/gdal/dependency_win.cmake @@ -1,257 +1,219 @@ macro(find_dependency_win) - # Setup proj4 libraries + include path - set(PROJ_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") - set(PROJ_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/proj.lib") - set(PROJ_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib") - - # Setup libpng libraries + include path - set(PNG_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") - set(PNG_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" ) - set(PNG_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" ) - - # Setup zlib libraries + include path - set(ZLIB_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(ZLIB_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/zlib.lib" ) - set(ZLIB_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib" ) - - # Setup geos libraries + include path - set(GEOS_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(GEOS_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib" ) - set(GEOS_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib" ) - - # Setup expat libraries + include path - set(EXPAT_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib" ) - set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib" ) - else() - set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib" ) - set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib" ) - endif() - - # Setup curl libraries + include path - set(CURL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib") - set(CURL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib" ) - elseif(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib") - set(CURL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib" ) - endif() - if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib") - set(CURL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib" ) - elseif(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib") - set(CURL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib" ) - endif() - - # Setup sqlite3 libraries + include path - set(SQLITE_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(SQLITE_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib" ) - set(SQLITE_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib" ) - - # Setup PostgreSQL libraries + include path - set(PGSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(PGSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libpq.lib" ) - set(PGSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpq.lib" ) - - set(TMP_REL "${CURRENT_INSTALLED_DIR}/lib/libpgcommon.lib" ) - set(TMP_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpgcommon.lib" ) - set(PGSQL_LIBRARY_REL "${PGSQL_LIBRARY_REL} ${TMP_REL}") - set(PGSQL_LIBRARY_DBG "${PGSQL_LIBRARY_DBG} ${TMP_DBG}") - - set(TMP_REL "${CURRENT_INSTALLED_DIR}/lib/libpgport.lib" ) - set(TMP_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpgport.lib" ) - set(PGSQL_LIBRARY_REL "${PGSQL_LIBRARY_REL} ${TMP_REL}") - set(PGSQL_LIBRARY_DBG "${PGSQL_LIBRARY_DBG} ${TMP_DBG}") - - # Setup OpenJPEG libraries + include path - set(OPENJPEG_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(OPENJPEG_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/openjp2.lib" ) - set(OPENJPEG_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/openjp2.lib" ) - - # Setup WebP libraries + include path - set(WEBP_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(WEBP_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/webp.lib" ) - set(WEBP_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" ) - - # Setup libxml2 libraries + include path - set(XML2_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(XML2_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" ) - set(XML2_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" ) - - # Setup liblzma libraries + include path - set(LZMA_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(LZMA_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/lzma.lib" ) - set(LZMA_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib" ) - - # Setup openssl libraries path - set(OPENSSL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/lib/libssl.lib" ) - set(OPENSSL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.lib" ) - - # Setup libiconv libraries path - set(ICONV_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib" ) - set(ICONV_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib" ) - - # Setup jpeg libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/jpeg.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" JPEG_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/jpeg.lib" JPEG_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/jpeg.lib" JPEG_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS JPEG_EXTERNAL_LIB=1) - list(APPEND NMAKE_OPTIONS JPEGDIR=${JPEG_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL JPEG_LIB=${JPEG_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG JPEG_LIB=${JPEG_LIBRARY_DBG}) - endif() + # curl + x_vcpkg_pkgconfig_get_modules(PREFIX CURL MODULES --msvc-syntax libcurl INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "CURL_INC=${CURL_INCLUDE_DIRS_RELEASE}" "CURL_LIB=${CURL_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "CURL_INC=${CURL_INCLUDE_DIRS_DEBUG}" "CURL_LIB=${CURL_LIBS_DEBUG}") + + # expat + list(APPEND NMAKE_OPTIONS "EXPAT_DIR=YES") + x_vcpkg_pkgconfig_get_modules(PREFIX EXPAT MODULES --msvc-syntax expat INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "EXPAT_INCLUDE=${EXPAT_INCLUDE_DIRS}" "EXPAT_LIB=${EXPAT_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "EXPAT_INCLUDE=${EXPAT_INCLUDE_DIRS}" "EXPAT_LIB=${EXPAT_LIBS_DEBUG}") + + # geos + x_vcpkg_pkgconfig_get_modules(PREFIX GEOS MODULES --msvc-syntax geos INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "GEOS_CFLAGS=${GEOS_INCLUDE_DIRS_RELEASE} -DHAVE_GEOS" "GEOS_LIB=${GEOS_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "GEOS_CFLAGS=${GEOS_INCLUDE_DIRS_DEBUG} -DHAVE_GEOS" "GEOS_LIB=${GEOS_LIBS_DEBUG}") + + # libgeotiff + list(APPEND NMAKE_OPTIONS "GEOTIFF_INC=-I${CURRENT_INSTALLED_DIR}/include") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND NMAKE_OPTIONS_REL "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/lib/geotiff_i.lib") + list(APPEND NMAKE_OPTIONS_DBG "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/geotiff_d_i.lib") + else() + # libgeotiff may need tiff and proj4, but these are added separately, with all transitive deps. + list(APPEND NMAKE_OPTIONS_REL "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/lib/geotiff.lib") + list(APPEND NMAKE_OPTIONS_DBG "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/geotiff_d.lib") + endif() - # Setup zstd libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/zstd.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" ZSTD_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/zstd.lib" ZSTD_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/zstdd.lib" ZSTD_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS ZSTD_CFLAGS=-I${ZSTD_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL ZSTD_LIBS=${ZSTD_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG ZSTD_LIBS=${ZSTD_LIBRARY_DBG}) - endif() + # libiconv + # There is no pc file, and CMake added the Find module in version 3.11. + list(APPEND extra_exports ICONV) + set(ICONV_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib") + set(ICONV_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib") + list(APPEND NMAKE_OPTIONS "LIBICONV_INCLUDE=-I${CURRENT_INSTALLED_DIR}/include" "LIBICONV_CFLAGS=-DICONV_CONST=") + list(APPEND NMAKE_OPTIONS_REL "LIBICONV_LIBRARY=${ICONV_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "LIBICONV_LIBRARY=${ICONV_LIBS_DEBUG}") + + # libjpeg-turbo + list(APPEND NMAKE_OPTIONS "JPEG_EXTERNAL_LIB=1" "JPEGDIR=${CURRENT_INSTALLED_DIR}/include") + x_vcpkg_pkgconfig_get_modules(PREFIX JPEG MODULES --msvc-syntax libjpeg LIBS) + list(APPEND NMAKE_OPTIONS_REL "JPEG_LIB=${JPEG_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "JPEG_LIB=${JPEG_LIBS_DEBUG}") + + # liblzma + x_vcpkg_pkgconfig_get_modules(PREFIX LZMA MODULES --msvc-syntax liblzma INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "LZMA_CFLAGS=${LZMA_INCLUDE_DIRS_RELEASE}" "LZMA_LIBS=${LZMA_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "LZMA_CFLAGS=${LZMA_INCLUDE_DIRS_DEBUG}" "LZMA_LIBS=${LZMA_LIBS_DEBUG}") + + # libpng + list(APPEND NMAKE_OPTIONS "PNG_EXTERNAL_LIB=1" "PNGDIR=${CURRENT_INSTALLED_DIR}/include") + x_vcpkg_pkgconfig_get_modules(PREFIX PNG MODULES --msvc-syntax libpng LIBS) + list(APPEND NMAKE_OPTIONS_REL "PNG_LIB=${PNG_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "PNG_LIB=${PNG_LIBS_DEBUG}") + + # libwebp + list(APPEND NMAKE_OPTIONS "WEBP_ENABLED=YES") + x_vcpkg_pkgconfig_get_modules(PREFIX WEBP MODULES --msvc-syntax libwebp INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "WEBP_CFLAGS=${WEBP_INCLUDE_DIRS_RELEASE}" "WEBP_LIBS=${WEBP_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "WEBP_CFLAGS=${WEBP_INCLUDE_DIRS_DEBUG}" "WEBP_LIBS=${WEBP_LIBS_DEBUG}") + + # libxml2 + x_vcpkg_pkgconfig_get_modules(PREFIX LIBXML2 MODULES --msvc-syntax libxml-2.0 INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "LIBXML2_INC=${LIBXML2_INCLUDE_DIRS_RELEASE}" "LIBXML2_LIB=${LIBXML2_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "LIBXML2_INC=${LIBXML2_INCLUDE_DIRS_DEBUG}" "LIBXML2_LIB=${LIBXML2_LIBS_DEBUG}") + + # openjpeg + list(APPEND NMAKE_OPTIONS "OPENJPEG_ENABLED=YES") + x_vcpkg_pkgconfig_get_modules(PREFIX OPENJPEG MODULES --msvc-syntax libopenjp2 INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "OPENJPEG_CFLAGS=${OPENJPEG_INCLUDE_DIRS_RELEASE}" "OPENJPEG_LIB=${OPENJPEG_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "OPENJPEG_CFLAGS=${OPENJPEG_INCLUDE_DIRS_DEBUG}" "OPENJPEG_LIB=${OPENJPEG_LIBS_DEBUG}") + + # proj + x_vcpkg_pkgconfig_get_modules(PREFIX PROJ MODULES --msvc-syntax proj INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "PROJ_INCLUDE=${PROJ_INCLUDE_DIRS_RELEASE}" "PROJ_LIBRARY=${PROJ_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "PROJ_INCLUDE=${PROJ_INCLUDE_DIRS_DEBUG}" "PROJ_LIBRARY=${PROJ_LIBS_DEBUG}") + + # sqlite3 and spatialite + if ("libspatialite" IN_LIST FEATURES) + list(APPEND extra_exports SPATIALITE) + list(APPEND NMAKE_OPTIONS "SPATIALITE_412_OR_LATER=yes") + x_vcpkg_pkgconfig_get_modules(PREFIX SQLITE MODULES --msvc-syntax spatialite sqlite3 INCLUDE_DIRS LIBS) + string(APPEND SQLITE_INCLUDE_DIRS_RELEASE " -DHAVE_SPATIALITE") + string(APPEND SQLITE_INCLUDE_DIRS_DEBUG " -DHAVE_SPATIALITE") + else() + x_vcpkg_pkgconfig_get_modules(PREFIX SQLITE MODULES --msvc-syntax sqlite3 INCLUDE_DIRS LIBS) + endif() + list(APPEND NMAKE_OPTIONS_REL "SQLITE_INC=${SQLITE_INCLUDE_DIRS_RELEASE}" "SQLITE_LIB=${SQLITE_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "SQLITE_INC=${SQLITE_INCLUDE_DIRS_DEBUG}" "SQLITE_LIB=${SQLITE_LIBS_DEBUG}") + + # tiff + x_vcpkg_pkgconfig_get_modules(PREFIX TIFF MODULES --msvc-syntax libtiff-4 INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "TIFF_INC=${TIFF_INCLUDE_DIRS_RELEASE} -DBIGTIFF_SUPPORT" "TIFF_LIB=${TIFF_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "TIFF_INC=${TIFF_INCLUDE_DIRS_DEBUG} -DBIGTIFF_SUPPORT" "TIFF_LIB=${TIFF_LIBS_DEBUG}") + + # zlib + list(APPEND NMAKE_OPTIONS "ZLIB_EXTERNAL_LIB=1") + x_vcpkg_pkgconfig_get_modules(PREFIX ZLIB MODULES --msvc-syntax zlib INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "ZLIB_INC=${ZLIB_INCLUDE_DIRS_RELEASE}" "ZLIB_LIB=${ZLIB_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "ZLIB_INC=${ZLIB_INCLUDE_DIRS_DEBUG}" "ZLIB_LIB=${ZLIB_LIBS_DEBUG}") + + # zstd + x_vcpkg_pkgconfig_get_modules(PREFIX ZSTD MODULES --msvc-syntax libzstd INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "ZSTD_CFLAGS=${ZSTD_INCLUDE_DIRS_RELEASE}" "ZSTD_LIBS=${ZSTD_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "ZSTD_CFLAGS=${ZSTD_INCLUDE_DIRS_DEBUG}" "ZSTD_LIBS=${ZSTD_LIBS_DEBUG}") + + # Features + + if ("cfitsio" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "FITS_INC_DIR=${CURRENT_INSTALLED_DIR}/include" "FITS_PLUGIN=NO") + list(APPEND NMAKE_OPTIONS_REL "FITS_LIB=${CURRENT_INSTALLED_DIR}/lib/cfitsio.lib") + list(APPEND NMAKE_OPTIONS_DBG "FITS_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/cfitsio.lib") + endif() - # Setup tiff libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/tiff.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" TIFF_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/tiff.lib" TIFF_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/tiffd.lib" TIFF_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS TIFF_INC=-I${TIFF_INCLUDE}) - list(APPEND NMAKE_OPTIONS TIFF_OPTS=-DBIGTIFF_SUPPORT) - list(APPEND NMAKE_OPTIONS_REL TIFF_LIB=${TIFF_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG TIFF_LIB=${TIFF_LIBRARY_DBG}) - endif() + if("hdf5" IN_LIST FEATURES) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" HDF5_DIR) + x_vcpkg_pkgconfig_get_modules(PREFIX HDF5 MODULES --msvc-syntax hdf5 LIBS) + list(APPEND NMAKE_OPTIONS "HDF5_DIR=${CURRENT_INSTALLED_DIR}" "HDF5_PLUGIN=NO") + list(APPEND NMAKE_OPTIONS_REL "HDF5_LIB=${HDF5_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "HDF5_LIB=${HDF5_LIBS_DEBUG}") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND NMAKE_OPTIONS "HDF5_H5_IS_DLL=YES") + endif() + endif() - # Setup geotiff libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/geotiff_i.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOTIFF_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geotiff_i.lib" GEOTIFF_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geotiff_d_i.lib" GEOTIFF_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS GEOTIFF_INC=-I${GEOTIFF_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL GEOTIFF_LIB=${GEOTIFF_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG GEOTIFF_LIB=${GEOTIFF_LIBRARY_DBG}) - endif() + if("mysql-libmariadb" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "MYSQL_INC_DIR=${CURRENT_INSTALLED_DIR}/include/mysql") + list(APPEND NMAKE_OPTIONS_REL "MYSQL_LIB=${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib") + list(APPEND NMAKE_OPTIONS_DBG "MYSQL_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib") + endif() - # Setup Xerces libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/xerces-c_3.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" XERCES_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XERCES_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/xerces-c_3.lib" XERCES_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/xerces-c_3D.lib" XERCES_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS ILI_ENABLED=YES) - list(APPEND NMAKE_OPTIONS XERCES_DIR=${XERCES_DIR}) - list(APPEND NMAKE_OPTIONS "XERCES_INCLUDE=-I${XERCES_INCLUDE} -I${XERCES_INCLUDE}/xercesc") - list(APPEND NMAKE_OPTIONS_REL XERCES_LIB=${XERCES_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG XERCES_LIB=${XERCES_LIBRARY_DBG}) - endif() + if("netcdf" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "NETCDF_INC_DIR=${CURRENT_INSTALLED_DIR}/include" "NETCDF_SETTING=yes" "NETCDF_PLUGIN=NO") + x_vcpkg_pkgconfig_get_modules(PREFIX NETCDF MODULES --msvc-syntax netcdf LIBS) + list(APPEND NMAKE_OPTIONS_REL "NETCDF_LIB=${NETCDF_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "NETCDF_LIB=${NETCDF_LIBS_DEBUG}") + endif() - # Setup freexl libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/freexl.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" FREEXL_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/freexl.lib" FREEXL_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib" FREEXL_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS FREEXL_CFLAGS=-I${FREEXL_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL FREEXL_LIBS=${FREEXL_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG FREEXL_LIBS=${FREEXL_LIBRARY_DBG}) - endif() + if("poppler" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "POPPLER_ENABLED=YES") + list(APPEND NMAKE_OPTIONS "POPPLER_MAJOR_VERSION=22" "POPPLER_MINOR_VERSION=1") # Bump as needed + list(APPEND NMAKE_OPTIONS "POPPLER_CFLAGS=-I${CURRENT_INSTALLED_DIR}/include -I${CURRENT_INSTALLED_DIR}/include/poppler /std:c++17") + x_vcpkg_pkgconfig_get_modules(PREFIX POPPLER MODULES --msvc-syntax poppler LIBS) + list(APPEND NMAKE_OPTIONS_REL "POPPLER_LIBS=${POPPLER_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "POPPLER_LIBS=${POPPLER_LIBS_DEBUG}") + endif() - # Setup Cryptopp libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/cryptopp-static.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CRYPTOPP_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS CRYPTOPP_INC=-I${CRYPTOPP_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_DBG}) - endif() + if("postgresql" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "PG_INC_DIR=${CURRENT_INSTALLED_DIR}/include") + x_vcpkg_pkgconfig_get_modules(PREFIX OPENSSL MODULES --msvc-syntax openssl LIBS) + set(PGSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libpq.lib ${CURRENT_INSTALLED_DIR}/lib/libpgcommon.lib ${CURRENT_INSTALLED_DIR}/lib/libpgport.lib") + list(APPEND NMAKE_OPTIONS_REL "PG_LIB=${PGSQL_LIBRARY_REL} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBS_RELEASE}") + set(PGSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpq.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libpgcommon.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libpgport.lib") + list(APPEND NMAKE_OPTIONS_DBG "PG_LIB=${PGSQL_LIBRARY_DBG} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBS_DEBUG}") + endif() - # Setup netcdf libraries - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/netcdf.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" NETCDF_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/netcdf.lib" NETCDF_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/netcdf.lib" NETCDF_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS NETCDF_PLUGIN=NO) - list(APPEND NMAKE_OPTIONS NETCDF_SETTING=yes) - list(APPEND NMAKE_OPTIONS NETCDF_INC_DIR=${NETCDF_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL NETCDF_LIB=${NETCDF_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG NETCDF_LIB=${NETCDF_LIBRARY_DBG}) - endif() - endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" HDF5_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/hdf5_D.lib" HDF5_LIBRARY_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/hdf5.lib" HDF5_LIBRARY_REL) - list(APPEND NMAKE_OPTIONS HDF5_PLUGIN=NO) - list(APPEND NMAKE_OPTIONS HDF5_H5_IS_DLL=YES) - list(APPEND NMAKE_OPTIONS HDF5_DIR=${HDF5_DIR}) - list(APPEND NMAKE_OPTIONS_REL HDF5_LIB=${HDF5_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG HDF5_LIB=${HDF5_LIBRARY_DBG}) - endif() + # Dependencies which are not in vpckg.json - # Setup libkml libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" LIBKML_DIR) - list(APPEND NMAKE_OPTIONS LIBKML_DIR=${LIBKML_DIR}) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LIBKML_INCLUDE) - list(APPEND NMAKE_OPTIONS LIBKML_INCLUDE=-I${LIBKML_INCLUDE}) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib" KMLBASE_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlbase.lib" KMLBASE_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlconvenience.lib" KMLCONVENIENCE_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlconvenience.lib" KMLCONVENIENCE_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmldom.lib" KMLDOM_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmldom.lib" KMLDOM_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlengine.lib" KMLENGINE_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlengine.lib" KMLENGINE_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlregionator.lib" KMLREGIONATOR_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlregionator.lib" KMLREGIONATOR_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlxsd.lib" KMLXSD_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlxsd.lib" KMLXSD_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/bz2.lib" BZIP2_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/bz2d.lib" BZIP2_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/minizip.lib" MINIZIP_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/minizip.lib" MINIZIP_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/uriparser.lib" URIPARSER_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/uriparser.lib" URIPARSER_DBG) - list(APPEND NMAKE_OPTIONS_REL "LIBKML_LIBS=${KMLBASE_REL} ${KMLCONVENIENCE_REL} ${KMLDOM_REL} ${KMLENGINE_REL} ${KMLREGIONATOR_REL} ${KMLXSD_REL} ${BZIP2_REL} ${MINIZIP_REL} ${URIPARSER_REL} ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL}") - list(APPEND NMAKE_OPTIONS_DBG "LIBKML_LIBS=${KMLBASE_DBG} ${KMLCONVENIENCE_DBG} ${KMLDOM_DBG} ${KMLENGINE_DBG} ${KMLREGIONATOR_DBG} ${KMLXSD_DBG} ${BZIP2_DBG} ${MINIZIP_DBG} ${URIPARSER_DBG} ${EXPAT_LIBRARY_DBG} ${ZLIB_LIBRARY_DBG}") - endif() + # cryptopp + if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/cryptopp-static.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CRYPTOPP_INCLUDE) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_DBG) + list(APPEND NMAKE_OPTIONS CRYPTOPP_INC=-I${CRYPTOPP_INCLUDE}) + list(APPEND NMAKE_OPTIONS_REL CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_REL}) + list(APPEND NMAKE_OPTIONS_DBG CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_DBG}) + endif() - if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) - # Setup MySQL libraries + include path - if("mysql-libmysql" IN_LIST FEATURES) - set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql" ) - set(MYSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib" ) - set(MYSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib" ) - endif() + # freexl + if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/freexl.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" FREEXL_INCLUDE) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/freexl.lib" FREEXL_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib" FREEXL_LIBRARY_DBG) + list(APPEND NMAKE_OPTIONS FREEXL_CFLAGS=-I${FREEXL_INCLUDE}) + list(APPEND NMAKE_OPTIONS_REL FREEXL_LIBS=${FREEXL_LIBRARY_REL}) + list(APPEND NMAKE_OPTIONS_DBG FREEXL_LIBS=${FREEXL_LIBRARY_DBG}) + endif() - if("mysql-libmariadb" IN_LIST FEATURES) - set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql" ) - set(MYSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib" ) - set(MYSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib" ) - endif() - endif() + # libkml + if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" LIBKML_DIR) + list(APPEND NMAKE_OPTIONS LIBKML_DIR=${LIBKML_DIR}) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LIBKML_INCLUDE) + list(APPEND NMAKE_OPTIONS LIBKML_INCLUDE=-I${LIBKML_INCLUDE}) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib" KMLBASE_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlbase.lib" KMLBASE_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlconvenience.lib" KMLCONVENIENCE_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlconvenience.lib" KMLCONVENIENCE_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmldom.lib" KMLDOM_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmldom.lib" KMLDOM_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlengine.lib" KMLENGINE_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlengine.lib" KMLENGINE_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlregionator.lib" KMLREGIONATOR_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlregionator.lib" KMLREGIONATOR_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlxsd.lib" KMLXSD_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlxsd.lib" KMLXSD_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/bz2.lib" BZIP2_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/bz2d.lib" BZIP2_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/minizip.lib" MINIZIP_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/minizip.lib" MINIZIP_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/uriparser.lib" URIPARSER_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/uriparser.lib" URIPARSER_DBG) + list(APPEND NMAKE_OPTIONS_REL "LIBKML_LIBS=${KMLBASE_REL} ${KMLCONVENIENCE_REL} ${KMLDOM_REL} ${KMLENGINE_REL} ${KMLREGIONATOR_REL} ${KMLXSD_REL} ${BZIP2_REL} ${MINIZIP_REL} ${URIPARSER_REL} ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL}") + list(APPEND NMAKE_OPTIONS_DBG "LIBKML_LIBS=${KMLBASE_DBG} ${KMLCONVENIENCE_DBG} ${KMLDOM_DBG} ${KMLENGINE_DBG} ${KMLREGIONATOR_DBG} ${KMLXSD_DBG} ${BZIP2_DBG} ${MINIZIP_DBG} ${URIPARSER_DBG} ${EXPAT_LIBRARY_DBG} ${ZLIB_LIBRARY_DBG}") + endif() - if ("libspatialite" IN_LIST FEATURES) - # Setup spatialite libraries + include path - set(SPATIALITE_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/spatialite" ) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SPATIALITE_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/librttopo.lib" "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib") - set(SPATIALITE_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib" "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib") - else() - set(SPATIALITE_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib" ) - set(SPATIALITE_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib" ) + # xerces-c + if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/xerces-c_3.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" XERCES_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XERCES_INCLUDE) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/xerces-c_3.lib" XERCES_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/xerces-c_3D.lib" XERCES_LIBRARY_DBG) + list(APPEND NMAKE_OPTIONS ILI_ENABLED=YES) + list(APPEND NMAKE_OPTIONS XERCES_DIR=${XERCES_DIR}) + list(APPEND NMAKE_OPTIONS "XERCES_INCLUDE=-I${XERCES_INCLUDE} -I${XERCES_INCLUDE}/xercesc") + list(APPEND NMAKE_OPTIONS_REL XERCES_LIB=${XERCES_LIBRARY_REL}) + list(APPEND NMAKE_OPTIONS_DBG XERCES_LIB=${XERCES_LIBRARY_DBG}) endif() - set(HAVE_SPATIALITE "-DHAVE_SPATIALITE") - endif() - if ("cfitsio" IN_LIST FEATURES) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" FITS_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/cfitsio.lib" FITS_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/cfitsio.lib" FITS_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS FITS_PLUGIN=YES) - list(APPEND NMAKE_OPTIONS FITS_INC_DIR=${FITS_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL FITS_LIB=${FITS_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG FITS_LIB=${FITS_LIBRARY_DBG}) - endif() endmacro() diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 0556278a8df83f..50e1bea245f5b0 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -5,6 +5,7 @@ set(GDAL_PATCHES 0005-Fix-configure.patch 0007-Control-tools.patch 0008-Fix-absl-string_view.patch + 0009-poppler-cxx17.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND GDAL_PATCHES 0006-Fix-mingw-dllexport.patch) @@ -13,109 +14,53 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF d699b38a744301368070ef780f797340da4a9c3c # 3.4.0 - SHA512 709523740a51a0a2a144debcfa5fbc5a5b3d93cc3632856cfbc37f7ca52f2e83f4942d9a27d4c723ee19d2397cc91a4b1ba4543547afdfefb3980a7ba6684bd7 + REF v3.4.1 + SHA512 b9b5389f15fdc6cff846003a07c934918c0e1d8e53d0f2ea3f88fff31d3f8a59a857e938fc337d0bde11dc1416297d46f52d729576281bec53d50b08868c51ba HEAD_REF master PATCHES ${GDAL_PATCHES} ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") +set(extra_exports "") if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(NATIVE_DATA_DIR "${CURRENT_PACKAGES_DIR}/share/gdal") - set(NATIVE_HTML_DIR "${CURRENT_PACKAGES_DIR}/share/gdal/html") - - set(NMAKE_OPTIONS "") - set(NMAKE_OPTIONS_REL "") - set(NMAKE_OPTIONS_DBG "") - - include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") - find_dependency_win() - - if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS "MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}") - list(APPEND NMAKE_OPTIONS_REL "MYSQL_LIB=${MYSQL_LIBRARY_REL}") - list(APPEND NMAKE_OPTIONS_DBG "MYSQL_LIB=${MYSQL_LIBRARY_DBG}") - endif() - - list(APPEND NMAKE_OPTIONS - "DATADIR=${NATIVE_DATA_DIR}" - "HTMLDIR=${NATIVE_HTML_DIR}" - "GEOS_DIR=${GEOS_INCLUDE_DIR}" - "GEOS_CFLAGS=-I${GEOS_INCLUDE_DIR} -DHAVE_GEOS" - "PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR}" - "EXPAT_DIR=${EXPAT_INCLUDE_DIR}" - "EXPAT_INCLUDE=-I${EXPAT_INCLUDE_DIR}" - "CURL_INC=-I${CURL_INCLUDE_DIR}" - "SQLITE_INC=-I${SQLITE_INCLUDE_DIR} ${HAVE_SPATIALITE}" - "PG_INC_DIR=${PGSQL_INCLUDE_DIR}" - OPENJPEG_ENABLED=YES - "OPENJPEG_CFLAGS=-I${OPENJPEG_INCLUDE_DIR}" - OPENJPEG_VERSION=20100 - WEBP_ENABLED=YES - "WEBP_CFLAGS=-I${WEBP_INCLUDE_DIR}" - "LIBXML2_INC=-I${XML2_INCLUDE_DIR}" - PNG_EXTERNAL_LIB=1 - "PNGDIR=${PNG_INCLUDE_DIR}" - "ZLIB_INC=-I${ZLIB_INCLUDE_DIR}" - ZLIB_EXTERNAL_LIB=1 - MSVC_VER=1900 - ) - - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - list(APPEND NMAKE_OPTIONS WIN64=YES) - endif() - - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND NMAKE_OPTIONS CURL_CFLAGS=-DCURL_STATICLIB) - list(APPEND NMAKE_OPTIONS DLLBUILD=0) - list(APPEND NMAKE_OPTIONS "PROJ_FLAGS=-DPROJ_STATIC -DPROJ_VERSION=5") - else() - # Enables PDBs for release and debug builds - list(APPEND NMAKE_OPTIONS WITH_PDB=1) - list(APPEND NMAKE_OPTIONS DLLBUILD=1) - endif() - if (VCPKG_CRT_LINKAGE STREQUAL "static") set(LINKAGE_FLAGS "/MT") else() set(LINKAGE_FLAGS "/MD") endif() - list(APPEND NMAKE_OPTIONS_REL - ${NMAKE_OPTIONS} + set(NMAKE_OPTIONS + "DATADIR=${CURRENT_PACKAGES_DIR}/share/gdal" + "HTMLDIR=${CURRENT_PACKAGES_DIR}/share/gdal/html" + "MSVC_VER=1900" + ) + set(NMAKE_OPTIONS_REL "GDAL_HOME=${CURRENT_PACKAGES_DIR}" "CXX_CRT_FLAGS=${LINKAGE_FLAGS}" - "PROJ_LIBRARY=${PROJ_LIBRARY_REL}" - "PNG_LIB=${PNG_LIBRARY_REL}" - "GEOS_LIB=${GEOS_LIBRARY_REL}" - "EXPAT_LIB=${EXPAT_LIBRARY_REL}" - "CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib" - "SQLITE_LIB=${SQLITE_LIBRARY_REL} ${SPATIALITE_LIBRARY_REL}" - "OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}" - "WEBP_LIBS=${WEBP_LIBRARY_REL}" - "LIBXML2_LIB=${XML2_LIBRARY_REL} ${ICONV_LIBRARY_REL} ${LZMA_LIBRARY_REL}" - "ZLIB_LIB=${ZLIB_LIBRARY_REL}" - "PG_LIB=${PGSQL_LIBRARY_REL} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_REL}" - ) - - list(APPEND NMAKE_OPTIONS_DBG - ${NMAKE_OPTIONS} + ) + set(NMAKE_OPTIONS_DBG "GDAL_HOME=${CURRENT_PACKAGES_DIR}/debug" "CXX_CRT_FLAGS=${LINKAGE_FLAGS}d" - "PROJ_LIBRARY=${PROJ_LIBRARY_DBG}" - "PNG_LIB=${PNG_LIBRARY_DBG}" - "GEOS_LIB=${GEOS_LIBRARY_DBG}" - "EXPAT_LIB=${EXPAT_LIBRARY_DBG}" - "CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib" - "SQLITE_LIB=${SQLITE_LIBRARY_DBG} ${SPATIALITE_LIBRARY_DBG}" - "OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}" - "WEBP_LIBS=${WEBP_LIBRARY_DBG}" - "LIBXML2_LIB=${XML2_LIBRARY_DBG} ${ICONV_LIBRARY_DBG} ${LZMA_LIBRARY_DBG}" - "ZLIB_LIB=${ZLIB_LIBRARY_DBG}" - "PG_LIB=${PGSQL_LIBRARY_DBG} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_DBG}" DEBUG=1 - ) + ) + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND NMAKE_OPTIONS "WIN64=YES") + endif() + + if(VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") + list(APPEND NMAKE_OPTIONS "SSEFLAGS=/DNO_SSSE" "AVXFLAGS=/DNO_AVX") + endif() + + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND NMAKE_OPTIONS "DLLBUILD=0") + else() + list(APPEND NMAKE_OPTIONS "DLLBUILD=1" "WITH_PDB=1") + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") + find_dependency_win() if("tools" IN_LIST FEATURES) list(APPEND NMAKE_OPTIONS_REL "BUILD_TOOLS=1") @@ -128,15 +73,13 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_install_nmake( SOURCE_PATH "${SOURCE_PATH}/gdal" TARGET devinstall + OPTIONS + ${NMAKE_OPTIONS} OPTIONS_RELEASE - "${NMAKE_OPTIONS_REL}" + ${NMAKE_OPTIONS_REL} OPTIONS_DEBUG - "${NMAKE_OPTIONS_DBG}" - ) - - if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/gdal/html") - endif() + ${NMAKE_OPTIONS_DBG} + ) if("tools" IN_LIST FEATURES) set(GDAL_EXES @@ -166,9 +109,8 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) ogrinfo ogrlineref ogrtindex - testepsg - ) - # vcpkg_copy_tools removed the bin directories for us so no need to remove again + ) + # vcpkg_copy_tools removes the bin directories for us so no need to remove again vcpkg_copy_tools(TOOL_NAMES ${GDAL_EXES} AUTO_CLEAN) elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -186,10 +128,11 @@ else() file(TOUCH "${SOURCE_PATH}/gdal/config.rpath") set(CONF_OPTS + --with-gnm=yes --with-hide-internal-symbols=yes + --with-java=no --with-perl=no --with-python=no - --with-java=no ) set(CONF_CHECKS "") function(add_config option check) @@ -203,16 +146,13 @@ else() add_config("--with-expat=yes" "Expat support: yes") add_config("--with-geos=yes" "GEOS support: yes") add_config("--with-gif=yes" "LIBGIF support: external") - add_config("--with-hdf5=yes" "HDF5 support: yes") add_config("--with-libjson=yes" "checking for JSONC... yes") add_config("--with-geotiff=yes" "LIBGEOTIFF support: external") add_config("--with-jpeg=yes" "LIBJPEG support: external") add_config("--with-liblzma=yes" "LIBLZMA support: yes") add_config("--with-png=yes" "LIBPNG support: external") - add_config("--with-pg=yes" "PostgreSQL support: yes") add_config("--with-webp=yes" "WebP support: yes") add_config("--with-xml2=yes" "libxml2 support: yes") - add_config("--with-netcdf=yes" "NetCDF support: yes") add_config("--with-openjpeg=yes" "OpenJPEG support: yes") add_config("--with-proj=yes" "PROJ >= 6: yes") add_config("--with-sqlite3=yes" "SQLite support: yes") @@ -236,6 +176,17 @@ else() add_config("--with-spatialite=no" "SpatiaLite support: no") endif() + if ("poppler" IN_LIST FEATURES) + add_config("--with-poppler=yes" "Poppler support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-poppler=no" "Poppler support: no") + endif() + if ("postgresql" IN_LIST FEATURES) + add_config("--with-pg=yes" "PostgreSQL support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-pg=no" "PostgreSQL support: no") + endif() + if ("mysql-libmariadb" IN_LIST FEATURES) add_config("--with-mysql=yes" "MySQL support: yes") elseif(DISABLE_SYSTEM_LIBRARIES) @@ -248,11 +199,25 @@ else() add_config("--with-cfitsio=no" "CFITSIO support: no") endif() + if ("hdf5" IN_LIST FEATURES) + add_config("--with-hdf5=yes" "HDF5 support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-hdf5=no" "HDF5 support: no") + endif() + + if ("netcdf" IN_LIST FEATURES) + add_config("--with-netcdf=yes" "NetCDF support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-netcdf=no" "NetCDF support: no") + endif() + if(DISABLE_SYSTEM_LIBRARIES) list(APPEND CONF_OPTS # Too much: --disable-all-optional-drivers # alphabetical order --with-armadillo=no + --with-blosc=no + --with-brunsli=no --with-charls=no --with-crypto=no --with-cryptopp=no @@ -271,19 +236,24 @@ else() --with-heif=no --with-idb=no --with-ingres=no - --with-jasper=no --with-jp2lura=no + --with-jp2mrsid=no + --with-jasper=no + --with-jxl=no --with-kakadu=no --with-kea=no + --with-lerc=no --with-libdeflate=no --with-libgrass=no --with-libkml=no + --with-lz4=no --with-mdb=no + --with-mongocxx=no + --with-mongocxxv3=no --with-mrsid=no --with-mrsid_lidar=no --with-msg=no - --with-mongocxx=no - --with-mongocxxv3=no + --with-null=no --with-oci=no --with-odbc=no --with-ogdi=no @@ -291,9 +261,9 @@ else() --with-pcidsk=no --with-pcraster=no --with-pcre=no + --with-pcre2=no --with-pdfium=no --with-podofo=no - --with-poppler=no --with-qhull=no --with-rasdaman=no --with-rasterlite2=no @@ -306,12 +276,7 @@ else() ) endif() - # proj needs a C++ runtime library - if(VCPKG_TARGET_IS_OSX) - list(APPEND CONF_OPTS "--with-proj-extra-lib-for-test=-lc++") - else() - list(APPEND CONF_OPTS "--with-proj-extra-lib-for-test=-lstdc++") - endif() + x_vcpkg_pkgconfig_get_modules(PREFIX PROJ MODULES proj LIBS) if("tools" IN_LIST FEATURES) list(APPEND CONF_OPTS "--with-tools=yes") @@ -324,10 +289,13 @@ else() AUTOCONFIG COPY_SOURCE OPTIONS - ${CONF_OPTS} + ${CONF_OPTS} + OPTIONS_RELEASE + "--with-proj-extra-lib-for-test=${PROJ_LIBS_RELEASE}" OPTIONS_DEBUG - --enable-debug - --with-tools=no + --enable-debug + --with-tools=no + "--with-proj-extra-lib-for-test=${PROJ_LIBS_DEBUG}" ) # Verify configuration results (tightly coupled to vcpkg_configure_make) @@ -371,10 +339,29 @@ else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gdal/debug/bin/gdal-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDAL_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") + + if("libspatialite" IN_LIST FEATURES) + list(APPEND extra_exports SPATIALITE) + x_vcpkg_pkgconfig_get_modules( + PREFIX SPATIALITE + MODULES spatialite + LIBS + ) + endif() endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +string(COMPARE NOTEQUAL "${NMAKE_OPTIONS}" "" NMAKE_BUILD) +set(GDAL_EXTRA_LIBS_DEBUG "") +set(GDAL_EXTRA_LIBS_RELEASE "") +foreach(prefix IN LISTS extra_exports) + string(REPLACE "${CURRENT_INSTALLED_DIR}/" "\${CMAKE_CURRENT_LIST_DIR}/../../" libs "${${prefix}_LIBS_DEBUG}") + string(APPEND GDAL_EXTRA_LIBS_DEBUG " ${libs}") + string(REPLACE "${CURRENT_INSTALLED_DIR}/" "\${CMAKE_CURRENT_LIST_DIR}/../../" libs "${${prefix}_LIBS_RELEASE}") + string(APPEND GDAL_EXTRA_LIBS_RELEASE " ${libs}") +endforeach() +string(REPLACE "/lib/pkgconfig/../.." "" GDAL_EXTRA_LIBS_DEBUG "${GDAL_EXTRA_LIBS_DEBUG}") +string(REPLACE "/lib/pkgconfig/../.." "" GDAL_EXTRA_LIBS_RELEASE "${GDAL_EXTRA_LIBS_RELEASE}") configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) -# Handle copyright +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/gdal/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 28a1750fedddda..305de834ed73ab 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -70,6 +70,36 @@ function(_gdal_add_dependency target package) set(GDAL_FOUND false PARENT_SCOPE) endif() endfunction() +function(z_vcpkg_gdal_add_libs keyword config) + set(gdal_deps_target "unofficial::gdal::deps::${keyword}") + if(NOT TARGET "${gdal_deps_target}") + add_library("${gdal_deps_target}" INTERFACE IMPORTED) + if(TARGET GDAL::GDAL) # CMake 3.14 + set_property(TARGET GDAL::GDAL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$:${gdal_deps_target}>") + endif() + if(NOT GDAL_LIBRARIES STREQUAL "GDAL::GDAL") + set(GDAL_LIBRARIES "${GDAL_LIBRARIES};${keyword};${gdal_deps_target}" PARENT_SCOPE) + endif() + endif() + # The Ninja build system stumbles over '/libpath:` in INTERFACE_LINK_LIBRARIES. + set(lib_paths "${ARGN}") + list(REMOVE_DUPLICATES lib_paths) # For lib paths, late duplicates are redundant. + foreach(item IN LISTS lib_paths) + # INTERFACE_LINK_OPTIONS needs CMake 3.13. There is no direct alternative for older versions. + if(item MATCHES "^/libpath:(.*)|^-L") + set_property(TARGET "${gdal_deps_target}" APPEND PROPERTY INTERFACE_LINK_OPTIONS "${item}") + list(REMOVE_ITEM ARGN "${item}") + endif() + endforeach() + foreach(item IN LISTS ARGN) + get_property(libs TARGET "${gdal_deps_target}" PROPERTY INTERFACE_LINK_LIBRARIES) + if(item MATCHES "^-l|-pthread") + list(REMOVE_ITEM libs "${item}") # For libs, early duplicates are normally redundant. + endif() + list(APPEND libs "${item}") + set_property(TARGET "${gdal_deps_target}" PROPERTY INTERFACE_LINK_LIBRARIES "${libs}") + endforeach() +endfunction() if(GDAL_FOUND) cmake_policy(PUSH) cmake_policy(SET CMP0057 NEW) @@ -80,25 +110,38 @@ if(GDAL_FOUND) _gdal_add_dependency(CURL::libcurl CURL CONFIG) _gdal_add_dependency(expat::expat expat CONFIG) _gdal_add_dependency(GEOS::geos_c geos CONFIG) - _gdal_add_dependency(GIF::GIF GIF) - _gdal_add_dependency(hdf5::hdf5 hdf5 CONFIG) - if(NOT WIN32 OR MINGW) + if(NOT "@NMAKE_BUILD@") + _gdal_add_dependency(GIF::GIF GIF) + endif() + if("hdf5" IN_LIST Z_VCPKG_PORT_FEATURES) + _gdal_add_dependency(hdf5::hdf5 hdf5 CONFIG) + endif() + if(NOT "@NMAKE_BUILD@") _gdal_add_dependency(json-c::json-c json-c CONFIG) endif() _gdal_add_dependency(geotiff_library GeoTIFF CONFIG) _gdal_add_dependency(JPEG::JPEG JPEG) - _gdal_add_dependency(liblzma::liblzma liblzma CONFIG) + _gdal_add_dependency(LibLZMA::LibLZMA LibLZMA) _gdal_add_dependency(png libpng CONFIG) - _gdal_add_dependency(PostgreSQL::PostgreSQL PostgreSQL) + if("poppler" IN_LIST Z_VCPKG_PORT_FEATURES) + _gdal_add_dependency(unofficial::poppler::poppler-private unofficial-poppler) + endif() + if("postgresql" IN_LIST Z_VCPKG_PORT_FEATURES) + _gdal_add_dependency(PostgreSQL::PostgreSQL PostgreSQL) + endif() _gdal_add_dependency(WebP::webp WebP CONFIG) _gdal_add_dependency(LibXml2::LibXml2 LibXml2) - _gdal_add_dependency(netCDF::netcdf netCDF CONFIG) + if("netcdf" IN_LIST Z_VCPKG_PORT_FEATURES) + _gdal_add_dependency(netCDF::netcdf netCDF CONFIG) + endif() _gdal_add_dependency(openjp2 OpenJPEG CONFIG) _gdal_add_dependency(PROJ::proj PROJ4 CONFIG) _gdal_add_dependency(unofficial::sqlite3::sqlite3 unofficial-sqlite3 CONFIG) _gdal_add_dependency(TIFF::TIFF TIFF) _gdal_add_dependency(ZLIB::ZLIB ZLIB) _gdal_add_dependency(zstd::libzstd zstd CONFIG) + z_vcpkg_gdal_add_libs(optimized Release @GDAL_EXTRA_LIBS_RELEASE@) + z_vcpkg_gdal_add_libs(debug Debug @GDAL_EXTRA_LIBS_DEBUG@) list(FIND ARGS "REQUIRED" required) if(NOT GDAL_FOUND AND NOT required EQUAL "-1") message(FATAL_ERROR "Failed to find dependencies of GDAL") diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index e17bd14689826e..0d5299bc7489fb 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,35 +1,47 @@ { "name": "gdal", - "version-semver": "3.4.0", - "port-version": 1, + "version-semver": "3.4.1", + "port-version": 4, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", - "supports": "!(arm & windows)", + "license": null, + "supports": "!uwp", "dependencies": [ "curl", "expat", "geos", - "giflib", - "hdf5", + { + "name": "giflib", + "platform": "!windows | mingw" + }, { "name": "json-c", "platform": "!windows | mingw" }, "libgeotiff", + { + "name": "libiconv", + "platform": "windows & !mingw" + }, "libjpeg-turbo", "liblzma", "libpng", - "libpq", "libwebp", "libxml2", - "netcdf-c", "openjpeg", - "proj4", + "proj", "sqlite3", "tiff", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + }, "zlib", "zstd" ], + "default-features": [ + "supported-default-features" + ], "features": { "cfitsio": { "description": "Enable cfitsio support", @@ -37,6 +49,12 @@ "cfitsio" ] }, + "hdf5": { + "description": "Enable HDF5 support", + "dependencies": [ + "hdf5" + ] + }, "libspatialite": { "description": "Create or update SpatiaLite databases using libspatialite", "dependencies": [ @@ -49,8 +67,53 @@ "libmariadb" ] }, + "netcdf": { + "description": "Enable NetCDF support", + "dependencies": [ + "netcdf-c" + ] + }, + "poppler": { + "description": "Enable poppler support", + "dependencies": [ + { + "name": "poppler", + "default-features": false, + "features": [ + "private-api" + ] + } + ] + }, + "postgresql": { + "description": "Enable PostgreSQL support", + "dependencies": [ + "libpq" + ] + }, + "supported-default-features": { + "description": "Default set of features, dependent on platform", + "dependencies": [ + { + "name": "gdal", + "default-features": false, + "features": [ + "postgresql" + ], + "platform": "!uwp" + }, + { + "name": "gdal", + "default-features": false, + "features": [ + "hdf5", + "netcdf" + ], + "platform": "!uwp & !(windows & arm64)" + } + ] + }, "system-libraries": { - "$supports": "!windows", "description": "Include drivers which need additional libraries" }, "tools": { diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index ca65da57a9f2f3..45a085d52babd5 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdk-pixbuf", "version": "2.42.2", - "port-version": 1, + "port-version": 2, "description": "Image loading library.", "homepage": "https://developer.gnome.org/gdk-pixbuf/", "dependencies": [ @@ -13,6 +13,10 @@ }, "libpng", "tiff", + { + "name": "vcpkg-tool-meson", + "host": true + }, "zlib" ] } diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index 76a240210da42d..4908387759bde9 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alicevision/geogram diff --git a/ports/geogram/vcpkg.json b/ports/geogram/vcpkg.json index 79374c8cbdc912..e7c40ee36551cd 100644 --- a/ports/geogram/vcpkg.json +++ b/ports/geogram/vcpkg.json @@ -1,7 +1,7 @@ { "name": "geogram", "version": "1.7.6", - "port-version": 1, + "port-version": 2, "description": "Geogram is a programming library of geometric algorithms.", "homepage": "https://gforge.inria.fr/projects/geogram/", "supports": "!uwp", diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index a5c71f8f730af1..592d0dc63312bc 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -19,13 +19,6 @@ else () set (LIB_TYPE "STATIC") endif () -if (tools IN_LIST FEATURES) - vcpkg_fail_port_install ( - MESSAGE "Cannot build GeographicLib tools for UWP" - ON_TARGET uwp - ) -endif () - vcpkg_configure_cmake ( SOURCE_PATH ${SOURCE_PATH} OPTIONS diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json index 69c49bc99c4e3e..321cd04ec5ece6 100644 --- a/ports/geographiclib/vcpkg.json +++ b/ports/geographiclib/vcpkg.json @@ -1,12 +1,13 @@ { "name": "geographiclib", "version": "1.52", - "port-version": 1, + "port-version": 2, "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", "features": { "tools": { - "description": "The GeographicLib tools" + "description": "The GeographicLib tools", + "supports": "!uwp" } } } diff --git a/ports/getdns/disable-install-COPYING-in-config-step.patch b/ports/getdns/disable-install-COPYING-in-config-step.patch new file mode 100644 index 00000000000000..ada7313da289c0 --- /dev/null +++ b/ports/getdns/disable-install-COPYING-in-config-step.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 413709d..cbe330b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1102,7 +1102,7 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) + + set(docdir share/doc/getdns) +-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) ++#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) + install(FILES spec/index.html DESTINATION ${docdir}/spec) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + diff --git a/ports/getdns/portfile.cmake b/ports/getdns/portfile.cmake index c1411e621aa08b..3e5cc3cbf00b95 100644 --- a/ports/getdns/portfile.cmake +++ b/ports/getdns/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(GETDNS_VERSION 1.7.0) set(GETDNS_HASH d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6) @@ -12,12 +10,17 @@ vcpkg_download_distfile(ARCHIVE SHA512 ${GETDNS_HASH} ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${GETDNS_VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES disable-install-COPYING-in-config-step.patch ) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") +endif() + vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES diff --git a/ports/getdns/vcpkg.json b/ports/getdns/vcpkg.json index 9f657dcd104c8a..b891510d3ce496 100644 --- a/ports/getdns/vcpkg.json +++ b/ports/getdns/vcpkg.json @@ -1,6 +1,7 @@ { "name": "getdns", "version": "1.7.0", + "port-version": 2, "description": "GetDNS is a modern asynchronous DNS API", "homepage": "https://getdnsapi.net/", "supports": "!uwp", diff --git a/ports/getopt-win32/getopt.h.patch b/ports/getopt-win32/getopt.h.patch new file mode 100644 index 00000000000000..58435f4817c8ef --- /dev/null +++ b/ports/getopt-win32/getopt.h.patch @@ -0,0 +1,50 @@ +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 2e80cf943e8363..041c8ad308cfb0 100644 --- a/ports/getopt-win32/portfile.cmake +++ b/ports/getopt-win32/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( REF 0.1 SHA512 40e2a901241a5d751cec741e5de423c8f19b105572c7cae18adb6e69be0b408efc6c9a2ecaeb62f117745eac0d093f30d6b91d88c1a27e1f7be91f0e84fdf199 HEAD_REF master + PATCHES getopt.h.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/getopt-win32/vcpkg.json b/ports/getopt-win32/vcpkg.json index 8f68d57f2959d6..a53db8ae79c8df 100644 --- a/ports/getopt-win32/vcpkg.json +++ b/ports/getopt-win32/vcpkg.json @@ -1,8 +1,9 @@ { "name": "getopt-win32", "version-string": "0.1", - "port-version": 1, + "port-version": 2, "description": "An implementation of getopt.", "homepage": "https://github.com/libimobiledevice-win32", + "license": "LGPL-3.0-only", "supports": "windows" } diff --git a/ports/gettext/0004-Fix-uwp-tools-build.patch b/ports/gettext/0004-Fix-uwp-tools-build.patch new file mode 100644 index 00000000000000..65dfce570d9ab0 --- /dev/null +++ b/ports/gettext/0004-Fix-uwp-tools-build.patch @@ -0,0 +1,116 @@ +--- a/gettext-runtime/gnulib-lib/fcntl.c 2022-01-11 11:11:28.406622100 +0700 ++++ b/gettext-runtime/gnulib-lib/fcntl.c 2022-01-11 11:11:03.406190800 +0700 +@@ -38,6 +38,10 @@ + # define WIN32_LEAN_AND_MEAN + # include + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#define HANDLE_FLAG_INHERIT 0 ++#endif ++ + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW + # include "msvc-nothrow.h" +--- a/gettext-tools/gnulib-lib/fcntl.c 2022-01-11 11:11:28.406622100 +0700 ++++ b/gettext-tools/gnulib-lib/fcntl.c 2022-01-11 11:11:03.406190800 +0700 +@@ -38,6 +38,10 @@ + # define WIN32_LEAN_AND_MEAN + # include + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#define HANDLE_FLAG_INHERIT 0 ++#endif ++ + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW + # include "msvc-nothrow.h" +--- a/gettext-tools/src/hostname.c 2022-01-12 01:41:13.725124300 +0700 ++++ b/gettext-tools/src/hostname.c 2022-01-12 01:47:39.384274300 +0700 +@@ -35,15 +35,15 @@ + /* Get gethostname(). */ + #include + ++#if !HAVE_GETHOSTNAME + #ifdef WIN32_NATIVE + /* Native Woe32 API lacks gethostname() but has GetComputerName() instead. */ + # include + #else + /* Some systems, like early Solaris versions, lack gethostname() but + have uname() instead. */ +-# if !HAVE_GETHOSTNAME +-# include +-# endif ++# include ++#endif + #endif + + /* Get MAXHOSTNAMELEN. */ +@@ -56,6 +56,9 @@ + + /* Support for using gethostbyname(). */ + #if HAVE_GETHOSTBYNAME ++#if HAVE_WINSOCK2_H ++# include ++#else + # include + # include /* defines AF_INET, AF_INET6 */ + # include /* declares ntohs(), defines struct sockaddr_in */ +@@ -77,6 +80,7 @@ + # endif + # include /* defines struct hostent, declares gethostbyname() */ + #endif ++#endif + + /* Include this after , to avoid a syntax error on BeOS. */ + #include +@@ -250,7 +254,7 @@ + static char * + xgethostname () + { +-#ifdef WIN32_NATIVE ++#ifdef WIN32_NATIVE && !HAVE_GETHOSTNAME + char hostname[MAX_COMPUTERNAME_LENGTH+1]; + DWORD size = sizeof (hostname); + +--- a/libtextstyle/lib/fcntl.c 2020-06-27 03:00:38.000000000 +0700 ++++ b/libtextstyle/lib/fcntl.c 2022-01-11 11:10:29.936269800 +0700 +@@ -38,6 +38,10 @@ + # define WIN32_LEAN_AND_MEAN + # include + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#define HANDLE_FLAG_INHERIT 0 ++#endif ++ + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW + # include "msvc-nothrow.h" +--- a/libtextstyle/lib/isatty.c 2020-06-27 03:00:40.000000000 +0700 ++++ b/libtextstyle/lib/isatty.c 2022-01-11 11:19:04.852685700 +0700 +@@ -99,6 +99,7 @@ + BOOL result = FALSE; + ULONG processId; + ++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP) + #if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA) + if (!initialized) + initialize (); +@@ -137,6 +138,7 @@ + CloseHandle (processHandle); + } + } ++#endif // !WINAPI_FAMILY_APP + return result; + } + +--- a/libtextstyle/lib/unistd.in.h 2020-07-08 08:33:18.000000000 +0700 ++++ b/libtextstyle/lib/unistd.in.h 2022-01-11 22:11:46.402435600 +0700 +@@ -828,7 +828,7 @@ + Null terminate it if the name is shorter than LEN. + If the host name is longer than LEN, set errno = EINVAL and return -1. + Return 0 if successful, otherwise set errno and return -1. */ +-# if @UNISTD_H_HAVE_WINSOCK2_H@ ++# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef gethostname + # define gethostname rpl_gethostname diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 73e68ca1d7a7fa..bd46f930b4c331 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_extract_source_archive_ex( PATCHES 0002-Fix-uwp-build.patch 0003-Fix-win-unicode-paths.patch + 0004-Fix-uwp-tools-build.patch rel_path.patch android.patch gettext-tools_woe32dll_gettextsrc-exports.c.patch @@ -56,6 +57,7 @@ if(VCPKG_TARGET_IS_WINDOWS) ac_cv_func_memset=yes # not detected in release builds ac_cv_header_pthread_h=no ac_cv_header_dirent_h=no + ac_cv_header_getopt_h=no ) endif() diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index 94af3e586034ae..aa6ebb5f3d15f5 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gettext", "version": "0.21", - "port-version": 7, + "port-version": 9, "description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", "dependencies": [ diff --git a/ports/gherkin-c/fix-include-path.patch b/ports/gherkin-c/fix-include-path.patch new file mode 100644 index 00000000000000..ddaf80d310d622 --- /dev/null +++ b/ports/gherkin-c/fix-include-path.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74b9ffb..6af4645 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,7 +60,7 @@ LIST(APPEND GHERKIN_SRS + ) + + add_library(gherkin ${GHERKIN_SRS}) +-target_include_directories(gherkin PUBLIC "$") ++target_include_directories(gherkin PUBLIC "$" "$") + + if (BUILD_GHERKIN_TESTS) + LIST(APPEND GENERATE_TOKEN +@@ -96,7 +96,7 @@ if (BUILD_GHERKIN_TESTS) + ENDFOREACH() + endif() + +-set(include_install_dir "include") ++set(include_install_dir "include/gherkin-c") + set(lib_install_dir "lib/") + set(bin_install_dir "bin/") + set(config_install_dir "lib/cmake/") diff --git a/ports/gherkin-c/fix-install-error.patch b/ports/gherkin-c/fix-install-error.patch new file mode 100644 index 00000000000000..a695e0c7b97c57 --- /dev/null +++ b/ports/gherkin-c/fix-install-error.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3227bf5..74b9ffb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,7 +131,3 @@ install( + # NAMESPACE "${namespace}" + # DESTINATION "${config_install_dir}") + +-add_custom_target(install_${PROJECT_NAME} +- $(MAKE) install +- DEPENDS gherkin +- COMMENT "Installing ${PROJECT_NAME}") diff --git a/ports/gherkin-c/portfile.cmake b/ports/gherkin-c/portfile.cmake index 68c2049d14980d..3e4a7ad0a12660 100644 --- a/ports/gherkin-c/portfile.cmake +++ b/ports/gherkin-c/portfile.cmake @@ -4,19 +4,20 @@ vcpkg_from_github( REF dd180edc7d092311f2e90a0c4957061156d39dd3 SHA512 c6b38ab0e7a0fd1061d86b0ff9d9140f8c3d6f15cfc1673e947254c6c03a66d3e6aae5b267b074aa10fa30ba2850190c9e9ea7c12e340e4f8c5575b9bf31bab3 HEAD_REF master + PATCHES + fix-install-error.patch + fix-include-path.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_GHERKIN_TESTS=OFF ) -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - +vcpkg_cmake_install() vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gherkin-c RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gherkin-c" RENAME copyright) diff --git a/ports/gherkin-c/vcpkg.json b/ports/gherkin-c/vcpkg.json index 462f19b78e5bf5..a91fd90b574304 100644 --- a/ports/gherkin-c/vcpkg.json +++ b/ports/gherkin-c/vcpkg.json @@ -1,6 +1,12 @@ { "name": "gherkin-c", - "version-string": "2019-10-07", - "port-version": 2, - "description": "Gherkin parser/compiler in C" + "version-date": "2019-10-07", + "port-version": 3, + "description": "Gherkin parser/compiler in C", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/giflib/vcpkg.json b/ports/giflib/vcpkg.json index 965fa663bc77a1..2e950baed3d9bd 100644 --- a/ports/giflib/vcpkg.json +++ b/ports/giflib/vcpkg.json @@ -1,8 +1,10 @@ { "name": "giflib", "version": "5.2.1", + "port-version": 2, "description": "A library for reading and writing gif images.", "homepage": "https://sourceforge.net/projects/giflib/", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake index 1cf3e0f2beba9f..2633bf05a48b04 100644 --- a/ports/gl3w/portfile.cmake +++ b/ports/gl3w/portfile.cmake @@ -8,16 +8,9 @@ vcpkg_from_github( 0001-enable-shared-build.patch ) -# Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used -vcpkg_download_distfile(KHRPLATFORM_H - URLS "https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h" - FILENAME khrplatform.h - SHA512 93d9075718eddb69c44482acdc72bbbd3511741272a6124d05ab1ef0702ef03e918501403b6fd334faf2c61f3332f34b7730158aa090db3d448c32b5dd9d9e67 - ) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h" DESTINATION "${SOURCE_PATH}/include/GL") -file(COPY "${KHRPLATFORM_H}" DESTINATION "${SOURCE_PATH}/include/KHR") +file(COPY "${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h" DESTINATION "${SOURCE_PATH}/include/KHR") vcpkg_find_acquire_program(PYTHON3) @@ -27,15 +20,14 @@ vcpkg_execute_required_process( LOGNAME gl3w-gen ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h" "#define GL3W_API" "#define GL3W_API __declspec(dllimport)") diff --git a/ports/gl3w/vcpkg.json b/ports/gl3w/vcpkg.json index f38702da242839..0963571711e09b 100644 --- a/ports/gl3w/vcpkg.json +++ b/ports/gl3w/vcpkg.json @@ -1,10 +1,19 @@ { "name": "gl3w", "version-date": "2018-05-31", - "port-version": 3, + "port-version": 4, "description": "Simple OpenGL core profile loading", "homepage": "https://github.com/skaslev/gl3w", "dependencies": [ - "opengl-registry" + "egl-registry", + "opengl-registry", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index 4eb911174b16a0..2f1195eef4513a 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glfw/glfw - REF 3.3.5 - SHA512 cbb8ebf25d3d826eb1daeff3ad2e0e965ce9def3352955f297743d918f625d96bc05bf87c90f7b57ec53376a0f2f6ce62f80b57fac4e81e023400de275e97beb + REF 7d5a16ce714f0b5f4efa3262de22e4d948851525 #v3.3.5 + SHA512 46f21d34eb4f7c3721fb42d5e817e208d7c70c2fbf1f1d61200ec22c052c9e93989ee3c693ec6b6c3498e5f61388286cfa97b97e10326548e94b6586b87184f7 HEAD_REF master ) diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index 581dae957f02dc..6edaff10a6d596 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glfw3", - "version-semver": "3.3.5", + "version-semver": "3.3.6", "description": "GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.", "homepage": "https://github.com/glfw/glfw", "dependencies": [ diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index f44148415a6c2e..61d7a0bc5fb146 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -1,6 +1,3 @@ -# Glib uses winapi functions not available in WindowsStore -vcpkg_fail_port_install(ON_TARGET "UWP") - # Glib relies on DllMain on Windows if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) @@ -94,7 +91,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - + IF(VCPKG_TARGET_IS_WINDOWS) set(SYSTEM_LIBRARIES dnsapi iphlpapi winmm lshlwapi) else() diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 0afb22048d36d6..586c4cc2723b24 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glib", "version": "2.70.1", + "port-version": 2, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "supports": "!uwp & !(windows & static)", @@ -11,7 +12,7 @@ "libiconv", "pcre", { - "name": "tool-meson", + "name": "vcpkg-tool-meson", "host": true }, "zlib" diff --git a/ports/glibmm/CMakeLists.txt b/ports/glibmm/CMakeLists.txt deleted file mode 100644 index 3e34075d9dfe70..00000000000000 --- a/ports/glibmm/CMakeLists.txt +++ /dev/null @@ -1,149 +0,0 @@ -cmake_minimum_required(VERSION 3.9) -project(glibmm) - -set(CMAKE_CXX_STANDARD 17) - -set(GLIBMM_DLL_SUFFIX 2) -set(GLIBMM_LIB_SUFFIX 2.0) -set(GLIBMM_EXTRA_LIB_SUFFIX 2.4) - -find_path(GLIB_INCLUDE_DIR NAMES glib.h) -find_library(GLIB_LIBRARY NAMES glib-2.0) -find_library(GIO_LIBRARY NAMES gio-2.0) -find_library(GOBJECT_LIBRARY NAMES gobject-2.0) -find_library(GMODULE_LIBRARY NAMES gmodule-2.0) -find_library(GTHREAD_LIBRARY NAMES gthread-2.0) -find_program(GLIB_COMPILE_SCHEMAS NAMES glib-compile-schemas) -find_library(PCRE_LIBRARY NAMES pcre) -find_library(SIGC_LIBRARY NAMES sigc-2.0) -find_library(FFI_LIBRARY NAMES ffi libffi) - -include_directories(${GLIB_INCLUDE_DIR}) -link_libraries( - ${GIO_LIBRARY} - ${GOBJECT_LIBRARY} - ${GMODULE_LIBRARY} - ${GTHREAD_LIBRARY} - ${GLIB_LIBRARY} - ${PCRE_LIBRARY} - ${SIGC_LIBRARY} - ${FFI_LIBRARY} -) - -find_package(Intl REQUIRED) -find_package(Iconv REQUIRED) -link_libraries(${Intl_LIBRARIES} Iconv::Iconv) - -if(APPLE) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) - find_library(CORESERVICES_LIBRARY CoreServices) - find_library(FOUNDATION_LIBRARY Foundation) - link_libraries(${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${FOUNDATION_LIBRARY}) -endif() - -# Activate workaround for exporting all symbols from Windows DLLs to mimic the -# behavior on Linux, where dynamic libraries always export all symbols. -# The same approach was already used by the upstream MSVC build (see MSVC_NMake/gendef/gendef.cc) -if (WIN32) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) -endif() - -if(NOT BUILD_SHARED_LIBS) - add_definitions(-DGLIBMM_STATIC_LIB -DGIOMM_STATIC_LIB) -endif() - -if(WIN32) - add_compile_options(/FI${WARNINGS_HEADER} -DSIZEOF_WCHAR_T=2) -else() - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - link_libraries(Threads::Threads ${CMAKE_DL_LIBS}) -endif() - -if(WIN32) - configure_file(MSVC_Net2013/giomm/giommconfig.h ${CMAKE_BINARY_DIR}/config/gio/giommconfig.h COPYONLY) - configure_file(MSVC_Net2013/glibmm/glibmmconfig.h ${CMAKE_BINARY_DIR}/config/glib/glibmmconfig.h COPYONLY) -else() - set(ENV{GLIB_COMPILE_SCHEMAS} "${GLIB_COMPILE_SCHEMAS}") - set(ENV{GLIBMM_CFLAGS} -I${GLIB_INCLUDE_DIR}) - set(ENV{GLIBMM_LIBS} "${GLIB_LIBRARY}") - set(ENV{GIOMM_CFLAGS} -I${GLIB_INCLUDE_DIR}) - set(ENV{GIOMM_LIBS} "${GIO_LIBRARY}") - set(ENV{PKG_CONFIG} "echo") - - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/config) - execute_process( - COMMAND "${CMAKE_SOURCE_DIR}/configure" - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/config - RESULT_VARIABLE res - ) - if(NOT res EQUAL 0) - message(FATAL_ERROR "Configure failed.") - endif() -endif() - -file(GLOB GLIBMM_SOURCES glib/glibmm/*.cc) -add_library(glibmm ${GLIBMM_SOURCES}) -target_compile_definitions(glibmm PRIVATE -DGLIBMM_BUILD) -target_include_directories(glibmm PUBLIC glib ${CMAKE_BINARY_DIR}/config/glib) -set_target_properties(glibmm PROPERTIES OUTPUT_NAME glibmm-${GLIBMM_DLL_SUFFIX} ARCHIVE_OUTPUT_NAME glibmm-${GLIBMM_LIB_SUFFIX}) - -set(GLIBMM_EXTRA_SOURCES tools/extra_defs_gen/generate_extra_defs.cc) -add_library(glibmm_generate_extra_defs ${GLIBMM_EXTRA_SOURCES}) -target_include_directories(glibmm_generate_extra_defs PUBLIC glib ${CMAKE_BINARY_DIR}/config/glib) -set_target_properties(glibmm_generate_extra_defs PROPERTIES - OUTPUT_NAME glibmm_generate_extra_defs-${GLIBMM_EXTRA_LIB_SUFFIX} - ARCHIVE_OUTPUT_NAME glibmm_generate_extra_defs-${GLIBMM_EXTRA_LIB_SUFFIX}) - -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(libdir ${CMAKE_INSTALL_PREFIX}/lib) -set(includedir ${CMAKE_INSTALL_PREFIX}/include) -set(GLIBMM_API_VERSION 2.0) -set(GLIBMM_MODULE_NAME glibmm) -set(PACKAGE_VERSION 2.52.1) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glib/glibmm.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/glibmm.pc" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glibmm.pc" DESTINATION lib/pkgconfig) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glibmm.pc" DESTINATION lib/pkgconfig RENAME glibmm-2.4.pc) - -file(GLOB GIOMM_SOURCES gio/giomm/*.cc) -if(WIN32) - list(FILTER GIOMM_SOURCES EXCLUDE REGEX "desktopappinfo.cc\$|/unix[^/]+.cc\$") -endif() -add_library(giomm ${GIOMM_SOURCES}) -target_compile_definitions(giomm PRIVATE -DGIOMM_BUILD) -target_link_libraries(giomm PUBLIC glibmm) -target_include_directories(giomm PUBLIC gio ${CMAKE_BINARY_DIR}/config/gio) - -install( - TARGETS glibmm giomm glibmm_generate_extra_defs - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -if(NOT DISABLE_INSTALL_HEADERS) - install( - FILES - ${CMAKE_BINARY_DIR}/config/gio/giommconfig.h - gio/giomm.h - ${CMAKE_BINARY_DIR}/config/glib/glibmmconfig.h - glib/glibmm.h - DESTINATION include - ) - install( - DIRECTORY gio/giomm glib/glibmm - DESTINATION include - FILES_MATCHING PATTERN *.h - ) - install( - DIRECTORY tools/extra_defs_gen/ - DESTINATION include/glibmm_generate_extra_defs/ - FILES_MATCHING PATTERN *.h - ) -endif() - -if(NOT DISABLE_EXAMPLES) - add_executable(options examples/options/main.cc) - target_link_libraries(options PRIVATE giomm) -endif() diff --git a/ports/glibmm/msvc_recommended_pragmas.h b/ports/glibmm/msvc_recommended_pragmas.h deleted file mode 100644 index c0eb1d5edf4cd5..00000000000000 --- a/ports/glibmm/msvc_recommended_pragmas.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef _MSC_VER -#pragma error "This header is for Microsoft VC only." -#endif /* _MSC_VER */ - -/* Make MSVC more pedantic, this is a recommended pragma list - * from _Win32_Programming_ by Rector and Newcomer. - */ -#pragma warning(error:4002) /* too many actual parameters for macro */ -#pragma warning(error:4003) /* not enough actual parameters for macro */ -#pragma warning(1:4010) /* single-line comment contains line-continuation character */ -#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */ -#pragma warning(1:4016) /* no function return type; using int as default */ -#pragma warning(error:4020) /* too many actual parameters */ -#pragma warning(error:4021) /* too few actual parameters */ -#pragma warning(error:4027) /* function declared without formal parameter list */ -#pragma warning(error:4029) /* declared formal parameter list different from definition */ -#pragma warning(error:4033) /* 'function' must return a value */ -#pragma warning(error:4035) /* 'function' : no return value */ -#pragma warning(error:4045) /* array bounds overflow */ -#pragma warning(error:4047) /* different levels of indirection */ -#pragma warning(error:4049) /* terminating line number emission */ -#pragma warning(error:4053) /* An expression of type void was used as an operand */ -#pragma warning(error:4071) /* no function prototype given */ -#pragma warning(disable:4101) /* unreferenced local variable */ -#pragma warning(error:4150) - -#pragma warning(disable:4244) /* No possible loss of data warnings */ -#pragma warning(disable:4305) /* No truncation from int to char warnings */ - -#pragma warning(error:4819) /* The file contains a character that cannot be represented in the current code page */ - -/* work around Microsoft's premature attempt to deprecate the C-Library */ -#define _CRT_SECURE_NO_WARNINGS -#define _CRT_NONSTDC_NO_WARNINGS diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index a6a4307dde3075..35d44428034261 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -1,5 +1,4 @@ # Glib uses winapi functions not available in WindowsStore -vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.68/glibmm-2.68.1.tar.xz" @@ -13,7 +12,7 @@ vcpkg_extract_source_archive_ex( ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dbuild-examples=false -Dmsvc14x-parallel-installable=false @@ -21,6 +20,8 @@ vcpkg_configure_meson( vcpkg_install_meson() vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/glibmm-2.68/proc" "${CURRENT_PACKAGES_DIR}/lib/glibmm-2.68/proc") + vcpkg_fixup_pkgconfig() # Handle copyright and readme diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json index feb01216f9a978..08650595852a11 100644 --- a/ports/glibmm/vcpkg.json +++ b/ports/glibmm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glibmm", "version": "2.68.1", + "port-version": 2, "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", "supports": "!uwp", @@ -11,6 +12,10 @@ "libiconv", "libsigcpp-3", "pcre", + { + "name": "vcpkg-tool-meson", + "host": true + }, "zlib" ] } diff --git a/ports/gmmlib/portfile.cmake b/ports/gmmlib/portfile.cmake index eef38b62225e2a..4fb8c45208dffd 100644 --- a/ports/gmmlib/portfile.cmake +++ b/ports/gmmlib/portfile.cmake @@ -24,5 +24,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Scripts") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Resource") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/GlobalInfo") +vcpkg_fixup_pkgconfig() + # Handle copyright configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/gmmlib/vcpkg.json b/ports/gmmlib/vcpkg.json index 96a697a3db4877..cd2ee1825b4aaa 100644 --- a/ports/gmmlib/vcpkg.json +++ b/ports/gmmlib/vcpkg.json @@ -1,8 +1,10 @@ { "name": "gmmlib", "version": "21.3.2", + "port-version": 1, "description": "Intel(R) Graphics Memory Management Library", "homepage": "https://github.com/intel/gmmlib", + "license": "MIT", "supports": "linux", "dependencies": [ { diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index f907a9babdb175..972a4d67f6f998 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version-string": "6.2.1", - "port-version": 7, + "port-version": 8, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "supports": "!(windows & (arm | arm64))", @@ -12,8 +12,11 @@ "platform": "windows" }, { - "name": "yasm-tool", + "name": "yasm", "host": true, + "features": [ + "tools" + ], "platform": "windows" } ] diff --git a/ports/gmsh/fix-install.patch b/ports/gmsh/fix-install.patch new file mode 100644 index 00000000000000..2f4510240781de --- /dev/null +++ b/ports/gmsh/fix-install.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7040709..a4b8c61 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1872,12 +1872,30 @@ endif() + + # mark targets as optional so we can install them separately if needed + # (e.g. "make lib" or "make shared" followed by "make install/fast") +-install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL) ++install( ++ TARGETS gmsh ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ OPTIONAL ++) + if(ENABLE_BUILD_LIB) +- install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL) ++ install( ++ TARGETS lib ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ OPTIONAL ++ ) + endif() + if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) +- install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL) ++ install( ++ TARGETS shared ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ OPTIONAL ++ ) + endif() + + if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab) diff --git a/ports/gmsh/portfile.cmake b/ports/gmsh/portfile.cmake new file mode 100644 index 00000000000000..78f9194a191135 --- /dev/null +++ b/ports/gmsh/portfile.cmake @@ -0,0 +1,111 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.onelab.info + OUT_SOURCE_PATH SOURCE_PATH + REPO gmsh/gmsh + REF gmsh_4_9_0 + SHA512 e70a09741a86a9131094e77742078aec1cc94517e1d7c855c257bc93c21c057e25c7ac5168d31ec4d905d78f31d5704faf63bfd3a81b4b9e2ebbcfacf2fdaa8b + HEAD_REF master + PATCHES fix-install.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_LIB) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + opencascade ENABLE_OCC + opencascade ENABLE_OCC_CAF + opencascade ENABLE_OCC_TBB + mpi ENABLE_MPI + zipper ENABLE_ZIPPER +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} + -DENABLE_BUILD_LIB=${BUILD_LIB} + -DENABLE_BUILD_SHARED=${BUILD_SHARED} + -DENABLE_MSVC_STATIC_RUNTIME=${STATIC_RUNTIME} + -DGMSH_RELEASE=ON + -DENABLE_PACKAGE_STRIP=ON + -DENABLE_SYSTEM_CONTRIB=ON + # Not implement + -DENABLE_GRAPHICS=OFF # Requires mesh, post, plugins and onelab + -DENABLE_POST=OFF + -DENABLE_PLUGINS=OFF + -DENABLE_MESH=OFF + -DENABLE_PARSER=OFF + -DENABLE_PROFILE=OFF + -DENABLE_PRIVATE_API=OFF + -DENABLE_QUADMESHINGTOOLS=OFF + -DENABLE_PRO=OFF + -DENABLE_TOUCHBAR=OFF + -DENABLE_VISUDEV=OFF + -DENABLE_BLAS_LAPACK=OFF + -DENABLE_CAIRO=OFF + -DENABLE_CGNS=OFF + -DENABLE_CGNS_CPEX0045=OFF + -DENABLE_EIGEN=OFF + -DENABLE_GMP=OFF + -DENABLE_OPENMP=OFF + -DENABLE_POPPLER=OFF + -DENABLE_WRAP_JAVA=OFF + -DENABLE_WRAP_PYTHON=OFF + # Requies dependencies which not included in vcpkg yet + -DENABLE_3M=OFF + -DENABLE_ALGLIB=OFF + -DENABLE_ANN=OFF + -DENABLE_BAMG=OFF + -DENABLE_BLOSSOM=OFF + -DENABLE_BUILD_DYNAMIC=OFF # Needs gfortran + -DENABLE_FLTK=OFF # Needs executable fltk-config + -DENABLE_DINTEGRATION=OFF + -DENABLE_GEOMETRYCENTRAL=OFF + -DENABLE_DOMHEX=OFF + -DENABLE_GETDP=OFF + -DENABLE_GMM=OFF + -DENABLE_HXT=OFF + -DENABLE_KBIPACK=OFF + -DENABLE_MATHEX=OFF + -DENABLE_MED=OFF + -DENABLE_METIS=OFF + -DENABLE_MMG=OFF + -DENABLE_MPEG_ENCODE=OFF + -DENABLE_MUMPS=OFF + -DENABLE_NUMPY=OFF + -DENABLE_NETGEN=OFF + -DENABLE_PETSC4PY=OFF + -DENABLE_ONELAB_METAMODEL=OFF + -DENABLE_ONELAB=OFF + -DENABLE_OPENACC=OFF + -DENABLE_OPTHOM=OFF + -DENABLE_OSMESA=OFF + -DENABLE_P4EST=OFF + -DENABLE_PETSC=OFF + -DENABLE_QUADTRI=OFF + -DENABLE_REVOROPT=OFF + -DENABLE_SLEPC=OFF + -DENABLE_SOLVER=OFF + -DENABLE_TCMALLOC=OFF + -DENABLE_VOROPP=OFF + -DENABLE_WINSLOWUNTANGLER=OFF + # experimental + -DENABLE_BUILD_ANDROID=OFF + -DENABLE_BUILD_IOS=OFF + + -DENABLE_OS_SPECIFIC_INSTALL=OFF # Needs system permission + -DENABLE_RPATH=OFF # Should use dependencies in vcpkg + -DENABLE_TESTS=OFF +) + +vcpkg_cmake_install() + +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) diff --git a/ports/gmsh/vcpkg.json b/ports/gmsh/vcpkg.json new file mode 100644 index 00000000000000..70b1d266ec9cec --- /dev/null +++ b/ports/gmsh/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "gmsh", + "version": "4.9.0", + "description": "Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor.", + "homepage": "https://gmsh.info", + "supports": "!uwp", + "dependencies": [ + "blas", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "graphics": { + "description": "Enable building graphics lib even without GUI (advanced)", + "dependencies": [ + "libjpeg-turbo", + "libpng", + "opengl", + "zlib" + ] + }, + "mpi": { + "description": "Enable MPI (experimental, not used for meshing)", + "dependencies": [ + "openmpi" + ] + }, + "occ": { + "description": "Enable OpenCASCADE modules", + "dependencies": [ + "caf", + "freetype", + "opencascade", + "tbb" + ] + }, + "zipper": { + "description": "Enable Zip file compression/decompression", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/gobject-introspection/0001-g-ir-tool-template.in.patch b/ports/gobject-introspection/0001-g-ir-tool-template.in.patch new file mode 100644 index 00000000000000..c3d4e35de32894 --- /dev/null +++ b/ports/gobject-introspection/0001-g-ir-tool-template.in.patch @@ -0,0 +1,23 @@ +--- a/tools/g-ir-tool-template.in 2021-09-17 23:02:42.601052000 +0700 ++++ b/tools/g-ir-tool-template.in 2021-12-29 21:41:52.987141900 +0700 +@@ -59,7 +59,7 @@ + builtins.__dict__['GIRDIR'] = [girdir] + + # Again, relative paths first so that the installation prefix is relocatable +-pylibdir = os.path.abspath(os.path.join(filedir, '..', 'lib', 'gobject-introspection')) ++pylibdir = os.path.abspath(os.path.join(filedir, '..', '..', 'lib', 'gobject-introspection')) + + # EXT_SUFFIX for py3 SO for py2 + py_mod_suffix = sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO') +@@ -91,6 +91,11 @@ + + sys.path.insert(0, pylibdir) + ++pkg_config_path = os.getenv('PKG_CONFIG_PATH', '') ++if pkg_config_path: ++ pkg_config_path = os.pathsep + pkg_config_path ++os.environ['PKG_CONFIG_PATH'] = os.path.normpath(os.path.join(pylibdir, '..', 'pkgconfig')) + pkg_config_path ++ + from giscanner.utils import dll_dirs + dll_dirs = dll_dirs() + dll_dirs.add_dll_dirs(['gio-2.0']) diff --git a/ports/gobject-introspection/0002-cross-build.patch b/ports/gobject-introspection/0002-cross-build.patch new file mode 100644 index 00000000000000..aa962c9d0f7af1 --- /dev/null +++ b/ports/gobject-introspection/0002-cross-build.patch @@ -0,0 +1,60 @@ +--- a/gir/meson.build 2021-09-17 23:02:42.502052000 +0700 ++++ b/gir/meson.build 2022-01-05 02:31:25.960457800 +0700 +@@ -42,7 +42,7 @@ + install_data(gir_files, install_dir: girdir) + + scanner_command = [ +- find_program('g-ir-scanner', native: true), ++ find_program('g-ir-scanner'), + '--output=@OUTPUT@', + '--no-libtool', + '--quiet', +@@ -495,6 +495,7 @@ + ) + + typelibs = [] ++gircompiler = find_program('g-ir-compiler') + if get_option('gi_cross_binary_wrapper') != '' + gircompiler_command = [get_option('gi_cross_binary_wrapper'), gircompiler.full_path(), ] + else +@@ -510,7 +511,7 @@ + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), + input: gir, + output: '@BASENAME@.typelib', +- depends: [gobject_gir, gircompiler, ], ++ depends: [gobject_gir, ], + command: gircompiler_command, + install: true, + install_dir: typelibdir, +--- a/tools/meson.build 2021-09-17 23:02:42.601052000 +0700 ++++ b/tools/meson.build 2022-01-05 02:36:06.103763400 +0700 +@@ -64,7 +64,9 @@ + install: true, + c_args: custom_c_args, + ) +-meson.override_find_program('g-ir-compiler', gircompiler) ++if not get_option('gi_cross_use_prebuilt_gi') ++ meson.override_find_program('g-ir-compiler', gircompiler) ++endif + + girgenerate = executable('g-ir-generate', 'generate.c', + dependencies: [ +@@ -74,11 +76,15 @@ + install: true, + c_args: custom_c_args, + ) +-meson.override_find_program('g-ir-generate', girgenerate) ++if not get_option('gi_cross_use_prebuilt_gi') ++ meson.override_find_program('g-ir-generate', girgenerate) ++endif + + girinspect = executable('g-ir-inspect', 'g-ir-inspect.c', + dependencies: girepo_dep, + install: true, + c_args: custom_c_args, + ) +-meson.override_find_program('g-ir-inspect', girinspect) ++if not get_option('gi_cross_use_prebuilt_gi') ++ meson.override_find_program('g-ir-inspect', girinspect) ++endif +\ No newline at end of file diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake new file mode 100644 index 00000000000000..56e6be53e79b76 --- /dev/null +++ b/ports/gobject-introspection/portfile.cmake @@ -0,0 +1,82 @@ + +set(GI_MAJOR_MINOR 1.70) +set(GI_PATCH 0) + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.gnome.org/sources/gobject-introspection/${GI_MAJOR_MINOR}/gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz" + FILENAME "gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz" + SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 0001-g-ir-tool-template.in.patch + 0002-cross-build.patch +) + +vcpkg_find_acquire_program(PYTHON3) +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(BISON) + +set(OPTIONS_DEBUG -Dbuild_introspection_data=false) +set(OPTIONS_RELEASE -Dbuild_introspection_data=true) +if(NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET AND + NOT (CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")) + list(APPEND OPTIONS_RELEASE -Dgi_cross_use_prebuilt_gi=true) +endif() + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + ADDITIONAL_NATIVE_BINARIES + flex='${FLEX}' + bison='${BISON}' + ADDITIONAL_CROSS_BINARIES + flex='${FLEX}' + bison='${BISON}' + g-ir-annotation-tool='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-annotation-tool' + g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}' + g-ir-scanner='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-scanner' +) + +vcpkg_host_path_list(APPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") +vcpkg_host_path_list(APPEND ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib") +vcpkg_install_meson(ADD_BIN_TO_PATH) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +set(GI_TOOLS + g-ir-compiler + g-ir-generate + g-ir-inspect +) +set(GI_SCRIPTS + g-ir-annotation-tool + g-ir-scanner +) + +vcpkg_copy_tools(TOOL_NAMES ${GI_TOOLS} AUTO_CLEAN) +foreach(script IN LISTS GI_SCRIPTS) + file(READ "${CURRENT_PACKAGES_DIR}/bin/${script}" _contents) + string(REPLACE "#!/usr/bin/env ${PYTHON3}" "#!/usr/bin/env python3" _contents "${_contents}") + string(REPLACE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_INSTALLED_DIR}/lib" _contents "${_contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}" "${_contents}") + + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${script}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${script}") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") + +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) # _giscanner.lib diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json new file mode 100644 index 00000000000000..e7996b9253226a --- /dev/null +++ b/ports/gobject-introspection/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "gobject-introspection", + "version": "1.70.0", + "port-version": 1, + "description": "A middleware layer between C libraries (using GObject) and language bindings.", + "homepage": "https://gi.readthedocs.io/en/latest/", + "supports": "!static & (native | (windows & x86))", + "dependencies": [ + { + "name": "cairo", + "default-features": false, + "features": [ + "gobject" + ] + }, + "glib", + { + "name": "glib", + "host": true + }, + { + "name": "gobject-introspection", + "host": true + }, + "python3", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index e860f9e585c74c..12526e4caedfce 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -1,19 +1,21 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.33.0 - SHA512 fda083368db3b31dbfa6b6d6b02254a2c2b71a61389c94d8f62a5fcd729691bbe54745e1887fe36b244411af09fcaf7968e535ea9a3dc4833892859e7201bf67 + REF v1.38.0 + SHA512 8d13450d5d669c8f736a6b8cb57291e7de997ab8dcd3dbce8dabd6d71ff81096ef92f02cf64711d40a1465b47f8fd5ce21a355c9526c5900adc076e25b062fa7 HEAD_REF main + PATCHES + support_absl_cxx17.patch ) vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}") list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core") +# This feature does not exist, but allows us to simplify the vcpkg.json file. +list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "grpc-common") list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "googleapis") vcpkg_cmake_configure( @@ -74,7 +76,7 @@ endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" - "${CURRENT_PACKAGES_DIR}/debug/share") + "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/google-cloud-cpp/support_absl_cxx17.patch b/ports/google-cloud-cpp/support_absl_cxx17.patch new file mode 100644 index 00000000000000..0f8074b1d547e3 --- /dev/null +++ b/ports/google-cloud-cpp/support_absl_cxx17.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0e2b703..7097f06 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,8 +28,13 @@ project( + VERSION 1.38.0 + LANGUAGES CXX C) + +-# Allow applications to override the CMAKE_CXX_STANDARD, but if not set use 11. +-if (NOT CMAKE_CXX_STANDARD) ++find_package(absl CONFIG REQUIRED) ++ ++# Use CMAKE_CXX_STANDARD=17 if ABSL_USE_CXX17 is set ++if (ABSL_USE_CXX17) ++ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") ++ set(CMAKE_CXX_STANDARD 17) ++elseif (NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) + endif () + if (CMAKE_CXX_STANDARD VERSION_LESS 11) +diff --git a/google/cloud/internal/port_platform.h b/google/cloud/internal/port_platform.h +index c9f34cf..e624004 100644 +--- a/google/cloud/internal/port_platform.h ++++ b/google/cloud/internal/port_platform.h +@@ -49,6 +49,8 @@ + // Abort compilation if the compiler does not support C++11. + #if GOOGLE_CLOUD_CPP_CPP_VERSION < 201103L + # error "C++11 or newer is required" ++#elif defined(ABSL_USE_CXX17) && GOOGLE_CLOUD_CPP_CPP_VERSION < 201703L ++# error "Compiled to use Abseil with C++17 support, but using with C++ < C++17" + #endif // GOOGLE_CLOUD_CPP_CPP_VERSION < 201103L + + // Abort the build if the version of the compiler is too old. With CMake we diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 9bc82c6c8a9087..86e32b1fe501fc 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "google-cloud-cpp", - "version": "1.33.0", + "version": "1.38.0", + "port-version": 2, "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -25,33 +26,255 @@ "storage" ], "features": { + "accessapproval": { + "description": "Access Approval API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "accesscontextmanager": { + "description": "Access Context Manager API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "apigateway": { + "description": "API Gateway API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "appengine": { + "description": "App Engine Admin API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "artifactregistry": { + "description": "Artifact Registry API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "asset": { + "description": "Cloud Asset API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "assuredworkloads": { + "description": "Assured Workloads API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "automl": { + "description": "Cloud AutoML API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "bigquery": { "description": "The Google Cloud BigQuery C++ client library", "dependencies": [ - "grpc", - { - "name": "grpc", - "host": true - }, - "protobuf", { - "name": "protobuf", - "host": true + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] } ] }, "bigtable": { "description": "The Google Cloud Bigtable C++ client library", "dependencies": [ - "grpc", { - "name": "grpc", - "host": true - }, - "protobuf", + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "billing": { + "description": "Cloud Billing Budget API C++ Client Library", + "dependencies": [ { - "name": "protobuf", - "host": true + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "binaryauthorization": { + "description": "Binary Authorization API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "channel": { + "description": "Cloud Channel API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "cloudbuild": { + "description": "Cloud Build API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "composer": { + "description": "Cloud Composer C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "container": { + "description": "Kubernetes Engine API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "containeranalysis": { + "description": "Container Analysis API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "datamigration": { + "description": "Database Migration API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "debugger": { + "description": "Stackdriver Debugger 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": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "eventarc": { + "description": "Eventarc API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] } ] }, @@ -62,53 +285,62 @@ "name": "google-cloud-cpp", "default-features": false, "features": [ + "grpc-common", "storage" ] - }, - "grpc", - { - "name": "grpc", - "host": true - }, - "protobuf", - { - "name": "protobuf", - "host": true } ] }, - "iam": { - "description": "The Google Cloud IAM C++ client library", + "filestore": { + "description": "Cloud Filestore API C++ Client Library", "dependencies": [ - "grpc", { - "name": "grpc", - "host": true - }, - "protobuf", + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "functions": { + "description": "Cloud Functions API C++ Client Library", + "dependencies": [ { - "name": "protobuf", - "host": true + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] } ] }, - "pubsub": { - "description": "The Google Cloud Bigtable C++ client library", + "gameservices": { + "description": "Game Services API C++ Client Library", "dependencies": [ - "grpc", { - "name": "grpc", - "host": true - }, - "protobuf", + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "gkehub": { + "description": "GKE Hub C++ Client Library", + "dependencies": [ { - "name": "protobuf", - "host": true + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] } ] }, - "spanner": { - "description": "The Google Cloud Spanner C++ client library", + "grpc-common": { + "description": "Dependencies used by all gRPC-based libraries", "dependencies": [ "grpc", { @@ -122,18 +354,510 @@ } ] }, - "storage": { - "description": "The Google Cloud Storage C++ client library", + "iam": { + "description": "The Google Cloud IAM C++ client library", "dependencies": [ - "crc32c", { - "name": "curl", + "name": "google-cloud-cpp", + "default-features": false, "features": [ - "ssl" + "grpc-common" + ] + } + ] + }, + "iap": { + "description": "Cloud Identity-Aware Proxy API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "ids": { + "description": "Cloud IDS API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "iot": { + "description": "Cloud IoT API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "kms": { + "description": "Cloud Key Management Service (KMS) API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "memcache": { + "description": "Cloud Memorystore for Memcached API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "monitoring": { + "description": "Cloud Monitoring API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "networkmanagement": { + "description": "Network Management API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "notebooks": { + "description": "Notebooks API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "orgpolicy": { + "description": "Organization Policy API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "oslogin": { + "description": "Cloud OS Login API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "policytroubleshooter": { + "description": "Policy Troubleshooter API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "privateca": { + "description": "Certificate Authority API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "pubsub": { + "description": "The Google Cloud Bigtable C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "recommender": { + "description": "Recommender C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "redis": { + "description": "Google Cloud Memorystore for Redis API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "resourcemanager": { + "description": "Cloud Resource Manager API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "retail": { + "description": "Retail API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "scheduler": { + "description": "Cloud Scheduler API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "secretmanager": { + "description": "The Google Cloud Secret Manager C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "securitycenter": { + "description": "Security Command Center API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "servicecontrol": { + "description": "Service Control API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "servicedirectory": { + "description": "Service Directory API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "servicemanagement": { + "description": "Service Management API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "serviceusage": { + "description": "Service Usage API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "shell": { + "description": "Cloud Shell API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "spanner": { + "description": "The Google Cloud Spanner C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "storage": { + "description": "The Google Cloud Storage C++ client library", + "dependencies": [ + "crc32c", + { + "name": "curl", + "features": [ + "ssl" ] }, "nlohmann-json" ] + }, + "storagetransfer": { + "description": "Storage Transfer API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "talent": { + "description": "Cloud Talent Solution API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "tasks": { + "description": "The Google Cloud Tasks C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "texttospeech": { + "description": "Cloud Text-to-Speech API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "tpu": { + "description": "Cloud TPU API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "trace": { + "description": "Stackdriver Trace API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "translate": { + "description": "Cloud Translation API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "videointelligence": { + "description": "Cloud Video Intelligence API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "vision": { + "description": "Cloud Vision API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "vmmigration": { + "description": "VM Migration API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "vpcaccess": { + "description": "Serverless VPC Access API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "webrisk": { + "description": "Web Risk API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "websecurityscanner": { + "description": "Web Security Scanner API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "workflows": { + "description": "Workflow Executions API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] } } } diff --git a/ports/gperf/portfile.cmake b/ports/gperf/portfile.cmake index 8531426fca02a2..1e589d7c937189 100644 --- a/ports/gperf/portfile.cmake +++ b/ports/gperf/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) vcpkg_download_distfile(ARCHIVE diff --git a/ports/gperf/vcpkg.json b/ports/gperf/vcpkg.json index 248f4da4c3f794..da0d637c4eee9e 100644 --- a/ports/gperf/vcpkg.json +++ b/ports/gperf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gperf", - "version-string": "3.1", - "port-version": 2, + "version": "3.1", + "port-version": 3, "description": "GNU perfect hash function generator", "homepage": "https://www.gnu.org/software/gperf/" } diff --git a/ports/gperftools/portfile.cmake b/ports/gperftools/portfile.cmake index 00b72fefc63d62..4d03e0e0758706 100644 --- a/ports/gperftools/portfile.cmake +++ b/ports/gperftools/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gperftools/gperftools diff --git a/ports/gperftools/vcpkg.json b/ports/gperftools/vcpkg.json index 6aeb5dd81d2eaf..556db9a29149ae 100644 --- a/ports/gperftools/vcpkg.json +++ b/ports/gperftools/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gperftools", "version-date": "2019-09-02", - "port-version": 2, + "port-version": 3, "description": "A set of tools for performance profiling and memory checking", "homepage": "https://github.com/gperftools/gperftools", "supports": "!(arm | arm64 | uwp)", diff --git a/ports/graphene/vcpkg.json b/ports/graphene/vcpkg.json index 8849b4d42d4ce9..f34bcb79961d21 100644 --- a/ports/graphene/vcpkg.json +++ b/ports/graphene/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphene", "version": "1.10.2", - "port-version": 1, + "port-version": 2, "description": "A thin layer of types for graphic libraries.", "homepage": "https://www.gtk.org/", "supports": "!(arm & windows)", @@ -11,6 +11,10 @@ { "name": "glib", "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true } ] } diff --git a/ports/graphicsmagick/CMakeLists.txt b/ports/graphicsmagick/CMakeLists.txt index 7e6be2992629fb..c71495951fbf62 100644 --- a/ports/graphicsmagick/CMakeLists.txt +++ b/ports/graphicsmagick/CMakeLists.txt @@ -40,6 +40,7 @@ string(REPLACE "#undef HasTTF" "#define HasTTF" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef HAVE_FT2BUILD_H" "#define HAVE_FT2BUILD_H" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef HasZLIB" "#define HasZLIB" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef HasJBIG" "#define HasJBIG" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HasWEBP" "#define HasWEBP" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef QuantumDepth" "#define QuantumDepth 16" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef restrict" "#define restrict" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef size_t" "/* #undef size_t */" CONFIG_H "${CONFIG_H}") @@ -82,14 +83,14 @@ add_library(graphicsmagick coders/art.c coders/avs.c coders/tiff.c coders/tile.c coders/tim.c coders/topol.c coders/ttf.c coders/txt.c coders/uil.c coders/url.c coders/uyvy.c coders/vicar.c coders/vid.c coders/viff.c - coders/wbmp.c coders/wmf.c coders/wpg.c + coders/wbmp.c coders/webp.c coders/wmf.c coders/wpg.c coders/x.c coders/xbm.c coders/xc.c coders/xcf.c coders/xpm.c coders/xtrn.c coders/xwd.c coders/yuv.c filters/analyze.c magick/analyze.c magick/animate.c magick/annotate.c magick/attribute.c magick/average.c magick/bit_stream.c magick/blob.c magick/cdl.c - magick/channel.c magick/color.c magick/colormap.c magick/colorspace.c - magick/color_lookup.c magick/command.c magick/compare.c magick/composite.c + magick/channel.c magick/color.c magick/color_lookup.c magick/colormap.c + magick/colorspace.c magick/command.c magick/compare.c magick/composite.c magick/compress.c magick/confirm_access.c magick/constitute.c magick/decorate.c magick/delegate.c magick/deprecate.c magick/describe.c magick/display.c magick/draw.c magick/effect.c magick/enhance.c magick/enum_strings.c magick/error.c magick/export.c @@ -122,6 +123,7 @@ TARGET_LINK_LIBRARIES(graphicsmagick PRIVATE PNG::PNG TIFF::TIFF Freetype::Freetype + WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder ) target_include_directories(graphicsmagick INTERFACE $) @@ -143,6 +145,7 @@ find_package(JPEG REQUIRED) find_package(PNG REQUIRED) find_package(TIFF REQUIRED) find_package(Freetype REQUIRED) +find_package(WebP CONFIG REQUIRED) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-graphicsmagick-config.cmake " include(CMakeFindDependencyMacro) @@ -152,6 +155,7 @@ find_dependency(JPEG) find_dependency(PNG) find_dependency(TIFF) find_dependency(Freetype) +find_dependency(WebP) include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-graphicsmagick-targets.cmake) ") @@ -248,7 +252,7 @@ if (INSTALL_HEADERS) install(FILES magick/version.h DESTINATION include/magick) install(FILES magick/widget.h DESTINATION include/magick) install(FILES magick/xwindow.h DESTINATION include/magick) - + install(FILES Magick++/lib/Magick++.h DESTINATION include) install(FILES Magick++/lib/Magick++/Blob.h DESTINATION include/Magick++) diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index 11b1252dc6ee36..142364ea9dbd32 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -1,11 +1,11 @@ -set(GM_VERSION 1.3.36) +set(GM_VERSION 1.3.37) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO graphicsmagick/graphicsmagick REF ${GM_VERSION} - FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z" - SHA512 4976816acb9d348b83cc33c1ad2b0a3f9c4174c8983b3a3f867bcd6369984bea34b203a4e168f52f556c94288b9340db1357f614e8ff3a8802bef859378bdd31 + FILENAME "GraphicsMagick-${GM_VERSION}-windows.7z" + SHA512 2e465a290946d730c0da1b45602ebdebc256d9a0705d6d79784efcefb0760a923dd78c73f7a563ce6ec41e4199da66d3b31cc8c6b8f821ff993092d348aeaa2f 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 7e8ef699e00f45..e343f1eb45924c 100644 --- a/ports/graphicsmagick/vcpkg.json +++ b/ports/graphicsmagick/vcpkg.json @@ -1,6 +1,6 @@ { "name": "graphicsmagick", - "version-string": "1.3.36", + "version": "1.3.37", "port-version": 1, "description": "Image processing library", "homepage": "https://sourceforge.net/projects/graphicsmagick/", @@ -9,6 +9,7 @@ "freetype", "libjpeg-turbo", "libpng", + "libwebp", "tiff", "zlib" ] diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake index 6a4b451063a832..14f0b00db5c63e 100644 --- a/ports/graphviz/portfile.cmake +++ b/ports/graphviz/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH @@ -9,6 +11,25 @@ vcpkg_from_gitlab( 0001-Fix-build.patch ) +if(VCPKG_TARGET_IS_OSX) + message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be installed with brew install libtool") +elseif(VCPKG_TARGET_IS_LINUX) + message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be installed with apt-get install libtool") +else() + vcpkg_download_distfile( + LTDL_H_PATH + URLS "https://gitlab.com/graphviz/graphviz-windows-dependencies/-/raw/141d3a21be904fa8dc2ae3ed01d36684db07a35d/${VCPKG_TARGET_ARCHITECTURE}/include/ltdl.h" + FILENAME ltdl.h + SHA512 f2d20e849e35060536265f47014c40eb70e57dacd600a9db112fc465fbfa6a66217b44a8c3dc33039c260a27f09d9034b329b03cc28c32a22ec503fcd17b78cd + ) + file(COPY ${LTDL_H_PATH} DESTINATION ${SOURCE_PATH}/lib/common) + set(EXTRA_CMAKE_OPTION "-DLTDL_INCLUDE_DIR=${SOURCE_PATH}/lib/common") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(EXTRA_CMAKE_OPTION "-DCMAKE_INSTALL_RPATH=${CURRENT_INSTALLED_DIR}/lib") +endif() + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk) vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") @@ -19,15 +40,14 @@ vcpkg_find_acquire_program(PYTHON3) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBISON_EXECUTABLE=${BISON} -DFLEX_EXECUTABLE=${FLEX} -DGIT_EXECUTABLE=${GIT} -DPython3_EXECUTABLE=${PYTHON3} - -DPKG_CONFIG_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/pkgconf/pkgconf - -Denable_ltdl=OFF + -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf + ${EXTRA_CMAKE_OPTION} ) vcpkg_cmake_install() @@ -40,7 +60,18 @@ vcpkg_copy_tools( AUTO_CLEAN ) -# # Handle copyright +if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB PLUGINS "${CURRENT_PACKAGES_DIR}/bin/gvplugin_*") + file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_execute_required_process( + COMMAND dot -c + WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT} + LOGNAME configure-plugins + ) + file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config6" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +endif() + +# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json index 249daf03cbcc88..d9e8eca967d8e0 100644 --- a/ports/graphviz/vcpkg.json +++ b/ports/graphviz/vcpkg.json @@ -1,16 +1,20 @@ { "name": "graphviz", "version-semver": "2.49.1", - "port-version": 1, + "port-version": 2, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", + "license": "EPL-1.0", "dependencies": [ "cairo", "getopt", "libffi", "libgd", "pango", - "pkgconf", + { + "name": "pkgconf", + "host": true + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake index 5e1358ca2872db..fb746d71f6882c 100644 --- a/ports/gsl/portfile.cmake +++ b/ports/gsl/portfile.cmake @@ -1,9 +1,9 @@ -set(GSL_VERSION 2.7) +set(GSL_VERSION 2.7.1) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/gsl/gsl-${GSL_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gsl/gsl-${GSL_VERSION}.tar.gz" FILENAME "gsl-${GSL_VERSION}.tar.gz" - SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5 + SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131 ) vcpkg_extract_source_archive_ex( diff --git a/ports/gsl/vcpkg.json b/ports/gsl/vcpkg.json index e09fe1f11bedb2..c01838c6135342 100644 --- a/ports/gsl/vcpkg.json +++ b/ports/gsl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gsl", - "version": "2.7", + "version": "2.7.1", "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", "homepage": "https://www.gnu.org/software/gsl/", "dependencies": [ diff --git a/ports/gsoap/portfile.cmake b/ports/gsoap/portfile.cmake index 3ba596bc424097..d6073274697d13 100644 --- a/ports/gsoap/portfile.cmake +++ b/ports/gsoap/portfile.cmake @@ -1,7 +1,5 @@ message(FATAL_ERROR "gsoap does not offer permanent public downloads of its sources; all versions except the latest are removed from sourceforge. Therefore, vcpkg cannot support this library directly in the central catalog. If you would like to use gsoap, you can use this port as a starting point (${CMAKE_CURRENT_LIST_DIR}) and update it to use a permanent commercial copy or the latest public download. Do not report issues with this library to the vcpkg GitHub.") -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" "arm64") - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO gsoap2 @@ -52,7 +50,7 @@ file(COPY ${SOURCE_PATH}/gsoap/custom DESTINATION ${CURRENT_PACKAGES_DIR}/share/ 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") +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) diff --git a/ports/gsoap/vcpkg.json b/ports/gsoap/vcpkg.json index ffa37c5d2b5aab..4fce1bad32208b 100644 --- a/ports/gsoap/vcpkg.json +++ b/ports/gsoap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gsoap", "version": "2.8.112", + "port-version": 1, "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)" diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index f9f495c64b760e..cd58d37f023230 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -1,8 +1,13 @@ { "name": "gst-rtsp-server", "version": "1.19.2", + "port-version": 1, "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server", "dependencies": [ - "gstreamer" + "gstreamer", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/gstreamer/gstreamer-disable-hot-doc.patch b/ports/gstreamer/gstreamer-disable-hot-doc.patch new file mode 100644 index 00000000000000..e952046f7ff8a7 --- /dev/null +++ b/ports/gstreamer/gstreamer-disable-hot-doc.patch @@ -0,0 +1,34 @@ +diff --git a/meson.build b/meson.build +index 4a2eb27..1316366 100644 +--- a/meson.build ++++ b/meson.build +@@ -70,19 +70,19 @@ endif + + # Ordered list of subprojects (dict has no ordering guarantees) + subprojects = [ +- ['gstreamer', {'build-hotdoc': true}], +- ['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': true}], +- ['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': true}], ++ ['gstreamer', {'build-hotdoc': false}], ++ ['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': false}], ++ ['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': false}], + ['libnice', { 'option': get_option('libnice'), 'match_gst_version': false}], + ['gst-plugins-bad', { 'option': get_option('bad'), 'build-hotdoc': true}], +- ['gst-plugins-ugly', { 'option': get_option('ugly'), 'build-hotdoc': true}], +- ['gst-libav', { 'option': get_option('libav'), 'build-hotdoc': true}], +- ['gst-rtsp-server', { 'option': get_option('rtsp_server'), 'build-hotdoc': true}], +- ['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': true }], ++ ['gst-plugins-ugly', { 'option': get_option('ugly'), 'build-hotdoc': false}], ++ ['gst-libav', { 'option': get_option('libav'), 'build-hotdoc': false}], ++ ['gst-rtsp-server', { 'option': get_option('rtsp_server'), 'build-hotdoc': false}], ++ ['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': false }], + ['gst-integration-testsuites', { 'option': get_option('devtools') }], +- ['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': true}], +- ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': true}], +- ['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': true}], ++ ['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': false}], ++ ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': false}], ++ ['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': false}], + ['gstreamer-sharp', { 'option': get_option('sharp') }], + ['pygobject', { 'option': get_option('python'), 'match_gst_version': false }], + ['gst-python', { 'option': get_option('python')}], diff --git a/ports/gstreamer/gstreamer-disable-no-unused.patch b/ports/gstreamer/gstreamer-disable-no-unused.patch new file mode 100644 index 00000000000000..4fd3e068f48e7e --- /dev/null +++ b/ports/gstreamer/gstreamer-disable-no-unused.patch @@ -0,0 +1,15 @@ +diff --git a/meson.build b/meson.build +index bed8c4e..772809e 100644 +--- a/meson.build ++++ b/meson.build +@@ -435,8 +435,9 @@ if cc.has_header('execinfo.h') + endif + endif + ++build_system = build_machine.system() + gst_debug = get_option('gst_debug') +-if not gst_debug ++if not gst_debug and build_system != 'windows' + add_project_arguments(['-Wno-unused'], language: 'c') + endif + diff --git a/ports/gstreamer/plugin-base-disable-no-unused.patch b/ports/gstreamer/plugin-base-disable-no-unused.patch new file mode 100644 index 00000000000000..dbd5d345f7fea6 --- /dev/null +++ b/ports/gstreamer/plugin-base-disable-no-unused.patch @@ -0,0 +1,26 @@ +diff --git a/meson.build b/meson.build +index 9b00253..495671e 100644 +--- a/meson.build ++++ b/meson.build +@@ -388,10 +388,11 @@ int32x4_t testfunc(int16_t *a, int16_t *b) { + endif + endif + ++build_system = build_machine.system() + if gst_dep.type_name() == 'internal' + gst_proj = subproject('gstreamer') + +- if not gst_proj.get_variable('gst_debug') ++ if not gst_proj.get_variable('gst_debug') and build_system != 'windows' + message('GStreamer debug system is disabled') + add_project_arguments('-Wno-unused', language: 'c') + else +@@ -404,7 +405,7 @@ else + #include + #ifdef GST_DISABLE_GST_DEBUG + #error "debugging disabled, make compiler fail" +-#endif''' , dependencies: gst_dep) ++#endif''' , dependencies: gst_dep) and build_system != 'windows' + message('GStreamer debug system is disabled') + add_project_arguments('-Wno-unused', language: 'c') + else diff --git a/ports/gstreamer/plugins-ugly-disable-doc.patch b/ports/gstreamer/plugins-ugly-disable-doc.patch new file mode 100644 index 00000000000000..46adcbeeb666c2 --- /dev/null +++ b/ports/gstreamer/plugins-ugly-disable-doc.patch @@ -0,0 +1,16 @@ +diff --git a/meson.build b/meson.build +index c5c78fc..14be48c 100644 +--- a/meson.build ++++ b/meson.build +@@ -281,7 +281,11 @@ if find_program('xgettext', required : get_option('nls')).found() + cdata.set('ENABLE_NLS', 1) + subdir('po') + endif ++ ++enable_doc = get_option('doc') ++if enable_doc.enabled() + subdir('docs') ++endif + subdir('scripts') + + # Set release date diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 20d94fef7842a2..25cfb74b8fcb9c 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -1,11 +1,10 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "emscripten" "wasm32" "android" "ios") - vcpkg_from_github( OUT_SOURCE_PATH GST_BUILD_SOURCE_PATH REPO gstreamer/gst-build REF 1.19.2 SHA512 d6b8e9fc195a60dfb83fe8a49040c21ca5603e3ada2036d56851e6e61a1cd2653ad45f33e39388bde859dfb4806f4a60d9dbfac5fe41b6d2a8b395c44d4525e3 HEAD_REF master + PATCHES gstreamer-disable-hot-doc.patch ) vcpkg_from_github( OUT_SOURCE_PATH GST_SOURCE_PATH @@ -13,10 +12,12 @@ vcpkg_from_github( REF 1.19.2 SHA512 6070f1febf2a1bcc6e68f1e03c1b76891db210773065696e26fac20f0bd3ff47e1634222a49f93a10f6e47717ff21084c9ae0feed6a20facb9650aeb879cc380 HEAD_REF master + PATCHES gstreamer-disable-no-unused.patch ) if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch) + list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch) list(APPEND PLUGIN_GOOD_PATCHES plugins-good-use-zlib.patch) + list(APPEND PLUGIN_UGLY_PATCHES plugins-ugly-disable-doc.patch) endif() vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_BASE_SOURCE_PATH @@ -47,6 +48,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 70dcd4a36d3bd35f680eaa3c980842fbb57f55f17d1453c6a95640709b1b33a263689bf54caa367154267d281e5474686fedaa980de24094de91886a57b6547a HEAD_REF master + PATCHES ${PLUGIN_UGLY_PATCHES} ) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org @@ -57,15 +59,27 @@ vcpkg_from_gitlab( HEAD_REF master ) -file(RENAME ${GST_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer) -file(RENAME ${GST_PLUGIN_BASE_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base) -file(RENAME ${GST_PLUGIN_GOOD_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good) -file(RENAME ${GST_PLUGIN_BAD_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad) -file(RENAME ${GST_PLUGIN_UGLY_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly) -file(RENAME ${GST_MESON_PORTS_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers) +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer") + file(RENAME "${GST_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base") + file(RENAME "${GST_PLUGIN_BASE_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good") + file(RENAME "${GST_PLUGIN_GOOD_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad") + file(RENAME "${GST_PLUGIN_BAD_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly") + file(RENAME "${GST_PLUGIN_UGLY_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers") + file(RENAME "${GST_MESON_PORTS_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers") +endif() if(VCPKG_TARGET_IS_OSX) - # In Darwin platform, there can be an old version of `bison`, + # In Darwin platform, there can be an old version of `bison`, # Which can't be used for `gst-build`. It requires 2.4+ vcpkg_find_acquire_program(BISON) execute_process( @@ -82,10 +96,21 @@ if(VCPKG_TARGET_IS_OSX) endif() # make tools like 'glib-mkenums' visible -get_filename_component(GLIB_TOOL_DIR ${CURRENT_INSTALLED_DIR}/tools/glib ABSOLUTE) +get_filename_component(GLIB_TOOL_DIR "${CURRENT_INSTALLED_DIR}/tools/glib" ABSOLUTE) message(STATUS "Using glib tools: ${GLIB_TOOL_DIR}") -vcpkg_add_to_path(PREPEND ${GLIB_TOOL_DIR}) +vcpkg_add_to_path(PREPEND "${GLIB_TOOL_DIR}") +if ("x264" IN_LIST FEATURES) + set(PLUGIN_UGLY_X264 enabled) +else() + set(PLUGIN_UGLY_X264 disabled) +endif() + +if("plugins-base" IN_LIST FEATURES) + set(PLUGIN_BASE_SUPPORT enabled) +else() + set(PLUGIN_BASE_SUPPORT disabled) +endif() if("plugins-bad" IN_LIST FEATURES) # requires 'libdrm', 'dssim', 'libmicrodns' message(FATAL_ERROR "The feature 'plugins-bad' is not supported in this port version") @@ -99,6 +124,18 @@ else() set(PLUGIN_UGLY_SUPPORT disabled) endif() +if ("gl-graphene" IN_LIST FEATURES) + set(GL_GRAPHENE enabled) +else() + set(GL_GRAPHENE disabled) +endif() + +if ("flac" IN_LIST FEATURES) + set(PLUGIN_GOOD_FLAC enabled) +else() + set(PLUGIN_GOOD_FLAC disabled) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(LIBRARY_LINKAGE "shared") else() @@ -122,7 +159,7 @@ vcpkg_add_to_path("${GIT_DIR}") # https://github.com/GStreamer/gst-plugins-ugly/blob/1.18.4/meson_options.txt # vcpkg_configure_meson( - SOURCE_PATH ${GST_BUILD_SOURCE_PATH} + SOURCE_PATH "${GST_BUILD_SOURCE_PATH}" OPTIONS # gstreamer -Dgstreamer:default_library=${LIBRARY_LINKAGE} @@ -136,18 +173,21 @@ vcpkg_configure_meson( -Dgstreamer:tests=disabled -Dgstreamer:benchmarks=disabled -Dgstreamer:tools=disabled - -Dgstreamer:gtk_doc=disabled + -Dgstreamer:doc=disabled -Dgstreamer:introspection=disabled -Dgstreamer:nls=disabled # gst-plugins-base + -Dbase=${PLUGIN_BASE_SUPPORT} -Dgst-plugins-base:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-base:examples=disabled -Dgst-plugins-base:tests=disabled + -Dgst-plugins-base:doc=disabled -Dgst-plugins-base:tools=disabled -Dgst-plugins-base:introspection=disabled -Dgst-plugins-base:nls=disabled -Dgst-plugins-base:orc=disabled -Dgst-plugins-base:pango=disabled + -Dgst-plugins-base:gl-graphene=${GL_GRAPHENE} # gst-plugins-good -Dgst-plugins-good:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-good:qt5=disabled @@ -158,8 +198,10 @@ vcpkg_configure_meson( -Dgst-plugins-good:vpx=auto # libvpx -Dgst-plugins-good:examples=disabled -Dgst-plugins-good:tests=disabled + -Dgst-plugins-good:doc=disabled -Dgst-plugins-good:nls=disabled -Dgst-plugins-good:orc=disabled + -Dgst-plugins-good:flac=${PLUGIN_GOOD_FLAC} # gst-plugins-bad -Dbad=${PLUGIN_BAD_SUPPORT} -Dgst-plugins-bad:default_library=${LIBRARY_LINKAGE} @@ -167,6 +209,7 @@ vcpkg_configure_meson( -Dgst-plugins-bad:hls-crypto=openssl -Dgst-plugins-bad:examples=disabled -Dgst-plugins-bad:tests=disabled + -Dgst-plugins-bad:doc=disabled -Dgst-plugins-bad:introspection=disabled -Dgst-plugins-bad:nls=${LIBRARY_LINKAGE} -Dgst-plugins-bad:orc=disabled @@ -174,8 +217,10 @@ vcpkg_configure_meson( -Dugly=${PLUGIN_UGLY_SUPPORT} -Dgst-plugins-ugly:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-ugly:tests=disabled + -Dgst-plugins-ugly:doc=disabled -Dgst-plugins-ugly:nls=disabled -Dgst-plugins-ugly:orc=disabled + -Dgst-plugins-ugly:x264=${PLUGIN_UGLY_X264} # see ${GST_BUILD_SOURCE_PATH}/meson_options.txt -Dpython=disabled -Dlibav=disabled @@ -215,50 +260,48 @@ vcpkg_configure_meson( -Dgst-plugins-bad:glib-asserts=disabled -Dgst-plugins-bad:glib-checks=disabled ) -if(VCPKG_TARGET_IS_WINDOWS) - # note: can't find where z.lib comes from. replace it to appropriate library name manually - get_filename_component(BUILD_NINJA_DBG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja ABSOLUTE) - vcpkg_replace_string(${BUILD_NINJA_DBG} "z.lib" "zlibd.lib") - get_filename_component(BUILD_NINJA_REL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja ABSOLUTE) - vcpkg_replace_string(${BUILD_NINJA_REL} "z.lib" "zlib.lib") - vcpkg_replace_string(${BUILD_NINJA_REL} "\"-Wno-unused\"" "") # todo: may need a patch for `gst_debug=false` -endif() + vcpkg_install_meson() # Remove duplicated GL headers (we already have `opengl-registry`) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR - ${CURRENT_PACKAGES_DIR}/include/GL +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR" + "${CURRENT_PACKAGES_DIR}/include/GL" ) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include/gst/gl/gstglconfig.h - ${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gl/gstglconfig.h +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include/gst/gl/gstglconfig.h" + "${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gl/gstglconfig.h" ) - -file(INSTALL ${GST_BUILD_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/libexec - ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/include - ${CURRENT_PACKAGES_DIR}/libexec - ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/libexec" + "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/include" + "${CURRENT_PACKAGES_DIR}/libexec" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include" ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin - ${CURRENT_PACKAGES_DIR}/bin + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" ) - set(PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX}) - set(SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${PREFIX}gstreamer-full-1.0${SUFFIX} - ${CURRENT_PACKAGES_DIR}/lib/${PREFIX}gstreamer-full-1.0${SUFFIX} + set(PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}") + set(SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" + "${CURRENT_PACKAGES_DIR}/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" ) endif() + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(GLOB DBG_BINS ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll - ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb - ) - file(COPY ${DBG_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(GLOB REL_BINS ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll - ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb + if (NOT VCPKG_BUILD_TYPE) + file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll" + "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb" + ) + file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb" ) - file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE ${DBG_BINS} ${REL_BINS}) endif() + vcpkg_fixup_pkgconfig() + +file(INSTALL "${GST_BUILD_SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index d6d984817953b5..43bfd15e654f30 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,11 +1,11 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 1, + "port-version": 5, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", - "supports": "(windows | osx) & (x64 | x86)", + "supports": "!linux & !uwp", "dependencies": [ { "name": "cairo", @@ -26,7 +26,6 @@ "name": "glib", "host": true }, - "graphene", "libnice", "libxml2", { @@ -34,32 +33,78 @@ "platform": "windows | osx" }, "openssl", - "tool-meson", + { + "name": "vcpkg-tool-meson", + "host": true + }, { "name": "yasm-tool-helper", "platform": "windows" } ], "default-features": [ + "plugins-base", "plugins-good", "plugins-ugly" ], "features": { + "flac": { + "description": "FLAC audio codec plugin", + "supports": "!arm", + "dependencies": [ + "libflac" + ] + }, + "gl-graphene": { + "description": "Use Graphene in OpenGL plugin", + "supports": "!arm", + "dependencies": [ + "graphene" + ] + }, "plugins-bad": { "description": "'Bad' GStreamer plugins and helper libraries", "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "rawparse" + ], + "platform": "!arm" + }, "openh264" ] }, + "plugins-base": { + "description": "'Base' GStreamer plugins and helper libraries", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "gl-graphene", + "rawparse" + ], + "platform": "!arm" + } + ] + }, "plugins-good": { "description": "'Good' GStreamer plugins and helper libraries", "dependencies": [ "bzip2", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "flac" + ], + "platform": "!arm" + }, "jack2", - "libflac", "libjpeg-turbo", "libpng", - "libraw", "libvpx", "mpg123", "speex", @@ -68,6 +113,27 @@ }, "plugins-ugly": { "description": "'Ugly' GStreamer plugins and helper libraries", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "x264" + ], + "platform": "!arm" + } + ] + }, + "rawparse": { + "description": "Build with libraw support", + "supports": "!arm", + "dependencies": [ + "libraw" + ] + }, + "x264": { + "description": "Colon separated list of additional x264 library paths, e.g. for 10-bit version", + "supports": "!arm", "dependencies": [ "x264" ] diff --git a/ports/gtk/0003-vs2022-rc.patch b/ports/gtk/0003-vs2022-rc.patch deleted file mode 100644 index 634ce15828becc..00000000000000 --- a/ports/gtk/0003-vs2022-rc.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/gtk/gtk-win32.rc.body.in b/gtk/gtk-win32.rc.body.in -index b876a6ddf51846236f2c77e4c529b0c0a84e303e..fc2dfd2ed31ed518cc8238bd5b5602cc4a343f02 100644 ---- a/gtk/gtk-win32.rc.body.in -+++ b/gtk/gtk-win32.rc.body.in -@@ -1,5 +1,5 @@ --#include --#include -+#define WIN32_LEAN_AND_MEAN -+#include - - GTK_ICON ICON "gtk.ico" - -diff --git a/tools/generate-uac-manifest.py b/tools/generate-uac-manifest.py -index ede6ba5044c3f11112f5e8f36dea8f1aaa14a70d..62f063a8bb6d00201ca42a28eb33e560179a41f5 100644 ---- a/tools/generate-uac-manifest.py -+++ b/tools/generate-uac-manifest.py -@@ -24,7 +24,7 @@ def main(): - help='require admin access to application') - parser.add_argument('--input-resource-file', dest='resource', - default=None, -- help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included winuser.h in it') -+ help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included windows.h in it') - parser.add_argument('--output-dir', dest='outdir', - default=None, - help='directory to output resulting files') -@@ -92,7 +92,8 @@ def write_rc_file(name, resource, outdir): - - if resource is None: - outfile = open(output_file_base_name + '.rc', 'w+') -- outfile.write('#include ') -+ outfile.write('#define WIN32_LEAN_AND_MEAN\n') -+ outfile.write('#include \n') - else: - if resource != output_file_base_name + '.rc': - outfile = open(output_file_base_name + '.rc', 'w+') diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 63cb02230f3e5a..8c7595e60ed2bd 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -1,16 +1,15 @@ -set(GTK_VERSION 4.4.0) +set(GTK_VERSION 4.6.0) vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/gtk - REF f1f197e3b94a55d5cbfaae2498f991a0ae733b32 #v4.4.0 - SHA512 80ffc2c2a2baae4a4097470a41d0b10d5df9086e60daa520aad845fe571e03486c4f87e295ae4f05aa0069df80fe40ad7655de4f9aecc21c2482bbe0b2b6e2fb + REF 70cb61fb7104c76a15bc6494a10e6ff1d470f6d8 #v4.6.0 + SHA512 dba6ce5a8306f9dda290f3785d6d15aee67c66329ab0756b7b7573387c1a512e96d3b53b24ed342ce7376832dcac20fb24025f2b8986f74d91a88e4fcf3de6ae HEAD_REF master # branch name PATCHES 0001-build.patch 0002-windows-build.patch - 0003-vs2022-rc.patch # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4063 0004-macos-build.patch ) @@ -48,13 +47,10 @@ vcpkg_configure_meson( -Dgtk_doc=false -Dman-pages=false -Dintrospection=disabled - -Dsassc=enabled # Rebuild themes using sassc -Dmedia-ffmpeg=disabled # Build the ffmpeg media backend -Dmedia-gstreamer=disabled # Build the gstreamer media backend -Dprint-cups=disabled # Build the cups print backend - -Dprint-cloudprint=disabled # Build the cloudprint print backend -Dvulkan=disabled # Enable support for the Vulkan graphics API - -Dxinerama=disabled # Enable support for the X11 Xinerama extension -Dcloudproviders=disabled # Enable the cloudproviders support -Dsysprof=disabled # include tracing support for sysprof -Dtracker=disabled # Enable Tracker3 filechooser search diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index d045461352ed45..4966aae5be56a6 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,8 +1,9 @@ { "name": "gtk", - "version": "4.4.0", + "version": "4.6.0", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", + "license": "LGPL-2.0-only", "dependencies": [ "atk", { @@ -30,6 +31,10 @@ "graphene", "libepoxy", "pango", - "sassc" + "sassc", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index 5287256224432e..634367eae07f83 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -1,9 +1,7 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.0/gtkmm-4.0.1.tar.xz" - FILENAME "gtkmm-4.0.1.tar.xz" - SHA512 5b9f9f32fe85ee7a281c9d3d3b266b1265924926058d778f48302808812cad7047c09440c317497fa0069816984d3556868a703a5488e0bfd8cd26fc64afcb1b + URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.6/gtkmm-4.6.0.tar.xz" + FILENAME "gtkmm-4.6.0.tar.xz" + SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199 ) vcpkg_extract_source_archive_ex( diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json index f394a6c8009038..47cbec9f5f7f7d 100644 --- a/ports/gtkmm/vcpkg.json +++ b/ports/gtkmm/vcpkg.json @@ -1,8 +1,9 @@ { "name": "gtkmm", - "version": "4.0.1", + "version": "4.6.0", "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.", "homepage": "https://www.gtkmm.org/", + "license": "LGPL-3.0-or-later", "supports": "!uwp", "dependencies": [ "atk", @@ -20,6 +21,10 @@ "gtk", "libepoxy", "pango", - "pangomm" + "pangomm", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/gtl/portfile.cmake b/ports/gtl/portfile.cmake new file mode 100644 index 00000000000000..ed16730c14f71f --- /dev/null +++ b/ports/gtl/portfile.cmake @@ -0,0 +1,21 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO greg7mdp/gtl + REF 1.00 + SHA512 842a5e2634919a04fdd87995a8ada2f949c51a070a7c175043e0f9105a93248325023f85b28f9406276c2912a0fb4015a2e9ba30113d4a0214492da0dc5e5716 + HEAD_REF main +) + +# Use greg7mdp/gtl's own build process, skipping examples and tests +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +# Delete redundant directories +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/doc") + +# Put the licence file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gtl/vcpkg.json b/ports/gtl/vcpkg.json new file mode 100644 index 00000000000000..b6b93c45f4392d --- /dev/null +++ b/ports/gtl/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "gtl", + "version": "1.0.0", + "description": "Greg's Template Library of useful classes.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/guetzli/CMakeLists.txt b/ports/guetzli/CMakeLists.txt index d24b2326dccbc0..af5eea6c7c0089 100644 --- a/ports/guetzli/CMakeLists.txt +++ b/ports/guetzli/CMakeLists.txt @@ -17,6 +17,8 @@ list(REMOVE_ITEM guetzli_srcs "guetzli/guetzli.cc") add_library(guetzli_lib ${guetzli_srcs}) +target_compile_features(guetzli_lib PUBLIC cxx_std_11) + add_executable(guetzli guetzli/guetzli.cc) target_link_libraries(guetzli_lib ${butteraugli_library} ${PNG_LIBRARIES}) diff --git a/ports/guetzli/portfile.cmake b/ports/guetzli/portfile.cmake index d2260241845425..82873070132506 100644 --- a/ports/guetzli/portfile.cmake +++ b/ports/guetzli/portfile.cmake @@ -9,17 +9,16 @@ vcpkg_from_github( PATCHES butteraugli.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/guetzli) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/guetzli") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/guetzli RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/guetzli" RENAME copyright) diff --git a/ports/guetzli/vcpkg.json b/ports/guetzli/vcpkg.json index 63228967765c94..05da33a62d31c8 100644 --- a/ports/guetzli/vcpkg.json +++ b/ports/guetzli/vcpkg.json @@ -1,11 +1,15 @@ { "name": "guetzli", - "version-string": "2020-09-14", - "port-version": 1, + "version-date": "2020-09-14", + "port-version": 2, "description": "Perceptual JPEG encoder", "homepage": "https://github.com/google/guetzli", "dependencies": [ "butteraugli", - "libpng" + "libpng", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/h3/portfile.cmake b/ports/h3/portfile.cmake index 880bcb98fc3990..f691fe780e91fb 100644 --- a/ports/h3/portfile.cmake +++ b/ports/h3/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -25,4 +24,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/h3/vcpkg.json b/ports/h3/vcpkg.json index 6e1c8ebeec31f4..183a69dfe50973 100644 --- a/ports/h3/vcpkg.json +++ b/ports/h3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "h3", "version-semver": "3.7.2", + "port-version": 1, "description": "A Hexagonal Hierarchical Geospatial Indexing System", "homepage": "https://github.com/uber/h3", "supports": "!uwp", diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake index 486726c289e395..1b7dea6d572c5f 100644 --- a/ports/halide/portfile.cmake +++ b/ports/halide/portfile.cmake @@ -1,11 +1,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +set(HALIDE_VERSION_TAG v13.0.2) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO halide/Halide - REF 5dabcaa9effca1067f907f6c8ea212f3d2b1d99a # v12.0.1 - SHA512 5ab44703850885561337e23d8b538a5adfe1611e24e8daa4a1313756b4f9dfeb54e89bf8400d46a3340c00234402681b4f44ba3ed5322027fd6cb5dfbd525acd - HEAD_REF release/12.x + REF ${HALIDE_VERSION_TAG} + SHA512 d2b19934ff0d759d302428f61e4075306f79c29cc1cd8802dc1ac5f325434034e0f430c435610e58f862b87cc8ef34ddcc3d0588947eeb8e1387d0bf31b9c008 + HEAD_REF release/13.x ) vcpkg_check_features( @@ -68,8 +70,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/tutorial) -file(GLOB readmes "${CURRENT_PACKAGES_DIR}/share/${PORT}/*.md") -file(REMOVE ${readmes}) - configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY) +configure_file(${CMAKE_CURRENT_LIST_DIR}/usage.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) diff --git a/ports/halide/usage b/ports/halide/usage deleted file mode 100644 index 591e497db458ef..00000000000000 --- a/ports/halide/usage +++ /dev/null @@ -1,14 +0,0 @@ -The package halide provides CMake targets: - - find_package(Halide REQUIRED) - - # JIT mode: - target_link_libraries(main PRIVATE Halide::Halide) - - # AOT mode: - target_link_libraries(gen PRIVATE Halide::Generator) - add_halide_library(filter FROM gen) - target_link_libraries(main PRIVATE filter) - -For more information see: - https://github.com/halide/Halide/blob/v12.0.1/README_cmake.md diff --git a/ports/halide/usage.in b/ports/halide/usage.in new file mode 100644 index 00000000000000..70cb98bd390f0a --- /dev/null +++ b/ports/halide/usage.in @@ -0,0 +1,27 @@ +The package halide provides CMake targets: + + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED YES) + set(CMAKE_CXX_EXTENSIONS NO) + + find_package(Halide REQUIRED) + + # JIT mode: + add_executable(my_halide_app main.cpp) + target_link_libraries(my_halide_app PRIVATE Halide::Halide) + + # AOT mode: + add_executable(my_generators my_generators.cpp) + target_link_libraries(my_generators PRIVATE Halide::Generator) + add_halide_library(my_first_generator FROM my_generators) + add_halide_library(my_second_generator FROM my_generators + PARAMS parallel=false scale=3.0 rotation=ccw output.type=uint16) + add_halide_library(my_second_generator_2 FROM my_generators + GENERATOR my_second_generator + PARAMS scale=9.0 rotation=ccw output.type=float32) + add_halide_library(my_second_generator_3 FROM my_generators + GENERATOR my_second_generator + PARAMS parallel=false output.type=float64) + +For more information see: + https://github.com/halide/Halide/blob/@HALIDE_VERSION_TAG@/README_cmake.md diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json index baa99449ae8893..4e54393fe62d91 100644 --- a/ports/halide/vcpkg.json +++ b/ports/halide/vcpkg.json @@ -1,7 +1,6 @@ { "name": "halide", - "version": "12.0.1", - "port-version": 1, + "version": "13.0.2", "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.", "homepage": "https://github.com/halide/Halide", "supports": "!uwp", diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in index a142735cf2a927..d4db3ea41c8948 100644 --- a/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -1,5 +1,6 @@ # For old projects where the minimum CMake version is lower than 3.3. cmake_policy(SET CMP0057 NEW) +include(CMakeFindDependencyMacro) if(TARGET harfbuzz) return() @@ -14,9 +15,7 @@ if(HARFBUZZ_LIBRARY_DEBUG) endif() find_library(HARFBUZZ_LIBRARY_RELEASE NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) -if(HARFBUZZ_LIBRARY_RELEASE) - target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) -endif() +target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) set(HARFBUZZ_FEATURES @FEATURES@) @@ -25,7 +24,7 @@ if(APPLE) target_link_libraries(harfbuzz INTERFACE ${APPLICATIONSERVICES_LIBRARY}) endif() -find_package(freetype CONFIG REQUIRED) +find_dependency(freetype CONFIG) target_link_libraries(harfbuzz INTERFACE freetype) if ("graphite2" IN_LIST HARFBUZZ_FEATURES) @@ -53,9 +52,20 @@ if ("glib" IN_LIST HARFBUZZ_FEATURES) endif() if ("icu" IN_LIST HARFBUZZ_FEATURES) - find_package(ICU 61 COMPONENTS uc REQUIRED) + find_dependency(ICU 61 COMPONENTS uc) target_link_libraries(harfbuzz INTERFACE ICU::uc) endif() get_filename_component(_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) -target_include_directories(harfbuzz INTERFACE ${_INSTALL_DIR}/include/harfbuzz) +target_include_directories(harfbuzz INTERFACE "${_INSTALL_DIR}/include/harfbuzz") + +set(HARFBUZZ_LIBRARY harfbuzz::harfbuzz PARENT_SCOPE) +set(HARFBUZZ_LIBRARIES harfbuzz::harfbuzz PARENT_SCOPE) +set(HARFBUZZ_INCLUDE_DIR "${_INSTALL_DIR}/include/harfbuzz" PARENT_SCOPE) +set(HARFBUZZ_INCLUDE_DIRS "${_INSTALL_DIR}/include/harfbuzz" PARENT_SCOPE) + +if(HARFBUZZ_LIBRARY_RELEASE) + set(HARFBUZZ_FOUND TRUE PARENT_SCOPE) +else() + set(HARFBUZZ_FOUND FALSE PARENT_SCOPE) +endif() diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 816dec15a75cff..01b201be0e065e 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 3.0.0 - SHA512 69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5 + REF 3.2.0 + SHA512 5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18 HEAD_REF master PATCHES # This patch is a workaround that is needed until the following issues are resolved upstream: diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 13207c7228ebd8..110a24c2913991 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "harfbuzz", - "version-semver": "3.0.0", + "version-semver": "3.2.0", + "port-version": 1, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ @@ -11,6 +12,10 @@ { "name": "gettext", "platform": "osx" + }, + { + "name": "vcpkg-tool-meson", + "host": true } ], "features": { diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index 23263c7d77b48a..6383a4826f02e2 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -1,7 +1,5 @@ # highfive should be updated together with hdf5 -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HDFGroup/hdf5 @@ -86,6 +84,12 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") + foreach(file IN LISTS pc_files) + vcpkg_replace_string("${file}" " -lhdf5" " -llibhdf5") + endforeach() +endif() file(READ "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" contents) string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] @@ -98,25 +102,25 @@ if(FEATURES MATCHES "tools") set(HDF5_TOOLS h5cc h5hlcc h5c++ h5hlc++ h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import ) - + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(TRANSFORM HDF5_TOOLS REPLACE "^(.+)$" "\\1-shared") else() endif() - + foreach(HDF5_TOOL IN LISTS HDF5_TOOLS) if (NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${HDF5_TOOL}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" OR NOT EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${HDF5_TOOL}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") list(REMOVE_ITEM HDF5_TOOLS "${HDF5_TOOL}") endif() endforeach() - + vcpkg_copy_tools(TOOL_NAMES ${HDF5_TOOLS} AUTO_CLEAN) endif() if ("utils" IN_LIST FEATURES) vcpkg_copy_tools( - TOOL_NAMES mirror_server mirror_server_stop + TOOL_NAMES mirror_server mirror_server_stop AUTO_CLEAN ) endif() diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index 25c2acc283d523..d535ebfa54f279 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hdf5", "version": "1.12.1", - "port-version": 1, + "port-version": 4, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "supports": "!uwp", diff --git a/ports/hexl/portfile.cmake b/ports/hexl/portfile.cmake index e6946232a3bb0e..bbfbed2a954c27 100644 --- a/ports/hexl/portfile.cmake +++ b/ports/hexl/portfile.cmake @@ -1,6 +1,3 @@ -# This library only supports "x64" architecture -vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hexl diff --git a/ports/hexl/vcpkg.json b/ports/hexl/vcpkg.json index 2b3adb89759019..7d75fd4b523d30 100644 --- a/ports/hexl/vcpkg.json +++ b/ports/hexl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hexl", "version": "1.2.3", + "port-version": 1, "description": "Intel® HEXL is an open-source library which provides efficient implementations of integer arithmetic on Galois fields.", "homepage": "https://github.com/intel/hexl", "supports": "x64 & !(windows & !static)", diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index 1c9edd1ff0371c..57dfd339bf3e8f 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi - REF hidapi-0.11.0 - SHA512 0de4abc963600d159ce231416c468b9e81a8361e4d2c2202988d6eb2e58a923700e9b9be639fbddc6bc14625131848409e2e88dbc4b34a1f8a726c8fa4692d92 + REF hidapi-0.11.2 + SHA512 c4d04bf570aa98dd88d7ce08ef1abb0675d500c9aa2c22f0437fa30b700a94446779f77e1170267926d5f6f0d9cdb2bb81ad1fe20d158c18587fddbca59e9517 HEAD_REF master ) @@ -16,6 +16,8 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/hidapi/hidapi.cmake" "\"/hidapi\"" "\"\${_IMPORT_PREFIX}/include\"") + file(INSTALL "${SOURCE_PATH}/LICENSE-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/hidapi/vcpkg.json b/ports/hidapi/vcpkg.json index cefc523a421371..673384492db5fa 100644 --- a/ports/hidapi/vcpkg.json +++ b/ports/hidapi/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hidapi", - "version-semver": "0.11.0", + "version-semver": "0.11.2", + "port-version": 1, "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.", "homepage": "https://github.com/libusb/hidapi", "license": "BSD-3-Clause-Clear", diff --git a/ports/highfive/fix-error-C1128.patch b/ports/highfive/fix-error-C1128.patch new file mode 100644 index 00000000000000..89b88960a3ecd2 --- /dev/null +++ b/ports/highfive/fix-error-C1128.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d42b6e..e6d9f18 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,10 @@ option(HIGHFIVE_BUILD_DOCS "Enable documentation building" ON) + option(HIGHFIVE_USE_INSTALL_DEPS "End applications by default use detected dependencies here" OFF) + mark_as_advanced(HIGHFIVE_USE_INSTALL_DEPS) + ++# Allow big object ++if(MSVC) ++ add_compile_options(/bigobj) ++endif() + + # Check compiler cxx_std requirements + # ----------------------------------- diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index 025d30014253f8..f43ab26b58090b 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF v2.3 SHA512 5bf8bc6d3a57be39a4fd15f28f8c839706e2c8d6e2270f45ea39c28a2ac1e3c7f31ed2f48390a45a868c714c85f03f960a0bc8fad945c80b41f495e6f4aca36a HEAD_REF master - PATCHES fix-dependency-hdf5.patch + PATCHES + fix-dependency-hdf5.patch + fix-error-C1128.patch ) vcpkg_check_features( @@ -13,17 +15,15 @@ vcpkg_check_features( boost HIGHFIVE_USE_BOOST tests HIGHFIVE_UNIT_TESTS xtensor HIGHFIVE_USE_XTENSOR + eigen3 HIGHFIVE_USE_EIGEN ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" HDF5_USE_STATIC_LIBRARIES) - vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DHIGHFIVE_EXAMPLES=OFF -DHIGHFIVE_BUILD_DOCS=OFF - -DHDF5_USE_STATIC_LIBRARIES=${HDF5_USE_STATIC_LIBRARIES} ) vcpkg_cmake_install() @@ -38,12 +38,10 @@ if("tests" IN_LIST FEATURES) ) endif() -vcpkg_cmake_config_fixup(CONFIG_PATH share/HighFive/CMake) +# Use PACKAGE_NAME to avoid folder HighFive and highfive are exist at same time +vcpkg_cmake_config_fixup(PACKAGE_NAME HighFive CONFIG_PATH share/HighFive/CMake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -if(NOT (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/HighFive) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/highfive/vcpkg.json b/ports/highfive/vcpkg.json index a89959aa70f8c1..c30c52860605e2 100644 --- a/ports/highfive/vcpkg.json +++ b/ports/highfive/vcpkg.json @@ -1,6 +1,7 @@ { "name": "highfive", "version": "2.3", + "port-version": 2, "description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5", "homepage": "https://github.com/BlueBrain/HighFive", "license": "BSL-1.0", @@ -21,9 +22,16 @@ "dependencies": [ "boost-multi-array", "boost-serialization", + "boost-system", "boost-ublas" ] }, + "eigen3": { + "description": "Enable Eigen testing", + "dependencies": [ + "eigen3" + ] + }, "tests": { "description": "Build unit tests", "dependencies": [ diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake index 7ba78cda34dddc..6e7e0937d3adac 100644 --- a/ports/hiredis/portfile.cmake +++ b/ports/hiredis/portfile.cmake @@ -1,5 +1,5 @@ -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(HIREDIS_PATCHES support-static.patch) endif() vcpkg_from_github( @@ -10,10 +10,10 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-feature-example.patch - support-static-in-win.patch fix-timeval.patch fix-include-path.patch fix-ssize_t.patch + ${HIREDIS_PATCHES} ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -31,6 +31,8 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup() if("ssl" IN_LIST FEATURES) @@ -39,4 +41,3 @@ endif() # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() diff --git a/ports/hiredis/support-static-in-win.patch b/ports/hiredis/support-static.patch similarity index 100% rename from ports/hiredis/support-static-in-win.patch rename to ports/hiredis/support-static.patch diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json index 32b9954975346c..48379f488c24b6 100644 --- a/ports/hiredis/vcpkg.json +++ b/ports/hiredis/vcpkg.json @@ -1,10 +1,9 @@ { "name": "hiredis", "version": "1.0.2", - "port-version": 1, + "port-version": 3, "description": "Hiredis is a minimalistic C client library for the Redis database.", "homepage": "https://github.com/redis/hiredis", - "supports": "!(windows & !static)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/hpx/fix-cmakecache-paths.patch b/ports/hpx/fix-cmakecache-paths.patch new file mode 100644 index 00000000000000..5a9e1b3ca02bbe --- /dev/null +++ b/ports/hpx/fix-cmakecache-paths.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/HPX_ForwardCacheVariables.cmake b/cmake/HPX_ForwardCacheVariables.cmake +index 7c434085a76..34cc47c7750 100644 +--- a/cmake/HPX_ForwardCacheVariables.cmake ++++ b/cmake/HPX_ForwardCacheVariables.cmake +@@ -23,6 +23,17 @@ set(_cache_var_file_template + ) + set(_cache_variables) + foreach(_var IN LISTS cache_vars) ++ if(HPX_WITH_VCPKG) ++ # avoid writing directory names into cache file ++ string(FIND ${_var} "_DIR" _pos) ++ if(NOT ${_pos} EQUAL -1) ++ continue() ++ endif() ++ string(FIND ${_var} "_PATH" _pos) ++ if(NOT ${_pos} EQUAL -1) ++ continue() ++ endif() ++ endif() + set(_cache_variables "${_cache_variables}set(${_var} ${${_var}})\n") + endforeach() + diff --git a/ports/hpx/fix-dependency-hwloc.patch b/ports/hpx/fix-dependency-hwloc.patch new file mode 100644 index 00000000000000..b829acd0cd907c --- /dev/null +++ b/ports/hpx/fix-dependency-hwloc.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/FindHwloc.cmake b/cmake/FindHwloc.cmake +index cdede78..6967abf 100644 +--- a/cmake/FindHwloc.cmake ++++ b/cmake/FindHwloc.cmake +@@ -71,6 +71,9 @@ if(NOT TARGET Hwloc::hwloc) + add_library(Hwloc::hwloc INTERFACE IMPORTED) + target_include_directories(Hwloc::hwloc SYSTEM INTERFACE ${HWLOC_INCLUDE_DIR}) + target_link_libraries(Hwloc::hwloc INTERFACE ${HWLOC_LIBRARIES}) +- ++ if(APPLE) ++ target_link_libraries(Hwloc::hwloc INTERFACE "-framework CoreFoundation" "-framework IOKit") ++ endif() ++ + mark_as_advanced(HWLOC_ROOT HWLOC_LIBRARY HWLOC_INCLUDE_DIR) + endif() diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 21fe93429e86b8..9cbdf361fe99a8 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -1,4 +1,3 @@ - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( @@ -7,6 +6,9 @@ vcpkg_from_github( REF 1.7.1 SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3 HEAD_REF stable + PATCHES + fix-dependency-hwloc.patch + fix-cmakecache-paths.patch ) set(HPX_WITH_MALLOC system) @@ -93,6 +95,5 @@ vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}/debug\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") -file(REMOVE "${CURRENT_PACKAGES_DIR}/share/hpx/HPXCacheVariables.cmake") vcpkg_copy_pdbs() diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json index 10896b3f2d8518..c82018a7574d64 100644 --- a/ports/hpx/vcpkg.json +++ b/ports/hpx/vcpkg.json @@ -1,12 +1,13 @@ { "name": "hpx", "version-semver": "1.7.1", - "port-version": 3, + "port-version": 5, "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", "dependencies": [ "asio", "boost-accumulators", diff --git a/ports/hunspell/0004-add-win-arm64.patch b/ports/hunspell/0004-add-win-arm64.patch new file mode 100644 index 00000000000000..271bc788877473 --- /dev/null +++ b/ports/hunspell/0004-add-win-arm64.patch @@ -0,0 +1,529 @@ +diff --git a/msvc/Hunspell.sln b/msvc/Hunspell.sln +index dabd755..9b0d996 100644 +--- a/msvc/Hunspell.sln ++++ b/msvc/Hunspell.sln +@@ -11,46 +11,66 @@ Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_dll|Win32 = Debug_dll|Win32 + Debug_dll|x64 = Debug_dll|x64 ++ Debug_dll|ARM64 = Debug_dll|ARM64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 ++ Debug|ARM64 = Debug|ARM64 + Release_dll|Win32 = Release_dll|Win32 + Release_dll|x64 = Release_dll|x64 ++ Release_dll|ARM64 = Release_dll|ARM64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 ++ Release|ARM64 = Release|ARM64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|Win32.Build.0 = Debug_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|x64.ActiveCfg = Debug_dll|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|x64.Build.0 = Debug_dll|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|ARM64.ActiveCfg = Debug_dll|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|ARM64.Build.0 = Debug_dll|ARM64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|Win32.ActiveCfg = Debug|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|Win32.Build.0 = Debug|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|x64.ActiveCfg = Debug|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|x64.Build.0 = Debug|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|ARM64.ActiveCfg = Debug|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|ARM64.Build.0 = Debug|ARM64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|Win32.ActiveCfg = Release_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|Win32.Build.0 = Release_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|x64.ActiveCfg = Release_dll|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|x64.Build.0 = Release_dll|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|ARM64.ActiveCfg = Release_dll|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|ARM64.Build.0 = Release_dll|ARM64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|Win32.ActiveCfg = Release|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|Win32.Build.0 = Release|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|x64.ActiveCfg = Release|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|x64.Build.0 = Release|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|ARM64.ActiveCfg = Release|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|ARM64.Build.0 = Release|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|Win32.ActiveCfg = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|Win32.Build.0 = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|x64.ActiveCfg = Debug|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|x64.Build.0 = Debug|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|ARM64.ActiveCfg = Debug|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|ARM64.Build.0 = Debug|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|Win32.ActiveCfg = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|Win32.Build.0 = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|x64.ActiveCfg = Debug|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|x64.Build.0 = Debug|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|ARM64.ActiveCfg = Debug|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|ARM64.Build.0 = Debug|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|Win32.ActiveCfg = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|Win32.Build.0 = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|x64.ActiveCfg = Release|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|x64.Build.0 = Release|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|ARM64.ActiveCfg = Release|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|ARM64.Build.0 = Release|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|Win32.ActiveCfg = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|Win32.Build.0 = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|x64.ActiveCfg = Release|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|x64.Build.0 = Release|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|ARM64.ActiveCfg = Release|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|ARM64.Build.0 = Release|ARM64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE +diff --git a/msvc/hunspell.vcxproj b/msvc/hunspell.vcxproj +index d4817a5..b8afa73 100644 +--- a/msvc/hunspell.vcxproj ++++ b/msvc/hunspell.vcxproj +@@ -9,6 +9,10 @@ + Debug + x64 + ++ ++ Debug ++ ARM64 ++ + + Release + Win32 +@@ -17,6 +21,10 @@ + Release + x64 + ++ ++ Release ++ ARM64 ++ + + + {6A0453F4-B12A-4810-B9A2-8AB059316ED7} +@@ -37,6 +45,12 @@ + MultiByte + true + ++ ++ Application ++ v141 ++ MultiByte ++ true ++ + + Application + v140_xp +@@ -47,6 +61,11 @@ + v140_xp + MultiByte + ++ ++ Application ++ v141 ++ MultiByte ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>14.0.25420.1 +@@ -75,6 +100,10 @@ + true + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ true ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(SolutionDir)$(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ +@@ -84,6 +113,10 @@ + false + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ false ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + + Disabled +@@ -128,6 +161,27 @@ + + + ++ ++ ++ Disabled ++ ..\src\hunspell;..\src\parsers;.;%(AdditionalIncludeDirectories) ++ W32;WIN32;_DEBUG;_CONSOLE;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Level4 ++ ProgramDatabase ++ $(IntDir)$(ProjectName).pdb ++ 4127;4267;4706 ++ ++ ++ true ++ Console ++ ++ ++ ++ + + + Full +@@ -176,6 +230,30 @@ + + + ++ ++ ++ Full ++ AnySuitable ++ ..\src\hunspell;..\src\parsers;.;%(AdditionalIncludeDirectories) ++ W32;WIN32;NDEBUG;_CONSOLE;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreaded ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ++ ++ 4127;4267;4706 ++ ++ ++ true ++ Console ++ true ++ true ++ ++ ++ ++ + + + +diff --git a/msvc/libhunspell.vcxproj b/msvc/libhunspell.vcxproj +index 9a875ca..b7ed6b2 100644 +--- a/msvc/libhunspell.vcxproj ++++ b/msvc/libhunspell.vcxproj +@@ -9,6 +9,10 @@ + Debug_dll + x64 + ++ ++ Debug_dll ++ x64 ++ + + Debug + Win32 +@@ -17,6 +21,10 @@ + Debug + x64 + ++ ++ Debug ++ ARM64 ++ + + Release_dll + Win32 +@@ -24,6 +32,10 @@ + + Release_dll + x64 ++ ++ ++ Release_dll ++ ARM64 + + + Release +@@ -33,6 +45,10 @@ + Release + x64 + ++ ++ Release ++ ARM64 ++ + + + {53609BB3-D874-465C-AF7B-DF626DB0D89B} +@@ -53,6 +69,12 @@ + false + MultiByte + ++ ++ DynamicLibrary ++ v141 ++ false ++ MultiByte ++ + + DynamicLibrary + v140_xp +@@ -67,6 +89,13 @@ + MultiByte + true + ++ ++ DynamicLibrary ++ v141 ++ false ++ MultiByte ++ true ++ + + StaticLibrary + v140_xp +@@ -80,6 +109,13 @@ + false + MultiByte + true ++ ++ ++ StaticLibrary ++ v141 ++ false ++ MultiByte ++ true + + + StaticLibrary +@@ -93,6 +129,12 @@ + false + MultiByte + ++ ++ StaticLibrary ++ v140_xp ++ false ++ MultiByte ++ + + + +@@ -102,24 +144,36 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>14.0.25420.1 +@@ -141,6 +195,10 @@ + + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(SolutionDir)$(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ +@@ -150,12 +208,23 @@ + true + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ true ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -196,6 +265,25 @@ + + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Disabled ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ false ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Level4 ++ ProgramDatabase ++ 4706;4251;4267 ++ ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -250,6 +338,34 @@ + false + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Full ++ AnySuitable ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ MultiThreaded ++ true ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ++ ++ 4706;4251;4267 ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ false ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -315,6 +431,39 @@ + Windows + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Full ++ AnySuitable ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBHUNSPELL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ++ ++ 4706;4251;4267 ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ false ++ true ++ true ++ ++ ++ Windows ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -366,6 +515,31 @@ + + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Disabled ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;BUILDING_LIBHUNSPELL;%(PreprocessorDefinitions) ++ false ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ProgramDatabase ++ 4706;4251;4267 ++ ++ ++ true ++ Windows ++ ++ ++ ++ + + + diff --git a/ports/hunspell/portfile.cmake b/ports/hunspell/portfile.cmake index 053d1dda4f70c4..6c82edd18b007a 100644 --- a/ports/hunspell/portfile.cmake +++ b/ports/hunspell/portfile.cmake @@ -1,15 +1,14 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hunspell/hunspell REF v1.7.0 SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 HEAD_REF master - PATCHES + PATCHES 0001_fix_unistd.patch 0002-disable-test.patch 0003-fix-win-build.patch + 0004-add-win-arm64.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -19,28 +18,30 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) file(REMOVE "${SOURCE_PATH}/README") #README is a symlink - + #architecture detection if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(HUNSPELL_ARCH Win32) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(HUNSPELL_ARCH x64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(HUNSPELL_ARCH ARM64) else() message(FATAL_ERROR "unsupported architecture") endif() - + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(HUNSPELL_CONFIGURATION _dll) else() set(HUNSPELL_CONFIGURATION ) endif() - + if("tools" IN_LIST FEATURES) set(HSP_TARGET hunspell) else() set(HSP_TARGET libhunspell) endif() - + vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "msvc/Hunspell.sln" @@ -63,14 +64,14 @@ else() vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} - OPTIONS + OPTIONS AUTOCONFIG ADDITIONAL_MSYS_PACKAGES gzip ) #install-pkgconfDATA: vcpkg_build_make(BUILD_TARGET dist LOGFILE_ROOT build-dist) vcpkg_install_make() - + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") vcpkg_fixup_pkgconfig() diff --git a/ports/hunspell/vcpkg.json b/ports/hunspell/vcpkg.json index 61065b0192e1e7..ae1c6d393591a4 100644 --- a/ports/hunspell/vcpkg.json +++ b/ports/hunspell/vcpkg.json @@ -1,10 +1,10 @@ { "name": "hunspell", "version": "1.7.0", - "port-version": 6, + "port-version": 8, "description": "The most popular spellchecking library.", "homepage": "https://github.com/hunspell/hunspell", - "supports": "!((arm | uwp) & windows)", + "supports": "!uwp", "dependencies": [ "libiconv" ], diff --git a/ports/hwloc/fix_shared_win_build.patch b/ports/hwloc/fix_shared_win_build.patch index 20ce59f7bc1bbe..dcfadbd48c5541 100644 --- a/ports/hwloc/fix_shared_win_build.patch +++ b/ports/hwloc/fix_shared_win_build.patch @@ -1,56 +1,30 @@ diff --git a/configure.ac b/configure.ac -index 44180d1aa..6bba9c435 100644 +index 8af26ec..0d52b00 100644 --- a/configure.ac +++ b/configure.ac -@@ -101,10 +101,11 @@ AM_PROG_CC_C_O - m4_version_prereq([2.70], [], [AC_PROG_CC_C99]) - CFLAGS=$CFLAGS_save - --AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) --AS_IF([test -z "$CC_FOR_BUILD"],[ -- AC_SUBST([CC_FOR_BUILD], [$CC]) --]) -+# only needed to run/build dolib.exe which can be replaced with a bash script.... -+# AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) -+# AS_IF([test -z "$CC_FOR_BUILD"],[ -+# AC_SUBST([CC_FOR_BUILD], [$CC]) -+# ]) - - #################################################################### - # CLI arguments -@@ -132,6 +133,8 @@ AS_IF([test "$enable_embedded_mode" != "yes"], +@@ -127,6 +127,8 @@ AS_IF([test "$enable_embedded_mode" != "yes"], #################################################################### AC_SUBST([libhwloc_so_version]) +libhwloc_so_version_current_minus_age=`expr [[ $libhwloc_so_version=~ ([[:digit:]]+):[[:digit:]]+:([[:digit:]]+) ]] && real_so_ver=$(expr ${BASH_REMATCH[1]} - ${BASH_REMATCH[2]})` +AC_SUBST(libhwloc_so_version_current_minus_age) + AC_SUBST([libhwloc_so_name]) # Setup the hwloc core - HWLOC_SETUP_CORE([], [], [AC_MSG_ERROR([Cannot build hwloc core])], [1]) diff --git a/hwloc/Makefile.am b/hwloc/Makefile.am -index 48cc81c5b..5aac67d4f 100644 +index 4b3800a..f96473c 100644 --- a/hwloc/Makefile.am +++ b/hwloc/Makefile.am -@@ -191,16 +191,15 @@ if HWLOC_HAVE_WINDOWS +@@ -189,11 +189,10 @@ if HWLOC_HAVE_WINDOWS LC_MESSAGES=C export LC_MESSAGES -ldflags += -Xlinker --output-def -Xlinker .libs/libhwloc.def if HWLOC_HAVE_MS_LIB --dolib$(EXEEXT): dolib.c -- $(CC_FOR_BUILD) $< -o $@ --.libs/libhwloc.lib: libhwloc.la dolib$(EXEEXT) -- [ ! -r .libs/libhwloc.def ] || ./dolib$(EXEEXT) "$(HWLOC_MS_LIB)" $(HWLOC_MS_LIB_ARCH) .libs/libhwloc.def $(libhwloc_so_version) .libs/libhwloc.lib -+# dolib$(EXEEXT): dolib.c -+# $(CC_FOR_BUILD) $< -o $@ -+# .libs/libhwloc.lib: libhwloc.la dolib$(EXEEXT) -+# [ ! -r .libs/libhwloc.def ] || ./dolib$(EXEEXT) "$(HWLOC_MS_LIB)" $(HWLOC_MS_LIB_ARCH) .libs/libhwloc.def $(libhwloc_so_version) .libs/libhwloc.lib -+.libs/libhwloc.lib: libhwloc.la -+ [ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" /machine:$(HWLOC_MS_LIB_ARCH) /def:.libs/libhwloc.def /name:libhwloc-$(libhwloc_so_version_current_minus_age) /out:.libs/libhwloc.lib + .libs/libhwloc.lib: libhwloc.la +- [ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" -machine:$(HWLOC_MS_LIB_ARCH) -def:.libs/libhwloc.def -name:libhwloc-$(libhwloc_so_name) -out:.libs/libhwloc.lib ++# [ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" -machine:$(HWLOC_MS_LIB_ARCH) -def:.libs/libhwloc.def -name:libhwloc-$(libhwloc_so_name) -out:.libs/libhwloc.lib all-local: .libs/libhwloc.lib --clean-local: -- $(RM) dolib$(EXEEXT) endif HWLOC_HAVE_MS_LIB - install-exec-hook: diff --git a/ports/hwloc/portfile.cmake b/ports/hwloc/portfile.cmake index edc6f5cd97b757..2109cf4147f81e 100644 --- a/ports/hwloc/portfile.cmake +++ b/ports/hwloc/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-mpi/hwloc - REF 5e185ccfff2728fa351cea41f6d9fefebfb88078 # hwloc-2.5.0 - SHA512 96f6421c40eede3a3c273a1ffa06accc43767421d5fb7b402a83caea1ef1a3bb8282c08ed94bc696296f37f3df80cd86403dac1012f2218b674569c8afcf3de9 - PATCHES fix_wrong_ifdef.patch - fix_shared_win_build.patch + REF 6fa8466a9c9c28de8ca3bd9e879c426edd85decf # hwloc-2.7.0 + SHA512 33bcc30362ba27076eacc83327a9d6235e2914a3c64536631e05e2d44c2c12b0176d55cc42ec0dc3c80682b977a83e60bd3a41f3ef486581cf8afa62ad2e9516 + PATCHES + fix_shared_win_build.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -14,6 +14,8 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND OPTIONS "HWLOC_LDFLAGS=-no-undefined") +elseif(VCPKG_TARGET_IS_OSX) + list(APPEND OPTIONS "HWLOC_LDFLAGS=-framework CoreFoundation") endif() vcpkg_configure_make( @@ -45,7 +47,14 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-compress-dir") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-compress-dir" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-compress-dir") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-compress-dir" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-compress-dir" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-gather-topology") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-gather-topology" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-gather-topology") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-gather-topology" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") endif() # Handle copyright diff --git a/ports/hwloc/vcpkg.json b/ports/hwloc/vcpkg.json index 4910da26b942df..139760ba480cd1 100644 --- a/ports/hwloc/vcpkg.json +++ b/ports/hwloc/vcpkg.json @@ -1,12 +1,12 @@ { "name": "hwloc", - "version": "2.5.0", - "port-version": 1, + "version": "2.7.0", "maintainers": "bgoglin", "description": [ "Portable Hardware Locality (hwloc)", "The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs." ], "homepage": "https://github.com/open-mpi/hwloc", + "license": "BSD-2-Clause", "supports": "!uwp" } diff --git a/ports/icu/fix-win-build.patch b/ports/icu/fix-win-build.patch new file mode 100644 index 00000000000000..0c2e46cfb67b58 --- /dev/null +++ b/ports/icu/fix-win-build.patch @@ -0,0 +1,35 @@ +diff --git a/source/configure.ac b/source/configure.ac +index 425fdc7..97210f8 100644 +--- a/source/configure.ac ++++ b/source/configure.ac +@@ -114,6 +114,15 @@ AC_ARG_ENABLE([icu-config], + esac], [enable_icu_config=true]) + AC_SUBST(INSTALL_ICU_CONFIG, [$enable_icu_config]) + ++AC_ARG_ENABLE([icu-build-win], ++ AS_HELP_STRING([--enable-icu-build-win], [install icu-build-win]), ++ [case "${enableval}" in ++ yes) enable_icu_build_win=true ;; ++ no) enable_icu_build_win=false ;; ++ *) AC_MSG_ERROR([bad value '${enableval}' for --enable-icu-build-win]) ;; ++ esac], [enable_icu_build_win=true]) ++AC_SUBST(INSTALL_ICU_BUILD_WIN, [$enable_icu_build_win]) ++ + # Check whether to build debug libraries + AC_MSG_CHECKING([whether to build debug libraries]) + enabled=no +@@ -263,12 +272,14 @@ ICU_CHECK_MH_FRAG + # Checks for libraries and other host specific stuff + # On HP/UX, don't link to -lm from a shared lib because it isn't + # PIC (at least on 10.2) ++if test "$enable_icu_build_win" = no; then + case "${host}" in + *-*-hpux*) AC_CHECK_LIB(m, floor, LIB_M="-lm") ;; + + *) AC_CHECK_LIB(m, floor) + LIB_M="" ;; + esac ++fi + AC_SUBST(LIB_M) + + # Check whether to build shared libraries diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 32c03bc5015bee..1724086d4430d2 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(ICU_VERSION_MAJOR 69) set(ICU_VERSION_MINOR 1) set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}") @@ -22,11 +20,16 @@ vcpkg_extract_source_archive_ex( fix-extra.patch mingw-dll-install.patch disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw. + fix-win-build.patch ) vcpkg_find_acquire_program(PYTHON3) set(ENV{PYTHON} "${PYTHON3}") +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND CONFIGURE_OPTIONS --enable-icu-build-win) +endif() + list(APPEND CONFIGURE_OPTIONS --disable-samples --disable-tests --disable-layoutex) list(APPEND CONFIGURE_OPTIONS_RELEASE --disable-debug --enable-release) @@ -47,6 +50,7 @@ endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG PROJECT_SUBPATH source OPTIONS ${CONFIGURE_OPTIONS} OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} @@ -191,6 +195,5 @@ vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread m) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 990030910d1849..456560655e7775 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "69.1", - "port-version": 16, + "port-version": 18, "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "supports": "!uwp", diff --git a/ports/idevicerestore/portfile.cmake b/ports/idevicerestore/portfile.cmake index 5cd1acef983437..23202a2a4c5eb0 100644 --- a/ports/idevicerestore/portfile.cmake +++ b/ports/idevicerestore/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_fail_port_install(ON_TARGET "linux" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/idevicerestore REF 1.0.12 SHA512 ba623be56c2f37853516d7d4c32e16f1ec72f33d512f18aa812ce6830af4b9e389f7af5321888dd0ddd168e282b652e379b60f90970680e213eabf489f406915 HEAD_REF msvc-master - PATCHES + PATCHES libcurl_d.patch fix-libgen.h-cannot-be-found.patch ) diff --git a/ports/idevicerestore/vcpkg.json b/ports/idevicerestore/vcpkg.json index c2d9b175e56f17..1ca1202bc2ead4 100644 --- a/ports/idevicerestore/vcpkg.json +++ b/ports/idevicerestore/vcpkg.json @@ -1,7 +1,7 @@ { "name": "idevicerestore", "version-string": "1.0.12", - "port-version": 5, + "port-version": 6, "description": "Restore/upgrade firmware of iOS devices", "supports": "windows", "dependencies": [ diff --git a/ports/ignition-common3/vcpkg.json b/ports/ignition-common3/vcpkg.json index ce71be39dac52a..700d243cb4bd98 100644 --- a/ports/ignition-common3/vcpkg.json +++ b/ports/ignition-common3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-common3", "version-string": "3.9.0", - "port-version": 1, + "port-version": 2, "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", "dependencies": [ @@ -17,7 +17,7 @@ "ignition-modularscripts", { "name": "libuuid", - "platform": "!windows & !uwp" + "platform": "!windows & !uwp & !osx" }, "tinyxml2" ] diff --git a/ports/ignition-math6/fix-isspace.patch b/ports/ignition-math6/fix-isspace.patch new file mode 100644 index 00000000000000..70d593229ebbbe --- /dev/null +++ b/ports/ignition-math6/fix-isspace.patch @@ -0,0 +1,12 @@ +diff --git a/include/ignition/math/Color.hh b/include/ignition/math/Color.hh +index faf7a08..16758c5 100644 +--- a/include/ignition/math/Color.hh ++++ b/include/ignition/math/Color.hh +@@ -18,6 +18,7 @@ + #define IGNITION_MATH_COLOR_HH_ + + #include ++#include + + #include + #include diff --git a/ports/ignition-math6/portfile.cmake b/ports/ignition-math6/portfile.cmake index 138d39acbbe4c1..b0254303f1feb0 100644 --- a/ports/ignition-math6/portfile.cmake +++ b/ports/ignition-math6/portfile.cmake @@ -2,4 +2,5 @@ include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_l ignition_modular_library(NAME math VERSION "6.6.0" - SHA512 1b5f59b45256daa81cbfb7da4727200d0d6cb4a75fbc3b83b512c18ec6307b5bd78b8ee7a84f0f8a8c334717a1480766f62658bd213e9021c09c0ed22caa921d) + SHA512 1b5f59b45256daa81cbfb7da4727200d0d6cb4a75fbc3b83b512c18ec6307b5bd78b8ee7a84f0f8a8c334717a1480766f62658bd213e9021c09c0ed22caa921d + PATCHES fix-isspace.patch) diff --git a/ports/ignition-math6/vcpkg.json b/ports/ignition-math6/vcpkg.json index bf5c3cfbb06065..9d934867b3d8e8 100644 --- a/ports/ignition-math6/vcpkg.json +++ b/ports/ignition-math6/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-math6", "version-string": "6.6.0", - "port-version": 1, + "port-version": 2, "description": "Math API for robotic applications", "homepage": "https://ignitionrobotics.org/libs/math", "dependencies": [ diff --git a/ports/ignition-msgs5/portfile.cmake b/ports/ignition-msgs5/portfile.cmake index ea54585901ff93..23a05709d203aa 100644 --- a/ports/ignition-msgs5/portfile.cmake +++ b/ports/ignition-msgs5/portfile.cmake @@ -1,6 +1,5 @@ -# Explicitly disable cross-compilation until the upstream discussion +# Cross-compilation is disabled until the upstream discussion # https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) @@ -8,5 +7,4 @@ ignition_modular_library(NAME msgs VERSION "5.3.0" SHA512 55c167d00b60ae6da0144a9495e9ac8aed61fcbdc61e057e75d31261e335c573543d60e28a7dc195a7c9849c5c6eb0e088d4f4e79fd927e83470a3f1fabef60e PATCHES - "01-protobuf.patch") - + "01-protobuf.patch") diff --git a/ports/ignition-msgs5/vcpkg.json b/ports/ignition-msgs5/vcpkg.json index 24c072d73ed969..d215d8c47013ba 100644 --- a/ports/ignition-msgs5/vcpkg.json +++ b/ports/ignition-msgs5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-msgs5", - "version-string": "5.3.0", - "port-version": 3, + "version": "5.3.0", + "port-version": 4, "description": "Middleware protobuf messages for robotics", "supports": "!(arm | uwp)", "dependencies": [ diff --git a/ports/ignition-msgs6/portfile.cmake b/ports/ignition-msgs6/portfile.cmake index f79c5aabd22f88..41f29fa1e61896 100644 --- a/ports/ignition-msgs6/portfile.cmake +++ b/ports/ignition-msgs6/portfile.cmake @@ -1,10 +1,8 @@ -# Explicitly disable cross-compilation until the upstream discussion +# Cross-compilation is explicitly disabled until the upstream discussion # https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) ignition_modular_library(NAME msgs VERSION "6.0.0" SHA512 d1d6f6602ae33ec95b36c5df7815b06970f349492ef0309d8aacbaf2dca0c3e7314bbd64890a2554485fbd52f148a90b7bf54dceb0b3a1dd40eeb1f5bdb9613c) - diff --git a/ports/ignition-msgs6/vcpkg.json b/ports/ignition-msgs6/vcpkg.json index 995f166e11f43a..df11c0d2f49875 100644 --- a/ports/ignition-msgs6/vcpkg.json +++ b/ports/ignition-msgs6/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-msgs6", - "version-string": "6.0.0", - "port-version": 2, + "version": "6.0.0", + "port-version": 3, "description": "Middleware protobuf messages for robotics", "supports": "!(arm | uwp)", "dependencies": [ diff --git a/ports/ignition-transport4/portfile.cmake b/ports/ignition-transport4/portfile.cmake index cdab5c0a6b768d..09a868c14002d6 100644 --- a/ports/ignition-transport4/portfile.cmake +++ b/ports/ignition-transport4/portfile.cmake @@ -4,4 +4,7 @@ ignition_modular_library(NAME transport VERSION "4.0.0" SHA512 d4125044c21fdd6754f3b8b06f372df3f858080d5d33e97ed7a8ef8f6fb9857d562082aad41c89ea9146a33b1c3814305d33c5c8f8bcde66a16477b4a01655b4 # This can be removed when the pc file of libuuid on Windows is fixed - DISABLE_PKGCONFIG_INSTALL) + DISABLE_PKGCONFIG_INSTALL + PATCHES + uuid-osx.patch + ) diff --git a/ports/ignition-transport4/uuid-osx.patch b/ports/ignition-transport4/uuid-osx.patch new file mode 100644 index 00000000000000..c18d8caeaa3ce2 --- /dev/null +++ b/ports/ignition-transport4/uuid-osx.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5453cd0..10c2ad4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,8 @@ ign_find_package(CPPZMQ REQUIRED PRIVATE + # Find uuid + if (MSVC) + message (STATUS "UUID: Using Windows RPC UuidCreate function\n") ++elseif (APPLE) ++ message (STATUS "Use system uuid header") + else() + ign_find_package(UUID REQUIRED) + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6683e64..33669ab 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -18,7 +18,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + ) + + # 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/ignition-transport4/vcpkg.json b/ports/ignition-transport4/vcpkg.json index 4b315b85ebfe43..b7e6b193e35925 100644 --- a/ports/ignition-transport4/vcpkg.json +++ b/ports/ignition-transport4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-transport4", - "version-string": "4.0.0", - "port-version": 3, + "version": "4.0.0", + "port-version": 5, "description": "Transport middleware for robotics", "dependencies": [ "cppzmq", @@ -10,7 +10,7 @@ "ignition-msgs1", { "name": "libuuid", - "platform": "!windows & !uwp" + "platform": "!windows & !uwp & !osx" }, "protobuf", "zeromq" diff --git a/ports/ignition-transport8/vcpkg.json b/ports/ignition-transport8/vcpkg.json index 6d9f810c006263..8dd933199cfc7e 100644 --- a/ports/ignition-transport8/vcpkg.json +++ b/ports/ignition-transport8/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-transport8", "version-string": "8.1.0", - "port-version": 1, + "port-version": 2, "description": "Transport middleware for robotics", "dependencies": [ "cppzmq", @@ -9,7 +9,7 @@ "ignition-msgs5", { "name": "libuuid", - "platform": "!windows & !uwp" + "platform": "!windows & !uwp & !osx" }, "protobuf", "sqlite3", diff --git a/ports/ignition-transport9/portfile.cmake b/ports/ignition-transport9/portfile.cmake index cd224b3f72cffc..fcd8e6b46f1d26 100644 --- a/ports/ignition-transport9/portfile.cmake +++ b/ports/ignition-transport9/portfile.cmake @@ -4,4 +4,7 @@ ignition_modular_library(NAME transport VERSION "9.0.0" SHA512 c3edb7a8a063b4aa5826838ae08c8ec2b3d14563492022df632a719409c95272f4f6a43d91f0c317e44b85921b5aedc1685670b81a7baa949f01af3b3534d76e # This can be removed when the pc file of sqlite3 is available ( https://github.com/microsoft/vcpkg/issues/14327 ) - DISABLE_PKGCONFIG_INSTALL) + DISABLE_PKGCONFIG_INSTALL + PATCHES + uuid-osx.patch + ) diff --git a/ports/ignition-transport9/uuid-osx.patch b/ports/ignition-transport9/uuid-osx.patch new file mode 100644 index 00000000000000..350a0b43daf064 --- /dev/null +++ b/ports/ignition-transport9/uuid-osx.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 084b6da..6fd212d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,6 +70,8 @@ ign_find_package(CPPZMQ REQUIRED PRIVATE + # Find uuid + if (MSVC) + message (STATUS "UUID: Using Windows RPC UuidCreate function\n") ++elseif (APPLE) ++ message (STATUS "Use system uuid header") + else() + ign_find_package(UUID REQUIRED) + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9777240..9e860a9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,7 +31,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + ) + + # 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/ignition-transport9/vcpkg.json b/ports/ignition-transport9/vcpkg.json index 9e9147c0d68982..cfbbf4d87902ea 100644 --- a/ports/ignition-transport9/vcpkg.json +++ b/ports/ignition-transport9/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-transport9", - "version-string": "9.0.0", - "port-version": 1, + "version": "9.0.0", + "port-version": 3, "description": "Transport middleware for robotics", "dependencies": [ "cppzmq", @@ -9,7 +9,7 @@ "ignition-msgs6", { "name": "libuuid", - "platform": "!windows & !uwp" + "platform": "!windows & !uwp & !osx" }, "protobuf", "sqlite3", diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index 22e26a741978e0..a0ed9e4fa01587 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.9.5/igraph-0.9.5.tar.gz" - FILENAME "igraph-0.9.5.tar.gz" - SHA512 2eb562bb898ff19f8e4ebb2d9f3393000b66154cb87318999bbb920793657e4e3a0b52d10bc8cbe4d2c3a5d27258fd8156df97f778065a92b969bfcb7d9fc28c + URLS "https://github.com/igraph/igraph/releases/download/0.9.7/igraph-0.9.7.tar.gz" + FILENAME "igraph-0.9.7.tar.gz" + SHA512 8c1841bef3e27b2c0cf895d40afa4f2ff055d65a86263c3f55697b56c0100b6fd897c805294c842f65988236850bbdb9074bcbd3297b0cb27c8851e5af9ba317 ) vcpkg_extract_source_archive_ex( @@ -47,6 +47,8 @@ vcpkg_cmake_configure( -DIGRAPH_USE_INTERNAL_GLPK=ON # Currently, external GMP provides no performance or functionality benefits. -DIGRAPH_USE_INTERNAL_GMP=ON + # PLFIT is not yet available in vcpkg. + -DIGRAPH_USE_INTERNAL_PLFIT=ON -DF2C_EXTERNAL_ARITH_HEADER=${ARITH_H} ${FEATURE_OPTIONS} ) diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index a339a6ac75e958..8b9c46bbf5038b 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "igraph", - "version": "0.9.5", + "version": "0.9.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/", "dependencies": [ diff --git a/ports/imgui-sfml/005-fix-imtextureid-define.patch b/ports/imgui-sfml/005-fix-imtextureid-define.patch new file mode 100644 index 00000000000000..7444e00e57472c --- /dev/null +++ b/ports/imgui-sfml/005-fix-imtextureid-define.patch @@ -0,0 +1,9 @@ +diff --git a/imconfig-SFML.h b/imconfig-SFML.h +index ddfe05d..bd7174e 100644 +--- a/imconfig-SFML.h ++++ b/imconfig-SFML.h +@@ -24,4 +24,3 @@ + static_cast(z * 255.f), static_cast(w * 255.f)); \ + } + +-#define ImTextureID unsigned int diff --git a/ports/imgui-sfml/portfile.cmake b/ports/imgui-sfml/portfile.cmake index 290278406ca94b..3e84f0df11a3d0 100644 --- a/ports/imgui-sfml/portfile.cmake +++ b/ports/imgui-sfml/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES 0001-fix_find_package.patch 004-fix-find-sfml.patch + 005-fix-imtextureid-define.patch ) vcpkg_cmake_configure( diff --git a/ports/imgui-sfml/vcpkg.json b/ports/imgui-sfml/vcpkg.json index 5fb0c04043560b..b0fbb42503b888 100644 --- a/ports/imgui-sfml/vcpkg.json +++ b/ports/imgui-sfml/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui-sfml", "version": "2.4", + "port-version": 1, "description": "ImGui binding for use with SFML", "homepage": "https://github.com/eliasdaler/imgui-sfml", "dependencies": [ diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index b8c8dacf94efc0..41f03db1cd179e 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -172,11 +172,6 @@ if(NOT IMGUI_SKIP_HEADERS) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glut.h DESTINATION include) endif() - if(IMGUI_COPY_MARMALADE_BINDING) - file(GLOB MARMALADE_BINDING_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_marmalade.*) - install(FILES ${MARMALADE_BINDING_SRCS} DESTINATION include/bindings) - endif() - if(IMGUI_BUILD_METAL_BINDING) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_metal.h DESTINATION include) endif() diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 12fcbb7863838d..c342a637a0a4a7 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -4,22 +4,22 @@ if ("docking-experimental" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF 1b215ecb018ba0fd170618366ddc4be9bd45f283 - SHA512 afd79082c4439b47d5943df5f7ddbdf80dcf23cd120b8da99b67b2979728e604436dd656ef8e8ae0af2a9050f8ea56b2f8c109243326fb842d684027616843e7 + REF 1ee252772ae9c0a971d06257bb5c89f628fa696a + SHA512 942cd8e39f490c15d90b6feb6f919ebeab8f6f8f9aacfcbf552daef24b0f7e637ad5f630767a52fd9993d84a80b5954c7b05f7400a9f96b6b739cf5680368119 HEAD_REF docking ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.85 - SHA512 830ff36681a661d77754fb7818bb13cc63da58a293d343a8d6847a586f00c6e0bfc3ffe51cdf882849e5083d4ddca52cdbdc1b3abc9b794a96f89ae7628f1fc2 + REF v1.87 + SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 HEAD_REF master ) endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/imgui-config.cmake.in DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/imgui-config.cmake.in" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") if(("metal-binding" IN_LIST FEATURES OR "osx-binding" IN_LIST FEATURES) AND (NOT VCPKG_TARGET_IS_OSX)) message(FATAL_ERROR "Feature metal-binding and osx-binding are only supported on osx.") @@ -34,7 +34,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS dx12-binding IMGUI_BUILD_DX12_BINDING glfw-binding IMGUI_BUILD_GLFW_BINDING glut-binding IMGUI_BUILD_GLUT_BINDING - marmalade-binding IMGUI_COPY_MARMALADE_BINDING metal-binding IMGUI_BUILD_METAL_BINDING opengl2-binding IMGUI_BUILD_OPENGL2_BINDING opengl3-binding IMGUI_BUILD_OPENGL3_BINDING @@ -57,17 +56,15 @@ if ("libigl-imgui" IN_LIST FEATURES) abe9250c9a5989e0a3f2285bbcc83696ff8e38c1f5657c358e6fe616ff792d3c6e5ff2fa23c2eeae7d7b307392e0dc798a95d14f6d10f8e9bfbd7768d36d8b31 ) - file(INSTALL ${IMGUI_FONTS_DROID_SANS_H} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(INSTALL "${IMGUI_FONTS_DROID_SANS_H}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG -DIMGUI_SKIP_HEADERS=ON - MAYBE_UNUSED_VARIABLES - IMGUI_COPY_MARMALADE_BINDING ) vcpkg_cmake_install() @@ -82,4 +79,4 @@ endif() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index c926875959e4d6..b5b624befb64da 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,8 +1,9 @@ { "name": "imgui", - "version": "1.85", + "version": "1.87", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", @@ -56,9 +57,6 @@ "libigl-imgui": { "description": "Install the libigl-imgui headers" }, - "marmalade-binding": { - "description": "Make available Marmalade binding" - }, "metal-binding": { "description": "Make available Metal binding" }, diff --git a/ports/implot/CMakeLists.txt b/ports/implot/CMakeLists.txt index 5d23a83c0bbef6..6807c550d7e03e 100644 --- a/ports/implot/CMakeLists.txt +++ b/ports/implot/CMakeLists.txt @@ -10,6 +10,7 @@ set(CMAKE_DEBUG_POSTFIX d) add_library(${PROJECT_NAME} "") add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) +target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) target_include_directories( ${PROJECT_NAME} PUBLIC diff --git a/ports/implot/portfile.cmake b/ports/implot/portfile.cmake index ba1241c5edc291..37d13429d4a746 100644 --- a/ports/implot/portfile.cmake +++ b/ports/implot/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO epezent/implot - REF v0.12 - SHA512 972bb831150a8b7c5fddb828c9d6928b493186ae587c8c5ea679c4fe499459892f175181c529e37195f72e09854ec8c698b77ae39e60295f831ad67e4a5f3358 + REF v0.13 + SHA512 ed653a14f1174b1689c7b8e5761455644e41e75a3cdf5a76d96adf8e286893418660809c1c158fa405c1c48a82752ae9c3b8e1eb14bd0015081604cdb44d95f4 HEAD_REF master ) diff --git a/ports/implot/vcpkg.json b/ports/implot/vcpkg.json index 0bd23ce03721d3..73df80238f86f7 100644 --- a/ports/implot/vcpkg.json +++ b/ports/implot/vcpkg.json @@ -1,8 +1,9 @@ { "name": "implot", - "version": "0.12", + "version": "0.13", "description": "Advanced 2D Plotting for Dear ImGui", "homepage": "https://github.com/epezent/implot", + "license": "MIT", "dependencies": [ "imgui", { diff --git a/ports/influxdb-cxx/include-stringview.patch b/ports/influxdb-cxx/include-stringview.patch new file mode 100644 index 00000000000000..a44563506e3230 --- /dev/null +++ b/ports/influxdb-cxx/include-stringview.patch @@ -0,0 +1,12 @@ +diff --git a/src/Point.cxx b/src/Point.cxx +index 8f7fc10..95b119e 100644 +--- a/src/Point.cxx ++++ b/src/Point.cxx +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + namespace influxdb + { diff --git a/ports/influxdb-cxx/portfile.cmake b/ports/influxdb-cxx/portfile.cmake index e666277a79363a..5498788ecd268f 100644 --- a/ports/influxdb-cxx/portfile.cmake +++ b/ports/influxdb-cxx/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v0.6.7 SHA512 4e871c6d06c94b24b45aeedb7c74c75aed17332fbde76fc1e6c2ad06aeb41e268a95f4cab1c12c4402765c11811feb84bf48d60b138717c485327848782e402c HEAD_REF master + PATCHES include-stringview.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -23,6 +24,6 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(PACKAGE_NAME InfluxDB CONFIG_PATH lib/cmake/InfluxDB) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/influxdb-cxx/vcpkg.json b/ports/influxdb-cxx/vcpkg.json index 59724c89ae8c2f..1666fc558cf58b 100644 --- a/ports/influxdb-cxx/vcpkg.json +++ b/ports/influxdb-cxx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "influxdb-cxx", "version": "0.6.7", + "port-version": 1, "description": "InfluxDB C++ client library", "homepage": "https://github.com/offa/influxdb-cxx", "dependencies": [ diff --git a/ports/infoware/portfile.cmake b/ports/infoware/portfile.cmake index e8b0703a8af8a7..2e0d4bdaba3d98 100644 --- a/ports/infoware/portfile.cmake +++ b/ports/infoware/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ThePhD/infoware diff --git a/ports/infoware/vcpkg.json b/ports/infoware/vcpkg.json index 7b395639532f39..1836379c9344fb 100644 --- a/ports/infoware/vcpkg.json +++ b/ports/infoware/vcpkg.json @@ -2,6 +2,7 @@ "$reason": "Note that independent usage and testing may work, but it seems to fail in CI environments for potential cross-compilation, and is thusly noted here to note break how vcpkg builds things!", "name": "infoware", "version-date": "2021-06-16", + "port-version": 1, "description": "C++ Library for pulling system and hardware information, without hitting the command line.", "homepage": "https://github.com/ThePhD/infoware", "supports": "!(arm | uwp)", diff --git a/ports/intel-ipsec/CMakeLists.txt b/ports/intel-ipsec/CMakeLists.txt deleted file mode 100644 index 4d778eb306bf18..00000000000000 --- a/ports/intel-ipsec/CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) -PROJECT(ipsec C) - -IF (SOURCE_PATH) - SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) -ENDIF () - -INCLUDE(ProcessorCount) -PROCESSORCOUNT(PROCS) - -FIND_PROGRAM(NASM nasm) -IF (NOT NASM) - MESSAGE(FATAL_ERROR "NASM not found") -ENDIF () - -FIND_PROGRAM(MAKE make) -IF (NOT MAKE) - MESSAGE(FATAL_ERROR "MAKE not found") -ENDIF () - -IF (EXEC_ENV STREQUAL "Windows") - FIND_PROGRAM(MAKE nmake) - IF (NOT MAKE) - MESSAGE(FATAL_ERROR "nmake not found") - ENDIF () -ENDIF () - -SET(MAKE_FLAGS) - -IF (EXEC_ENV STREQUAL Windows) - LIST(APPEND MAKE_FLAGS /f win_x64.mak) -ENDIF () - -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LIST(APPEND MAKE_FLAGS DEBUG=y) -ENDIF () - -IF (LIBRARY_LINKAGE STREQUAL "static") - LIST(APPEND MAKE_FLAGS SHARED=n) -ENDIF () - -MESSAGE(STATUS "${MAKE_FLAGS}") -ADD_CUSTOM_TARGET(ipsec-mb ALL - COMMAND ${MAKE} -j ${MAKE_FLAGS} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ -# VERBATIM - ) - -SET(LIB_PATH ${CMAKE_SOURCE_DIR}/) -IF (LIBRARY_LINKAGE STREQUAL "dynamic") - STRING(APPEND LIB_PATH libIPSec_MB.so) -ELSEIF (LIBRARY_LINKAGE STREQUAL "static") - STRING(APPEND LIB_PATH libIPSec_MB.a) -ELSE () - MESSAGE(FATAL_ERROR "Unknown linkage type ${LIBRARY_LINKAGE}") -ENDIF () -INSTALL(FILES ${LIB_PATH} - DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/) -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) diff --git a/ports/intel-ipsec/always-generate-pdb.patch b/ports/intel-ipsec/always-generate-pdb.patch new file mode 100644 index 00000000000000..24894e4e7dbfde --- /dev/null +++ b/ports/intel-ipsec/always-generate-pdb.patch @@ -0,0 +1,80 @@ +From 19d3b3fca689fb87e819b0b27bc74d1f52fcd2c8 Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Wed, 12 Jan 2022 12:40:30 +0000 +Subject: [PATCH] lib: generate PDB in release build on Windows + +PDBs are necessary for postmortem debugging and for teams to get reports +from Watson, so they should be built for released software too. This +change always passes /DEBUG to the MSVC linker. That switch controls +whether a PDB is generated (as in "generate debugging information") not +a statement that the resulting files are the debug specific version of +your library. + +/DEBUG changes the default values of /INCREMENTAL (to on) and /OPT:REF +and /OPT:ICF to off, so those are changed back to incremental off and +linker optimizations on in debug builds. + +This missing PDB issue was discovered in fixing intel-ipsec's port in +vcpkg to build on Windows (https://github.com/microsoft/vcpkg/pull/22269). + +intel-ipsec-mb vcpkg PR link is https://github.com/microsoft/vcpkg/pull/5586 +--- + lib/win_x64.mak | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/lib/win_x64.mak b/lib/win_x64.mak +index 89162feb..bb62b2ea 100644 +--- a/lib/win_x64.mak ++++ b/lib/win_x64.mak +@@ -12,7 +12,7 @@ + # * Neither the name of Intel Corporation nor the names of its contributors + # may be used to endorse or promote products derived from this software + # without specific prior written permission. +-# ++# + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +@@ -71,14 +71,14 @@ LIB_DIR = .\ + + !ifdef DEBUG + OPT = $(DEBUG_OPT) +-DCFLAGS = /DDEBUG /Z7 ++DCFLAGS = /DDEBUG + DAFLAGS = -gcv8 +-DLFLAGS = /DEBUG ++DLFLAGS = /DEBUG /INCREMENTAL:NO + !else + OPT = /O2 /Oi + DCFLAGS = + DAFLAGS = +-DLFLAGS = /RELEASE ++DLFLAGS = /RELEASE /DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO + !endif + + !if "$(SAFE_DATA)" != "n" +@@ -98,7 +98,7 @@ DAFLAGS = $(DAFLAGS) -DSAFE_LOOKUP + + CC = cl + CFLAGS_ALL = $(EXTRA_CFLAGS) /DNO_COMPAT_IMB_API_053 /I. /Iinclude /Ino-aesni \ +- /nologo /Y- /W3 /WX- /Gm- /fp:precise /EHsc ++ /nologo /Y- /W3 /WX- /Gm- /fp:precise /EHsc /Z7 + + CFLAGS = $(CFLAGS_ALL) $(OPT) $(DCFLAGS) + CFLAGS_NO_SIMD = $(CFLAGS_ALL) /Od $(DCFLAGS) +@@ -633,6 +633,7 @@ install: + -copy /Y /V /B $(LIBBASE).lib "$(INSTDIR)" + -copy /Y /V /A intel-ipsec-mb.h "$(INSTDIR)" + !if "$(SHARED)" == "y" ++ -copy /Y /V /B $(LIB_DIR)\$(LIBBASE).pdb "$(INSTDIR)" + -copy /Y /V /B $(LIB_DIR)\$(LIBBASE).dll "$(INSTDIR)" + -copy /Y /V /B $(LIB_DIR)\$(LIBBASE).dll "%windir%\system32" + !endif +@@ -641,6 +642,7 @@ uninstall: + !if "$(SHARED)" == "y" + -del /Q "%windir%\system32\$(LIBBASE).dll" + -del /Q "$(INSTDIR)\$(LIBBASE).dll" ++ -del /Q "$(INSTDIR)\$(LIBBASE).pdb" + !endif + -del /Q "$(INSTDIR)\$(LIBBASE).def" + -del /Q "$(INSTDIR)\$(LIBBASE).exp" diff --git a/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in b/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in new file mode 100644 index 00000000000000..1a907fc9756e58 --- /dev/null +++ b/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in @@ -0,0 +1,5 @@ +set_property(TARGET IPSEC::ipsec APPEND PROPERTY IMPORTED_CONFIGURATIONS @INTEL_IPSEC_CONFIGURATION@) +set_target_properties(IPSEC::ipsec PROPERTIES + IMPORTED_LOCATION_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_LOCATION@" + IMPORTED_IMPLIB_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_IMPLIB@" + ) diff --git a/ports/intel-ipsec/intel-ipsec-targets.cmake.in b/ports/intel-ipsec/intel-ipsec-targets.cmake.in new file mode 100644 index 00000000000000..0f5983c9629848 --- /dev/null +++ b/ports/intel-ipsec/intel-ipsec-targets.cmake.in @@ -0,0 +1,4 @@ +set_property(TARGET IPSEC::ipsec APPEND PROPERTY IMPORTED_CONFIGURATIONS @INTEL_IPSEC_CONFIGURATION@) +set_target_properties(IPSEC::ipsec PROPERTIES + IMPORTED_LOCATION_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_LOCATION@" + ) diff --git a/ports/intel-ipsec/intel-ipsecConfig.cmake b/ports/intel-ipsec/intel-ipsecConfig.cmake deleted file mode 100644 index 3861032d5200b3..00000000000000 --- a/ports/intel-ipsec/intel-ipsecConfig.cmake +++ /dev/null @@ -1,17 +0,0 @@ - -FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) -ENDFUNCTION() - -GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) - -SET_LIBRARY_TARGET("IPSEC" "ipsec" "${ROOT}/debug/lib/libIPSec_MB.a" "${ROOT}/lib/libIPSec_MB.a" "${ROOT}/include/intel-ipsec") diff --git a/ports/intel-ipsec/intel-ipsecConfig.cmake.in b/ports/intel-ipsec/intel-ipsecConfig.cmake.in new file mode 100644 index 00000000000000..cc722d53b93453 --- /dev/null +++ b/ports/intel-ipsec/intel-ipsecConfig.cmake.in @@ -0,0 +1,16 @@ +if(TARGET IPSEC::ipsec) + return() +endif() + +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) # intel-ipsec +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # share +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # package root +add_library(IPSEC::ipsec @INTEL_IPSEC_STATIC_OR_SHARED@ IMPORTED) +set_target_properties(IPSEC::ipsec PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include") +set(IPSEC_ipsec_FOUND 1) + +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +file(GLOB CONFIG_FILES "${_DIR}/intel-ipsec-targets-*.cmake") +foreach(f ${CONFIG_FILES}) + include(${f}) +endforeach() diff --git a/ports/intel-ipsec/portfile.cmake b/ports/intel-ipsec/portfile.cmake index 3218d67b00f6ac..eb945e1f95cf45 100644 --- a/ports/intel-ipsec/portfile.cmake +++ b/ports/intel-ipsec/portfile.cmake @@ -1,58 +1,105 @@ -IF (VCPKG_TARGET_IS_WINDOWS) - SET(EXEC_ENV "Windows") -ELSE () - SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}") -ENDIF () - -IF (NOT EXEC_ENV STREQUAL "Linux") - MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports Linux/Windows platforms") - MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows") -ENDIF () - -IF (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports x64 architecture") -ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - MESSAGE(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -ENDIF () - -VCPKG_FROM_GITHUB( - OUT_SOURCE_PATH SOURCE_PATH - REPO intel/intel-ipsec-mb - REF v0.52 - SHA512 3b115fb6df53801800a63a3b62198165824a9262d579a7696f1ec365a5680282b172ffac742fe6453ae53b97043c19136adf558a85a0e51d163b27be2abc9e63 - HEAD_REF master +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/intel-ipsec-mb + REF bde82c8737edc04d80549f0a68225ede7e5cefd #v1.1 + SHA512 f41dcde88b062e8ec2327987c6d36cd4f74a5e4fea386cc1ef8364f1dc432a2db02ca7d3312c0471b443cf93e815af6d74a4819c249afd6777aa91693b2546e5 + HEAD_REF master + PATCHES + always-generate-pdb.patch # https://github.com/intel/intel-ipsec-mb/pull/93 ) -VCPKG_FIND_ACQUIRE_PROGRAM(NASM) - -EXEC_PROGRAM(${NASM} - ARGS -v - OUTPUT_VARIABLE NASM_OUTPUT - ) -STRING(REGEX REPLACE "NASM version ([0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1" - NASM_VERSION - ${NASM_OUTPUT}) -IF (NASM_VERSION VERSION_LESS 2.13.03) - MESSAGE(FATAL_ERROR "NASM version 2.13.03 (or newer) is required to build this package") -ENDIF () - -GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) -SET(ENV{PATH} " $ENV{PATH};${NASM_PATH} ") - -VCPKG_CONFIGURE_CMAKE( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA - OPTIONS - -DSOURCE_PATH=${SOURCE_PATH} - -DEXEC_ENV=${VCPKG_CMAKE_SYSTEM_NAME} - -DLIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} -) +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_DIR "${NASM}" DIRECTORY) +vcpkg_add_to_path(PREPEND "${NASM_DIR}") + +vcpkg_list(SET MAKE_OPTIONS) +set(INTEL_IPSEC_STATIC_OR_SHARED SHARED) +if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + vcpkg_list(APPEND MAKE_OPTIONS SHARED=n) + set(INTEL_IPSEC_STATIC_OR_SHARED STATIC) +endif() + +set(DEBUG_LIB "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib") +set(RELEASE_LIB "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib") + +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_build_nmake( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH lib + PROJECT_NAME win_x64.mak + OPTIONS ${MAKE_OPTIONS} + OPTIONS_DEBUG DEBUG=y + ) + + if(NOT "${VCPKG_BUILD_TYPE}" STREQUAL "release") + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + set(INTEL_IPSEC_CONFIGURATION "DEBUG") + if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(INTEL_IPSEC_LOCATION "debug/lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY) + else() + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.exp" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + set(INTEL_IPSEC_LOCATION "debug/bin/libIPSec_MB.dll") + set(INTEL_IPSEC_IMPLIB "debug/lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets-implib.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY) + endif() + endif() + + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + set(INTEL_IPSEC_CONFIGURATION "RELEASE") + if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(INTEL_IPSEC_LOCATION "lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY) + else() + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.exp" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + set(INTEL_IPSEC_LOCATION "bin/libIPSec_MB.dll") + set(INTEL_IPSEC_IMPLIB "lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets-implib.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY) + endif() +else() + if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(LIB_SUFFIX ".a") + else() + set(LIB_SUFFIX ".so") + endif() + + find_program(MAKE make REQUIRED) + if(NOT "${VCPKG_BUILD_TYPE}" STREQUAL "release") + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + set(INTEL_IPSEC_CONFIGURATION "DEBUG") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + vcpkg_execute_build_process( + COMMAND "${MAKE}" "-j${VCPKG_CONCURRENCY}" ${MAKE_OPTIONS} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib" + LOGNAME "build-${TARGET_TRIPLET}-dbg" + ) + + file(INSTALL "${DEBUG_LIB}/libIPSec_MB${LIB_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + set(INTEL_IPSEC_LOCATION "debug/lib/libIPSec_MB${LIB_SUFFIX}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY) + endif() + + message(STATUS "Building ${TARGET_TRIPLET}-rel") + set(INTEL_IPSEC_CONFIGURATION "RELEASE") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + vcpkg_execute_build_process( + COMMAND "${MAKE}" -j ${MAKE_OPTIONS} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib" + LOGNAME "build-${TARGET_TRIPLET}-rel" + ) -VCPKG_INSTALL_CMAKE() + file(INSTALL "${RELEASE_LIB}/libIPSec_MB${LIB_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + set(INTEL_IPSEC_LOCATION "lib/libIPSec_MB${LIB_SUFFIX}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY) +endif() -FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/intel-ipsecConfig.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 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/lib/intel-ipsec-mb.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsecConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsecConfig.cmake" @ONLY) +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) diff --git a/ports/intel-ipsec/vcpkg.json b/ports/intel-ipsec/vcpkg.json index eb8da35ce0d1b4..2083fbf777d548 100644 --- a/ports/intel-ipsec/vcpkg.json +++ b/ports/intel-ipsec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "intel-ipsec", - "version-string": "0.52", - "port-version": 2, - "description": "Intel(R) Multi-Buffer Crypto for IPsec Library" + "version": "1.1", + "description": "Intel(R) Multi-Buffer Crypto for IPsec Library", + "supports": "x64 & (windows | linux) & !uwp" } diff --git a/ports/intelrdfpmathlib/portfile.cmake b/ports/intelrdfpmathlib/portfile.cmake index 9aad26f84869e3..5b05fd56bd72cb 100644 --- a/ports/intelrdfpmathlib/portfile.cmake +++ b/ports/intelrdfpmathlib/portfile.cmake @@ -13,16 +13,15 @@ vcpkg_extract_source_archive_ex( set(LIB_SOURCE_PATH "${SOURCE_PATH}/LIBRARY") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION "${LIB_SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${LIB_SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${LIB_SOURCE_PATH}" - PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/eula.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/IntelRDFPMathLib RENAME copyright) +file(INSTALL "${SOURCE_PATH}/eula.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/intelrdfpmathlib/vcpkg.json b/ports/intelrdfpmathlib/vcpkg.json index 661c295ad92e56..1be8cccde57bf9 100644 --- a/ports/intelrdfpmathlib/vcpkg.json +++ b/ports/intelrdfpmathlib/vcpkg.json @@ -1,6 +1,12 @@ { "name": "intelrdfpmathlib", "version-string": "20U2", - "port-version": 2, - "description": "Intel(R) Decimal Floating-Point Math Library" + "port-version": 3, + "description": "Intel(R) Decimal Floating-Point Math Library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 9641f8fddc837d..37f4ee26e888d1 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO irrlicht/Irrlicht%20SDK @@ -12,7 +10,16 @@ vcpkg_from_sourceforge( fix-osx-compilation.patch ) -configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +if(VCPKG_TARGET_IS_LINUX) + message( +"Irrlicht currently requires the following libraries from the system package manager: + libgl1-mesa + xf86vmode + +These can be installed on Ubuntu systems via sudo apt-get install libgl1-mesa-dev libxxf86vm-dev") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -25,7 +32,7 @@ vcpkg_check_features( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIB) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DIRR_SHARED_LIB=${SHARED_LIB} ${FEATURE_OPTIONS} @@ -36,15 +43,15 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup() if("tools" IN_LIST FEATURES) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/irrlicht/) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/irrlicht/") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/share/irrlicht/irrlicht-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/irrlicht-targets.cmake)") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/irrlicht/irrlicht-config.cmake" "include(\${CMAKE_CURRENT_LIST_DIR}/irrlicht-targets.cmake)") vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/irrlicht) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/irrlicht") endif() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/irrlicht/vcpkg.json b/ports/irrlicht/vcpkg.json index 2f348b948e8240..1815c8040208e3 100644 --- a/ports/irrlicht/vcpkg.json +++ b/ports/irrlicht/vcpkg.json @@ -1,7 +1,7 @@ { "name": "irrlicht", "version-string": "1.8.4", - "port-version": 12, + "port-version": 13, "description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.", "homepage": "http://irrlicht.sourceforge.net", "supports": "!(arm | uwp)", diff --git a/ports/itk/cufftw.patch b/ports/itk/cufftw.patch deleted file mode 100644 index 17365fb2f1f0e3..00000000000000 --- a/ports/itk/cufftw.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0f47aae05217884193a39690c2beef566f4ed3b1 Mon Sep 17 00:00:00 2001 -From: Stephen Aylward -Date: Sat, 25 Apr 2020 20:15:21 -0400 -Subject: [PATCH] BUG: CUFFTW paths were not being set and unnecessary FFTW - files used - -FindFFTW sets the FFTW_INCLUDES variable. The FFTW_INCLUDE_PATH var is -specific to FFTW (not used by CUFFTW). - -FFTWGlobalConfiguration file is only needed if FFTW is being used, -not if CUFFT is being used. ---- - CMake/FindFFTW.cmake | 2 +- - Modules/Filtering/FFT/CMakeLists.txt | 2 +- - Modules/Filtering/FFT/src/CMakeLists.txt | 9 +++++---- - 3 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/CMake/FindFFTW.cmake b/CMake/FindFFTW.cmake -index 785edc2b628..e1935899cab 100644 ---- a/CMake/FindFFTW.cmake -+++ b/CMake/FindFFTW.cmake -@@ -62,7 +62,7 @@ if(ITK_USE_FFTWD OR ITK_USE_FFTWF) - find_path(FFTW_INCLUDE_PATH fftw3.h ${FFTW_INC_SEARCHPATH}) - endif() - -- if(FFTW_INCLUDE_PATH) -+ if(FFTW_INCLUDE_PATH OR CUFFTW_INCLUDE_PATH) - if(ITK_USE_CUFFTW) - file(TO_CMAKE_PATH "${CUFFTW_INCLUDE_PATH}" CUFFTW_INCLUDE_PATH) - set(FFTW_INCLUDE ${CUFFTW_INCLUDE_PATH}) -diff --git a/Modules/Filtering/FFT/CMakeLists.txt b/Modules/Filtering/FFT/CMakeLists.txt -index 7d9d1900b56..713530149cb 100644 ---- a/Modules/Filtering/FFT/CMakeLists.txt -+++ b/Modules/Filtering/FFT/CMakeLists.txt -@@ -5,5 +5,5 @@ if(ITK_USE_CUFFTW) - else() - set(ITKFFT_LIBRARIES ITKFFT) - endif() --set(ITKFFT_INCLUDE_DIRS ${FFTW_INCLUDE_PATH}) -+set(ITKFFT_INCLUDE_DIRS ${FFTW_INCLUDE}) - itk_module_impl() -diff --git a/Modules/Filtering/FFT/src/CMakeLists.txt b/Modules/Filtering/FFT/src/CMakeLists.txt -index 3f3137b8cd4..bde3ee906f8 100644 ---- a/Modules/Filtering/FFT/src/CMakeLists.txt -+++ b/Modules/Filtering/FFT/src/CMakeLists.txt -@@ -1,7 +1,8 @@ --set(ITKFFT_SRCS -- itkFFTWGlobalConfiguration.cxx -- itkComplexToComplexFFTImageFilter.cxx -- ) -+set(ITKFFT_SRCS itkComplexToComplexFFTImageFilter.cxx) -+ -+if( ITK_USE_FFTWF OR ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW) -+ list(APPEND ITKFFT_SRCS itkFFTWGlobalConfiguration.cxx ) -+endif() - - itk_module_add_library(ITKFFT ${ITKFFT_SRCS}) - diff --git a/ports/itk/hdf5.patch b/ports/itk/hdf5.patch deleted file mode 100644 index 091594cda0e933..00000000000000 --- a/ports/itk/hdf5.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Modules/ThirdParty/HDF5/CMakeLists.txt b/Modules/ThirdParty/HDF5/CMakeLists.txt -index a700ecdfb..0a683a52b 100644 ---- a/Modules/ThirdParty/HDF5/CMakeLists.txt -+++ b/Modules/ThirdParty/HDF5/CMakeLists.txt -@@ -25,11 +25,11 @@ endif() - ") - endif() - -- set(ITKHDF5_LIBRARIES ) -- if(BUILD_SHARED_LIBS) -- list(APPEND ITKHDF5_LIBRARIES ${HDF5_C_SHARED_LIBRARY} ${HDF5_CXX_SHARED_LIBRARY}) -+ set(ITKHDF5_LIBRARIES) -+ if(HDF5_BUILD_SHARED_LIBS) -+ list(APPEND ITKHDF5_LIBRARIES hdf5::hdf5_cpp-shared hdf5::hdf5-shared) - else() -- list(APPEND ITKHDF5_LIBRARIES ${HDF5_C_STATIC_LIBRARY} ${HDF5_CXX_STATIC_LIBRARY}) -+ list(APPEND ITKHDF5_LIBRARIES hdf5::hdf5_cpp-static hdf5::hdf5-static) - endif() - - set(ITKHDF5_INCLUDE_DIRS diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index 055b0194f0b7cc..5bd030f4e61e39 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -3,19 +3,16 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO InsightSoftwareConsortium/ITK - REF d3286c9cc04ba16cc8f73de9a98fbcd7c02f3c7b - SHA512 c358449870d580aeb10e32f8be0ca39e8a76d8dc06fda973788fafb5971333e546611c399190be49d40f5f3c18a1105d9699eef271a560aff25ce168a396926e + REF 95800fd4d4b08678a6c0ebb63eb242893025b660 #5.2.1 + SHA512 fe703bc6ed681cb9983d7d6e21c8ffa7650337e470c09a7241de58a463c23e315516b1a81a18c14f682706056a0ec66932b63d2e24945bdcea03169bc1122bb2 HEAD_REF master PATCHES - hdf5.patch double-conversion.patch openjpeg.patch openjpeg2.patch var_libraries.patch wrapping.patch - python_gpu_wrapping.patch opencl.patch - cufftw.patch use-the-lrintf-intrinsic.patch ) @@ -194,8 +191,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/ITK-5.3/vcl_where_root_dir.h") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.1/itk_eigen.h" "include(${SOURCE_PATH}/CMake/UseITK.cmake)" "include(UseITK)") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.1/itk_eigen.h" "message(STATUS \"From ITK: Eigen3_DIR: ${CURRENT_INSTALLED_DIR}/share/eigen3\")" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/itk_eigen.h" "include(${SOURCE_PATH}/CMake/UseITK.cmake)" "include(UseITK)") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/itk_eigen.h" "message(STATUS \"From ITK: Eigen3_DIR: ${CURRENT_INSTALLED_DIR}/share/eigen3\")" "") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/itk/python_gpu_wrapping.patch b/ports/itk/python_gpu_wrapping.patch deleted file mode 100644 index 37367d979e0fb8..00000000000000 --- a/ports/itk/python_gpu_wrapping.patch +++ /dev/null @@ -1,178 +0,0 @@ -diff --git a/CMake/itkOpenCL.cmake b/CMake/itkOpenCL.cmake -index 0ccbe144d..fa381524f 100644 ---- a/CMake/itkOpenCL.cmake -+++ b/CMake/itkOpenCL.cmake -@@ -48,7 +48,7 @@ if(ITK_USE_GPU) - ) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE} - PROPERTIES GENERATED ON) -- set(${SRC_VAR} ${${SRC_VAR}} ${OUTPUT_FILE}) -+ set(${SRC_VAR} ${${SRC_VAR}} ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}) - endmacro() - - macro(write_gpu_kernels GPUKernels GPU_SRC) -diff --git a/Modules/Core/Common/include/itkMacro.h b/Modules/Core/Common/include/itkMacro.h -index 1816f722a..3a6a8aee5 100644 ---- a/Modules/Core/Common/include/itkMacro.h -+++ b/Modules/Core/Common/include/itkMacro.h -@@ -1141,7 +1141,7 @@ compilers. - #define itkGetVectorMacro(name, type, count) \ - virtual type * Get##name() const { return this->m_##name; } - --/**\def itkGPUKernelClassMacro -+/**\def class itkGPUKernelClassMacro - * Construct a non-templatized helper class that - * provides the GPU kernel source code as a const char* - */ -@@ -1150,7 +1150,7 @@ compilers. - * Workaround KWstyle bug \ \ - * \ingroup ITKCommon \ \ - */ \ -- class kernel \ -+ kernel \ - { \ - public: \ - static const char * \ -diff --git a/Modules/Core/GPUCommon/include/itkGPUImageOps.h b/Modules/Core/GPUCommon/include/itkGPUImageOps.h -index f4eb8f33b..fbdf3d757 100644 ---- a/Modules/Core/GPUCommon/include/itkGPUImageOps.h -+++ b/Modules/Core/GPUCommon/include/itkGPUImageOps.h -@@ -23,7 +23,7 @@ - namespace itk - { - /** Create a helper GPU Kernel class for GPUImageOps */ --itkGPUKernelClassMacro(GPUImageOpsKernel); -+class itkGPUKernelClassMacro(GPUImageOpsKernel); - - /** \class GPUImageOps - * -diff --git a/Modules/Core/GPUCommon/include/itkGPUReduction.h b/Modules/Core/GPUCommon/include/itkGPUReduction.h -index 524a5cd01..1b3ce91e9 100644 ---- a/Modules/Core/GPUCommon/include/itkGPUReduction.h -+++ b/Modules/Core/GPUCommon/include/itkGPUReduction.h -@@ -26,7 +26,7 @@ - namespace itk - { - /** Create a helper GPU Kernel class for GPUReduction */ --itkGPUKernelClassMacro(GPUReductionKernel); -+class itkGPUKernelClassMacro(GPUReductionKernel); - - /** - * \class GPUReduction -diff --git a/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h b/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h -index 853801cec..2fccf0bc5 100644 ---- a/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h -+++ b/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h -@@ -24,7 +24,7 @@ - namespace itk - { - /** Create a helper GPU Kernel class for GPUDenseFiniteDifferenceImageFilter */ --itkGPUKernelClassMacro(GPUDenseFiniteDifferenceImageFilterKernel); -+class ITKGPUFiniteDifference_EXPORT itkGPUKernelClassMacro(GPUDenseFiniteDifferenceImageFilterKernel); - - /** - * \class GPUDenseFiniteDifferenceImageFilter -diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h -index 4245ff914..1b21b709e 100644 ---- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h -+++ b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h -@@ -54,7 +54,7 @@ namespace itk - */ - - /** Create a helper GPU Kernel class for GPUGradientNDAnisotropicDiffusionFunction */ --itkGPUKernelClassMacro(GPUGradientNDAnisotropicDiffusionFunctionKernel); -+class itkGPUKernelClassMacro(GPUGradientNDAnisotropicDiffusionFunctionKernel); - - template - class ITK_TEMPLATE_EXPORT GPUGradientNDAnisotropicDiffusionFunction -diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h -index 305f6490e..d0d433080 100644 ---- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h -+++ b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h -@@ -32,7 +32,7 @@ namespace itk - * */ - - /** Create a helper GPU Kernel class for GPUScalarAnisotropicDiffusionFunction */ --itkGPUKernelClassMacro(GPUScalarAnisotropicDiffusionFunctionKernel); -+class itkGPUKernelClassMacro(GPUScalarAnisotropicDiffusionFunctionKernel); - - template - class ITK_TEMPLATE_EXPORT GPUScalarAnisotropicDiffusionFunction : public GPUAnisotropicDiffusionFunction -diff --git a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h b/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h -index 23530ac5c..e1b83f696 100644 ---- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h -+++ b/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h -@@ -29,7 +29,7 @@ namespace itk - { - - /** Create a helper GPU Kernel class for GPUCastImageFilter */ --itkGPUKernelClassMacro(GPUCastImageFilterKernel); -+class itkGPUKernelClassMacro(GPUCastImageFilterKernel); - - /** \class GPUCastImageFilter - * \brief GPU version of CastImageFilter. -diff --git a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h b/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h -index c4adc2967..69aeac6db 100644 ---- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h -+++ b/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h -@@ -41,7 +41,7 @@ namespace itk - */ - - /** Create a helper GPU Kernel class for GPUNeighborhoodOperatorImageFilter */ --itkGPUKernelClassMacro(GPUNeighborhoodOperatorImageFilterKernel); -+class itkGPUKernelClassMacro(GPUNeighborhoodOperatorImageFilterKernel); - - template - class ITK_TEMPLATE_EXPORT GPUMeanImageFilter -diff --git a/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h b/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h -index 8d26dcfc5..613bc623f 100644 ---- a/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h -+++ b/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h -@@ -85,7 +85,7 @@ private: - } // end of namespace Functor - - /** Create a helper GPU Kernel class for GPUBinaryThresholdImageFilter */ --itkGPUKernelClassMacro(GPUBinaryThresholdImageFilterKernel); -+class itkGPUKernelClassMacro(GPUBinaryThresholdImageFilterKernel); - - /** - * \class GPUBinaryThresholdImageFilter -diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h -index 28b21d592..0b46e27b8 100644 ---- a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h -+++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h -@@ -51,7 +51,7 @@ namespace itk - * \ingroup ITKGPUPDEDeformableRegistration - */ - /** Create a helper GPU Kernel class for GPUDemonsRegistrationFunction */ --itkGPUKernelClassMacro(GPUDemonsRegistrationFunctionKernel); -+class itkGPUKernelClassMacro(GPUDemonsRegistrationFunctionKernel); - - template - class ITK_TEMPLATE_EXPORT GPUDemonsRegistrationFunction -diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h -index 93ab975ec..0afd84871 100644 ---- a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h -+++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h -@@ -73,7 +73,7 @@ namespace itk - */ - - /** Create a helper GPU Kernel class for GPUPDEDeformableRegistrationFilter */ --itkGPUKernelClassMacro(GPUPDEDeformableRegistrationFilterKernel); -+class itkGPUKernelClassMacro(GPUPDEDeformableRegistrationFilterKernel); - - template ,zstd::libzstd_shared,zstd::libzstd_static>) + endif() + + diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index 165ca84e4f27e9..ec0c2dd9883eae 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -1,39 +1,40 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/karchive - REF v5.87.0 - SHA512 5c4f2a8d4863f9f0c90b9a12aee2dd00d43797a2c2c778bb4cb6f61fe5c7cd49b4e54d4bee0d811da52a8b86d673b23db62f0810b170bd4b2f2bd0ae2ebbb14f - HEAD_REF master - PATCHES - use_cmake_to_find_zstd.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/24 -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - "lzma" CMAKE_DISABLE_FIND_PACKAGE_LibLZMA - "zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - ${FEATURE_OPTIONS} -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Archive CONFIG_PATH lib/cmake/KF5Archive) -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/karchive + REF v5.89.0 + SHA512 e77d5233b6549332f180be3dcf0459688d6565c24e1af409814aab92d415ebb2b8a04ad720dfa9ed6f017f3ab86fab766b909e30a860bb83c5ddd51def7c3e5f + HEAD_REF master + PATCHES + control-dependencies.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "bzip2" VCPKG_USE_BZIP2 + "lzma" VCPKG_USE_LIBLZMA + "zstd" VCPKG_USE_ZSTD +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=ON + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Archive CONFIG_PATH lib/cmake/KF5Archive) +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/LGPL-2.0-or-later.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kf5archive/use_cmake_to_find_zstd.patch b/ports/kf5archive/use_cmake_to_find_zstd.patch deleted file mode 100644 index ee7dfd555b0f80..00000000000000 --- a/ports/kf5archive/use_cmake_to_find_zstd.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 82fc20234d4cf8abdec1a2b4fea9823154f1aecc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Fri, 27 Aug 2021 01:48:53 +0200 -Subject: [PATCH] Use CMake to find ZSTD - ---- - CMakeLists.txt | 11 +++++------ - KF5ArchiveConfig.cmake.in | 3 +-- - 2 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8ab85f4..ece1f77 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -44,12 +44,11 @@ set_package_properties(LibLZMA PROPERTIES - PURPOSE "Support for xz compressed files and data streams" - ) - --find_package(PkgConfig) --if (PkgConfig_FOUND) -- pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") --endif() --add_feature_info(LibZstd LibZstd_FOUND -- "Support for zstd compressed files and data streams" -+find_package(ZSTD) -+set_package_properties(LibZstd PROPERTIES -+ URL "http://www.zstd.net" -+ DESCRIPTION "Support for zstd compressed files and data streams" -+ PURPOSE "Support for zstd compressed files and data streams" - ) - - include(ECMSetupVersion) -diff --git a/KF5ArchiveConfig.cmake.in b/KF5ArchiveConfig.cmake.in -index 0a738c2..d868324 100644 ---- a/KF5ArchiveConfig.cmake.in -+++ b/KF5ArchiveConfig.cmake.in -@@ -23,8 +23,7 @@ if (NOT @BUILD_SHARED_LIBS@) - endif() - - if (@LibZstd_FOUND@) -- find_package(PkgConfig) -- pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") -+ find_dependency(ZSTD) - endif() - endif() - --- -GitLab - diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json index c29c0eb5c9bb7c..a6a778d87563be 100644 --- a/ports/kf5archive/vcpkg.json +++ b/ports/kf5archive/vcpkg.json @@ -1,10 +1,11 @@ { "name": "kf5archive", - "version": "5.87.0", + "version": "5.89.0", + "port-version": 1, "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", + "license": "LGPL-2.0-or-later", "dependencies": [ - "bzip2", "ecm", "qt5-base", { @@ -17,7 +18,16 @@ }, "zlib" ], + "default-features": [ + "bzip2" + ], "features": { + "bzip2": { + "description": "Support for bzip2 compressed files and data streams", + "dependencies": [ + "bzip2" + ] + }, "lzma": { "description": "Support for xz compressed files and data streams", "dependencies": [ diff --git a/ports/kf5attica/portfile.cmake b/ports/kf5attica/portfile.cmake index 1a9bb1183e430d..ebb31c98c23f75 100644 --- a/ports/kf5attica/portfile.cmake +++ b/ports/kf5attica/portfile.cmake @@ -1,30 +1,31 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/attica - REF v5.87.0 - SHA512 8d6635e9670713c2ef3101d3c0dbeaab7c34d046010cfef898783eac68980c9bf07d5d09cf00fe3e8862e1e4f5f34b48fd10dfdb69b3744dc5cf13b034522b10 - HEAD_REF master -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Attica CONFIG_PATH lib/cmake/KF5Attica) -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/attica + REF v5.89.0 + SHA512 46f4cb550a13032da2e48861916356f3dfa47de0e1c0672ffeea19bad813dfb5cdf1b45b1a25ff35adc07e622486b37d7a65ddf3d39c2b214114d916f09577bb + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Attica CONFIG_PATH lib/cmake/KF5Attica) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${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_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5attica/vcpkg.json b/ports/kf5attica/vcpkg.json index 9679f4ae4eda29..2f38ba3eecd57b 100644 --- a/ports/kf5attica/vcpkg.json +++ b/ports/kf5attica/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5attica", - "version": "5.87.0", + "version": "5.89.0", + "port-version": 1, "description": "A Qt library that implements the Open Collaboration Services API", "homepage": "https://api.kde.org/frameworks/attica/html/index.html", "dependencies": [ diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index d6d8f2a890acda..2c75a4bfcbee35 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kauth - REF v5.87.0 - SHA512 c2e885a6d1db3b5611562768c97e0d2aa50ddef31d99a77e1bcdc13fc760c68b797c0c78ec347ed8b01b573427ac2bd524792fb732e44c60fcef7ec475102f08 + REF v5.89.0 + SHA512 815672fc572b22c51761476da9c82bc128a6a66ede39b5b9e09592c415908064d2b2f0c39674b702f503eeb48f33d0d4443d200bc2830b63b5f4468db66b0d8f HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -28,4 +28,3 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json index 10db340d1bbea7..e821fee90fd084 100644 --- a/ports/kf5auth/vcpkg.json +++ b/ports/kf5auth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5auth", - "version": "5.87.0", + "version": "5.89.0", "description": "Execute actions as privileged user", "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", "dependencies": [ diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index 0e10e678684933..159f79ffa67066 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -1,17 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kbookmarks - REF v5.87.0 - SHA512 0ba852d6ce908a61073e048dc1556f20d4e45c2312f2401e57c160f30099fe6f17f5368be2e4b536e7fa41f8a106fbde986dec04d214c3d74ee3029ddc575e44 + REF v5.89.0 + SHA512 590b95c049600745995c76c2c7b8033eb591f8b7c1a2b832068a0e0d668858e04b1ed4a1fc8d2ef3c7fe43c5f3b7b311a7d0626a1053706fd46cbc5506c222b8 HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json index e4a93e095ad8f8..5064aa9eebca3d 100644 --- a/ports/kf5bookmarks/vcpkg.json +++ b/ports/kf5bookmarks/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5bookmarks", - "version": "5.87.0", + "version": "5.89.0", "description": "Bookmarks management library", "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", "dependencies": [ diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake index 2cd355450b8af6..538664fa9ec6e6 100644 --- a/ports/kf5codecs/portfile.cmake +++ b/ports/kf5codecs/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcodecs - REF v5.87.0 - SHA512 119ada2dfae2a74864c1d2cd7873e5a9c8491a2b7e4592e31bf56157fb5957fb4d4ef6e70f50a976f002c1d87232798ba9695c9773fd841bba59f8fbffa0e815 + REF v5.89.0 + SHA512 77104ab234d0b0baf00c2d3a37d366dc36c6f831c0fa011cb5ad965310e5317bbca3b569d9202123ed23b70137fe61ffec1689f51cccf8d60cc750913d36856f HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") find_program(GPERF_EXE NAMES gperf PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH) @@ -23,7 +23,7 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Codecs CONFIG_PATH lib/cmake/KF5Codecs) vcpkg_copy_pdbs() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json index 2aa26730a1caf6..3e53561c2509bc 100644 --- a/ports/kf5codecs/vcpkg.json +++ b/ports/kf5codecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5codecs", - "version": "5.87.0", + "version": "5.89.0", "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index 7315c22d764057..a66913e1ab4a49 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -1,30 +1,30 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kcompletion - REF v5.87.0 - SHA512 39b8fdb11122c35e97592db84005729fa500b3d0f558573b9f632079f3ce9aef1dff7f62c80f927788e302fc11bb7173589ea5474ea4f4177e43e0aae33e35f9 - HEAD_REF master -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DBUILD_DESIGNERPLUGIN=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Completion CONFIG_PATH lib/cmake/KF5Completion) -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcompletion + REF v5.89.0 + SHA512 26211e45497bfc324503213fdc31acc062fca9c203a192b92e06cd41385df6d207c592fb84bbed1e55627418685ff99347129704f09f98302d03e9ef57c4ed78 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_DESIGNERPLUGIN=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Completion CONFIG_PATH lib/cmake/KF5Completion) +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json index ea7b308e936e38..a5619c4b036310 100644 --- a/ports/kf5completion/vcpkg.json +++ b/ports/kf5completion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5completion", - "version": "5.87.0", + "version": "5.89.0", "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index ca548d346067ae..3abf465951cb2b 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -1,49 +1,48 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kconfig - REF v5.87.0 - SHA512 b9ad658f75c0ea97e69f203b60e1755cbcc3eadf807b72a9fcd063d1d544bc916a3bee8308a69d45c2f00291376f6ef63565b93d90bc426b171c6ad734016c82 - HEAD_REF master -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DKDE_INSTALL_LIBEXECDIR=bin -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Config CONFIG_PATH lib/cmake/KF5Config) -vcpkg_copy_pdbs() - -vcpkg_copy_tools( - TOOL_NAMES kreadconfig5 kwriteconfig5 - AUTO_CLEAN -) - -if(NOT VCPKG_TARGET_IS_WINDOWS) - set(LIBEXEC_SUBFOLDER "kf5/") -endif() - -vcpkg_copy_tools( - TOOL_NAMES kconf_update kconfig_compiler_kf5 - SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/${LIBEXEC_SUBFOLDER}" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${LIBEXEC_SUBFOLDER}" - AUTO_CLEAN -) - -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../share") - -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") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kconfig + REF v5.89.0 + SHA512 5b61812cd8b1d4cbbcc97e4ae350f5e46de9e7d73e3c68e3fbea3a2bad6a6be104c111ddcab9696593b60d34f74f3d4d7f828f54ad8d1f7b3408925b4bc51640 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_LIBEXECDIR=bin +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Config CONFIG_PATH lib/cmake/KF5Config) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kreadconfig5 kwriteconfig5 + AUTO_CLEAN +) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(LIBEXEC_SUBFOLDER "kf5/") +endif() + +vcpkg_copy_tools( + TOOL_NAMES kconf_update kconfig_compiler_kf5 + SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/${LIBEXEC_SUBFOLDER}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${LIBEXEC_SUBFOLDER}" + AUTO_CLEAN +) + +file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../share") + +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") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index 5be6027ca964e4..2e3c6fe3b6aa7c 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5config", - "version": "5.87.0", + "version": "5.89.0", "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/kf5configwidgets/portfile.cmake b/ports/kf5configwidgets/portfile.cmake index 6fa012052fd866..e314320d7f04cb 100644 --- a/ports/kf5configwidgets/portfile.cmake +++ b/ports/kf5configwidgets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kconfigwidgets - REF v5.87.0 - SHA512 0c7205394d270ca867387c4db01af9517fc9a19a2f134dc0ec53aa78bd49ec645c66aab5f2b6d023b68a1e0b0fbddfe17e85db77b90c26df8d40cffe9e6a61ec + REF v5.89.0 + SHA512 4dfc69c9b6126509df95d89172da0dfaaaa38cb497a3fda34b96a9fd25503998ab8124308a11e6894aed08feab4a122af775c2d375d0cac0736f85779e4d772e HEAD_REF master ) @@ -13,7 +13,7 @@ vcpkg_check_features( ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/kf5configwidgets/vcpkg.json b/ports/kf5configwidgets/vcpkg.json index 35baff79cf8c79..a844fb52151121 100644 --- a/ports/kf5configwidgets/vcpkg.json +++ b/ports/kf5configwidgets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5configwidgets", - "version": "5.87.0", + "version": "5.89.0", "description": "Widgets for configuration dialogs", "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 7403138bbab456..36cb5cc9b14e88 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -1,37 +1,37 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kcoreaddons - REF v5.87.0 - SHA512 bbba155cf347add1a364bd8a3d727096afa47bb91b9bdcf87abf9b66de9f5822e301f67531e8de186b3e912c7a20816aab11f31e4b64a0a00f5be1e8ba74f17e - PATCHES - fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129 -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5CoreAddons CONFIG_PATH lib/cmake/KF5CoreAddons) -vcpkg_copy_pdbs() - -vcpkg_copy_tools( - TOOL_NAMES desktoptojson - AUTO_CLEAN -) - -file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcoreaddons + REF v5.89.0 + SHA512 60b3ffdc69ff39e9d7edf23458d5ed5d063a55cae90d63ced18dc5db16eab027aa39d14a3a8507e7330dfc768e5ab8f77c1770874ad76807ec31a9ee4e0491a4 + PATCHES + fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129 +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5CoreAddons CONFIG_PATH lib/cmake/KF5CoreAddons) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES desktoptojson + AUTO_CLEAN +) + +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json index 00eaa7889be20e..7ea1f782b3cb3c 100644 --- a/ports/kf5coreaddons/vcpkg.json +++ b/ports/kf5coreaddons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5coreaddons", - "version": "5.87.0", + "version": "5.89.0", "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index a76f24f82b70bc..8cf3567ad47047 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcrash - REF v5.87.0 - SHA512 c239419dd1a9a48ef87d901a0d54f8f918782b84a10be9c903d6b6c92490b710ab86c8049d4a950aa452ca2e29f90ce8ada4b3b4b90e57d3504925efa14915e6 + REF v5.89.0 + SHA512 8493f9264e7844eefadd7bfa1700fa25baec2db9fd3cc8c85069d8a3c6452982d00ec1bb8e870ff9011391866e94cf63dfc8207d27d87b1b9b76e14b6ad5943d HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -27,4 +27,3 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json index 2a8a491274ae09..f4588397ed7648 100644 --- a/ports/kf5crash/vcpkg.json +++ b/ports/kf5crash/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5crash", - "version": "5.87.0", + "version": "5.89.0", "description": "KCrash provides support for intercepting and handling application crashes.", "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", "dependencies": [ diff --git a/ports/kf5dbusaddons/portfile.cmake b/ports/kf5dbusaddons/portfile.cmake index 56addda5786396..c3e125188e1a75 100644 --- a/ports/kf5dbusaddons/portfile.cmake +++ b/ports/kf5dbusaddons/portfile.cmake @@ -1,15 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kdbusaddons - REF v5.87.0 - SHA512 d37a0e28d6a78bbde3fbf0cb4669711edebc27b295beb7a29f60751cbd21448c3ea6f82e487b889e466908f2217d1477552cd4ae3399b761700f0789edfc02d4 + REF v5.89.0 + SHA512 83f748690efe8024f603057cc97ab713f82ba6fbdb4462bb6052a8e89945e4117d6b1f030e0064120ae7e34a9b06860ba77d56617d5663578f0ac11a74dba2db HEAD_REF master - PATCHES - x11_private_dependency.diff ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/kf5dbusaddons/vcpkg.json b/ports/kf5dbusaddons/vcpkg.json index 464ed0b7f9e3f2..6249aa2e08a24c 100644 --- a/ports/kf5dbusaddons/vcpkg.json +++ b/ports/kf5dbusaddons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5dbusaddons", - "version": "5.87.0", + "version": "5.89.0", "description": "Convenience classes for D-Bus", "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5dbusaddons/x11_private_dependency.diff b/ports/kf5dbusaddons/x11_private_dependency.diff deleted file mode 100644 index 1054028bf47425..00000000000000 --- a/ports/kf5dbusaddons/x11_private_dependency.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/KF5DBusAddonsConfig.cmake.in b/KF5DBusAddonsConfig.cmake.in -index 36f55e452635a8edc3a883fe58ac69d490e5e596..2f6f02fc4f3f70052b7206156e74d94f10037936 100644 ---- a/KF5DBusAddonsConfig.cmake.in -+++ b/KF5DBusAddonsConfig.cmake.in -@@ -3,6 +3,11 @@ - include(CMakeFindDependencyMacro) - find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) - -+if(NOT @BUILD_SHARED_LIBS@) -+ if(@Qt5X11Extras_FOUND@) -+ find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) -+ endif() -+endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KF5DBusAddonsTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ diff --git a/ports/kf5declarative/dont_force_shared.diff b/ports/kf5declarative/dont_force_shared.diff deleted file mode 100644 index 6fcae5ef072598..00000000000000 --- a/ports/kf5declarative/dont_force_shared.diff +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/src/calendarevents/CMakeLists.txt b/src/calendarevents/CMakeLists.txt -index e2e6e6f808e0e4f3569c0f1225f7d5b50798833c..aa0868118b64acaefd7c54add624e589cb0976a0 100644 ---- a/src/calendarevents/CMakeLists.txt -+++ b/src/calendarevents/CMakeLists.txt -@@ -3,7 +3,7 @@ set(calendar-integration_SRCS - eventdata_p.cpp - ) - --add_library(KF5CalendarEvents SHARED ${calendar-integration_SRCS}) -+add_library(KF5CalendarEvents ${calendar-integration_SRCS}) - generate_export_header(KF5CalendarEvents BASE_NAME CalendarEvents) - add_library(KF5::CalendarEvents ALIAS KF5CalendarEvents) - -diff --git a/src/qmlcontrols/draganddrop/CMakeLists.txt b/src/qmlcontrols/draganddrop/CMakeLists.txt -index e8127e44f7ed51514fc94337c9de524343e2a4bd..e649c4fe421f12e5f3a3d7833004886bf6a40dd6 100644 ---- a/src/qmlcontrols/draganddrop/CMakeLists.txt -+++ b/src/qmlcontrols/draganddrop/CMakeLists.txt -@@ -9,7 +9,7 @@ set(declarativedragdrop_SRCS - MimeDataWrapper.cpp - ) - --add_library(draganddropplugin SHARED ${declarativedragdrop_SRCS}) -+add_library(draganddropplugin ${declarativedragdrop_SRCS}) - target_link_libraries(draganddropplugin - Qt5::Core - Qt5::Quick -diff --git a/src/qmlcontrols/kcmcontrols/CMakeLists.txt b/src/qmlcontrols/kcmcontrols/CMakeLists.txt -index a2e107ff7ae776f584f05b1d94130be6d2de4382..eec89dd219c345f50236f4d2d8e0004d4fb0741c 100644 ---- a/src/qmlcontrols/kcmcontrols/CMakeLists.txt -+++ b/src/qmlcontrols/kcmcontrols/CMakeLists.txt -@@ -6,7 +6,7 @@ set(kcmcontrols_SRCS - settinghighlighterprivate.cpp - ) - --add_library(kcmcontrolsplugin SHARED ${kcmcontrols_SRCS}) -+add_library(kcmcontrolsplugin ${kcmcontrols_SRCS}) - target_link_libraries(kcmcontrolsplugin - Qt5::Core - Qt5::Quick -diff --git a/src/qmlcontrols/kconfig/CMakeLists.txt b/src/qmlcontrols/kconfig/CMakeLists.txt -index 59a68b2277dee3532d39b40d2240a1ba2d3e041d..73658100ce4d832088d8bf6479b3a04853addecb 100644 ---- a/src/qmlcontrols/kconfig/CMakeLists.txt -+++ b/src/qmlcontrols/kconfig/CMakeLists.txt -@@ -5,7 +5,7 @@ set(kconfigplugin_SRCS - kauthorizedproxy.cpp - ) - --add_library(kconfigplugin SHARED ${kconfigplugin_SRCS}) -+add_library(kconfigplugin ${kconfigplugin_SRCS}) - target_link_libraries(kconfigplugin - Qt5::Core - Qt5::Qml -diff --git a/src/qmlcontrols/kcoreaddons/CMakeLists.txt b/src/qmlcontrols/kcoreaddons/CMakeLists.txt -index 3f77f2d1bf067a545f74f31423a8facff8e38ff7..3c27e3bb3db2c8686ef97ef093051a3ead7ad475 100644 ---- a/src/qmlcontrols/kcoreaddons/CMakeLists.txt -+++ b/src/qmlcontrols/kcoreaddons/CMakeLists.txt -@@ -6,7 +6,7 @@ set(kcoreaddonsplugin_SRCS - kuserproxy.cpp - ) - --add_library(kcoreaddonsplugin SHARED ${kcoreaddonsplugin_SRCS}) -+add_library(kcoreaddonsplugin ${kcoreaddonsplugin_SRCS}) - target_link_libraries(kcoreaddonsplugin - Qt5::Core - Qt5::Quick -diff --git a/src/qmlcontrols/kioplugin/CMakeLists.txt b/src/qmlcontrols/kioplugin/CMakeLists.txt -index 22a4f1e4326a2dbb721fd94ebbf74bdc0f8a7acf..2afcbdd3ef4aeee55da5a0800f7da0ce78edc909 100644 ---- a/src/qmlcontrols/kioplugin/CMakeLists.txt -+++ b/src/qmlcontrols/kioplugin/CMakeLists.txt -@@ -5,7 +5,7 @@ set(kioplugin_SRCS - krunproxy.cpp - ) - --add_library(kio SHARED ${kioplugin_SRCS}) -+add_library(kio ${kioplugin_SRCS}) - target_link_libraries(kio - Qt5::Core - Qt5::Qml -diff --git a/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt b/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt -index 61fae96bb475af320a5f12d7b5c4178a0bf293f9..5afb253e4a4fce5f1448f8f74b966ea4ec387041 100644 ---- a/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt -+++ b/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt -@@ -6,7 +6,7 @@ set(kquickcontrolsprivate_SRCS - translationcontext.cpp - ) - --add_library(kquickcontrolsprivateplugin SHARED ${kquickcontrolsprivate_SRCS}) -+add_library(kquickcontrolsprivateplugin ${kquickcontrolsprivate_SRCS}) - - target_link_libraries(kquickcontrolsprivateplugin - Qt5::Core -diff --git a/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt b/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt -index 71aacc6920e126e271b9192ed384d9753f469520..513eebfb18b8b6e093db540fb5e964cf8b1cbbe2 100644 ---- a/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt -+++ b/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt -@@ -17,7 +17,7 @@ set(kquickcontrolsaddons_SRCS - icondialog.cpp - ) - --add_library(kquickcontrolsaddonsplugin SHARED ${kquickcontrolsaddons_SRCS}) -+add_library(kquickcontrolsaddonsplugin ${kquickcontrolsaddons_SRCS}) - - target_link_libraries(kquickcontrolsaddonsplugin - Qt5::Core -diff --git a/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt b/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt -index 48378f7e93c5fd9641e11d7dd784992cf7f62f3e..6c8a01d249a67371caba84e8f9a263dcf728b60b 100644 ---- a/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt -+++ b/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt -@@ -5,7 +5,7 @@ set(kwindowsystemplugin_SRCS - kwindowsystemproxy.cpp - ) - --add_library(kwindowsystem SHARED ${kwindowsystemplugin_SRCS}) -+add_library(kwindowsystem ${kwindowsystemplugin_SRCS}) - target_link_libraries(kwindowsystem - Qt5::Core - Qt5::Qml diff --git a/ports/kf5declarative/portfile.cmake b/ports/kf5declarative/portfile.cmake index 0378396e1ccc16..07b1b54e2e8418 100644 --- a/ports/kf5declarative/portfile.cmake +++ b/ports/kf5declarative/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kdeclarative - REF v5.87.0 - SHA512 48480a30f91ffec9841668a0c263c8fab3144b0a973b2100715cfee7c132e159b004e6ddb3ed46ddb9e08f2be4251596a14e23a9184d2de4b256bd4c3df216d3 + REF v5.89.0 + SHA512 baad15ef1288e215a269c7b69d2de3659508ce16f91e7f20ec9255ed07810b22ea7e04f7446c50715f7b4abe2809c22d9911f03a5cc0791f7b9e5298f9e2ac59 HEAD_REF master - PATCHES - dont_force_shared.diff ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -14,17 +12,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_QTPLUGINDIR=plugins -DBUNDLE_INSTALL_DIR=bin -DKDE_INSTALL_QMLDIR=qml ${FEATURE_OPTIONS} - MAYBE_UNUSED_VARIABLES + MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_EPOXY BUNDLE_INSTALL_DIR ) @@ -45,4 +43,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5declarative/vcpkg.json b/ports/kf5declarative/vcpkg.json index b37e47ad6e9f55..5407b3989f70a2 100644 --- a/ports/kf5declarative/vcpkg.json +++ b/ports/kf5declarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5declarative", - "version": "5.87.0", + "version": "5.89.0", "description": "Integration of QML and KDE work spaces", "homepage": "https://api.kde.org/frameworks/kdeclarative/html/index.html", "dependencies": [ diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake index 0d6646aa9218be..3b0b1d070dcc0e 100644 --- a/ports/kf5globalaccel/portfile.cmake +++ b/ports/kf5globalaccel/portfile.cmake @@ -1,35 +1,33 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kglobalaccel - REF v5.87.0 - SHA512 2fde268730d840a56e09809e2486182b6df4b7567685bc5dce41fea48ae04d504f780ff5698ff1794142b6e25321296dc2b6332bf2f4160f68f9567123d3a96a - HEAD_REF master - PATCHES - xcb_xtest_optional.diff # https://invent.kde.org/frameworks/kglobalaccel/-/merge_requests/30 -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GlobalAccel CONFIG_PATH lib/cmake/KF5GlobalAccel) -vcpkg_copy_pdbs() - -vcpkg_copy_tools( - TOOL_NAMES kglobalaccel5 - AUTO_CLEAN - ) - -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") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kglobalaccel + REF v5.89.0 + SHA512 824e4d6204189290dcc542ef3004ad2e2e2f83620dbf381ab78edbef996f412996709b9b49b72aad7c23deeeb6be274906b4cbbbd49498be081330e89c5674de + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GlobalAccel CONFIG_PATH lib/cmake/KF5GlobalAccel) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kglobalaccel5 + AUTO_CLEAN + ) + +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") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5globalaccel/vcpkg.json b/ports/kf5globalaccel/vcpkg.json index 71285edbde9bb9..dbc60bfaa6460e 100644 --- a/ports/kf5globalaccel/vcpkg.json +++ b/ports/kf5globalaccel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5globalaccel", - "version": "5.87.0", + "version": "5.89.0", "description": "lobal desktop keyboard shortcuts", "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html", "dependencies": [ diff --git a/ports/kf5globalaccel/xcb_xtest_optional.diff b/ports/kf5globalaccel/xcb_xtest_optional.diff deleted file mode 100644 index affb39e4d5eb1d..00000000000000 --- a/ports/kf5globalaccel/xcb_xtest_optional.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5b58f6..17eaed8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,7 +49,7 @@ find_package(KF5WindowSystem ${KF_DEP_VERSION} REQUIRED) - - # no X11 stuff on mac - if (NOT APPLE) -- find_package(XCB MODULE COMPONENTS XCB KEYSYMS XTEST XKB) -+ find_package(XCB MODULE COMPONENTS XCB KEYSYMS XKB OPTIONAL_COMPONENTS XTEST) - set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" - URL "http://xcb.freedesktop.org" - TYPE OPTIONAL diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index 715e33b51c081a..07048be6d09779 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -1,45 +1,44 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kguiaddons - REF v5.87.0 - SHA512 20d55c05d5cc2223667a6ca888c7d3e61ec3e1b0f576f0aeff57fce13edb763910fb0bb84d93f53d3965d4a48169fd0fdf2cb5f49946b0e32b25ba4d7645123b - HEAD_REF master - PATCHES - fix_cmake.patch # https://github.com/microsoft/vcpkg/issues/17607#issuecomment-831518812 -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - wayland WITH_WAYLAND -) - -if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX) - message(FATAL_ERROR "Feature wayland is only supported on Linux.") -endif() - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DQtWaylandScanner_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/qt5-wayland/bin/qtwaylandscanner - ${FEATURE_OPTIONS} - MAYBE_UNUSED_VARIABLES - QtWaylandScanner_EXECUTABLE -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GuiAddons CONFIG_PATH lib/cmake/KF5GuiAddons) -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kguiaddons + REF v5.89.0 + SHA512 062a8da3a5d3f9da3288031f8e694fd6adb5b4f404071f2d66c7f4d5b15cbf10fedff58d9db928e45a052b69abbe38d7de57349638d8bb9a229798a553e3b9ed + HEAD_REF master + PATCHES + fix_cmake.patch # https://github.com/microsoft/vcpkg/issues/17607#issuecomment-831518812 +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + wayland WITH_WAYLAND +) + +if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX) + message(FATAL_ERROR "Feature wayland is only supported on Linux.") +endif() + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DQtWaylandScanner_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/qt5-wayland/bin/qtwaylandscanner + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + QtWaylandScanner_EXECUTABLE +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GuiAddons CONFIG_PATH lib/cmake/KF5GuiAddons) +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json index 370074475fe507..ca00997c9017a2 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5guiaddons", - "version": "5.87.0", + "version": "5.89.0", "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 317a47e09ca1ee..df9d162c8ce21d 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -1,30 +1,30 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kholidays - REF v5.87.0 - SHA512 818c9bb33fb18f9e0cb2943458cf1f0ca868c9e406225d7b33eff441d8c22a0598a83003a8afb0af1af00c133c578791ded21b62bcadf89600bb871e0c927f65 - HEAD_REF master -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DKDE_INSTALL_QMLDIR=qml -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Holidays CONFIG_PATH lib/cmake/KF5Holidays) -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kholidays + REF v5.89.0 + SHA512 df5a68c9faf2c05b30b161f2e9f363f252be2efd9ec89787a88952fecb91d36b0187e9c88bdedde6887086f5ead4aa5d6ff627c9ea267cd447d5d7ad938b5d65 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Holidays CONFIG_PATH lib/cmake/KF5Holidays) +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index f5b26870f96b01..5055e2a83a030e 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5holidays", - "version": "5.87.0", + "version": "5.89.0", "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5i18n/fix_static_builds.patch b/ports/kf5i18n/fix_static_builds.patch index 541ce9f270fdf2..517e2e376410e7 100644 --- a/ports/kf5i18n/fix_static_builds.patch +++ b/ports/kf5i18n/fix_static_builds.patch @@ -7,11 +7,11 @@ index 364cc43..af7cd3b 100644 include("${CMAKE_CURRENT_LIST_DIR}/KF5I18nMacros.cmake") +find_dependency(Iconv) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +diff --git a/src/i18n/CMakeLists.txt b/src/i18n/CMakeLists.txt index c6b510c..0a25eca 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -38,12 +38,16 @@ ecm_generate_export_header(KF5I18n +--- a/src/i18n/CMakeLists.txt ++++ b/src/i18n/CMakeLists.txt +@@ -40,12 +40,16 @@ ecm_generate_export_header(KF5I18n EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index d1f01774978f46..078c5a5adce54f 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -1,38 +1,38 @@ -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - list(APPEND PATCHES fix_static_builds.patch) -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/ki18n - REF v5.87.0 - SHA512 75f5989fe25e2d192aaf91c69cd84a8a0eff21dd64a668f1cab36f9c55e03c83847a900823f2affe89447c9402fbc3efb6531733e8282d61c959f212f886f91f - PATCHES ${PATCHES} -) - -vcpkg_find_acquire_program(PYTHON3) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DKDE_INSTALL_PLUGINDIR=plugins - -DPYTHON_EXECUTABLE=${PYTHON3} -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5I18n CONFIG_PATH lib/cmake/KF5I18n) -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + list(APPEND PATCHES fix_static_builds.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/ki18n + REF v5.89.0 + SHA512 f83d8b9ef51cc05a2eccb175e602fd0530d0cb6bb0c21e582a82fdd2897d9f988c2d927f2dc986faaf7482ec1c81e8cea4a9e74fc557c88be9958393db71c2a9 + PATCHES ${PATCHES} +) + +vcpkg_find_acquire_program(PYTHON3) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QMLDIR=qml + -DPYTHON_EXECUTABLE=${PYTHON3} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5I18n CONFIG_PATH lib/cmake/KF5I18n) +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index d5c17c06330f11..6aeeada8055c83 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5i18n", - "version": "5.87.0", + "version": "5.89.0", "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake index 3601289007e089..9486d26fb45522 100644 --- a/ports/kf5iconthemes/portfile.cmake +++ b/ports/kf5iconthemes/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kiconthemes - REF v5.87.0 - SHA512 891b9667cbe57878ad08c81c9304ff380b8cb954dc09b3cd1d6ea7fd6c9efb0b1a08ef0d734fa17563e72196abc3e7674fb83957df0a0e2aa0ce868aa7505925 + REF v5.89.0 + SHA512 d876f4a67d667a881820280c51fac8ddcdb99414f8c810422dd20be370173c036abcec3168495009242d479520a379be0c8ee4bea637023584e52c9452d9b3b7 HEAD_REF master ) @@ -13,7 +13,7 @@ vcpkg_check_features( ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json index d0ea0c7561a85d..a7e496cd052e92 100644 --- a/ports/kf5iconthemes/vcpkg.json +++ b/ports/kf5iconthemes/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5iconthemes", - "version": "5.87.0", + "version": "5.89.0", "description": "Icon GUI utilities", "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html", "dependencies": [ diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index 85543109bc56a9..04c74eda41912d 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -1,30 +1,29 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kitemmodels - REF v5.87.0 - SHA512 bb42c4c5c8518de2114fc50a1e3f263de55594e3dfe88ce7a8111ebd9760976e282ca07d36af05911dbe70ed5cf6c6b787f667457d385a41e8dac7abb046babe -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DKDE_INSTALL_QMLDIR=qml -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemModels CONFIG_PATH lib/cmake/KF5ItemModels) -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kitemmodels + REF v5.89.0 + SHA512 4d7730994f935bd0929e8ceacfaed945e784cebdc86642c6148ce21108c4ffe792774196613c8b3215354069db85d276a30c6608445961f67aeb1b420a579007 +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemModels CONFIG_PATH lib/cmake/KF5ItemModels) +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5itemmodels/vcpkg.json b/ports/kf5itemmodels/vcpkg.json index 1c0519bfb680cf..f289009c755b88 100644 --- a/ports/kf5itemmodels/vcpkg.json +++ b/ports/kf5itemmodels/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5itemmodels", - "version": "5.87.0", + "version": "5.89.0", "description": "Models for Qt Model/View system", "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", "dependencies": [ diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index 9c554c77d75d28..f1efb9e1c8047c 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -1,30 +1,29 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kitemviews - REF v5.87.0 - SHA512 a30b4da714e7ef6729cbe30248636a8f7db93de4580e56690bb6ed5c8033aa87cb8fd2bb46367b658984207aad4105e8b4889ee345efae9800e47cd755991bdb -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DBUILD_DESIGNERPLUGIN=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemViews CONFIG_PATH lib/cmake/KF5ItemViews) -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kitemviews + REF v5.89.0 + SHA512 c96cb1204d5e9d0b1206eac93f36b06c94b7fcf63c7a75938e50783af1e7d3fe48617fadd264f55f2ac31c3d316a062b9200053a582ccf2e7c927659b7e1b442 +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_DESIGNERPLUGIN=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemViews CONFIG_PATH lib/cmake/KF5ItemViews) +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5itemviews/vcpkg.json b/ports/kf5itemviews/vcpkg.json index e73617105e3f56..444aa1f79ae6f7 100644 --- a/ports/kf5itemviews/vcpkg.json +++ b/ports/kf5itemviews/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5itemviews", - "version": "5.87.0", + "version": "5.89.0", "description": "Widget addons for Qt Model/View", "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", "dependencies": [ diff --git a/ports/kf5jobwidgets/portfile.cmake b/ports/kf5jobwidgets/portfile.cmake index 237d814c5bba39..e34c97193e8df0 100644 --- a/ports/kf5jobwidgets/portfile.cmake +++ b/ports/kf5jobwidgets/portfile.cmake @@ -1,31 +1,30 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kjobwidgets - REF v5.87.0 - SHA512 f5b2d4d36bf9b5a3e29e2fdceb532906632e13af7833c6ef4a8e2f81e3576f612925c7bc95c353eb94b2816af3b48b4d1cc02c4aa0ff6cbe89dbf9006a07c94b - HEAD_REF master -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5JobWidgets CONFIG_PATH lib/cmake/KF5JobWidgets) - -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kjobwidgets + REF v5.89.0 + SHA512 6fcc1fbef4de8adde1577739a28b5a3671829b24d4d8885a6b22f7b99662f058502183ab7d4f8c47f2c69f02a1932ac94a55be93bd6245fe97d8819644b1e708 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5JobWidgets CONFIG_PATH lib/cmake/KF5JobWidgets) + +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5jobwidgets/vcpkg.json b/ports/kf5jobwidgets/vcpkg.json index 7c78986cf359e3..8a616421286493 100644 --- a/ports/kf5jobwidgets/vcpkg.json +++ b/ports/kf5jobwidgets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5jobwidgets", - "version": "5.87.0", + "version": "5.89.0", "description": "Widgets for showing progress of asynchronous jobs", "homepage": "https://api.kde.org/frameworks/kjobwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5kcmutils/portfile.cmake b/ports/kf5kcmutils/portfile.cmake index 260e1a6bc12a12..da0a49637c96f9 100644 --- a/ports/kf5kcmutils/portfile.cmake +++ b/ports/kf5kcmutils/portfile.cmake @@ -1,17 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcmutils - REF v5.87.0 - SHA512 8d0362cf75acc47b6fffe178f76881937180b9143472e8ae69930967f63205ae52c5f300fda122ab3d4641d5f5b1b5d3e19d2e9797963d1ae1765f223f053277 + REF v5.89.0 + SHA512 9f12e906d9bd763906d6c9a0ebbefec1b7d1e958a217de5ed7ea418c8fcda1dbaccd8df89a849019aa81303fc4540b26872d205e7215285c4f312e8bbfcb97d0 HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DBUILD_TESTING=OFF ) @@ -27,4 +27,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5kcmutils/vcpkg.json b/ports/kf5kcmutils/vcpkg.json index c63fe418a870a1..85309cd383b92a 100644 --- a/ports/kf5kcmutils/vcpkg.json +++ b/ports/kf5kcmutils/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5kcmutils", - "version": "5.87.0", + "version": "5.89.0", "description": "Utilities for KDE System Settings modules", "homepage": "https://api.kde.org/frameworks/kcmutils/html/index.html", "dependencies": [ diff --git a/ports/kf5kio/libmount_static_dep.diff b/ports/kf5kio/libmount_static_dep.diff deleted file mode 100644 index 6f57261fbdb71c..00000000000000 --- a/ports/kf5kio/libmount_static_dep.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in -index 05922f7690986c93ec4ee35e42d68906190f400b..a9f41e30753d1a2451008708ed7665804d41a5ba 100644 ---- a/KF5KIOConfig.cmake.in -+++ b/KF5KIOConfig.cmake.in -@@ -26,6 +26,10 @@ if (NOT @KIOCORE_ONLY@) - find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") - find_dependency(KF5IconThemes "@KF_DEP_VERSION@") - find_dependency(KF5DBusAddons "@KF_DEP_VERSION@") -+ -+ if (@LibMount_FOUND@) -+ find_dependency(LibMount) -+ endif() - endif() - endif() - diff --git a/ports/kf5kio/portfile.cmake b/ports/kf5kio/portfile.cmake index f3d82acf8290f2..12fdb59163db1e 100644 --- a/ports/kf5kio/portfile.cmake +++ b/ports/kf5kio/portfile.cmake @@ -5,12 +5,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kio - REF v5.87.0 - SHA512 ae16478ea1d4140d8168a87a25017861e5b3b2e4afb280ea01dc6822d3ce880961791ec37d658750fe48d81eccda6327d66ea7de0ca8d4515cec18a3b79f453e + REF v5.89.0-rc2 + SHA512 08df36c08b028998884983fa233aad5bfc05d4e9e5899ed85390015daa7e0703272edabc59189579957e9971435887c4486796061878ce0f252ac2259b78a799 HEAD_REF master PATCHES - libmount_static_dep.diff # https://invent.kde.org/frameworks/kio/-/merge_requests/615 - revert_blkid.diff # https://invent.kde.org/frameworks/kio/-/commit/221a94a66c4d2f6e4f2dc938ee8a63a6ca739477 ${PATCHES} ) @@ -21,7 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/kf5kio/revert_blkid.diff b/ports/kf5kio/revert_blkid.diff deleted file mode 100644 index 793a965c68fec2..00000000000000 --- a/ports/kf5kio/revert_blkid.diff +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ca374a4cbc84bb14d138d3dfafbd3fb23e110caa..f1bb1a59b3b00303a1335b8a22e043706dcfd5fc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -130,8 +130,7 @@ set_package_properties(ACL PROPERTIES DESCRIPTION "LibACL" - # Used by KMountPoint - if (CMAKE_SYSTEM_NAME MATCHES "Linux") - find_package(LibMount REQUIRED) -- find_package(Blkid REQUIRED) -- set(HAVE_LIBS_MOUNT_AND_BLKID ${LibMount_FOUND} AND ${Blkid_FOUND}) -+ set(HAVE_LIB_MOUNT ${LibMount_FOUND}) - endif() - - if (ANDROID) -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index be19e9b623e5ae4b331b2a23f94317807e3df4b9..67a1b1cf72623088f3f1470bf89fe16a705f7ffc 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -236,9 +236,8 @@ if(ACL_FOUND) - target_link_libraries(KF5KIOCore PRIVATE ${ACL_LIBS}) - endif() - --if(HAVE_LIBS_MOUNT_AND_BLKID) -- # libmount links against blkid anyway -- target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount Blkid::Blkid) -+if(HAVE_LIB_MOUNT) -+ target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount) - endif() - - # this should be done by cmake, see bug 371721 -diff --git a/src/core/config-kmountpoint.h.cmake b/src/core/config-kmountpoint.h.cmake -index f824d40426a650ad2054c50bbed7121804a84989..3673eb14181998772f7a85d237aa1f134ed2e913 100644 ---- a/src/core/config-kmountpoint.h.cmake -+++ b/src/core/config-kmountpoint.h.cmake -@@ -1,7 +1,7 @@ - #cmakedefine01 HAVE_GETMNTINFO - #cmakedefine01 GETMNTINFO_USES_STATVFS - --#cmakedefine01 HAVE_LIBS_MOUNT_AND_BLKID -+#cmakedefine01 HAVE_LIB_MOUNT - - #cmakedefine01 HAVE_SYS_MOUNT_H - #cmakedefine01 HAVE_FSTAB_H -diff --git a/src/core/kmountpoint.cpp b/src/core/kmountpoint.cpp -index e2d32055c669033711b5bd841a6cbd48275ac6cf..f41cff5ee41ee95426c46a64387f0ee34367a79f 100644 ---- a/src/core/kmountpoint.cpp -+++ b/src/core/kmountpoint.cpp -@@ -44,7 +44,7 @@ static const Qt::CaseSensitivity cs = Qt::CaseSensitive; - #endif - - // Linux --#if HAVE_LIBS_MOUNT_AND_BLKID -+#if HAVE_LIB_MOUNT - #include - #include - #endif -@@ -176,7 +176,7 @@ KMountPoint::List KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded - #ifdef Q_OS_WIN - result = KMountPoint::currentMountPoints(infoNeeded); - --#elif HAVE_LIBS_MOUNT_AND_BLKID -+#elif HAVE_LIB_MOUNT - if (struct libmnt_table *table = mnt_new_table()) { - // By default parses "/etc/fstab" - if (mnt_table_parse_fstab(table, nullptr) == 0) { -@@ -202,23 +202,13 @@ KMountPoint::List KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded - // or some network mount - if (const char *source = mnt_fs_get_source(fs)) { - mp->d->m_mountedFrom = QFile::decodeName(source); -- if (mp->d->m_mountedFrom.startsWith(QLatin1String("UUID")) || mp->d->m_mountedFrom.startsWith(QLatin1String("LABEL"))) { -- // Use blkid to resolve UUID/LABEL to the device file -- if (char *blkSource = blkid_evaluate_spec(source, nullptr)) { -- mp->d->m_mountedFrom = QFile::decodeName(blkSource); -- free(blkSource); -- if ((infoNeeded & KMountPoint::NeedRealDeviceName) // -- && mp->d->m_mountedFrom.startsWith(QLatin1String("/dev/"))) { -- mp->d->m_device = mp->d->m_mountedFrom; -- } -- } -- } - } - - if (infoNeeded & NeedMountOptions) { - mp->d->m_mountOptions = QFile::decodeName(mnt_fs_get_options(fs)).split(QLatin1Char(',')); - } - -+ mp->d->finalizePossibleMountPoint(infoNeeded); - result.append(mp); - } - mnt_free_iter(itr); -@@ -351,7 +341,7 @@ KMountPoint::List KMountPoint::currentMountPoints(DetailsNeededFlags infoNeeded) - } - } - --#elif HAVE_LIBS_MOUNT_AND_BLKID -+#elif HAVE_LIB_MOUNT - if (struct libmnt_table *table = mnt_new_table()) { - // By default, parses "/proc/self/mountinfo" - if (mnt_table_parse_mtab(table, nullptr) == 0) { diff --git a/ports/kf5kio/vcpkg.json b/ports/kf5kio/vcpkg.json index c9be3281e083a6..3f06846fc6d12f 100644 --- a/ports/kf5kio/vcpkg.json +++ b/ports/kf5kio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5kio", - "version": "5.87.0", + "version": "5.89.0", "description": "Network transparent access to files and data", "homepage": "https://api.kde.org/frameworks/kio/html/index.html", "dependencies": [ diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index d2925c5bd761d2..ddb0527c2ec06f 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/knewstuff - REF v5.87.0 - SHA512 67fe095f6473f9bb7378dda9b591ccdf57503e876cc1f01eb4c02c091dae1ace74f6f6b578c31679c7884076a1019fd21b349a7f4b51dcf1a5278fa6b42c9e5b + REF v5.89.0 + SHA512 e031fc985ad29be177b438667c624c6706a45edd7029b8144d712e04b9b3f5c8bc7aebea9e2a09afe2a2f28db078f58969cb63bf7dccd5d2e1e05dcbc456766b HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/kf5newstuff/vcpkg.json b/ports/kf5newstuff/vcpkg.json index e86d9657f5177b..a435e8b05215de 100644 --- a/ports/kf5newstuff/vcpkg.json +++ b/ports/kf5newstuff/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5newstuff", - "version": "5.87.0", + "version": "5.89.0", "description": "Framework for downloading and sharing additional application data", "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html", "dependencies": [ diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index a31ba9339d728e..e44c59b76485b5 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -1,18 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/knotifications - REF v5.87.0 - SHA512 8b12a6af3675f54bb494b91c71f4284ec109c381aa92e54c3613c6beca96c5f20ef418e7d35f2bcdec197884ea796c4f1d4ab2937583cd6b78d8ef40204c51cb + REF v5.89.0 + SHA512 58e9fe34b29e0f6d7507a3a783918bcfbc8a191ddc7bb287c793628a97a2a203347971849100ae9a98d9f8a23c27ba184b509c11caf00517d8c6422ae91ac310 HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml ) vcpkg_cmake_install() diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json index b8066d7b7b0813..1299e13af8ded6 100644 --- a/ports/kf5notifications/vcpkg.json +++ b/ports/kf5notifications/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5notifications", - "version": "5.87.0", + "version": "5.89.0", "description": "Desktop notifications", "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html", "dependencies": [ diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index 6c49d2061e9633..f58344ed04013c 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -1,32 +1,32 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kpackage - REF v5.87.0 - SHA512 254287e424045c357a3833c789e1640f1c2e44ed6884bd51f096d944f1945afac4cb921d2e85296741b119927a94b89cbc9a5e05f62be2831b9c04e7484fe62a - HEAD_REF master -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Package CONFIG_PATH lib/cmake/KF5Package) -vcpkg_copy_pdbs() - -vcpkg_copy_tools(TOOL_NAMES kpackagetool5 AUTO_CLEAN) - -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") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kpackage + REF v5.89.0 + SHA512 0f008129d2675fb8faa274bc9d1389be6a4acee0be95eb06973762933a7306749742e852a83144c54523aacdd10e5a808c8c06834ff533719a6e66ccc62f7186 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Package CONFIG_PATH lib/cmake/KF5Package) +vcpkg_copy_pdbs() + +vcpkg_copy_tools(TOOL_NAMES kpackagetool5 AUTO_CLEAN) + +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") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index fbb59dcbac3740..30d6ea179bd4fb 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5package", - "version": "5.87.0", + "version": "5.89.0", "description": "Installation and loading of additional content (ex: scripts, images...) as packages", "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", "dependencies": [ diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index c5bb1061be1faa..cd05b7ff557d72 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -1,17 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kplotting - REF v5.87.0 - SHA512 8437abe43e660b65e5c970039a343fee80c4e9bf1f3e1bf3b1a756fc211aa65192c0b6d7c10e42951a2fc5bec5ca8c45753d1ef009487865bb1e379025305410 + REF v5.89.0 + SHA512 4499f1820d2314041d78e48130f5f8ee30c677302c9a34a1f7e797d4ebd0ba4286278622c113907d9c224e753c528adc85cb55abd2d3132187553a5d7fbe382a HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 42d316f488fa6f..6a085aacc18510 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5plotting", - "version": "5.87.0", + "version": "5.89.0", "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 460346f830c5bb..afaebd0eb39cbd 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -1,59 +1,59 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kservice - REF v5.87.0 - SHA512 6f9b71f0038e55ce190feac17231a44ef33815be0722b75d2589ab25d69609ca18140e95910fa58706faa000c897dc690ec04ec4f4c54c627cc80b2cce5870db - HEAD_REF master -) - -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 - OUTPUT_VARIABLE BISON_OUTPUT - ) - string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") - set(BISON_MAJOR ${CMAKE_MATCH_1}) - set(BISON_MINOR ${CMAKE_MATCH_2}) - message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") - if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0)) - message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") - endif() -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) - -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_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Service CONFIG_PATH lib/cmake/KF5Service) -vcpkg_copy_pdbs() - -vcpkg_copy_tools( - TOOL_NAMES kbuildsycoca5 - AUTO_CLEAN -) - -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") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kservice + REF v5.89.0 + SHA512 9809b7cb05b3164575e4f92cc979b34dad63945648e054621248fd92ce1c5885a048704ed11b1292446bb55940ed2c11e982a434bb0983c25de9938514b53c6d + HEAD_REF master +) + +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 + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0)) + message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") + endif() +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) + +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_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Service CONFIG_PATH lib/cmake/KF5Service) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kbuildsycoca5 + AUTO_CLEAN +) + +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") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index fdce1f518b6615..a7f375e6125f4a 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5service", - "version": "5.87.0", + "version": "5.89.0", "description": "Plugin framework for desktop services", "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", "dependencies": [ @@ -19,6 +19,7 @@ "platform": "!android" }, "kf5i18n", + "libiconv", "qt5-base", "qt5-tools", { diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index 9c98eb431bdff8..cc4f0358ab3a94 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -1,68 +1,67 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/solid - REF v5.87.0 - SHA512 e1add78825841c8a87b006a2c1dba31fff7fff5a26af52379769a0851927edead2296aab240c95c11d4d866dfd08e63ee92619f44ea0b8b08a8cc1a827f31e9a - HEAD_REF master - PATCHES - fix-libmount.patch -) - -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 - OUTPUT_VARIABLE BISON_OUTPUT - ) - string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") - set(BISON_MAJOR ${CMAKE_MATCH_1}) - set(BISON_MINOR ${CMAKE_MATCH_2}) - message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") - if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0)) - message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") - endif() -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 ) - -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 -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DKDE_INSTALL_QMLDIR=qml -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Solid CONFIG_PATH lib/cmake/KF5Solid) -vcpkg_copy_pdbs() - -vcpkg_copy_tools( - TOOL_NAMES solid-hardware5 - AUTO_CLEAN - ) - -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") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/solid + REF v5.89.0 + SHA512 18d3c709756476870b6495bd5a99d70ec291a71a2f79dae954ce434953fb6299033c2dc85c68adf81031b03b70bf2e4798b7428da99c2ac28ddd6070cc413592 + HEAD_REF master + PATCHES + fix-libmount.patch +) + +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 + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0)) + message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") + endif() +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 ) + +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 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Solid CONFIG_PATH lib/cmake/KF5Solid) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES solid-hardware5 + AUTO_CLEAN + ) + +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") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json index 4c5b9983739980..ec477c5b450ef1 100644 --- a/ports/kf5solid/vcpkg.json +++ b/ports/kf5solid/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5solid", - "version": "5.87.0", + "version": "5.89.0", "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ diff --git a/ports/kf5sonnet/dont_build_examples.diff b/ports/kf5sonnet/dont_build_examples.diff deleted file mode 100644 index 02f1fe7f949282..00000000000000 --- a/ports/kf5sonnet/dont_build_examples.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d490ff73d3ff444e994ccd04fbc7000ce954113..c2c2369ce4622800f21d16d5019e4cfad4d4a9c6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,6 +4,7 @@ set(KF_VERSION "5.88.0") # handled by release scripts - project(Sonnet VERSION ${KF_VERSION}) - - include(FeatureSummary) -+include(CMakeDependentOption) - find_package(ECM 5.87.0 NO_MODULE) - set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") - feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) -@@ -63,11 +64,11 @@ if (BUILD_TESTING) - add_subdirectory(autotests) - endif() - --if(TARGET Qt5::Widgets) -+cmake_dependent_option(BUILD_EXAMPLES "Whether to build the examples" OFF "SONNET_USE_WIDGETS" OFF) -+if (BUILD_EXAMPLES) - add_subdirectory(examples) - endif() - -- - # create a Config.cmake and a ConfigVersion.cmake file and install them - set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Sonnet") - diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake index df72c2f428bbc4..f981c077c191a7 100644 --- a/ports/kf5sonnet/portfile.cmake +++ b/ports/kf5sonnet/portfile.cmake @@ -1,49 +1,47 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/sonnet - REF v5.87.0 - SHA512 4e4a8d0a31013f617dd6e38f78f56459cbb61fc59c31db0db09ee6a4086bb3913515af502c783a58c6c964168948394063fdabb6906e2cdb99f661dd1f596e4d - HEAD_REF master - PATCHES - dont_build_examples.diff # https://invent.kde.org/frameworks/sonnet/-/merge_requests/34 -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DBUILD_EXAMPLES=OFF - -DKDE_INSTALL_PLUGINDIR=plugins - -DKDE_INSTALL_QTPLUGINDIR=plugins -) - -vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") -vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Sonnet CONFIG_PATH lib/cmake/KF5Sonnet) - -vcpkg_copy_tools( - TOOL_NAMES gentrigrams parsetrigrams - AUTO_CLEAN -) - -file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") - -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/sonnet + REF v5.89.0 + SHA512 18e2b9f9553229853952e2b0e3e6fac9c87417014f607144419bfe10b9d40cf5b542b253a43e5305d75ccef525f8cce36c112e1bad9398365847d5ec2996e8e4 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QTPLUGINDIR=plugins + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") +vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Sonnet CONFIG_PATH lib/cmake/KF5Sonnet) + +vcpkg_copy_tools( + TOOL_NAMES gentrigrams parsetrigrams + AUTO_CLEAN +) + +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") + +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5sonnet/vcpkg.json b/ports/kf5sonnet/vcpkg.json index d8ec9407e55565..194bb46b22abef 100644 --- a/ports/kf5sonnet/vcpkg.json +++ b/ports/kf5sonnet/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5sonnet", - "version": "5.87.0", + "version": "5.89.0", "description": "Multi-language spell checker", "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html", "dependencies": [ diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 589bbee9c943f4..9cb527951225d1 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -1,39 +1,39 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/syntax-highlighting - REF v5.87.0 - SHA512 a5750e6dd3a055531f041a56240fba3cdfb90b2552fad8f1ec9ba6cebbe569a342737bc28a17bc1f738c21afe26208b7d1dd32a81d9d58421a2f3be52e836dce - HEAD_REF master -) - -vcpkg_find_acquire_program(PERL) -get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) -vcpkg_add_to_path("${PERL_EXE_PATH}") - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DKDE_INSTALL_QMLDIR=qml -) - -vcpkg_cmake_install(ADD_BIN_TO_PATH) -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5SyntaxHighlighting CONFIG_PATH lib/cmake/KF5SyntaxHighlighting) -vcpkg_copy_pdbs() - -vcpkg_copy_tools( - TOOL_NAMES kate-syntax-highlighter - AUTO_CLEAN -) - -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/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/syntax-highlighting + REF v5.89.0 + SHA512 c92df10d236d736f3f944f25efac796636ef857049732c0359edb900a1686839c55303917ab2286935024e7e6f19a0797fc38b417a1bd60d5dfb8c9c45ca6e66 + HEAD_REF master +) + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path("${PERL_EXE_PATH}") + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5SyntaxHighlighting CONFIG_PATH lib/cmake/KF5SyntaxHighlighting) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kate-syntax-highlighter + AUTO_CLEAN +) + +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/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5syntaxhighlighting/vcpkg.json b/ports/kf5syntaxhighlighting/vcpkg.json index a95a3d720aa701..51784515b5e9dc 100644 --- a/ports/kf5syntaxhighlighting/vcpkg.json +++ b/ports/kf5syntaxhighlighting/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5syntaxhighlighting", - "version": "5.87.0", + "version": "5.89.0", "description": "Syntax highlighting engine for Kate syntax definitions", "homepage": "https://github.com/KDE/syntax-highlighting", "dependencies": [ diff --git a/ports/kf5textwidgets/portfile.cmake b/ports/kf5textwidgets/portfile.cmake index 92247eacf8b42d..bf3e1ad9033bba 100644 --- a/ports/kf5textwidgets/portfile.cmake +++ b/ports/kf5textwidgets/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/ktextwidgets - REF v5.87.0 - SHA512 c01e75d33b5e634600d9982d7b0bf4688d0464f91d3687912e070fb23ed1e065eee7910baca8776c7fb56cae045561ec7c20badd49eb5f696384d5ea73176a4b + REF v5.89.0 + SHA512 5f57e20bc2e865499b4ef5c701baa17f492c5cd48b89f3add4e9fec29664a87ad6e69496c4e91f3a1192fbc4d244758a753ee250731a79b464f6af63f9abbde0 HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/kf5textwidgets/vcpkg.json b/ports/kf5textwidgets/vcpkg.json index 31da6f262685fe..82b0da989e6f9e 100644 --- a/ports/kf5textwidgets/vcpkg.json +++ b/ports/kf5textwidgets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5textwidgets", - "version": "5.87.0", + "version": "5.89.0", "description": "Text editing widgets", "homepage": "https://api.kde.org/frameworks/ktextwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5wallet/portfile.cmake b/ports/kf5wallet/portfile.cmake index d66307e7023314..61db39fa173fa0 100644 --- a/ports/kf5wallet/portfile.cmake +++ b/ports/kf5wallet/portfile.cmake @@ -1,31 +1,31 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kwallet - REF v5.87.0 - SHA512 cb37bbc69aeca97565a133abbc243fdf430726b14cf1305ab6d9078f25cfe2b1dfec7534c7747a511d0ef9c755592845b9f36194601f09be0c5ed6a5e8a6c960 - HEAD_REF master -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DBUILD_KWALLETD=OFF - -DBUILD_KWALLET_QUERY=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Wallet CONFIG_PATH lib/cmake/KF5Wallet) -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kwallet + REF v5.89.0 + SHA512 83bf40e5bfa9129ecfdaecebaf16c289542867337daf29be664aeb562e7c6bc32af4c59b71fcfae3cbbf70438872426b5981844c3c275b311340e5b48deac021 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_KWALLETD=OFF + -DBUILD_KWALLET_QUERY=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Wallet CONFIG_PATH lib/cmake/KF5Wallet) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5wallet/vcpkg.json b/ports/kf5wallet/vcpkg.json index 80f15aa9937f3f..eaf4d12538135e 100644 --- a/ports/kf5wallet/vcpkg.json +++ b/ports/kf5wallet/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5wallet", - "version": "5.87.0", + "version": "5.89.0", "description": "Safe desktop-wide storage for passwords", "homepage": "https://api.kde.org/frameworks/kwallet/html/index.html", "dependencies": [ diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake index 9e7e38d889279c..dacd9aab55007f 100644 --- a/ports/kf5widgetsaddons/portfile.cmake +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -1,31 +1,30 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kwidgetsaddons - REF v5.87.0 - SHA512 765a906bb0d05b9dcf1fee1c5f9231e7c0974c8f6d30e5b16b4db099805a1d4a7b5d05018ce21f026268d639c70d8172694b2f3b65ec998b121b4e86888ab01f - HEAD_REF master -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DBUILD_DESIGNERPLUGIN=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WidgetsAddons CONFIG_PATH lib/cmake/KF5WidgetsAddons) -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kwidgetsaddons + REF v5.89.0 + SHA512 5e83ffeefe3130f3a43768cbc777a81be9e43c029598f12ee48353f787e5ab4a97d0a92f6f3c41987fe021f1e92ac01a05601c642bbd508fbbd780925dd6c03b + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_DESIGNERPLUGIN=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WidgetsAddons CONFIG_PATH lib/cmake/KF5WidgetsAddons) +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5widgetsaddons/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json index d3ea6925d7eb41..7dd41877e72a4c 100644 --- a/ports/kf5widgetsaddons/vcpkg.json +++ b/ports/kf5widgetsaddons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5widgetsaddons", - "version": "5.87.0", + "version": "5.89.0", "description": "Addons to QtWidgets", "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 1673f5d56ec395..999383d7e731eb 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -1,36 +1,35 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kwindowsystem - REF v5.87.0 - SHA512 c6b09d2c67902370da3d6cba61aa0b6c13d496332e5ba9694fe43a6571229f60389164024643b9e56c0c1e5cced0d29942b4b7a0ba919dd86b47dbf4602cb74d - PATCHES - xcb_private_dependency.diff -) - -if (VCPKG_TARGET_IS_LINUX) - message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxcb-res0-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxcb-res0-dev") -endif() - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DKDE_INSTALL_PLUGINDIR=plugins -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WindowSystem CONFIG_PATH lib/cmake/KF5WindowSystem) -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") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kwindowsystem + REF v5.89.0 + SHA512 8cdb177b5dff487c0039f6243a8652e8e0aaae5cd55f299f8ad4cd2c66651fc0be36328998807398b53803989881b511f0ee472359c6129ff809e9b50283b66a +) + +if (VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxcb-res0-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxcb-res0-dev") +endif() + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WindowSystem CONFIG_PATH lib/cmake/KF5WindowSystem) +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/KF5/KWindowSystem/config-kwindowsystem.h" "${CURRENT_PACKAGES_DIR}/" "") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json index 1f2b602ce88fb9..d16a10e55a4008 100644 --- a/ports/kf5windowsystem/vcpkg.json +++ b/ports/kf5windowsystem/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5windowsystem", - "version": "5.87.0", + "version": "5.89.0", + "port-version": 1, "description": "Access to the windowing system", "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", "dependencies": [ diff --git a/ports/kf5windowsystem/xcb_private_dependency.diff b/ports/kf5windowsystem/xcb_private_dependency.diff deleted file mode 100644 index 592cbb4d50d481..00000000000000 --- a/ports/kf5windowsystem/xcb_private_dependency.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in -index b79eb0f4aabe0545493a5ab30be3d1f6299c88d3..5115daced38bdeaf62e70458c7fc58652f41327b 100644 ---- a/KF5WindowSystemConfig.cmake.in -+++ b/KF5WindowSystemConfig.cmake.in -@@ -18,6 +18,7 @@ if(NOT @BUILD_SHARED_LIBS@) - - if(@X11_FOUND@) - find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) -+ find_dependency(XCB) - endif() - endif() - diff --git a/ports/kf5xmlgui/portfile.cmake b/ports/kf5xmlgui/portfile.cmake index 0f2aa04d4e4de7..d3a9143db63724 100644 --- a/ports/kf5xmlgui/portfile.cmake +++ b/ports/kf5xmlgui/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kxmlgui - REF v5.87.0 - SHA512 1d471ec563533e1043afb985a7f7bb30ab489154d7270a164d5f24127a0e94aeca0c31a418965d97841f9afbda174eb5fd456e41a04225cd50ec213a3139002f + REF v5.89.0 + SHA512 6180089ff84456830ceddec564014c75127be1bcb996dd5458f86e5d1dfaa3e3b0267e0605dc8a799abe9aa3d3c0f48c805e5f58e754e19a44a20637dbb95044 HEAD_REF master ) @@ -13,11 +13,11 @@ vcpkg_check_features( ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins -DKDE_INSTALL_QTPLUGINDIR=plugins @@ -35,8 +35,8 @@ if (VCPKG_TARGET_IS_WINDOWS) ) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +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") diff --git a/ports/kf5xmlgui/vcpkg.json b/ports/kf5xmlgui/vcpkg.json index 4a0e656e4e03da..72fe1dcd737ee2 100644 --- a/ports/kf5xmlgui/vcpkg.json +++ b/ports/kf5xmlgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5xmlgui", - "version": "5.87.0", + "version": "5.89.0", "description": "Framework for managing menu and toolbar actions", "homepage": "https://api.kde.org/frameworks/kxmlgui/html/index.html", "dependencies": [ diff --git a/ports/kfr/portfile.cmake b/ports/kfr/portfile.cmake index ca8f4a0fd7b8a0..c632bb1d9c97ca 100644 --- a/ports/kfr/portfile.cmake +++ b/ports/kfr/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "Linux") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/kfr/vcpkg.json b/ports/kfr/vcpkg.json index ecf2ac02d0f308..9137445292221e 100644 --- a/ports/kfr/vcpkg.json +++ b/ports/kfr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kfr", "version-semver": "4.2.1", + "port-version": 1, "description": "Fast, modern C++ DSP framework.", "homepage": "https://www.kfr.dev/", "license": "GPL-2.0", diff --git a/ports/kinectsdk1/portfile.cmake b/ports/kinectsdk1/portfile.cmake index adcb82a524126a..305f9d7bb5dbab 100644 --- a/ports/kinectsdk1/portfile.cmake +++ b/ports/kinectsdk1/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm") - set(KINECTSDK10_VERSION "v1.8") vcpkg_download_distfile(KINECTSDK10_INSTALLER URLS "https://download.microsoft.com/download/E/1/D/E1DEC243-0389-4A23-87BF-F47DE869FC1A/KinectSDK-${KINECTSDK10_VERSION}-Setup.exe" @@ -63,4 +61,4 @@ file( ) # Handle copyright -file(INSTALL ${KINECTSDK10_DIR}/SDKEula.rtf DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${KINECTSDK10_DIR}/SDKEula.rtf DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kinectsdk1/vcpkg.json b/ports/kinectsdk1/vcpkg.json index 230677a2552107..225fe460e37185 100644 --- a/ports/kinectsdk1/vcpkg.json +++ b/ports/kinectsdk1/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kinectsdk1", - "version-string": "1.8", - "port-version": 3, + "version": "1.8", + "port-version": 4, "description": "Kinect for Windows SDK for Kinect v1 sensor.", "supports": "!arm" } diff --git a/ports/knet/portfile.cmake b/ports/knet/portfile.cmake index 73e97179b62d93..d3330ad118d663 100644 --- a/ports/knet/portfile.cmake +++ b/ports/knet/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/knet/vcpkg.json b/ports/knet/vcpkg.json index dfad9b2c133a15..a5a5c2411c7adb 100644 --- a/ports/knet/vcpkg.json +++ b/ports/knet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "knet", "version": "1.1.0", + "port-version": 1, "description": "A cross platform lock-free and timer-supported C++11 network library.", "homepage": "https://github.com/kibaamor/knet", "license": "MIT", diff --git a/ports/krabsetw/portfile.cmake b/ports/krabsetw/portfile.cmake index 7dcb2c7fb7c63c..ee321fc61cdd20 100644 --- a/ports/krabsetw/portfile.cmake +++ b/ports/krabsetw/portfile.cmake @@ -1,7 +1,3 @@ -# Header-only library - -vcpkg_fail_port_install(ON_TARGET "UWP" "LINUX" "OSX" "FREEBSD" "ANDROID" "MINGW") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/krabsetw diff --git a/ports/krabsetw/vcpkg.json b/ports/krabsetw/vcpkg.json index 93749378612ebf..9027ddacb83c03 100644 --- a/ports/krabsetw/vcpkg.json +++ b/ports/krabsetw/vcpkg.json @@ -1,6 +1,7 @@ { "name": "krabsetw", - "version-string": "4.1.18", + "version": "4.1.18", + "port-version": 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/ktx/portfile.cmake b/ports/ktx/portfile.cmake index 8731a85b8928e9..46fa8f5dd3170d 100644 --- a/ports/ktx/portfile.cmake +++ b/ports/ktx/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm64") - set(PORT_VERSION 4.0.0) vcpkg_from_github( @@ -24,7 +22,7 @@ if(VCPKG_TARGET_IS_WINDOWS) ff951c2cd96d0fda87bacb505c93e4aa1f9aeb35f829c52b5a7862d05e167f69605a4927a0e7197b5ee2b2fa5cb56619ad7a6ba293ede4765fdcacedf2ed35da ) vcpkg_add_to_path(${MSYS_ROOT}/usr/bin) - + file(REMOVE "${SOURCE_PATH}/other_include/zstd.h" "${SOURCE_PATH}/other_include/zstd_errors.h") @@ -74,4 +72,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") -file(COPY ${LICENSE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES") \ No newline at end of file +file(COPY ${LICENSE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES") diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index ae905f55d89c46..df4492757e9850 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ktx", "version": "4.0.0", + "port-version": 1, "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them", "homepage": "https://github.com/KhronosGroup/KTX-Software", "supports": "!(uwp | x86 | arm64)", diff --git a/ports/kubernetes/001-fix-destination.patch b/ports/kubernetes/001-fix-destination.patch index 00e7919d586c7c..9169ac3eeb67a3 100644 --- a/ports/kubernetes/001-fix-destination.patch +++ b/ports/kubernetes/001-fix-destination.patch @@ -1,11 +1,11 @@ diff --git a/kubernetes/CMakeLists.txt b/kubernetes/CMakeLists.txt ---- a/kubernetes/CMakeLists.txt (revision 6b98698c92c59d8c63815f74ed4183fc36cde37b) -+++ b/kubernetes/CMakeLists.txt (date 1632055519986) -@@ -1563,7 +1563,7 @@ - install(TARGETS ${pkgName} DESTINATION ${CMAKE_INSTALL_PREFIX}) +--- a/kubernetes/CMakeLists.txt (revision 80aff0a1c71c2cb8a1ab4b73e0592f0f88c59376) ++++ b/kubernetes/CMakeLists.txt (date 1642600807646) +@@ -1255,7 +1255,7 @@ + install(TARGETS ${pkgName} DESTINATION lib) else() include(GNUInstallDirs) -- install(TARGETS ${pkgName} DESTINATION ${CMAKE_INSTALL_PREFIX} EXPORT ${pkgName}Targets) +- install(TARGETS ${pkgName} DESTINATION lib EXPORT ${pkgName}Targets) + install(TARGETS ${pkgName} EXPORT ${pkgName}Targets) foreach(HDR_FILE ${HDRS}) diff --git a/ports/kubernetes/portfile.cmake b/ports/kubernetes/portfile.cmake index 134c11bd7fc412..ff554cf668e609 100644 --- a/ports/kubernetes/portfile.cmake +++ b/ports/kubernetes/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kubernetes-client/c - REF a019822652b57781647d4d262870fa38ef531ad9 - SHA512 7547bade6878dd6402f760fb49248cb1dd031be11dda31c3758324cf833ca184efb127c637d28cb5c59cc172dcb211a49e5fa60f459c396fea2fcd781c1260a1 + REF 5eab1ef0a855d1707b3ef01adb2c4b545a01f36d + SHA512 a45ff221cfdddd8add0d8a04d75906e369e84b192cb7d0611a22f28ac81e0bb0c29cb71faa2bc352100aadacd7467fc2700c25f074654b7a9d75c80d86b71296 HEAD_REF master PATCHES 001-fix-destination.patch @@ -24,4 +22,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kubernetes/vcpkg.json b/ports/kubernetes/vcpkg.json index a2403271f66007..0a0a186fbf954e 100644 --- a/ports/kubernetes/vcpkg.json +++ b/ports/kubernetes/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kubernetes", - "version-date": "2021-11-24", + "version-date": "2022-01-19", + "port-version": 1, "description": "Kubernetes C client", "homepage": "https://github.com/kubernetes-client/c/", "supports": "!uwp", diff --git a/ports/kwsys/portfile.cmake b/ports/kwsys/portfile.cmake index b676a4a13d53e0..6b8879d8955039 100644 --- a/ports/kwsys/portfile.cmake +++ b/ports/kwsys/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_gitlab( GITLAB_URL https://gitlab.kitware.com OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/kwsys/vcpkg.json b/ports/kwsys/vcpkg.json index b45350d738d937..6a6c4c3f8f86ab 100644 --- a/ports/kwsys/vcpkg.json +++ b/ports/kwsys/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kwsys", "version-date": "2021-08-06", + "port-version": 1, "description": "Provides platform-independent APIs to many common system features", "homepage": "https://gitlab.kitware.com/utils/kwsys", "supports": "!uwp", diff --git a/ports/lager/portfile.cmake b/ports/lager/portfile.cmake index 737df91aaf4620..ed2bb6da59444b 100644 --- a/ports/lager/portfile.cmake +++ b/ports/lager/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arximboldi/lager - REF 5924508df1e08752274404818c460c80f0666bb8 - SHA512 ee186b82dd1d729454c61207b48fb80ac8a861511ff501fab499aff5d3ba123ca669f89bdbbd37f120af6dc11a651ba6c163250b5ca94e6290657a35870618d7 + REF c87a4c7fd0368bea346f41191b8bc0b54a3e9d80 + SHA512 788586078fdc07f0bd899148ddb0ad255fc6e18254901de65c2d1e43f9637ed8a8c121e8d0d26f043e86c7764ea1ff6ce323a791ba7d577589b4c80a329619d4 HEAD_REF master ) diff --git a/ports/lager/vcpkg.json b/ports/lager/vcpkg.json index d59ce787cf0d6e..ee05059aadf37c 100644 --- a/ports/lager/vcpkg.json +++ b/ports/lager/vcpkg.json @@ -1,7 +1,6 @@ { "name": "lager", - "version-date": "2021-06-17", - "port-version": 1, + "version-date": "2022-02-21", "description": "C++ library for value-oriented design using the unidirectional data-flow architecture", "homepage": "https://sinusoid.es/lager/", "dependencies": [ diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 4fb353fdd5343e..8e7490c8f47b31 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -11,13 +11,13 @@ endif() include(vcpkg_find_fortran) SET(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -set(lapack_ver 3.8.0) +set(lapack_ver 3.10.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "Reference-LAPACK/lapack" REF "v${lapack_ver}" - SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f + SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf HEAD_REF master ) @@ -61,16 +61,15 @@ else() set(USE_OPTIMIZED_BLAS ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" "-DCBLAS=${CBLAS}" ${FORTRAN_CMAKE} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME lapack-${lapack_ver} CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference? diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index c3f20e0323cf89..e52b1ef84d7d33 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -1,10 +1,14 @@ { "name": "lapack-reference", - "version-semver": "3.8.0", - "port-version": 6, - "description": "LAPACK — Linear Algebra PACKage", + "version": "3.10.0", + "description": "LAPACK - Linear Algebra PACKage", "homepage": "http://www.netlib.org/lapack/", + "license": "BSD-3-Clause-Open-MPI", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, { "name": "vcpkg-cmake-config", "host": true diff --git a/ports/lapack/vcpkg.json b/ports/lapack/vcpkg.json index 49dbcfc2236863..70a2aabec304fe 100644 --- a/ports/lapack/vcpkg.json +++ b/ports/lapack/vcpkg.json @@ -1,16 +1,16 @@ { "name": "lapack", - "version-string": "3", - "port-version": 2, + "version-date": "2022-02-22", "description": "Metapackage for packages which provide LAPACK", + "license": null, "dependencies": [ { "name": "clapack", - "platform": "arm & windows" + "platform": "(arm & windows) | uwp" }, { "name": "lapack-reference", - "platform": "!arm | !windows" + "platform": "!((arm & windows) | uwp)" } ] } diff --git a/ports/lazy-importer/portfile.cmake b/ports/lazy-importer/portfile.cmake index 18aac44cf68f80..80845209975e94 100644 --- a/ports/lazy-importer/portfile.cmake +++ b/ports/lazy-importer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustasMasiulis/lazy_importer - REF a02a9ed62ea56c614728465b1be9fab812fdf037 - SHA512 d88a7a1df269f2159eb0997f691fb5b71e89d75160b45ce968bd58e0d71e214f03e4c05e44234ace04ba9025b0b7d3ff07cf803753473c51164223a05a61598f + REF edac6afddb9e0df2e3affa8b2d631caafcba69ed + SHA512 45f024c34fa1c8854b8b77706934ce95449b2416a5c1dcab970d0df068c9b5bf0de12994c13ac215e629f8ae21fdab75b4ce6535f56ca7508f490a4c664e5b1a HEAD_REF master ) diff --git a/ports/lazy-importer/vcpkg.json b/ports/lazy-importer/vcpkg.json index aa9f6c62c54ed9..7f3073487aa9ec 100644 --- a/ports/lazy-importer/vcpkg.json +++ b/ports/lazy-importer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lazy-importer", - "version-date": "2021-10-23", + "version-date": "2022-02-09", "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/lcms/CMakeLists.txt b/ports/lcms/CMakeLists.txt index 4852f8c4e0def0..83a1915bae54d4 100644 --- a/ports/lcms/CMakeLists.txt +++ b/ports/lcms/CMakeLists.txt @@ -12,7 +12,7 @@ if(BUILD_SHARED_LIBS) endif() target_compile_options(lcms2 PRIVATE -DUNICODE -D_UNICODE) -target_include_directories(lcms2 PUBLIC $) +target_include_directories(lcms2 PUBLIC $ $) set_target_properties(lcms2 PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/include/lcms2.h;${CMAKE_CURRENT_LIST_DIR}/include/lcms2_plugin.h") # Generate pkg-config file diff --git a/ports/lcms/vcpkg.json b/ports/lcms/vcpkg.json index 6dca15372ea624..8a78ac8bbf2d5d 100644 --- a/ports/lcms/vcpkg.json +++ b/ports/lcms/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lcms", "version": "2.12", - "port-version": 2, + "port-version": 3, "description": "Little CMS.", "homepage": "https://github.com/mm2/Little-CMS", "dependencies": [ diff --git a/ports/leptonica/Modify-include-dir.patch b/ports/leptonica/Modify-include-dir.patch deleted file mode 100644 index 59486c6e266b49..00000000000000 --- a/ports/leptonica/Modify-include-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5aed94f..9bfcff9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -212,7 +212,7 @@ include(Configure) - - configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY) - --set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_INSTALL_PREFIX}/include/leptonica") -+set(INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include" "\${CMAKE_CURRENT_LIST_DIR}/../../include/leptonica") - - ############################################################################### - # diff --git a/ports/leptonica/fix-cmakelists.patch b/ports/leptonica/fix-cmakelists.patch index 6d1d281693003c..86063c46355275 100644 --- a/ports/leptonica/fix-cmakelists.patch +++ b/ports/leptonica/fix-cmakelists.patch @@ -1,12 +1,39 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e474463..d2b999d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -14,7 +14,6 @@ if (MSVC) - set_source_files_properties(${src} PROPERTIES LANGUAGE CXX) - endif() - --string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") - - add_library (leptonica ${src} ${hdr}) - set_target_properties (leptonica PROPERTIES VERSION ${VERSION_PLAIN}) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,20 +58,19 @@ if(UNIX) + endif() + + if(NOT SW_BUILD) +- find_package(GIF) +- find_package(JPEG) +- find_package(PNG) +- find_package(TIFF) +- find_package(ZLIB) ++ find_package(GIF REQUIRED) ++ find_package(JPEG REQUIRED) ++ find_package(PNG REQUIRED) ++ find_package(TIFF REQUIRED) ++ find_package(ZLIB REQUIRED) + find_package(PkgConfig) ++ find_package(OpenJPEG REQUIRED) + if (PKG_CONFIG_FOUND) + pkg_check_modules(WEBP libwebp QUIET) + pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET) +- pkg_check_modules(JP2K libopenjp2>=2.0 QUIET) + endif() + if(NOT WEBP) +- find_path(WEBP_INCLUDE_DIR /webp/decode.h) +- find_library(WEBP_LIBRARY NAMES webp) ++ find_package(WebP CONFIG REQUIRED) + if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY) + set(WEBP 1) + set(WEBP_FOUND TRUE) +@@ -213,7 +212,7 @@ include(Configure) + + configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY) + +-set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_INSTALL_PREFIX}/include/leptonica") ++set(INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include" "\${CMAKE_CURRENT_LIST_DIR}/../../include/leptonica") + + ############################################################################### + # diff --git a/ports/leptonica/fix-find-libwebp.patch b/ports/leptonica/fix-find-libwebp.patch deleted file mode 100644 index 588cf0c5480374..00000000000000 --- a/ports/leptonica/fix-find-libwebp.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6535632..1740841 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,8 +70,7 @@ if(NOT SW_BUILD) - pkg_check_modules(JP2K libopenjp2>=2.0 QUIET) - endif() - if(NOT WEBP) -- find_path(WEBP_INCLUDE_DIR /webp/decode.h) -- find_library(WEBP_LIBRARY NAMES webp) -+ find_package(WebP CONFIG REQUIRED) - if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY) - set(WEBP 1) - set(WEBP_FOUND TRUE) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d2b999d..019ec7b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -52,7 +52,7 @@ if (TIFF_LIBRARIES) - endif() - if (WEBP_FOUND) - target_include_directories (leptonica PUBLIC ${WEBP_INCLUDE_DIRS}) -- target_link_libraries (leptonica ${WEBP_LIBRARIES}) -+ target_link_libraries (leptonica WebP::webp WebP::libwebpmux) - endif() - if (ZLIB_LIBRARIES) - target_include_directories (leptonica PUBLIC ${ZLIB_INCLUDE_DIRS}) diff --git a/ports/leptonica/fix-src-cmakelists.patch b/ports/leptonica/fix-src-cmakelists.patch new file mode 100644 index 00000000000000..d31153541c0a5e --- /dev/null +++ b/ports/leptonica/fix-src-cmakelists.patch @@ -0,0 +1,19 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -14,7 +14,6 @@ if (MSVC) + set_source_files_properties(${src} PROPERTIES LANGUAGE CXX) + endif() + +-string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") + + add_library (leptonica ${src} ${hdr}) + set_target_properties (leptonica PROPERTIES VERSION ${VERSION_PLAIN}) +@@ -52,7 +52,7 @@ if (TIFF_LIBRARIES) + endif() + if (WEBP_FOUND) + target_include_directories (leptonica PUBLIC ${WEBP_INCLUDE_DIRS}) +- target_link_libraries (leptonica ${WEBP_LIBRARIES}) ++ target_link_libraries (leptonica WebP::webp WebP::libwebpmux) + endif() + if (ZLIB_LIBRARIES) + target_include_directories (leptonica PUBLIC ${ZLIB_INCLUDE_DIRS}) diff --git a/ports/leptonica/portfile.cmake b/ports/leptonica/portfile.cmake index 11dfb396769659..b9fb57b5eea533 100644 --- a/ports/leptonica/portfile.cmake +++ b/ports/leptonica/portfile.cmake @@ -6,9 +6,8 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-cmakelists.patch + fix-src-cmakelists.patch find-dependency.patch - fix-find-libwebp.patch - Modify-include-dir.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC) diff --git a/ports/leptonica/vcpkg.json b/ports/leptonica/vcpkg.json index b70a8332d10620..7d6bfe4861ab6f 100644 --- a/ports/leptonica/vcpkg.json +++ b/ports/leptonica/vcpkg.json @@ -1,6 +1,7 @@ { "name": "leptonica", "version": "1.81.1", + "port-version": 1, "description": "An open source library containing software that is broadly useful for image processing and image analysis applications", "homepage": "https://github.com/DanBloomberg/leptonica", "dependencies": [ diff --git a/ports/leveldb/fix-dependencies.patch b/ports/leveldb/fix-dependencies.patch new file mode 100644 index 00000000000000..a0fe68651f94e3 --- /dev/null +++ b/ports/leveldb/fix-dependencies.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98b87dc..76d2e9b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,8 +35,14 @@ include(CheckIncludeFile) + check_include_file("unistd.h" HAVE_UNISTD_H) + + include(CheckLibraryExists) +-check_library_exists(crc32c crc32c_value "" HAVE_CRC32C) +-check_library_exists(snappy snappy_compress "" HAVE_SNAPPY) ++if (WITH_CRC32C) ++ find_package(Crc32c CONFIG REQUIRED) ++ set(HAVE_CRC32C 1) ++endif() ++if (WITH_SNAPPY) ++ find_package(Snappy CONFIG REQUIRED) ++ set(HAVE_SNAPPY 1) ++endif() + check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC) + + include(CheckCXXSymbolExists) +@@ -246,10 +252,10 @@ if(HAVE_CLANG_THREAD_SAFETY) + endif(HAVE_CLANG_THREAD_SAFETY) + + if(HAVE_CRC32C) +- target_link_libraries(leveldb crc32c) ++ target_link_libraries(leveldb Crc32c::crc32c) + endif(HAVE_CRC32C) + if(HAVE_SNAPPY) +- target_link_libraries(leveldb snappy) ++ target_link_libraries(leveldb Snappy::snappy) + endif(HAVE_SNAPPY) + if(HAVE_TCMALLOC) + target_link_libraries(leveldb tcmalloc) diff --git a/ports/leveldb/leveldbConfig.cmake.in b/ports/leveldb/leveldbConfig.cmake.in index 560e743feef844..65b9bac51cdb83 100644 --- a/ports/leveldb/leveldbConfig.cmake.in +++ b/ports/leveldb/leveldbConfig.cmake.in @@ -2,5 +2,13 @@ include(CMakeFindDependencyMacro) set_and_check(leveldb_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") +find_dependency(Threads) + +if (@WITH_CRC32C@) + find_dependency(Crc32c CONFIG) +endif() +if (@WITH_SNAPPY@) + find_dependency(Snappy CONFIG) +endif() include("${CMAKE_CURRENT_LIST_DIR}/leveldbTargets.cmake") diff --git a/ports/leveldb/portfile.cmake b/ports/leveldb/portfile.cmake index 4f20f837b60623..85af613ea682e3 100644 --- a/ports/leveldb/portfile.cmake +++ b/ports/leveldb/portfile.cmake @@ -1,7 +1,3 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "leveldb doesn't supports UWP") -endif() - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -12,22 +8,31 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_config.patch + fix-dependencies.patch ) -file(COPY ${CURRENT_PORT_DIR}/leveldbConfig.cmake.in DESTINATION ${SOURCE_PATH}/cmake) +file(COPY "${CURRENT_PORT_DIR}/leveldbConfig.cmake.in" DESTINATION "${SOURCE_PATH}/cmake") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + crc32c WITH_CRC32C + snappy WITH_SNAPPY +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/leveldb) +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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/leveldb RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/leveldb/vcpkg.json b/ports/leveldb/vcpkg.json index 00df32a4f0d388..10d1f8c0990326 100644 --- a/ports/leveldb/vcpkg.json +++ b/ports/leveldb/vcpkg.json @@ -1,8 +1,33 @@ { "name": "leveldb", - "version-string": "1.22", - "port-version": 2, + "version": "1.22", + "port-version": 5, "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/bitcoin-core/leveldb", - "supports": "!uwp" + "homepage": "https://github.com/google/leveldb", + "license": "BSD-3-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "crc32c": { + "description": "Build with crc32c", + "dependencies": [ + "crc32c" + ] + }, + "snappy": { + "description": "Build with snappy", + "dependencies": [ + "snappy" + ] + } + } } diff --git a/ports/levmar/portfile.cmake b/ports/levmar/portfile.cmake index 020d4252082cd8..1ed0ad75d57292 100644 --- a/ports/levmar/portfile.cmake +++ b/ports/levmar/portfile.cmake @@ -1,7 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "levmar currently only checked on Windows" - ON_TARGET "OSX" "Linux" "UWP" -) - vcpkg_download_distfile(ARCHIVE URLS "http://users.ics.forth.gr/~lourakis/levmar/levmar-2.6.tgz" FILENAME "levmar-2.6.tgz" diff --git a/ports/levmar/vcpkg.json b/ports/levmar/vcpkg.json index 99c22de7301ad5..a72eb4b3f46f2d 100644 --- a/ports/levmar/vcpkg.json +++ b/ports/levmar/vcpkg.json @@ -1,7 +1,8 @@ { "name": "levmar", - "version-string": "2.6", + "version": "2.6", + "port-version": 1, "description": "Levenberg-Marquardt nonlinear least squares optimization algorithm", "homepage": "http://users.ics.forth.gr/~lourakis/levmar/", - "supports": "!(uwp | osx | linux)" + "supports": "windows & !uwp" } diff --git a/ports/libalkimia/portfile.cmake b/ports/libalkimia/portfile.cmake index 4d12566d2f70a8..a9ba9230e609ff 100644 --- a/ports/libalkimia/portfile.cmake +++ b/ports/libalkimia/portfile.cmake @@ -47,4 +47,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libalkimia/vcpkg.json b/ports/libalkimia/vcpkg.json index 4c1e965d81a168..90cd8e2e0c215c 100644 --- a/ports/libalkimia/vcpkg.json +++ b/ports/libalkimia/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libalkimia", "version": "8.1.70", + "port-version": 1, "description": "Common functionality for finance applications.", "homepage": "https://community.kde.org/Alkimia/libalkimia", + "license": "LGPL-2.1-or-later", "dependencies": [ "ecm", { diff --git a/ports/libao/0001-windows-build-patch.patch b/ports/libao/0001-windows-build-patch.patch new file mode 100644 index 00000000000000..96bea61160a3c3 --- /dev/null +++ b/ports/libao/0001-windows-build-patch.patch @@ -0,0 +1,127 @@ +From 129f8e155596199191cc005bcc257397d0d981ac Mon Sep 17 00:00:00 2001 +From: xiaoyifang +Date: Wed, 16 Feb 2022 21:58:40 +0800 +Subject: [PATCH] patch windows + +--- + include/ao/ao_private.h | 30 +++++++++++++++--------------- + src/ao_wmm.c | 1 + + src/audio_out.c | 1 - + 3 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/include/ao/ao_private.h b/include/ao/ao_private.h +index 44fa03e..c3c50aa 100644 +--- a/include/ao/ao_private.h ++++ b/include/ao/ao_private.h +@@ -138,13 +138,13 @@ struct ao_functions { + + void ao_read_config_files (ao_config *config); + +-#define adebug(format, args...) {\ ++#define adebug(format, ...) {\ + if(!device || device->verbose==2){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s debug: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s debug: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"debug: " format,## args); \ ++ fprintf(stderr,"debug: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -152,13 +152,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define averbose(format, args...) {\ ++#define averbose(format, ...) {\ + if(!device || device->verbose>0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"info: " format,## args); \ ++ fprintf(stderr,"info: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -166,13 +166,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define ainfo(format, args...) {\ ++#define ainfo(format, ...) {\ + if(!device || device->verbose>=0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"info: " format,## args); \ ++ fprintf(stderr,"info: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -180,13 +180,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define awarn(format, args...) {\ ++#define awarn(format, ...) {\ + if(!device || device->verbose>=0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s WARNING: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s WARNING: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"WARNING: " format,## args); \ ++ fprintf(stderr,"WARNING: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -194,13 +194,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define aerror(format, args...) { \ ++#define aerror(format, ...) { \ + if(!device || device->verbose>=0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s ERROR: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s ERROR: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"ERROR: " format,## args); \ ++ fprintf(stderr,"ERROR: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +diff --git a/src/ao_wmm.c b/src/ao_wmm.c +index eec6b83..d18d2a4 100644 +--- a/src/ao_wmm.c ++++ b/src/ao_wmm.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + + #include +diff --git a/src/audio_out.c b/src/audio_out.c +index bd8f6fc..e3af366 100644 +--- a/src/audio_out.c ++++ b/src/audio_out.c +@@ -49,7 +49,6 @@ static int dlclose(void *handle) { return 0; } + #ifndef _MSC_VER + # include + #endif +-#include + + #include "ao/ao.h" + #include "ao_private.h" +-- +2.30.0.windows.2 + diff --git a/ports/libao/portfile.cmake b/ports/libao/portfile.cmake new file mode 100644 index 00000000000000..274beec82ec25c --- /dev/null +++ b/ports/libao/portfile.cmake @@ -0,0 +1,34 @@ +set(NO_DLFCN ) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND PATCHES "0001-windows-build-patch.patch") + set(NO_DLFCN "ac_cv_header_dlfcn_h=no") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/libao + REF 1.2.2 + SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a + HEAD_REF master + PATCHES ${PATCHES} +) + +if(VCPKG_TARGET_IS_WINDOWS) + set(ENV{LIBS} "-lwinmm -lksuser") +endif() + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS --disable-binaries + ${NO_DLFCN} +) +vcpkg_install_make() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libao/vcpkg.json b/ports/libao/vcpkg.json new file mode 100644 index 00000000000000..18f7a2675107f4 --- /dev/null +++ b/ports/libao/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libao", + "version": "1.2.2", + "port-version": 4, + "description": "libao - A Cross-platform Audio Library", + "homepage": "https://github.com/xiph/libao", + "license": "GPL-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } + ] +} diff --git a/ports/libarchive/fix-dependencies.patch b/ports/libarchive/fix-dependencies.patch index 0d3213c6766f52..573361c4912b79 100644 --- a/ports/libarchive/fix-dependencies.patch +++ b/ports/libarchive/fix-dependencies.patch @@ -11,38 +11,26 @@ index 39b5333..8164d8f 100644 ELSE() SET(BZIP2_FOUND FALSE) # Override cached value ENDIF() -@@ -462,27 +462,15 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES) +@@ -462,7 +462,8 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES) # Find LZMA # IF(ENABLE_LZMA) - FIND_PACKAGE(LibLZMA) -+ FIND_PACKAGE(LibLZMA CONFIG REQUIRED) ++ FIND_PACKAGE(LibLZMA REQUIRED) ++ SET(LIBLZMA_LIBRARIES LibLZMA::LibLZMA) ELSE() SET(LIBLZMA_FOUND FALSE) # Override cached value ENDIF() - --IF(LIBLZMA_FOUND) -+IF(LibLZMA_FOUND) +@@ -470,6 +471,8 @@ ENDIF() + IF(LIBLZMA_FOUND) SET(HAVE_LIBLZMA 1) SET(HAVE_LZMA_H 1) -- CMAKE_PUSH_CHECK_STATE() -- INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) -- LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) -- # Test if a macro is needed for the library. -- TRY_MACRO_FOR_LIBRARY( -- "${LIBLZMA_INCLUDE_DIRS}" "${LIBLZMA_LIBRARIES}" -- COMPILES -- "#include \nint main() {return (int)lzma_version_number(); }" -- "WITHOUT_LZMA_API_STATIC;LZMA_API_STATIC") -- IF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC) -- ADD_DEFINITIONS(-DLZMA_API_STATIC) -- ENDIF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC) -- CMAKE_POP_CHECK_STATE() + LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA) - ELSE(LIBLZMA_FOUND) - # LZMA not found and will not be used. - ENDIF(LIBLZMA_FOUND) -@@ -555,22 +543,15 @@ IF(ENABLE_LZ4) ++elseif(0) + CMAKE_PUSH_CHECK_STATE() + INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) + LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) +@@ -555,22 +558,15 @@ IF(ENABLE_LZ4) SET(LZ4_FIND_QUIETLY TRUE) ENDIF (LZ4_INCLUDE_DIR) @@ -138,13 +126,3 @@ index 39b5333..8164d8f 100644 ELSE() SET(LIBXML2_FOUND FALSE) ENDIF() -@@ -1432,8 +1400,7 @@ CHECK_C_SOURCE_COMPILES( - MAJOR_IN_SYSMACROS) - - CMAKE_PUSH_CHECK_STATE() --SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR}) --SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES}) -+SET(CMAKE_REQUIRED_LIBRARIES LibLZMA::LibLZMA) - IF(ENABLE_LZMA) - CHECK_C_SOURCE_COMPILES( - "#include \n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}" diff --git a/ports/libarchive/pkgconfig-modules.patch b/ports/libarchive/pkgconfig-modules.patch index d8e6f4cf759f41..72ad81394e3024 100644 --- a/ports/libarchive/pkgconfig-modules.patch +++ b/ports/libarchive/pkgconfig-modules.patch @@ -27,15 +27,15 @@ index 7b6f0ad..18cf15c 100644 # Test if a macro is needed for the library. TRY_MACRO_FOR_LIBRARY( "${BZIP2_INCLUDE_DIR}" "${BZIP2_LIBRARIES}" -@@ -471,6 +475,7 @@ IF(LibLZMA_FOUND) +@@ -471,6 +475,7 @@ IF(LIBLZMA_FOUND) SET(HAVE_LIBLZMA 1) SET(HAVE_LZMA_H 1) LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA) + STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " liblzma") - ELSE(LIBLZMA_FOUND) - # LZMA not found and will not be used. - ENDIF(LIBLZMA_FOUND) -@@ -499,6 +504,7 @@ IF(LZO2_FOUND) + elseif(0) + CMAKE_PUSH_CHECK_STATE() + INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) +@@ -514,6 +519,7 @@ IF(LZO2_FOUND) SET(HAVE_LZO_LZO1X_H 1) INCLUDE_DIRECTORIES(${LZO2_INCLUDE_DIR}) LIST(APPEND ADDITIONAL_LIBS ${LZO2_LIBRARY}) diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 71cdde2376474e..5685a345b2acd3 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libarchive/libarchive REF 1b2c437b99b361c7692538fa373e99955e9b93ae #v3.5.2 SHA512 df527dd333b01ed85f07831ba0bd4b1d0b5384fe12cfa53474ad39c04509105a3c8574a2d21a430e3584a931c8f6ae923bca95df83945f0c593c1ffaed3f62da HEAD_REF master - PATCHES + PATCHES disable-warnings.patch fix-buildsystem.patch fix-cpu-set.patch diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json index 0eb93f942a66d5..d3f0739cbbafd3 100644 --- a/ports/libarchive/vcpkg.json +++ b/ports/libarchive/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libarchive", "version-semver": "3.5.2", - "port-version": 2, + "port-version": 4, "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", + "license": null, "supports": "!uwp", "dependencies": [ { diff --git a/ports/libassuan/portfile.cmake b/ports/libassuan/portfile.cmake index d2cd25a5243972..1d0451406bc63b 100644 --- a/ports/libassuan/portfile.cmake +++ b/ports/libassuan/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gpg/libassuan @@ -21,7 +19,7 @@ vcpkg_configure_make( ) vcpkg_install_make() -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libassuan/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") diff --git a/ports/libassuan/vcpkg.json b/ports/libassuan/vcpkg.json index 9bb9aba212c5e8..eb2e6a2d86df08 100644 --- a/ports/libassuan/vcpkg.json +++ b/ports/libassuan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libassuan", "version": "2.5.3", - "port-version": 3, + "port-version": 4, "description": "A library implementing the so-called Assuan protocol", "homepage": "https://gnupg.org/software/libassuan/index.html", "supports": "!windows", diff --git a/ports/libavif/portfile.cmake b/ports/libavif/portfile.cmake index 2d0a37bb77bf1f..48081c53ba5257 100644 --- a/ports/libavif/portfile.cmake +++ b/ports/libavif/portfile.cmake @@ -1,6 +1,3 @@ -# AVIF depends on AOM, but AOM doesn't support ARM and UWP -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AOMediaCodec/libavif diff --git a/ports/libavif/vcpkg.json b/ports/libavif/vcpkg.json index b6e3bce5222d9b..dbad25be0f7948 100644 --- a/ports/libavif/vcpkg.json +++ b/ports/libavif/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libavif", "version-semver": "0.9.2", + "port-version": 1, "description": "Library for encoding and decoding AVIF files", "homepage": "https://github.com/AOMediaCodec/libavif", - "supports": "!uwp & !arm", "dependencies": [ "aom", "libyuv", diff --git a/ports/libb2/portfile.cmake b/ports/libb2/portfile.cmake index fe26199ce72198..452218f2804874 100644 --- a/ports/libb2/portfile.cmake +++ b/ports/libb2/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "WINDOWS") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BLAKE2/libb2 @@ -28,4 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libb2/vcpkg.json b/ports/libb2/vcpkg.json index 6cd8bc6dc8a662..e8ef8ec0578ee2 100644 --- a/ports/libb2/vcpkg.json +++ b/ports/libb2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libb2", "version": "0.98.1", - "port-version": 5, + "port-version": 6, "description": "C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp", "homepage": "https://github.com/BLAKE2/libb2", "supports": "!windows" diff --git a/ports/libbacktrace/vcpkg.json b/ports/libbacktrace/vcpkg.json index 7b6b32b53b710d..4136d4f6b87108 100644 --- a/ports/libbacktrace/vcpkg.json +++ b/ports/libbacktrace/vcpkg.json @@ -1,6 +1,8 @@ { "name": "libbacktrace", "version-date": "2021-03-14", + "port-version": 1, "description": "The libbacktrace library may be linked into a program or library and used to produce symbolic backtraces.", - "homepage": "https://github.com/ianlancetaylor/libbacktrace" + "homepage": "https://github.com/ianlancetaylor/libbacktrace", + "supports": "!windows" } diff --git a/ports/libcanberra/portfile.cmake b/ports/libcanberra/portfile.cmake index 6fa7f3221bc188..9b862ca23eb998 100644 --- a/ports/libcanberra/portfile.cmake +++ b/ports/libcanberra/portfile.cmake @@ -1,6 +1,5 @@ -vcpkg_fail_port_install(ON_TARGET "Windows" "UWP") set(VERSION 0.30) -set(PATCHES +set(PATCHES pkgconfig.patch undefined_reference.diff # https://sources.debian.org/patches/libcanberra/0.30-7/ gtk_dont_assume_x11.patch # likewise diff --git a/ports/libcanberra/vcpkg.json b/ports/libcanberra/vcpkg.json index 7ddde042164511..44c64d07b21e44 100644 --- a/ports/libcanberra/vcpkg.json +++ b/ports/libcanberra/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcanberra", "version": "0.30", - "port-version": 1, + "port-version": 2, "description": "An implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops", "homepage": "http://0pointer.de/lennart/projects/libcanberra/", "supports": "!(windows | uwp)", diff --git a/ports/libcpplocate/fix-install-paths.patch b/ports/libcpplocate/fix-install-paths.patch new file mode 100644 index 00000000000000..62d4722c2ce94d --- /dev/null +++ b/ports/libcpplocate/fix-install-paths.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 854214c..9c4d98a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -124,7 +124,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU + endif() + + # Installation paths +-if(UNIX AND SYSTEM_DIR_INSTALL) ++if(1) + # Install into the system (/usr/bin or /usr/local/bin) + set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ + set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share//cmake +diff --git a/cpplocate-config.cmake b/cpplocate-config.cmake +index 8693fa4..cdb2828 100644 +--- a/cpplocate-config.cmake ++++ b/cpplocate-config.cmake +@@ -26,7 +26,7 @@ macro(find_modules PREFIX) + if(TARGET ${module_name}) + set(MODULE_FOUND TRUE) + else() +- find_module("${CMAKE_CURRENT_LIST_DIR}/${PREFIX}/${module_name}/${module_name}-export.cmake") ++ find_module("${CMAKE_CURRENT_LIST_DIR}/${module_name}-export.cmake") + endif() + endforeach(module_name) + endmacro() +diff --git a/liblocate-config.cmake b/liblocate-config.cmake +index 3bf4823..7245353 100644 +--- a/liblocate-config.cmake ++++ b/liblocate-config.cmake +@@ -25,7 +25,7 @@ macro(find_modules PREFIX) + if(TARGET ${module_name}) + set(MODULE_FOUND TRUE) + else() +- find_module("${CMAKE_CURRENT_LIST_DIR}/${PREFIX}/${module_name}/${module_name}-export.cmake") ++ find_module("${CMAKE_CURRENT_LIST_DIR}/${module_name}-export.cmake") + endif() + endforeach(module_name) + endmacro() diff --git a/ports/libcpplocate/portfile.cmake b/ports/libcpplocate/portfile.cmake new file mode 100644 index 00000000000000..963700fcb8cbcd --- /dev/null +++ b/ports/libcpplocate/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cginternals/cpplocate + REF v2.3.0 + SHA512 4028d552d0c3c0161d5dd5aea27bb22f0c61297a4b461a067c082cfcf84e3a709c9895453e750d819433529089011c2512293b2064c42bb5ba11f957eebc2206 + HEAD_REF master + PATCHES + fix-install-paths.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DOPTION_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME cpplocate + CONFIG_PATH share/cpplocate/cmake/cpplocate + DO_NOT_DELETE_PARENT_CONFIG_PATH +) + +vcpkg_cmake_config_fixup( + PACKAGE_NAME liblocate + CONFIG_PATH share/cpplocate/cmake/liblocate +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/cpplocate/cmake") + +# Patched liblocate config file needs moving to the correct directory +file(RENAME + "${CURRENT_PACKAGES_DIR}/share/cpplocate/liblocate-config.cmake" + "${CURRENT_PACKAGES_DIR}/share/liblocate/liblocate-config.cmake" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libcpplocate/vcpkg.json b/ports/libcpplocate/vcpkg.json new file mode 100644 index 00000000000000..3dbe9db2e63091 --- /dev/null +++ b/ports/libcpplocate/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libcpplocate", + "version-semver": "2.3.0", + "description": "Cross-platform C++ library providing tools for applications to locate themselves, their data assets as well as dependent modules.", + "homepage": "https://cpplocate.org/", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libcrafter/portfile.cmake b/ports/libcrafter/portfile.cmake index 3b78eadf912089..b72759a15a3b4d 100644 --- a/ports/libcrafter/portfile.cmake +++ b/ports/libcrafter/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pellegre/libcrafter @@ -22,6 +20,7 @@ vcpkg_install_make() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() # Handle copyright -file(INSTALL "${SOURCE_PATH}/libcrafter/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/libcrafter/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libcrafter/vcpkg.json b/ports/libcrafter/vcpkg.json index 0f774a171abe74..8f8dfd08ca8f15 100644 --- a/ports/libcrafter/vcpkg.json +++ b/ports/libcrafter/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libcrafter", "version": "1.0", + "port-version": 2, "description": "Libcrafter is a high level library for C++ designed to create and decode network packets.", "homepage": "https://github.com/pellegre/libcrafter", "supports": "!windows", diff --git a/ports/libcurl-simple-https/portfile.cmake b/ports/libcurl-simple-https/portfile.cmake new file mode 100644 index 00000000000000..4ea56bdd11f470 --- /dev/null +++ b/ports/libcurl-simple-https/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SamuelMarks/curl-simple-https + REF 5a115053ba4d249fc1af22c3673b4d014e56bcf5 + SHA512 6274bfeec5235d39c627850b1b6ef03c3f1982c74f937b604137cf3cf87e982f971c4681760b42926a3fb15bc8268f2fa48c197919516066d73f53425aa24545 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_CLI=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/cmake/License.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libcurl-simple-https/vcpkg.json b/ports/libcurl-simple-https/vcpkg.json new file mode 100644 index 00000000000000..beac2afdd5a5f9 --- /dev/null +++ b/ports/libcurl-simple-https/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libcurl-simple-https", + "version-date": "2022-02-14", + "description": "Very simple HTTPS interface built atop libcurl", + "license": "Apache-2.0 OR MIT", + "supports": "!uwp", + "dependencies": [ + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libdatachannel/0001-fix-for-vcpkg.patch b/ports/libdatachannel/0001-fix-for-vcpkg.patch index 4bce9aa8874f04..9c8e45f2f161c3 100644 --- a/ports/libdatachannel/0001-fix-for-vcpkg.patch +++ b/ports/libdatachannel/0001-fix-for-vcpkg.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 02b688c..03b185f 100644 +index c0e59d1..1d71e38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -27,7 +27,6 @@ endif() +@@ -28,7 +28,6 @@ endif() set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) @@ -10,7 +10,7 @@ index 02b688c..03b185f 100644 if(WIN32) add_definitions(-DWIN32_LEAN_AND_MEAN) -@@ -196,9 +195,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +@@ -197,12 +196,13 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads REQUIRED) @@ -19,22 +19,25 @@ index 02b688c..03b185f 100644 +find_library(USRSCTP_LIBRARY usrsctp REQUIRED) +find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") + if(SCTP_DEBUG) + add_definitions(-DSCTP_DEBUG) + endif() +if(0) option(sctp_build_programs 0) option(sctp_build_shared_lib 0) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) -@@ -210,8 +210,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") +@@ -214,8 +214,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) endif() add_library(Usrsctp::Usrsctp ALIAS usrsctp) -- --add_library(datachannel SHARED +endif() + +-add_library(datachannel SHARED +add_library(datachannel ${LIBDATACHANNEL_SOURCES} ${LIBDATACHANNEL_HEADERS} ${LIBDATACHANNEL_IMPL_SOURCES} -@@ -235,16 +235,18 @@ target_include_directories(datachannel PUBLIC +@@ -239,16 +240,18 @@ target_include_directories(datachannel PUBLIC $) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) @@ -55,7 +58,7 @@ index 02b688c..03b185f 100644 if(WIN32) target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 -@@ -339,11 +341,11 @@ else() +@@ -351,11 +354,11 @@ else() target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) else() @@ -65,8 +68,8 @@ index 02b688c..03b185f 100644 target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=0) - target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic) - target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic) -+ target_link_libraries(datachannel PRIVATE LibJuice::juice) -+ target_link_libraries(datachannel-static PRIVATE LibJuice::juice) ++ target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) ++ target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) endif() endif() diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 0426c1a662444d..4f6c398e2df201 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF 267fdc190bcd276aacf45e4cd5ab8a51541161e8 #v0.15.1 - SHA512 333b1308b9f620326aa3b1af30aed8be2011c3a5a7d850e94476b8a14f696cef4cc815fda57e7a205cc264a077b7d1fa403ff1354364aae58651cdb0324c951b + REF 127f157fc00abeb6fe5a57ce56a7c4e092721203 #v0.16.4 + SHA512 ef7d1f652af031c13260a4c436c949eb566d40d15dcde5b56ab782e9e9d7b5e287f4a6a61bc4eb3fcdbb835c102637b0368f3c43af6f9fa9c87cd99d15bde454 HEAD_REF master PATCHES 0001-fix-for-vcpkg.patch diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 1767760c272f6f..464798d98405ac 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.15.1", - "port-version": 1, + "version-semver": "0.16.4", "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", "dependencies": [ diff --git a/ports/libdc1394/portfile.cmake b/ports/libdc1394/portfile.cmake new file mode 100644 index 00000000000000..2cc7f3d33e332f --- /dev/null +++ b/ports/libdc1394/portfile.cmake @@ -0,0 +1,22 @@ +set(LIBDC1394_VER "2.2.6") + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO libdc1394/libdc1394-2 + REF "${LIBDC1394_VER}" + FILENAME "libdc1394-${LIBDC1394_VER}.tar.gz" + SHA512 2d60ed1054da67d8518e870193b60c1d79778858f48cc6487e252de00cc57a08548515d41914a37d0227d29e158d68892c290f83930ffd95f4a483dce5aa3d25 +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "--disable-examples" +) +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" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libdc1394/vcpkg.json b/ports/libdc1394/vcpkg.json new file mode 100644 index 00000000000000..d48cd5a55cc159 --- /dev/null +++ b/ports/libdc1394/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libdc1394", + "version": "2.2.6", + "description": "libdc1394 is a library that provides a complete high level application programming interface (API) for developers who wish to control IEEE 1394 based cameras that conform to the 1394-based Digital Camera Specifications (also known as the IIDC or DCAM Specifications).", + "homepage": "https://damien.douxchamps.net/ieee1394/libdc1394", + "supports": "!windows", + "dependencies": [ + "sdl1" + ] +} diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 321253feb59cb9..2280ff18a07970 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - # Used for .pc file set(VERSION "1.0.8") vcpkg_from_github( @@ -12,13 +10,14 @@ vcpkg_from_github( fix-libde265-headers.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libde265/) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libde265) vcpkg_copy_tools(TOOL_NAMES dec265 enc265 AUTO_CLEAN) set(prefix "") @@ -40,7 +39,10 @@ vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libde265/de265.h" "!defined(LIBDE265_STATIC_BUILD)" "0") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libde265/de265.h" "!defined(LIBDE265_STATIC_BUILD)" "1") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json index 7ca6fb57398f46..76a03dc5ddcf7b 100644 --- a/ports/libde265/vcpkg.json +++ b/ports/libde265/vcpkg.json @@ -1,8 +1,19 @@ { "name": "libde265", - "version-string": "1.0.8", - "port-version": 2, + "version": "1.0.8", + "port-version": 4, "description": "Open h.265 video codec implementation.", "homepage": "https://www.libde265.org/", - "supports": "!(arm | uwp)" + "license": "LGPL-3.0-only", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libdisasm/CMakeLists.txt b/ports/libdisasm/CMakeLists.txt index c3a8dfa30e5494..4c029bdf31ae14 100644 --- a/ports/libdisasm/CMakeLists.txt +++ b/ports/libdisasm/CMakeLists.txt @@ -36,6 +36,10 @@ include_directories(libdisasm) add_library(libdisasm ${SRCS}) +if (MSVC) + target_compile_definitions(libdisasm PRIVATE _CRT_SECURE_NO_WARNINGS) +endif() + install( TARGETS libdisasm RUNTIME DESTINATION bin diff --git a/ports/libdisasm/portfile.cmake b/ports/libdisasm/portfile.cmake index 46ea1df735da75..cb681d8bb45cf1 100644 --- a/ports/libdisasm/portfile.cmake +++ b/ports/libdisasm/portfile.cmake @@ -9,15 +9,15 @@ vcpkg_from_sourceforge( PATCHES sizeofvoid.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libdisasm/vcpkg.json b/ports/libdisasm/vcpkg.json index ef5cb7b0672054..ce292684231c03 100644 --- a/ports/libdisasm/vcpkg.json +++ b/ports/libdisasm/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libdisasm", "version-string": "0.23", - "port-version": 8, + "port-version": 9, "description": "x86 Disassembler Library.", - "homepage": "https://sourceforge.net/projects/bastard" + "homepage": "https://sourceforge.net/projects/bastard", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libdshowcapture/portfile.cmake b/ports/libdshowcapture/portfile.cmake index 136be4d21a0bbb..79633e0f7fab1a 100644 --- a/ports/libdshowcapture/portfile.cmake +++ b/ports/libdshowcapture/portfile.cmake @@ -6,21 +6,20 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_build_cmake(TARGET libdshowcapture) +vcpkg_cmake_build(TARGET libdshowcapture) # Copy files -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libdshowcapture RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libdshowcapture" RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") endif() -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/dshowcapture.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/dshowcapture.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") vcpkg_copy_pdbs() diff --git a/ports/libdshowcapture/vcpkg.json b/ports/libdshowcapture/vcpkg.json index ca807e319aa055..643b10dc840fda 100644 --- a/ports/libdshowcapture/vcpkg.json +++ b/ports/libdshowcapture/vcpkg.json @@ -1,6 +1,13 @@ { "name": "libdshowcapture", - "version-string": "0.6.0", - "port-version": 2, - "description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows." + "version": "0.6.0", + "port-version": 3, + "description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows.", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libe57/0001_cmake.patch b/ports/libe57/0001_cmake.patch index 47001bbe466be9..e4963aeb55f4b7 100644 --- a/ports/libe57/0001_cmake.patch +++ b/ports/libe57/0001_cmake.patch @@ -86,3 +86,22 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt ) #include (InstallRequiredSystemLibraries) +--- a/src/refimpl/E57RefImplConfig.cmake 2011-10-06 16:01:00.000000000 +0800 ++++ b/src/refimpl/E57RefImplConfig.cmake 2022-03-01 16:48:29.117485600 +0800 +@@ -49,6 +49,8 @@ + # NOTE: You will also need to include the boost and xerces libraries to your + # project. + ++get_filename_component(E57RefImpl_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) ++ + IF (NOT "${E57RefImpl_DIR}/include" EQUAL "${E57RefImpl_INCLUDE_DIR}") + SET(E57RefImpl_LIBRARY_DEBUG E57RefImpl_LIBRARY_DEBUG-NOTFOUND) + SET(E57RefImpl_LIBRARY_RELEASE E57RefImpl_LIBRARY_RELEASE-NOTFOUND) +@@ -78,6 +80,6 @@ + NAMES libE57RefImpl-d + E57RefImpl-d +- HINTS ${E57RefImpl_DIR}/lib ++ HINTS ${E57RefImpl_DIR}/debug/lib + DOC "E57 debug library" + ) + diff --git a/ports/libe57/0002_replace_tr1_with_cpp11.patch b/ports/libe57/0002_replace_tr1_with_cpp11.patch index 1b48de7c22a612..ff23c340bf63ab 100644 --- a/ports/libe57/0002_replace_tr1_with_cpp11.patch +++ b/ports/libe57/0002_replace_tr1_with_cpp11.patch @@ -1,20 +1,20 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-06-16 22:53:02.033465000 +0800 -+++ b/CMakeLists.txt 2021-06-16 23:01:31.542323600 +0800 -@@ -25,7 +25,9 @@ - # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - # DEALINGS IN THE SOFTWARE. +diff --color -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2013-04-03 22:24:08.000000000 +0800 ++++ b/CMakeLists.txt 2022-03-01 17:23:01.210728200 +0800 +@@ -36,8 +36,9 @@ + # If you find any errors or have suggestion to improve the build script: + # patches are most welcome! Please send them to the development mailing list. --cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.1) -+ + +-cmake_minimum_required(VERSION 2.8.2) +set(CMAKE_CXX_STANDARD 11) # Override flags to enable prepare for linking to static runtime set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake) -diff -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp +diff --color -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp --- a/src/tools/e57fields.cpp 2012-04-04 17:19:01.000000000 +0800 -+++ b/src/tools/e57fields.cpp 2021-06-16 22:55:02.789463000 +0800 ++++ b/src/tools/e57fields.cpp 2022-03-01 17:24:17.904911600 +0800 @@ -30,11 +30,7 @@ #include #include @@ -49,10 +49,10 @@ diff -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp /// The precalculated parts of the element path name. /// The only part that is missing is the record number which goes in between. -diff -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp ---- a/src/tools/e57unpack.cpp 2011-10-06 16:01:00.000000000 +0800 -+++ b/src/tools/e57unpack.cpp 2021-06-16 22:56:57.150323800 +0800 -@@ -41,12 +41,8 @@ +diff --color -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp +--- a/src/tools/e57unpack.cpp 2013-04-03 22:24:08.000000000 +0800 ++++ b/src/tools/e57unpack.cpp 2022-03-01 17:25:15.206260200 +0800 +@@ -45,12 +45,8 @@ #include using std::runtime_error; @@ -67,10 +67,10 @@ diff -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp #include using std::string; -diff -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp +diff --color -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp --- a/src/tools/e57validate.cpp 2011-10-06 16:01:00.000000000 +0800 -+++ b/src/tools/e57validate.cpp 2021-06-16 22:58:19.365323700 +0800 -@@ -66,11 +66,8 @@ ++++ b/src/tools/e57validate.cpp 2022-03-01 17:25:46.220771800 +0800 +@@ -66,11 +66,7 @@ ================================================================*/ @@ -79,13 +79,12 @@ diff -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp -#else -# include -using std::tr1::unordered_map; -+ +-#endif +#include +using std::unordered_map; --#endif #include using std::strlen; -@@ -694,7 +692,7 @@ +@@ -694,7 +691,7 @@ void dump(int indent = 0, std::ostream& os = std::cout); //================ private: diff --git a/ports/libe57/portfile.cmake b/ports/libe57/portfile.cmake index 1f7bfd9ea5c3f4..c260430d67d37d 100644 --- a/ports/libe57/portfile.cmake +++ b/ports/libe57/portfile.cmake @@ -1,11 +1,11 @@ -set(VERSION 1.1.312) +set(VERSION 1.1.332) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION}) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO e57-3d-imgfmt FILENAME "E57RefImpl_src-${VERSION}.zip" - SHA512 c729cc3094131f115ddf9b8c24a9420c4ab9d16a4343acfefb42f997f4bf25247cd5563126271df2af95f103093b7f6b360dbade52c9e66ec39dd2f06e041eb7 + SHA512 86adb88cff32d72905e923b1205d609a2bce2eabd78995c59a7957395b233766a5ce31481db08977117abc1a70bbed90d2ce0cdb9897704a8c63d992e91a3907 PATCHES "0001_cmake.patch" "0002_replace_tr1_with_cpp11.patch" diff --git a/ports/libe57/vcpkg.json b/ports/libe57/vcpkg.json index 09984c737be08b..eb35fdaab4f877 100644 --- a/ports/libe57/vcpkg.json +++ b/ports/libe57/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libe57", - "version-semver": "1.1.312", + "version-semver": "1.1.332", "port-version": 1, "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", "homepage": "http://www.libe57.org/", + "license": "BSL-1.0", "dependencies": [ "boost-crc", "boost-filesystem", diff --git a/ports/libe57format/portfile.cmake b/ports/libe57format/portfile.cmake new file mode 100644 index 00000000000000..34ddab5cef9c1b --- /dev/null +++ b/ports/libe57format/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO asmaloney/libE57Format + REF v2.2.0 + SHA512 7b788efce2efdbfba83d4e3ab5c4884b3d85b5e44c510954f9200db26fb97c92f4e33d04209c0647fc39c3af081fc09d1ee6a79857b1980a0e1e43586f78bd0c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/E57Format") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/libe57format RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") \ No newline at end of file diff --git a/ports/libe57format/vcpkg.json b/ports/libe57format/vcpkg.json new file mode 100644 index 00000000000000..7582404541d0c3 --- /dev/null +++ b/ports/libe57format/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libe57format", + "version-string": "2.2.0", + "description": "A library to provide read & write support for the E57 file format.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xerces-c" + ] +} diff --git a/ports/libepoxy/vcpkg.json b/ports/libepoxy/vcpkg.json index b786ce4e4cacf2..a28f326718086f 100644 --- a/ports/libepoxy/vcpkg.json +++ b/ports/libepoxy/vcpkg.json @@ -1,9 +1,13 @@ { "name": "libepoxy", "version-semver": "1.5.9", + "port-version": 1, "description": "Epoxy is a library for handling OpenGL function pointer management for you", "homepage": "https://github.com/anholt/libepoxy", "dependencies": [ - "tool-meson" + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake index 0a6844c9ac16d8..df80d0a0939e77 100644 --- a/ports/libevent/portfile.cmake +++ b/ports/libevent/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libevent/libevent @@ -63,6 +61,7 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/libevent/LibeventTargets-${_t "${CURRENT_PACKAGES_DIR}" "${CURRENT_INSTALLED_DIR}" ) +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/libevent/LibeventConfig.cmake "${SOURCE_PATH}/include;${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include" "") vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() diff --git a/ports/libevent/vcpkg.json b/ports/libevent/vcpkg.json index 52dd90b20b7238..41bcecaf14cfa2 100644 --- a/ports/libevent/vcpkg.json +++ b/ports/libevent/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libevent", "version": "2.1.12", - "port-version": 4, + "port-version": 6, "description": "An event notification library", "homepage": "https://github.com/libevent/libevent", "supports": "!uwp", diff --git a/ports/libevhtp/portfile.cmake b/ports/libevhtp/portfile.cmake index 71c17ee533389d..07d8ee9376eddf 100644 --- a/ports/libevhtp/portfile.cmake +++ b/ports/libevhtp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platform" ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO criticalstack/libevhtp @@ -30,5 +28,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/libevhtp/vcpkg.json b/ports/libevhtp/vcpkg.json index 04f8de1723fb4d..db641b8fcf11de 100644 --- a/ports/libevhtp/vcpkg.json +++ b/ports/libevhtp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libevhtp", - "version-string": "1.2.18", - "port-version": 2, + "version": "1.2.18", + "port-version": 3, "description": "Libevhtp was created as a replacement API for Libevent's current HTTP API.", "homepage": "https://github.com/criticalstack/libevhtp", + "supports": "!windows", "dependencies": [ "libevent" ], diff --git a/ports/libexif/portfile.cmake b/ports/libexif/portfile.cmake index 4869c40b5099fc..a3f2abb371f2c6 100644 --- a/ports/libexif/portfile.cmake +++ b/ports/libexif/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET uwp) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libexif/libexif diff --git a/ports/libexif/vcpkg.json b/ports/libexif/vcpkg.json index d27752d4b700dd..01b68491c80dbc 100644 --- a/ports/libexif/vcpkg.json +++ b/ports/libexif/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libexif", - "version-string": "0.6.22", - "port-version": 1, + "version": "0.6.22", + "port-version": 2, "description": "a library for parsing, editing, and saving EXIF data", "homepage": "https://libexif.github.io/", "supports": "!uwp" diff --git a/ports/libfabric/portfile.cmake b/ports/libfabric/portfile.cmake index 563dc483f0c689..03b2ec3fa83db7 100644 --- a/ports/libfabric/portfile.cmake +++ b/ports/libfabric/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "x86") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( diff --git a/ports/libfabric/vcpkg.json b/ports/libfabric/vcpkg.json index 92b5b54bfe815c..547c77e3c26ac7 100644 --- a/ports/libfabric/vcpkg.json +++ b/ports/libfabric/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libfabric", "version-semver": "1.13.2", + "port-version": 1, "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 & x64 & !static", + "supports": "windows & !uwp & x64 & !static", "dependencies": [ { "name": "networkdirect-sdk", diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index 4f6a7b99a86c58..7e397e685d43c1 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -29,16 +29,15 @@ set(exec_prefix "\${prefix}") set(libdir "\${prefix}/lib") set(toolexeclibdir "\${libdir}") set(includedir "\${prefix}/include") -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY) -endif() +configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY) + # debug -set(prefix "${CURRENT_INSTALLED_DIR}/debug") -set(exec_prefix "\${prefix}") -set(libdir "\${prefix}/lib") -set(toolexeclibdir "\${libdir}") -set(includedir "\${prefix}/../include") -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + 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() diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index 4525cee7b98bae..83130d841f47b6 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libffi", "version": "3.4.2", - "port-version": 2, + "port-version": 4, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi", "dependencies": [ diff --git a/ports/libfido2/fix_cmakelists.patch b/ports/libfido2/fix_cmakelists.patch index d5c363706e49e7..a5da148cb1432d 100644 --- a/ports/libfido2/fix_cmakelists.patch +++ b/ports/libfido2/fix_cmakelists.patch @@ -1,27 +1,29 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1eb8726..b308597 100644 +index 11a51ac..33b9313 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -161,16 +161,20 @@ if(UNIX) +@@ -156,18 +156,20 @@ if(UNIX) endif() if(MSVC) - if((NOT CBOR_INCLUDE_DIRS) OR (NOT CBOR_LIBRARY_DIRS) OR -- (NOT CRYPTO_INCLUDE_DIRS) OR (NOT CRYPTO_LIBRARY_DIRS) OR -- (NOT ZLIB_INCLUDE_DIRS) OR (NOT ZLIB_LIBRARY_DIRS)) -- message(FATAL_ERROR "please provide definitions for " -- "{CBOR,CRYPTO,ZLIB}_{INCLUDE,LIBRARY}_DIRS when building " -- "under msvc") +- (NOT CBOR_BIN_DIRS) OR (NOT CRYPTO_INCLUDE_DIRS) OR +- (NOT CRYPTO_LIBRARY_DIRS) OR (NOT CRYPTO_BIN_DIRS) OR +- (NOT ZLIB_INCLUDE_DIRS) OR (NOT ZLIB_LIBRARY_DIRS) OR +- (NOT ZLIB_BIN_DIRS)) +- message(FATAL_ERROR "please define " +- "{CBOR,CRYPTO,ZLIB}_{INCLUDE,LIBRARY,BIN}_DIRS when " +- "building under msvc") - endif() - set(CBOR_LIBRARIES cbor) - set(ZLIB_LIBRARIES zlib) -- set(CRYPTO_LIBRARIES crypto-46) +- set(CRYPTO_LIBRARIES crypto-47) + include(FindPkgConfig) -+ ++ + find_package(LIBCBOR REQUIRED) + find_package(OpenSSL REQUIRED) + find_package(ZLIB REQUIRED) -+ ++ + # Handling of different Packagenames in VCPKG + set(CBOR_INCLUDE_DIRS ${LIBCBOR_INCLUDE_DIR}) + set(CRYPTO_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIRS}) @@ -31,18 +33,15 @@ index 1eb8726..b308597 100644 + set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES}) + add_definitions("-D_CRT_SECURE_NO_WARNINGS" "-D_CRT_NONSTDC_NO_DEPRECATE") set(MSVC_DISABLED_WARNINGS_LIST - "C4200" # nonstandard extension used: zero-sized array in - # struct/union; -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 11b0bb5..d820ff3 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -120,7 +120,7 @@ if(BUILD_SHARED_LIBS) - install(TARGETS fido2_shared - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() + "C4152" # nonstandard extension used: function/data pointer + # conversion in expression; +@@ -403,6 +402,9 @@ message(STATUS "USE_HIDAPI: ${USE_HIDAPI}") + message(STATUS "USE_WINHELLO: ${USE_WINHELLO}") + message(STATUS "NFC_LINUX: ${NFC_LINUX}") - install(FILES fido.h DESTINATION include) ++set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996") ++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996") ++ + subdirs(src) + if(BUILD_EXAMPLES) + subdirs(examples) diff --git a/ports/libfido2/portfile.cmake b/ports/libfido2/portfile.cmake index 9cc2b4cd219f05..dcd620840a76d3 100644 --- a/ports/libfido2/portfile.cmake +++ b/ports/libfido2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Yubico/libfido2 - REF 1.7.0 - SHA512 f40d394883d909e9e3ea3308b32f7ca31a882c709e11b3b143ed5734d16b0c244d4932effe06965d566776b03d152b1fc280e73cdfeeb81b65d8414042af19fe + REF 1.10.0 + SHA512 ba03e25d3f42f11cec74dee48c853ae35d03600f24ca06d2b751840408a132290fe22461372ae42ae31419061a63d9908c20a2c0cf3c0c9c8dbc46c34916784f HEAD_REF master PATCHES "fix_cmakelists.patch" @@ -12,7 +12,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBFIDO2_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBFIDO2_BUILD_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_MANPAGES=OFF @@ -26,4 +26,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/libfido2/vcpkg.json b/ports/libfido2/vcpkg.json index 5604af16f44db9..c45f3fceb1487b 100644 --- a/ports/libfido2/vcpkg.json +++ b/ports/libfido2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libfido2", - "version": "1.7.0", + "version": "1.10.0", "description": "Provides library functionality to communicate with a FIDO device over USB, and to verify attestation and assertion signatures.", "homepage": "https://developers.yubico.com/libfido2/", + "license": "BSD-2-Clause", "supports": "!uwp & (x86 | x64) & windows", "dependencies": [ "libcbor", diff --git a/ports/libgcrypt/portfile.cmake b/ports/libgcrypt/portfile.cmake index be2bd6142c812f..774868592108ac 100644 --- a/ports/libgcrypt/portfile.cmake +++ b/ports/libgcrypt/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows") - vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL git://git.gnupg.org/libgcrypt.git @@ -21,8 +19,13 @@ vcpkg_install_make() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgcrypt/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgcrypt/debug/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgcrypt/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgcrypt/debug/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libgcrypt/vcpkg.json b/ports/libgcrypt/vcpkg.json index 07b9f8b0c28f88..f70325d4f08e77 100644 --- a/ports/libgcrypt/vcpkg.json +++ b/ports/libgcrypt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgcrypt", "version": "1.9.4", - "port-version": 1, + "port-version": 2, "description": "A general purpose cryptographic library", "homepage": "https://gnupg.org/software/libgcrypt/index.html", "supports": "linux | osx", diff --git a/ports/libgeotiff/vcpkg.json b/ports/libgeotiff/vcpkg.json index ec7a39eb07d484..e07616b4e8c320 100644 --- a/ports/libgeotiff/vcpkg.json +++ b/ports/libgeotiff/vcpkg.json @@ -1,10 +1,12 @@ { "name": "libgeotiff", "version": "1.7.0", + "port-version": 1, "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.", "homepage": "https://github.com/OSGeo/libgeotiff", + "license": "MIT", "dependencies": [ - "proj4", + "proj", { "name": "tiff", "default-features": false diff --git a/ports/libgit2/fix-configcmake.patch b/ports/libgit2/fix-configcmake.patch index 3f860a656e0bc7..1cc67d89741a11 100644 --- a/ports/libgit2/fix-configcmake.patch +++ b/ports/libgit2/fix-configcmake.patch @@ -1,32 +1,34 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fdb3673..da1f972 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -125,7 +125,6 @@ include(SelectHashes) - target_sources(git2internal PRIVATE ${SRC_SHA1}) - +diff --git a/cmake/SelectRegex.cmake b/cmake/SelectRegex.cmake +index 2a3a91b8c..cbb409350 100644 +--- a/cmake/SelectRegex.cmake ++++ b/cmake/SelectRegex.cmake +@@ -1,5 +1,4 @@ # Specify regular expression implementation --FIND_PACKAGE(PCRE) +-find_package(PCRE) - IF(REGEX_BACKEND STREQUAL "") - CHECK_SYMBOL_EXISTS(regcomp_l "regex.h;xlocale.h" HAVE_REGCOMP_L) -@@ -159,8 +158,8 @@ ELSEIF(REGEX_BACKEND STREQUAL "pcre") - ADD_FEATURE_INFO(regex ON "using system PCRE") - SET(GIT_REGEX_PCRE 1) + if(REGEX_BACKEND STREQUAL "") + check_symbol_exists(regcomp_l "regex.h;xlocale.h" HAVE_REGCOMP_L) +@@ -33,8 +32,8 @@ elseif(REGEX_BACKEND STREQUAL "pcre") + add_feature_info(regex ON "using system PCRE") + set(GIT_REGEX_PCRE 1) -- LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS}) -- LIST(APPEND LIBGIT2_LIBS ${PCRE_LIBRARIES}) -+ FIND_PACKAGE(unofficial-pcre CONFIG REQUIRED) -+ LIST(APPEND LIBGIT2_LIBS unofficial::pcre::pcre) - LIST(APPEND LIBGIT2_PC_REQUIRES "libpcre") - ELSEIF(REGEX_BACKEND STREQUAL "regcomp") - ADD_FEATURE_INFO(regex ON "using system regcomp") -@@ -424,10 +423,28 @@ IF (MSVC_IDE) - ENDIF () +- list(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS}) +- list(APPEND LIBGIT2_SYSTEM_LIBS ${PCRE_LIBRARIES}) ++ find_package(unofficial-pcre CONFIG REQUIRED) ++ list(APPEND LIBGIT2_SYSTEM_LIBS unofficial::pcre::pcre) + list(APPEND LIBGIT2_PC_REQUIRES "libpcre") + elseif(REGEX_BACKEND STREQUAL "regcomp") + add_feature_info(regex ON "using system regcomp") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e7b54d036..6b549deef 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -298,10 +298,28 @@ if(MSVC_IDE) + endif() # Install --INSTALL(TARGETS git2 -+INSTALL(TARGETS git2 EXPORT unofficial-git2Targets +-install(TARGETS git2 ++install(TARGETS git2 EXPORT unofficial-git2Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -38,16 +40,16 @@ index fdb3673..da1f972 100644 +) +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" +[[include(CMakeFindDependencyMacro) -+IF(@USE_BUNDLED_ZLIB@ STREQUAL "OFF") ++if(@USE_BUNDLED_ZLIB@ STREQUAL "OFF") + find_dependency(ZLIB) -+ENDIF() -+IF(@REGEX_BACKEND@ STREQUAL "pcre") ++endif() ++if(@REGEX_BACKEND@ STREQUAL "pcre") + find_dependency(unofficial-pcre CONFIG) -+ENDIF() ++endif() +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-git2Targets.cmake") +]]) +configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake" @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake DESTINATION share/unofficial-git2) + - INSTALL(DIRECTORY ${libgit2_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - INSTALL(FILES ${libgit2_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES ${PROJECT_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 1f3a9a0d757085..867d0b175f3949 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgit2/libgit2 - REF v1.3.0 - SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e - HEAD_REF master + REF v1.4.2 + SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277 + HEAD_REF maint/v1.4 PATCHES fix-configcmake.patch ) @@ -67,7 +67,7 @@ vcpkg_check_features( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_CLAR=OFF + -DBUILD_TESTS=OFF -DUSE_HTTP_PARSER=system -DUSE_HTTPS=${USE_HTTPS} -DREGEX_BACKEND=${REGEX_BACKEND} diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json index 7ecca211e2fa78..1614564db7fb8c 100644 --- a/ports/libgit2/vcpkg.json +++ b/ports/libgit2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libgit2", - "version-semver": "1.3.0", - "port-version": 2, + "version-semver": "1.4.2", "description": "Git linkable library", "homepage": "https://github.com/libgit2/libgit2", "supports": "!uwp", diff --git a/ports/libgnutls/portfile.cmake b/ports/libgnutls/portfile.cmake index a6d074f062326d..aa83cb647a66c0 100644 --- a/ports/libgnutls/portfile.cmake +++ b/ports/libgnutls/portfile.cmake @@ -33,6 +33,7 @@ vcpkg_configure_make( --disable-maintainer-mode --disable-rpath --disable-libdane + --disable-guile --with-included-unistring --without-p11-kit --without-tpm diff --git a/ports/libgnutls/vcpkg.json b/ports/libgnutls/vcpkg.json index 1d48006bedcdab..c09c9244e0dd59 100644 --- a/ports/libgnutls/vcpkg.json +++ b/ports/libgnutls/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libgnutls", "version": "3.6.15", - "port-version": 2, + "port-version": 3, "description": "A secure communications library implementing the SSL, TLS and DTLS protocols", "homepage": "https://www.gnutls.org/", + "license": "LGPL-2.1-or-later", "supports": "!windows", "dependencies": [ "gettext", diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake index e365ee3a118321..e51f060e2729e1 100644 --- a/ports/libgo/portfile.cmake +++ b/ports/libgo/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/libgo/vcpkg.json b/ports/libgo/vcpkg.json index 47377a3e87b270..94c6818d16aab3 100644 --- a/ports/libgo/vcpkg.json +++ b/ports/libgo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgo", "version": "3.1", - "port-version": 3, + "port-version": 4, "description": "The best stackful coroutine by c++11.", "homepage": "https://github.com/yyzybb537/libgo", "supports": "!(arm | uwp)", diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake index 17d26617d24996..cc795c59daf03f 100644 --- a/ports/libgpg-error/portfile.cmake +++ b/ports/libgpg-error/portfile.cmake @@ -91,8 +91,15 @@ else() vcpkg_install_make() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() diff --git a/ports/libgpg-error/vcpkg.json b/ports/libgpg-error/vcpkg.json index 515330256255c5..8132e6b2d62f55 100644 --- a/ports/libgpg-error/vcpkg.json +++ b/ports/libgpg-error/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgpg-error", "version": "1.42", - "port-version": 2, + "port-version": 3, "description": "A common dependency of all GnuPG components", "homepage": "https://gnupg.org/software/libgpg-error/index.html", "supports": "!(windows & (arm | arm64))" diff --git a/ports/libgpiod/portfile.cmake b/ports/libgpiod/portfile.cmake new file mode 100644 index 00000000000000..68ee7eff023d0f --- /dev/null +++ b/ports/libgpiod/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL git://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git + REF dfc5d361e6748d5f48b706e5c4ac949d133b5470 # v1.6.3 + PATCHES +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + list(APPEND OPTIONS --enable-shared=yes) + list(APPEND OPTIONS --enable-static=no) +else() + list(APPEND OPTIONS --enable-shared=no) + list(APPEND OPTIONS --enable-static=yes) +endif() + +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +if (VCPKG_DETECTED_CMAKE_CROSSCOMPILING STREQUAL "TRUE") + list(APPEND OPTIONS CC=${VCPKG_DETECTED_CMAKE_C_COMPILER}) + if (VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND OPTIONS ac_cv_func_malloc_0_nonnull=yes) + list(APPEND OPTIONS ac_cv_func_realloc_0_nonnull=yes) + endif() +endif() + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${OPTIONS} + --enable-tools=no + --enable-tests=no + --enable-bindings-cxx=no + --enable-bindings-python=no +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libgpiod/vcpkg.json b/ports/libgpiod/vcpkg.json new file mode 100644 index 00000000000000..bbbca0c71bd686 --- /dev/null +++ b/ports/libgpiod/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libgpiod", + "version": "1.6.3", + "description": "C library and tools for interacting with the linux GPIO character device", + "homepage": "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git", + "license": "LGPL-2.1-or-later", + "supports": "linux & (x64 | arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/libgpod/portfile.cmake b/ports/libgpod/portfile.cmake index 397f0e5d125313..b5ff21b533f472 100644 --- a/ports/libgpod/portfile.cmake +++ b/ports/libgpod/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows" "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fadingred/libgpod @@ -37,4 +35,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(COPY ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libgpod/vcpkg.json b/ports/libgpod/vcpkg.json index 3915e50b11d2bb..550993c5705e51 100644 --- a/ports/libgpod/vcpkg.json +++ b/ports/libgpod/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libgpod", "version-date": "2019-08-29", - "port-version": 3, + "port-version": 4, "description": "libgpod is a library meant to abstract access to an iPod content.", "homepage": "https://github.com/fadingred/libgpod", + "supports": "!windows & !osx", "dependencies": [ "glib", "libplist", diff --git a/ports/libgwenhywfar/portfile.cmake b/ports/libgwenhywfar/portfile.cmake index 553825fab4aa6e..3ea00a459e822d 100644 --- a/ports/libgwenhywfar/portfile.cmake +++ b/ports/libgwenhywfar/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platforms" ON_TARGET "Windows") - set(VERSION_MAJOR 5) set(VERSION_MINOR 6) set(VERSION_PATCH 0) @@ -13,7 +11,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE ${ARCHIVE} REF ${VERSION} ) @@ -39,7 +37,7 @@ vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} OPTIONS --disable-silent-rules - --disable-binreloc + --disable-binreloc --with-guis=${GUIS} --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error --with-libgcrypt-prefix=${CURRENT_INSTALLED_DIR}/tools/libgcrypt @@ -55,13 +53,19 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() foreach(GUI IN LISTS FEATURES_GUI) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gwengui-${GUI}-${VERSION_MAJOR}.${VERSION_MINOR} TARGET_PATH share/gwengui-${GUI}-${VERSION_MAJOR}.${VERSION_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(PACKAGE_NAME gwengui-cpp CONFIG_PATH lib/cmake/gwengui-${GUI}-${VERSION_MAJOR}.${VERSION_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH) endforeach() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gwenhywfar-${VERSION_MAJOR}.${VERSION_MINOR}) +vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${VERSION_MAJOR}.${VERSION_MINOR}) if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin TOOL_NAMES gct-tool gsa mklistdoc typemaker typemaker2 xmlmerge AUTO_CLEAN) -endif() +endif() + +# the `dir` variable is not used in the script +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgwenhywfar/bin/gwenhywfar-config" "dir=\"${CURRENT_INSTALLED_DIR}\"" "") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgwenhywfar/debug/bin/gwenhywfar-config" "dir=\"${CURRENT_INSTALLED_DIR}/debug\"" "") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libgwenhywfar/vcpkg.json b/ports/libgwenhywfar/vcpkg.json index c02dca482b2d02..6c56ae3f811a1d 100644 --- a/ports/libgwenhywfar/vcpkg.json +++ b/ports/libgwenhywfar/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgwenhywfar", "version-semver": "5.6.0", + "port-version": 2, "description": "A helper library for networking and security applications and libraries", "homepage": "https://www.aquamaniac.de/rdm/", "supports": "!windows", @@ -11,6 +12,10 @@ "features": [ "openssl" ] + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/ports/libgxps/vcpkg.json b/ports/libgxps/vcpkg.json index b74fcc9eaa0a1f..e052c37d9b1f5f 100644 --- a/ports/libgxps/vcpkg.json +++ b/ports/libgxps/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgxps", "version": "0.3.2", + "port-version": 1, "description": "libgxps is a GObject based library for handling and rendering XPS documents.", "homepage": "https://wiki.gnome.org/Projects/libgxps", "dependencies": [ @@ -12,6 +13,9 @@ "libpng", "libxslt", "tiff", - "tool-meson" + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/libhdfs3/portfile.cmake b/ports/libhdfs3/portfile.cmake index 4bbc7621e87e14..a656d149f88a56 100644 --- a/ports/libhdfs3/portfile.cmake +++ b/ports/libhdfs3/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO erikmuttersbach/libhdfs3 diff --git a/ports/libhdfs3/vcpkg.json b/ports/libhdfs3/vcpkg.json index aebe7c702ed492..050bcb5eea8243 100644 --- a/ports/libhdfs3/vcpkg.json +++ b/ports/libhdfs3/vcpkg.json @@ -1,12 +1,16 @@ { "name": "libhdfs3", - "version-string": "2019-11-05", - "port-version": 1, + "version-date": "2019-11-05", + "port-version": 3, "description": "Native Hadoop RPC protocol and HDFS data transfer protocol implementation", "homepage": "https://github.com/erikmuttersbach/libhdfs3", + "supports": "!windows", "dependencies": [ "boost", - "libuuid", + { + "name": "libuuid", + "platform": "!windows & !osx" + }, "libxml2", "protobuf" ] diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 212d310ecae5fc..bde4f5b17332dd 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -25,6 +25,12 @@ if(NOT VCPKG_BUILD_TYPE) endif() vcpkg_fixup_pkgconfig() +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "0") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 1bdd57d4412d98..957f728f42a69a 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libheif", "version": "1.12.0", - "port-version": 1, + "port-version": 3, "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", + "license": "LGPL-3.0-only", "dependencies": [ { "name": "gdk-pixbuf", diff --git a/ports/libhsplasma/portfile.cmake b/ports/libhsplasma/portfile.cmake index b37dfa7ae5f528..5393b9ca569bd7 100644 --- a/ports/libhsplasma/portfile.cmake +++ b/ports/libhsplasma/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO H-uru/libhsplasma @@ -29,4 +27,4 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libhsplasma/vcpkg.json b/ports/libhsplasma/vcpkg.json index 3c6ea3930f5c5b..92bc718ae020dd 100644 --- a/ports/libhsplasma/vcpkg.json +++ b/ports/libhsplasma/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libhsplasma", "version-string": "2021.06.08", + "port-version": 1, "description": "Cross-platform Plasma data and network library", "homepage": "https://github.com/H-uru/libhsplasma", "supports": "!(arm | uwp)", diff --git a/ports/libhv/fix-find_package.patch b/ports/libhv/fix-find_package.patch new file mode 100644 index 00000000000000..6ec8b70783ac2c --- /dev/null +++ b/ports/libhv/fix-find_package.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cd9d1c3..e707884 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -112,7 +112,10 @@ endif() + + if(WITH_OPENSSL) + add_definitions(-DWITH_OPENSSL) +- set(LIBS ${LIBS} ssl crypto) ++ find_package(OpenSSL REQUIRED) ++ if(OpenSSL_FOUND) ++ set(LIBS ${LIBS} OpenSSL::SSL OpenSSL::Crypto) ++ endif() + endif() + + if(WITH_GNUTLS) +@@ -197,6 +200,7 @@ if(BUILD_STATIC) + add_library(hv_static STATIC ${LIBHV_SRCS}) + target_compile_definitions(hv_static PRIVATE HV_STATICLIB) + target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS}) ++ target_link_libraries(hv_static ${LIBS}) + install(TARGETS hv_static DESTINATION lib) + add_custom_target(libhv_static DEPENDS hv_static) + endif() diff --git a/ports/libhv/portfile.cmake b/ports/libhv/portfile.cmake index cb13974b9e5ea7..b456244996e555 100644 --- a/ports/libhv/portfile.cmake +++ b/ports/libhv/portfile.cmake @@ -1,16 +1,21 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ithewei/libhv - REF v1.2.2 - SHA512 D0CB0BE3901E282E642FE454ADF0CAAF1840DD0CD340B6558E40270CF32608FF0773AAAD0BE1B9EA97BE5BD41B4CEB00FA92CDDA1590B71900A3D8EE4AB2358F + REF v1.2.4 + SHA512 5732800970180294DCEB329F25D22B1A7178739A2A5A2CE32E030F4FD38055A6298797D26E7FF5525AC662059FF0AAEDB8ABC200E0BA9E4EEBEB5846FB53F4D0 HEAD_REF master + PATCHES + fix-find_package.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl WITH_OPENSSL +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE @@ -19,6 +24,7 @@ vcpkg_cmake_configure( -DBUILD_UNITTEST=OFF -DBUILD_STATIC=${BUILD_STATIC} -DBUILD_SHARED=${BUILD_SHARED} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/libhv/vcpkg.json b/ports/libhv/vcpkg.json index 6df137e120de9f..f337b9acd21166 100644 --- a/ports/libhv/vcpkg.json +++ b/ports/libhv/vcpkg.json @@ -1,13 +1,23 @@ { "name": "libhv", - "version": "1.2.2", + "version": "1.2.4", + "port-version": 1, "description": "Libhv is a C/C++ network library similar to libevent/libuv.", "homepage": "https://github.com/ithewei/libhv", + "license": "BSD-3-Clause", "supports": "!(arm | uwp)", "dependencies": [ { "name": "vcpkg-cmake", "host": true } - ] + ], + "features": { + "ssl": { + "description": "with openssl library", + "dependencies": [ + "openssl" + ] + } + } } diff --git a/ports/libhydrogen/portfile.cmake b/ports/libhydrogen/portfile.cmake index bf746bbbce277d..3a59970fed3d4e 100644 --- a/ports/libhydrogen/portfile.cmake +++ b/ports/libhydrogen/portfile.cmake @@ -3,20 +3,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jedisct1/libhydrogen - REF 46f083ed1370f4f1063f412b443f5a7704676f27 - SHA512 2408ba8ba365751cf4e4e52191f8a94fe00befcb1b6c741af73b3eeebe6e02aa191d9ad021b5eda555c2eeb9c9f39ab7d89a94fb7e0e2896bf4a015d2b8e2995 + REF 01c32862f6f6e864c113efc3f0142e05ea3531fe #2021-12-02 + SHA512 016181db4573a1ab31547fbfb51e19fa09e4ee4e0e788434a7654921956a02547b55eda14ccfea98425f4f615fb90e0534c5e1010d5320c1958b65b0489a2931 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/hydrogen TARGET_PATH share/hydrogen) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/hydrogen) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/libhydrogen/vcpkg.json b/ports/libhydrogen/vcpkg.json index a340a80e2b6682..f76895c40a185c 100644 --- a/ports/libhydrogen/vcpkg.json +++ b/ports/libhydrogen/vcpkg.json @@ -1,7 +1,16 @@ { "name": "libhydrogen", - "version-string": "2019-08-11", - "port-version": 1, + "version-date": "2021-12-02", "description": "A lightweight, secure, easy-to-use crypto library suitable for constrained environments", - "homepage": "https://github.com/jedisct1/libhydrogen" + "homepage": "https://github.com/jedisct1/libhydrogen", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 9d8ff25aa030b1..ee3d63c50a353f 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,7 +1,7 @@ if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/iconv) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/iconv") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv") return() endif() @@ -26,7 +26,7 @@ if (NOT VCPKG_TARGET_IS_ANDROID) list(APPEND OPTIONS --enable-relocatable) endif() -vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} +vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" DETERMINE_BUILD_TRIPLET USE_WRAPPERS OPTIONS @@ -38,12 +38,13 @@ vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} vcpkg_install_make() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv") -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}") # share contains unneeded doc files + +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libiconv/vcpkg.json b/ports/libiconv/vcpkg.json index 2cafb021836a0a..bda238d6824337 100644 --- a/ports/libiconv/vcpkg.json +++ b/ports/libiconv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libiconv", "version": "1.16", - "port-version": 11, + "port-version": 12, "description": "GNU Unicode text conversion", "homepage": "https://www.gnu.org/software/libiconv/" } diff --git a/ports/libidn2/CMakeLists.txt b/ports/libidn2/CMakeLists.txt index f8e0908f418f1a..9920afce229af9 100644 --- a/ports/libidn2/CMakeLists.txt +++ b/ports/libidn2/CMakeLists.txt @@ -37,7 +37,7 @@ set(LIB_SRC lib/bidi.c set(UNISTR_SRC unistring/c-ctype.c unistring/c-strcasecmp.c unistring/c-strncasecmp.c - unistring/malloca.c + unistring/free.c unistring/striconveh.c unistring/striconveha.c unistring/uniconv/u8-conv-from-enc.c @@ -45,6 +45,7 @@ set(UNISTR_SRC unistring/c-ctype.c unistring/uniconv/u8-strconv-from-locale.c unistring/uniconv/u8-strconv-to-enc.c unistring/uniconv/u8-strconv-to-locale.c + unistring/unistr/u32-cmp.c unistring/unistr/u32-cpy.c unistring/unistr/u32-cpy-alloc.c unistring/unistr/u32-mbtouc-unsafe.c @@ -86,6 +87,7 @@ set(GL_SRC gl/rawmemchr.c gl/strverscmp.c gl/msvc-inval.c gl/msvc-nothrow.c + gl/malloca.c ) add_library(libidn2 ${LIB_SRC} ${UNISTR_SRC} ${GL_SRC}) @@ -111,7 +113,12 @@ set(prefix "\${pcfiledir}/../..") set(exec_prefix "\${prefix}") set(includedir "\${prefix}/include") set(libdir "\${prefix}/lib") -set(LTLIBICONV "") +set(LTLIBICONV "-liconv -lcharset") set(LTLIBUNISTRING "") -configure_file("libidn2.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc") +configure_file("libidn2.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" @ONLY) +if(WIN32 AND NOT MINGW) + file(READ "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" pc_data) + string(REPLACE " -lidn" " -llibidn" pc_data "${pc_data}") + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" "${pc_data}") +endif() install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" DESTINATION "lib/pkgconfig") diff --git a/ports/libidn2/config.h b/ports/libidn2/config.h index 5d5e6efcca5087..8c8fad23059934 100644 --- a/ports/libidn2/config.h +++ b/ports/libidn2/config.h @@ -16,12 +16,8 @@ /* Define to the number of bits in type 'wint_t'. */ /* #undef BITSIZEOF_WINT_T */ -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ -/* Define to 1 if using `alloca.c'. */ +/* Define to 1 if using 'alloca.c'. */ /* #undef C_ALLOCA */ /* Define to 1 if // is a file system root distinct from /. */ @@ -31,6 +27,9 @@ language is requested. */ /* #undef ENABLE_NLS */ +/* Define this to 1 if F_DUPFD behavior does not match POSIX */ +/* #undef FCNTL_DUPFD_BUGGY */ + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module fscanf shall be considered present. */ #define GNULIB_FSCANF 1 @@ -704,12 +703,19 @@ STACK_DIRECTION = 0 => direction of growth unknown */ /* #undef STACK_DIRECTION */ +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ /* #undef STRERROR_R_CHAR_P */ +/* Define to 1 if the type of the st_atim member of a struct stat is struct + timespec. */ +/* #undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC */ + /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # define _ALL_SOURCE 1 @@ -718,11 +724,44 @@ #ifndef _DARWIN_C_SOURCE # define _DARWIN_C_SOURCE 1 #endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +/* # undef __EXTENSIONS__ */ +#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 #endif -/* Enable threading extensions on Solaris. */ +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +/* # undef _HPUX_ALT_XOPEN_SOCKET_API */ +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +/* # undef _NETBSD_SOURCE */ +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +/* # undef _OPENBSD_SOURCE */ +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # define _POSIX_PTHREAD_SEMANTICS 1 #endif @@ -758,16 +797,11 @@ #ifndef _TANDEM_SOURCE # define _TANDEM_SOURCE 1 #endif -/* Enable X/Open extensions if necessary. HP-UX 11.11 defines - mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of - whether compiling with -Ae or -D_HPUX_SOURCE=1. */ +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ #ifndef _XOPEN_SOURCE /* # undef _XOPEN_SOURCE */ #endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif /* Version number of package */ @@ -781,19 +815,48 @@ 'wint_t'. */ /* #undef WINT_T_SUFFIX */ -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ -/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */ -/* #undef _NETBSD_SOURCE */ +/* True if the compiler says it groks GNU C version MAJOR.MINOR. */ +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define _GL_GNUC_PREREQ(major, minor) \ + ((major) < __GNUC__ + ((minor) <= __GNUC_MINOR__)) +#else +# define _GL_GNUC_PREREQ(major, minor) 0 +#endif + + +/* Define to enable the declarations of ISO C 11 types and functions. */ +/* #undef _ISOC11_SOURCE */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ /* The _Noreturn keyword of C11. */ -#if ! (defined _Noreturn \ - || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) -# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ - || 0x5110 <= __SUNPRO_C) +#ifndef _Noreturn +# if (defined __cplusplus \ + && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ + || (defined _MSC_VER && 1900 <= _MSC_VER)) \ + && 0) + /* [[noreturn]] is not practically usable, because with it the syntax + extern _Noreturn void func (...); + would not be valid; such a declaration would only be valid with 'extern' + and '_Noreturn' swapped, or without the 'extern' keyword. However, some + AIX system header files and several gnulib header files use precisely + this syntax with 'extern'. */ +# define _Noreturn [[noreturn]] +# elif ((!defined __cplusplus || defined __clang__) \ + && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ + || (!defined __STRICT_ANSI__ \ + && (_GL_GNUC_PREREQ (4, 7) \ + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))))) + /* _Noreturn works as-is. */ +# elif _GL_GNUC_PREREQ (2, 8) || defined __clang__ || 0x5110 <= __SUNPRO_C # define _Noreturn __attribute__ ((__noreturn__)) -# elif defined _MSC_VER && 1200 <= _MSC_VER +# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) # define _Noreturn __declspec (noreturn) # else # define _Noreturn @@ -801,26 +864,262 @@ #endif -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for 'stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ - /* For standard stat data types on VMS. */ #define _USE_STD_STAT 1 +/* Define to rpl_ if the getopt replacement functions and variables should be + used. */ +/* #undef __GETOPT_PREFIX */ + /* Define to 1 if the system predates C++11. */ /* #undef __STDC_CONSTANT_MACROS */ /* Define to 1 if the system predates C++11. */ /* #undef __STDC_LIMIT_MACROS */ +/* The _GL_ASYNC_SAFE marker should be attached to functions that are + signal handlers (for signals other than SIGABRT, SIGPIPE) or can be + invoked from such signal handlers. Such functions have some restrictions: + * All functions that it calls should be marked _GL_ASYNC_SAFE as well, + or should be listed as async-signal-safe in POSIX + + section 2.4.3. Note that malloc(), sprintf(), and fwrite(), in + particular, are NOT async-signal-safe. + * All memory locations (variables and struct fields) that these functions + access must be marked 'volatile'. This holds for both read and write + accesses. Otherwise the compiler might optimize away stores to and + reads from such locations that occur in the program, depending on its + data flow analysis. For example, when the program contains a loop + that is intended to inspect a variable set from within a signal handler + while (!signal_occurred) + ; + the compiler is allowed to transform this into an endless loop if the + variable 'signal_occurred' is not declared 'volatile'. + Additionally, recall that: + * A signal handler should not modify errno (except if it is a handler + for a fatal signal and ends by raising the same signal again, thus + provoking the termination of the process). If it invokes a function + that may clobber errno, it needs to save and restore the value of + errno. */ +#define _GL_ASYNC_SAFE + + +/* Attributes. */ +#if (defined __has_attribute \ + && (!defined __clang_minor__ \ + || 3 < __clang_major__ + (5 <= __clang_minor__))) +# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) +#else +# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr +# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2) +# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95) +# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_diagnose_if 0 +# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1) +# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) +# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) +# ifdef _ICC +# define _GL_ATTR_may_alias 0 +# else +# define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) +# endif +# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) +# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) +# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96) +# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) +# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) +# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) +#endif + + +#if _GL_HAS_ATTRIBUTE (alloc_size) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) +#else +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +#endif + +#if _GL_HAS_ATTRIBUTE (always_inline) +# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) +#else +# define _GL_ATTRIBUTE_ALWAYS_INLINE +#endif + +#if _GL_HAS_ATTRIBUTE (artificial) +# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) +#else +# define _GL_ATTRIBUTE_ARTIFICIAL +#endif + +/* Avoid __attribute__ ((cold)) on MinGW; see thread starting at + . + Also, Oracle Studio 12.6 requires 'cold' not '__cold__'. */ +#if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ +# ifndef __SUNPRO_C +# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) +# else +# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) +# endif +#else +# define _GL_ATTRIBUTE_COLD +#endif + +#if _GL_HAS_ATTRIBUTE (const) +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +#else +# define _GL_ATTRIBUTE_CONST +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +#elif _GL_HAS_ATTRIBUTE (deprecated) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +#else +# define _GL_ATTRIBUTE_DEPRECATED +#endif + +#if _GL_HAS_ATTRIBUTE (error) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) +#elif _GL_HAS_ATTRIBUTE (diagnose_if) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) +#else +# define _GL_ATTRIBUTE_ERROR(msg) +# define _GL_ATTRIBUTE_WARNING(msg) +#endif + +#if _GL_HAS_ATTRIBUTE (externally_visible) +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) +#else +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +#endif + +/* FALLTHROUGH is special, because it always expands to something. */ +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +#elif _GL_HAS_ATTRIBUTE (fallthrough) +# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +#else +# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) +#endif + +#if _GL_HAS_ATTRIBUTE (format) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) +#endif + +#if _GL_HAS_ATTRIBUTE (leaf) +# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) +#else +# define _GL_ATTRIBUTE_LEAF +#endif + +/* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ +#if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C +# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) +#else +# define _GL_ATTRIBUTE_MAY_ALIAS +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +#elif _GL_HAS_ATTRIBUTE (unused) +# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) +#else +# define _GL_ATTRIBUTE_MAYBE_UNUSED +#endif +/* Earlier spellings of this macro. */ +#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED +#define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED + +#if _GL_HAS_ATTRIBUTE (malloc) +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +#else +# define _GL_ATTRIBUTE_MALLOC +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +#elif _GL_HAS_ATTRIBUTE (warn_unused_result) +# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) +#else +# define _GL_ATTRIBUTE_NODISCARD +#endif + +#if _GL_HAS_ATTRIBUTE (noinline) +# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) +#else +# define _GL_ATTRIBUTE_NOINLINE +#endif + +#if _GL_HAS_ATTRIBUTE (nonnull) +# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) +#else +# define _GL_ATTRIBUTE_NONNULL(args) +#endif + +#if _GL_HAS_ATTRIBUTE (nonstring) +# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) +#else +# define _GL_ATTRIBUTE_NONSTRING +#endif + +/* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead. */ + +#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +#else +# define _GL_ATTRIBUTE_NOTHROW +#endif + +#if _GL_HAS_ATTRIBUTE (packed) +# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) +#else +# define _GL_ATTRIBUTE_PACKED +#endif + +#if _GL_HAS_ATTRIBUTE (pure) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +#else +# define _GL_ATTRIBUTE_PURE +#endif + +#if _GL_HAS_ATTRIBUTE (returns_nonnull) +# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) +#else +# define _GL_ATTRIBUTE_RETURNS_NONNULL +#endif + +#if _GL_HAS_ATTRIBUTE (sentinel) +# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) +#else +# define _GL_ATTRIBUTE_SENTINEL(pos) +#endif + + +/* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ +#if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) +# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED +#else +# define _GL_UNUSED_LABEL +#endif + + /* Please see the Gnulib manual for how to use these macros. Suppress extern inline with HP-UX cc, as it appears to be broken; see - . + . Suppress extern inline with Sun C in standards-conformance mode, as it mishandles inline functions that call each other. E.g., for 'inline void f @@ -834,20 +1133,32 @@ if isdigit is mistakenly implemented via a static inline function, a program containing an extern inline function that calls isdigit may not work since the C standard prohibits extern inline functions - from calling static functions. This bug is known to occur on: + from calling static functions (ISO C 99 section 6.7.4.(3). + This bug is known to occur on: OS X 10.8 and earlier; see: - http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html + https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html DragonFly; see - http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log + http://muscles.dragonflybsd.org/bulk/clang-master-potential/20141111_102002/logs/ah-tty-0.3.12.log FreeBSD; see: - http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html + https://lists.gnu.org/r/bug-gnulib/2014-07/msg00104.html OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and - for clang but remains for g++; see . - Assume DragonFly and FreeBSD will be similar. */ + for clang but remains for g++; see . + Assume DragonFly and FreeBSD will be similar. + + GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 + inline semantics, unless -fgnu89-inline is used. It defines a macro + __GNUC_STDC_INLINE__ to indicate this situation or a macro + __GNUC_GNU_INLINE__ to indicate the opposite situation. + GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline + semantics but warns, unless -fgnu89-inline is used: + warning: C99 inline functions are not supported; using GNU89 + warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute + It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. + */ #if (((defined __APPLE__ && defined __MACH__) \ || defined __DragonFly__ || defined __FreeBSD__) \ && (defined __header_inline \ @@ -928,22 +1239,42 @@ # define __GNUC_STDC_INLINE__ 1 #endif +/* _GL_CMP (n1, n2) performs a three-valued comparison on n1 vs. n2, where + n1 and n2 are expressions without side effects, that evaluate to real + numbers (excluding NaN). + It returns + 1 if n1 > n2 + 0 if n1 == n2 + -1 if n1 < n2 + The naïve code (n1 > n2 ? 1 : n1 < n2 ? -1 : 0) produces a conditional + jump with nearly all GCC versions up to GCC 10. + This variant (n1 < n2 ? -1 : n1 > n2) produces a conditional with many + GCC versions up to GCC 9. + The better code (n1 > n2) - (n1 < n2) from Hacker's Delight § 2-9 + avoids conditional jumps in all GCC versions >= 3.4. */ +#define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2))) + + /* Define to `int' if does not define. */ /* #undef mode_t */ -/* Define to `int' if does not define. */ +/* Define to the type of st_nlink in struct stat, or a supertype. */ +/* #undef nlink_t */ + +/* Define as a signed integer type capable of holding a process identifier. */ /* #undef pid_t */ /* Define to the equivalent of the C99 'restrict' keyword, or to nothing if this is not supported. Do not define if restrict is - supported directly. */ + supported only directly. */ #define restrict __restrict -/* Work around a bug in Sun C++: it does not support _Restrict or - __restrict__, even though the corresponding Sun C compiler ends up with - "#define restrict _Restrict" or "#define restrict __restrict__" in the - previous line. Perhaps some future version of Sun C++ will work with - restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ -#if defined __SUNPRO_CC && !defined __RESTRICT +/* Work around a bug in older versions of Sun C++, which did not + #define __restrict__ or support _Restrict or __restrict__ + even though the corresponding Sun C compiler ended up with + "#define restrict _Restrict" or "#define restrict __restrict__" + in the previous line. This workaround can be removed once + we assume Oracle Developer Studio 12.5 (2016) or later. */ +#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__ # define _Restrict # define __restrict__ #endif @@ -954,42 +1285,5 @@ /* Define as a signed type of the same size as size_t. */ #define ssize_t intptr_t -/* Define as a marker that can be attached to declarations that might not - be used. This helps to reduce warnings, such as from - GCC -Wunused-parameter. */ -#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_UNUSED __attribute__ ((__unused__)) -#else -# define _GL_UNUSED -#endif -/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name - is a misnomer outside of parameter lists. */ -#define _UNUSED_PARAMETER_ _GL_UNUSED - -/* gcc supports the "unused" attribute on possibly unused labels, and - g++ has since version 4.5. Note to support C++ as well as C, - _GL_UNUSED_LABEL should be used with a trailing ; */ -#if !defined __cplusplus || __GNUC__ > 4 \ - || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -# define _GL_UNUSED_LABEL _GL_UNUSED -#else -# define _GL_UNUSED_LABEL -#endif - -/* The __pure__ attribute was added in gcc 2.96. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -#else -# define _GL_ATTRIBUTE_PURE /* empty */ -#endif - -/* The __const__ attribute was added in gcc 2.95. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) -#else -# define _GL_ATTRIBUTE_CONST /* empty */ -#endif - - /* Define as a macro for copying va_list variables. */ /* #undef va_copy */ diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index f9ffcae787c32e..07ef29cbbd1531 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -1,10 +1,10 @@ -set(IDN2_VERSION 2.3.0) +set(IDN2_VERSION 2.3.1) set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" FILENAME "${IDN2_FILENAME}" - SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187 + SHA512 4d77a4a79e08a05e46fc14827f987b9e7645ebf5d0c0869eb96f9902c2f6b73ea69fd6f9f97b80a9f07cce84f7aa299834df91485d4e7c16500d31a4b9865fe4 ) vcpkg_extract_source_archive_ex( @@ -20,10 +20,11 @@ if (VCPKG_TARGET_IS_WINDOWS) set(HAVE_ALLOCA_H 0) configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h" "${SOURCE_PATH}") + configure_file("${SOURCE_PATH}/gl/alloca.in.h" "${SOURCE_PATH}/gl/alloca.h") function(simple_copy_template_header FILE_PATH BASE_NAME) if(NOT EXISTS "${FILE_PATH}/${BASE_NAME}.h" AND EXISTS "${FILE_PATH}/${BASE_NAME}.in.h") - configure_file("${FILE_PATH}/${BASE_NAME}.in.h" "${FILE_PATH}/${BASE_NAME}.h") + configure_file("${FILE_PATH}/${BASE_NAME}.in.h" "${FILE_PATH}/${BASE_NAME}.h" @ONLY) endif() endfunction() diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json index 9c00c1b155fd14..767619f16608e4 100644 --- a/ports/libidn2/vcpkg.json +++ b/ports/libidn2/vcpkg.json @@ -1,19 +1,18 @@ { "name": "libidn2", - "version": "2.3.0", - "port-version": 4, + "version": "2.3.1", "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.", "homepage": "https://www.gnu.org/software/libidn/", "dependencies": [ "libiconv", { "name": "libunistring", - "platform": "!(windows | mingw)" + "platform": "!windows" }, { "name": "vcpkg-cmake", "host": true, - "platform": "windows | mingw" + "platform": "windows" } ] } diff --git a/ports/libigl/portfile.cmake b/ports/libigl/portfile.cmake index 5917425cec5cb6..345aa4cc7c58ee 100644 --- a/ports/libigl/portfile.cmake +++ b/ports/libigl/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libigl/libigl @@ -50,4 +48,4 @@ vcpkg_copy_pdbs() # libigl is a header-only library. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE.GPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.GPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libigl/vcpkg.json b/ports/libigl/vcpkg.json index 22f523168347ec..c74ff015f758dc 100644 --- a/ports/libigl/vcpkg.json +++ b/ports/libigl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libigl", "version": "2.3.0", + "port-version": 1, "description": "libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB.", "homepage": "https://github.com/libigl/libigl", "supports": "!(arm | uwp)", 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 49dc8fe290626d..c8cc84d97311fd 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 d80af40..361ecae 100644 +index 10a198f..68ac5a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -143,6 +143,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE) +@@ -168,6 +168,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE) boolean_number(ENABLE_SHARED) option(ENABLE_STATIC "Build static libraries" TRUE) boolean_number(ENABLE_STATIC) @@ -15,62 +15,39 @@ index d80af40..361ecae 100644 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) -@@ -593,18 +599,20 @@ if(WITH_TURBOJPEG) +@@ -634,6 +640,7 @@ if(WITH_TURBOJPEG) LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}") endif() -- add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c) -- target_link_libraries(tjunittest turbojpeg) + if(ENABLE_EXECUTABLES) -+ add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c) -+ target_link_libraries(tjunittest turbojpeg) - -- add_executable(tjbench tjbench.c tjutil.c) -- target_link_libraries(tjbench turbojpeg) -- if(UNIX) -- target_link_libraries(tjbench m) -- endif() -+ add_executable(tjbench tjbench.c tjutil.c) -+ target_link_libraries(tjbench turbojpeg) -+ if(UNIX) -+ target_link_libraries(tjbench m) -+ endif() - -- add_executable(tjexample tjexample.c) -- target_link_libraries(tjexample turbojpeg) -- endif() -+ add_executable(tjexample tjexample.c) -+ target_link_libraries(tjexample turbojpeg) -+ endif() -+ endif() + add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c) + target_link_libraries(tjunittest turbojpeg) + +@@ -646,6 +653,7 @@ if(WITH_TURBOJPEG) + add_executable(tjexample tjexample.c) + target_link_libraries(tjexample turbojpeg) + endif() ++ endif() if(ENABLE_STATIC) add_library(turbojpeg-static STATIC ${JPEG_SOURCES} $ -@@ -616,14 +624,16 @@ if(WITH_TURBOJPEG) +@@ -657,6 +665,7 @@ if(WITH_TURBOJPEG) set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) endif() -- add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c -- md5/md5hl.c) -- target_link_libraries(tjunittest-static turbojpeg-static) + if(ENABLE_EXECUTABLES) -+ add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c -+ md5/md5hl.c) -+ target_link_libraries(tjunittest-static turbojpeg-static) - -- add_executable(tjbench-static tjbench.c tjutil.c) -- target_link_libraries(tjbench-static turbojpeg-static) -- if(UNIX) -- target_link_libraries(tjbench-static m) -+ add_executable(tjbench-static tjbench.c tjutil.c) -+ target_link_libraries(tjbench-static turbojpeg-static) -+ if(UNIX) -+ target_link_libraries(tjbench-static m) -+ endif() + add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c + md5/md5hl.c) + target_link_libraries(tjunittest-static turbojpeg-static) +@@ -666,6 +675,7 @@ if(WITH_TURBOJPEG) + if(UNIX) + target_link_libraries(tjbench-static m) endif() ++ endif() endif() endif() -@@ -639,7 +649,7 @@ else() + +@@ -680,7 +690,7 @@ else() set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c) endif() @@ -79,169 +56,120 @@ index d80af40..361ecae 100644 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}) -@@ -655,9 +665,10 @@ if(ENABLE_STATIC) +@@ -696,10 +706,11 @@ if(ENABLE_STATIC) set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}") endif() --add_executable(rdjpgcom rdjpgcom.c) -- --add_executable(wrjpgcom wrjpgcom.c) +if(ENABLE_EXECUTABLES) -+ add_executable(rdjpgcom rdjpgcom.c) -+ add_executable(wrjpgcom wrjpgcom.c) -+endif() + add_executable(rdjpgcom rdjpgcom.c) + add_executable(wrjpgcom wrjpgcom.c) +- ++endif() ############################################################################### -@@ -1337,10 +1348,14 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX}) - - if(WITH_TURBOJPEG) - if(ENABLE_SHARED) -- install(TARGETS turbojpeg tjbench -+ install(TARGETS turbojpeg + # TESTS +@@ -1434,8 +1445,10 @@ if(WITH_TURBOJPEG) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + if(ENABLE_EXECUTABLES) -+ install(TARGETS tjbench -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS tjbench + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND CMAKE_C_LINKER_SUPPORTS_PDB) install(FILES "$" -@@ -1350,7 +1365,7 @@ if(WITH_TURBOJPEG) - if(ENABLE_STATIC) - install(TARGETS turbojpeg-static ARCHIVE - DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -1446,7 +1459,7 @@ if(WITH_TURBOJPEG) + install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(NOT ENABLE_SHARED) + if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) if(MSVC_IDE OR XCODE) set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") else() -@@ -1360,13 +1375,15 @@ if(WITH_TURBOJPEG) +@@ -1456,15 +1469,17 @@ if(WITH_TURBOJPEG) DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE}) endif() endif() -- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + if(INSTALL_HEADERS) -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() endif() if(ENABLE_STATIC) - install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS jpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(NOT ENABLE_SHARED) + if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) if(MSVC_IDE OR XCODE) set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") else() -@@ -1381,21 +1398,25 @@ if(ENABLE_STATIC) +@@ -1479,8 +1494,11 @@ if(ENABLE_STATIC) endif() endif() --install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +if(ENABLE_EXECUTABLES) -+ install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif() --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg -- ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt -- ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt -- ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt -- ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt -- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) --if(WITH_JAVA) -- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java -- DESTINATION ${CMAKE_INSTALL_DOCDIR}) +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}/tjexample.c -+ ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt -+ ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt -+ ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt -+ ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) -+ if(WITH_JAVA) -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java -+ DESTINATION ${CMAKE_INSTALL_DOCDIR}) -+ endif() + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg + ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt + ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c +@@ -1492,8 +1510,9 @@ if(WITH_JAVA) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java + DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() ++endif() -if(UNIX OR MINGW) +if((UNIX OR MINGW) AND INSTALL_DOCS) 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 -@@ -1406,10 +1427,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc - ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h -- ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h -- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +@@ -1511,10 +1530,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets + NAMESPACE ${CMAKE_PROJECT_NAME}:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME}) + +if(INSTALL_HEADERS) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h -+ ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h -+ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h + ${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) diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt -index a5c4e39..794c2af 100644 +index 78a2f28..e653b2d 100644 --- a/sharedlib/CMakeLists.txt +++ b/sharedlib/CMakeLists.txt -@@ -71,27 +71,35 @@ else() +@@ -71,6 +71,7 @@ else() set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c) endif() --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}) --target_link_libraries(cjpeg jpeg) +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}) -+ target_link_libraries(cjpeg jpeg) - --add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c -- ../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES}) --set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS}) --target_link_libraries(djpeg jpeg) -+ add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c -+ ../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES}) -+ set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS}) -+ target_link_libraries(djpeg jpeg) - --add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c) --target_link_libraries(jpegtran jpeg) --set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}") -+ add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c) -+ target_link_libraries(jpegtran jpeg) -+ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}") - --add_executable(jcstest ../jcstest.c) --target_link_libraries(jcstest jpeg) -+ add_executable(jcstest ../jcstest.c) -+ target_link_libraries(jcstest jpeg) + 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}) +@@ -87,14 +88,17 @@ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}") + + add_executable(jcstest ../jcstest.c) + target_link_libraries(jcstest jpeg) +endif() --install(TARGETS jpeg cjpeg djpeg jpegtran -+install(TARGETS jpeg + install(TARGETS jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +if(ENABLE_EXECUTABLES) -+ install(TARGETS cjpeg djpeg jpegtran -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS cjpeg djpeg jpegtran + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif() if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND CMAKE_C_LINKER_SUPPORTS_PDB) diff --git a/ports/libjpeg-turbo/fix-incompatibility-for-c11-c17.patch b/ports/libjpeg-turbo/fix-incompatibility-for-c11-c17.patch deleted file mode 100644 index c0aaf585b216cd..00000000000000 --- a/ports/libjpeg-turbo/fix-incompatibility-for-c11-c17.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tjutil.h b/tjutil.h -index f72840c..a3ae19f 100644 ---- a/tjutil.h -+++ b/tjutil.h -@@ -30,7 +30,7 @@ - #ifndef __MINGW32__ - #include - #define snprintf(str, n, format, ...) \ -- _snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__) -+ _snprintf_s(str, n, _TRUNCATE, format, ## __VA_ARGS__) - #endif - #define strcasecmp stricmp - #define strncasecmp strnicmp diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 98446fdbcfae21..091af45bc744ea 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -5,14 +5,13 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo - REF 10ba6ed3365615ed5c2995fe2d240cb2d5000173 # 2.0.6 - SHA512 219d01907e66dd0fc20ea13cfa51a8efee305810f1245d0648b6ad8ee3cf11bf0bbd43b1ceeeb142a6ebbbfa281ec6a3b4e283b2fc343c360cd3ad29e9d42528 + REF c5f269eb9665435271c05fbcaf8721fa58e9eafa # 2.1.3 + SHA512 5d1c3cbbc7628339cfedc0f81a65ceb972aba2b8ffcc72d001f87526d0ff468f83665c78165051aa95c39200d9aaa6aee76e01266a4ea9cddb678dc6ef17ec27 HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch - #workaround for vcpkg bug see #5697 on github for more information + # workaround for vcpkg bug see #5697 on github for more information workaround_cmake_system_processor.patch - fix-incompatibility-for-c11-c17.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")) @@ -38,9 +37,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS jpeg8 WITH_JPEG8 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_STATIC=${ENABLE_STATIC} -DENABLE_SHARED=${ENABLE_SHARED} @@ -55,7 +53,11 @@ vcpkg_configure_cmake( WITH_CRT_DLL ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libjpeg-turbo) # Rename libraries for static builds if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -66,20 +68,30 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") + endif() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + if (EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake" + "jpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "jpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake" + "turbojpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "turbojpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + endif() + if (EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake" + "jpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "jpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake" + "turbojpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "turbojpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") endif() endif() -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/share/man") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jpeg) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jpeg") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake b/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake index 22f0ab92e50dea..0c1a883c0383f8 100644 --- a/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake +++ b/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake @@ -1,9 +1,6 @@ find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) find_library(JPEG_LIBRARY_RELEASE NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) find_library(JPEG_LIBRARY_DEBUG NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) -if(NOT JPEG_INCLUDE_DIR OR NOT JPEG_LIBRARY_RELEASE OR (NOT JPEG_LIBRARY_DEBUG AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib")) - message(FATAL_ERROR "Broken installation of vcpkg port libjpeg-turbo") -endif() if(CMAKE_VERSION VERSION_LESS 3.12) include(SelectLibraryConfigurations) select_library_configurations(JPEG) diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 4e59d2b69abefa..97e1b2566a3b23 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,9 +1,20 @@ { "name": "libjpeg-turbo", - "version": "2.0.6", - "port-version": 2, + "version": "2.1.3", + "port-version": 1, "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", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "jpeg7": { "description": "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!)" diff --git a/ports/libjpeg-turbo/workaround_cmake_system_processor.patch b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch index 613504dfac9f9d..c99ff57d8d5b6b 100644 --- a/ports/libjpeg-turbo/workaround_cmake_system_processor.patch +++ b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2f137a..3754095 100644 +index 6dd83d3a..5cd717f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}") +@@ -54,7 +54,7 @@ message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}") # Detect CPU type and whether we're building 64-bit or 32-bit code math(EXPR BITS "${CMAKE_SIZEOF_VOID_P} * 8") -string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC) +string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" CMAKE_SYSTEM_PROCESSOR_LC) - if(CMAKE_SYSTEM_PROCESSOR_LC MATCHES "x86_64" OR - CMAKE_SYSTEM_PROCESSOR_LC MATCHES "amd64" OR - CMAKE_SYSTEM_PROCESSOR_LC MATCHES "i[0-9]86" OR + set(COUNT 1) + foreach(ARCH ${CMAKE_OSX_ARCHITECTURES}) + if(COUNT GREATER 1) diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index f6e383a5d11669..c409c4cc9b9ff5 100644 --- a/ports/libjuice/portfile.cmake +++ b/ports/libjuice/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libjuice - REF 026b3dd68db33143db8a5a9b16af3923733a8b61 #v0.9.1 - SHA512 050e92df2e3f24da465ffd4e57d35ffc7a4e13042dc0b829627a09c3f8c7898c7b066f3e386004b579e7416adf4885f5f7a8da46f34c76e9bc63747616f34f9d + REF 3795466e704191dd35f8a46b82ca06cbbc395cd9 #v0.9.6 + SHA512 3c931b47d852ead3027ed077f9ba930e9b5b77de1cf984023dd4bac3b52980f68419517e4edf11e8fd2741bfb2e154d3c748073ed302182e395df0b0acc1910c HEAD_REF master PATCHES fix-for-vcpkg.patch diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index d3a226ba9a768d..0630c3c670fbe4 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjuice", - "version": "0.9.1", + "version": "0.9.6", "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libjuice", "dependencies": [ diff --git a/ports/libjxl/disable-jxl_extras.patch b/ports/libjxl/disable-jxl_extras.patch new file mode 100644 index 00000000000000..32fbd6472871c1 --- /dev/null +++ b/ports/libjxl/disable-jxl_extras.patch @@ -0,0 +1,14 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index a366e51..257f87d 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -132,7 +132,9 @@ endif() #!MSVC + include(jxl.cmake) + + # Other libraries outside the core jxl library. ++if(JPEGXL_ENABLE_TOOLS) + include(jxl_extras.cmake) ++endif() + include(jxl_threads.cmake) + + # Install all the library headers from the source and the generated ones. There diff --git a/ports/libjxl/fix-dependencies.patch b/ports/libjxl/fix-dependencies.patch index 4c6353cfc4e08a..33e99713db153a 100644 --- a/ports/libjxl/fix-dependencies.patch +++ b/ports/libjxl/fix-dependencies.patch @@ -1,11 +1,13 @@ diff --git a/lib/jxl.cmake b/lib/jxl.cmake --- a/lib/jxl.cmake +++ b/lib/jxl.cmake -@@ -3,6 +3,16 @@ +@@ -3,6 +3,18 @@ # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. - + ++if(JPEGXL_ENABLE_TOOLS) +find_package(lodepng CONFIG REQUIRED) ++endif() +find_package(unofficial-brotli CONFIG REQUIRED) +find_package(lcms2 CONFIG REQUIRED) + @@ -46,7 +48,7 @@ diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt set_property(TARGET hwy PROPERTY INTERFACE_COMPILE_OPTIONS ${HWY_CFLAGS_OTHER}) else() target_include_directories(hwy INTERFACE ${HWY_INCLUDE_DIRS}) -@@ -114,82 +112,10 @@ else() +@@ -114,82 +112,12 @@ else() endif() # lodepng @@ -57,7 +59,9 @@ diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt -include(lodepng.cmake) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lodepng/LICENSE" - ${PROJECT_BINARY_DIR}/LICENSE.lodepng COPYONLY) ++if(JPEGXL_ENABLE_TOOLS) +find_package(lodepng CONFIG REQUIRED) ++endif() # brotli -if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR diff --git a/ports/libjxl/fix-link-flags.patch b/ports/libjxl/fix-link-flags.patch new file mode 100644 index 00000000000000..98399189c07a34 --- /dev/null +++ b/ports/libjxl/fix-link-flags.patch @@ -0,0 +1,15 @@ +diff --git a/lib/jxl.cmake b/lib/jxl.cmake +index 63539cc..2e1d617 100644 +--- a/lib/jxl.cmake ++++ b/lib/jxl.cmake +@@ -551,8 +551,10 @@ foreach(target IN ITEMS jxl jxl_dec) + # This hides the default visibility symbols from static libraries bundled into + # the shared library. In particular this prevents exposing symbols from hwy + # and skcms in the shared library. ++ if(NOT APPLE AND NOT MSVC) + set_property(TARGET ${target} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,--exclude-libs=ALL") ++ endif() + endforeach() + + # Only install libjxl shared library. The libjxl_dec is not installed since it diff --git a/ports/libjxl/portfile.cmake b/ports/libjxl/portfile.cmake index 039e330c9d71fe..31c68f3378ae5d 100644 --- a/ports/libjxl/portfile.cmake +++ b/ports/libjxl/portfile.cmake @@ -1,22 +1,54 @@ +set(JPEGXL_VERSION 0.6.1) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjxl/libjxl - REF v0.6.1 + REF "v${JPEGXL_VERSION}" SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52 HEAD_REF main PATCHES fix-install-directories.patch fix-dependencies.patch + fix-link-flags.patch + disable-jxl_extras.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tools JPEGXL_ENABLE_TOOLS + INVERTED_FEATURES + tools CMAKE_DISABLE_FIND_PACKAGE_GIF + tools CMAKE_DISABLE_FIND_PACKAGE_JPEG + tools CMAKE_DISABLE_FIND_PACKAGE_PNG + tools CMAKE_DISABLE_FIND_PACKAGE_ZLIB ) +if(VCPKG_TARGET_IS_UWP) + string(APPEND VCPKG_C_FLAGS " -D_CRT_SECURE_NO_WARNINGS /wd4146") + string(APPEND VCPKG_CXX_FLAGS " -D_CRT_SECURE_NO_WARNINGS /wd4146") + + # Temporary workaround for #9390 + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(APPEND FEATURE_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=x86) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND FEATURE_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + list(APPEND FEATURE_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=ARM) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND FEATURE_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=ARM64) + else() + message(FATAL_ERROR "Unsupported uwp VCPKG_TARGET_ARCHITECTURE \"${VCPKG_TARGET_ARCHITECTURE}\"") + endif() + # Workaround for vcpkg-cmake bug, proper fix in #21857 + set(_TARGETTING_UWP 1) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DJPEGXL_VERSION=${JPEGXL_VERSION}" + -DJPEGXL_FORCE_SYSTEM_HWY=ON + -DJPEGXL_FORCE_SYSTEM_BROTLI=ON ${FEATURE_OPTIONS} -DJPEGXL_ENABLE_FUZZERS=OFF -DJPEGXL_ENABLE_MANPAGES=OFF @@ -27,9 +59,14 @@ vcpkg_cmake_configure( -DJPEGXL_ENABLE_OPENEXR=OFF -DJPEGXL_ENABLE_PLUGINS=OFF -DJPEGXL_ENABLE_SKCMS=OFF - -DJPEGXL_FORCE_SYSTEM_HWY=ON - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON + -DJPEGXL_ENABLE_TCMALLOC=OFF -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1 + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_GIF + CMAKE_DISABLE_FIND_PACKAGE_JPEG + CMAKE_DISABLE_FIND_PACKAGE_PNG + CMAKE_DISABLE_FIND_PACKAGE_ZLIB ) vcpkg_cmake_install() @@ -47,32 +84,34 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" ) - file(REMOVE + set(FILES_TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/jxl.lib" "${CURRENT_PACKAGES_DIR}/lib/jxl_threads.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jxl.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jxl_threads.lib" ) else() - file(GLOB FILES "${CURRENT_PACKAGES_DIR}/lib/*.so*") - file(REMOVE ${FILES}) - file(GLOB FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*.so*") - file(REMOVE ${FILES}) + file(GLOB FILES_TO_REMOVE + "${CURRENT_PACKAGES_DIR}/lib/*.so*" + "${CURRENT_PACKAGES_DIR}/lib/*.dylib*" + "${CURRENT_PACKAGES_DIR}/debug/lib/*.so*" + "${CURRENT_PACKAGES_DIR}/debug/lib/*.dylib*" + ) endif() else() if(VCPKG_TARGET_IS_WINDOWS) - file(GLOB FILES "${CURRENT_PACKAGES_DIR}/lib/*-static.lib") - file(REMOVE ${FILES}) - file(GLOB FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*-static.lib") - file(REMOVE ${FILES}) + file(GLOB FILES_TO_REMOVE + "${CURRENT_PACKAGES_DIR}/lib/*-static.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/*-static.lib" + ) else() - file(GLOB FILES "${CURRENT_PACKAGES_DIR}/lib/*.a") - file(REMOVE ${FILES}) - file(GLOB FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*.a") - file(REMOVE ${FILES}) + file(GLOB FILES_TO_REMOVE + "${CURRENT_PACKAGES_DIR}/lib/*.a" + "${CURRENT_PACKAGES_DIR}/debug/lib/*.a" + ) endif() endif() - +file(REMOVE ${FILES_TO_REMOVE}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libjxl/vcpkg.json b/ports/libjxl/vcpkg.json index 22dfcf6e76f819..aa0c58f7cb0737 100644 --- a/ports/libjxl/vcpkg.json +++ b/ports/libjxl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libjxl", "version-semver": "0.6.1", + "port-version": 1, "description": "JPEG XL image format reference implementation", "homepage": "https://github.com/libjxl/libjxl", "license": "BSD-3-Clause", @@ -8,7 +9,6 @@ "brotli", "highway", "lcms", - "lodepng", { "name": "vcpkg-cmake", "host": true @@ -16,7 +16,14 @@ ], "features": { "tools": { - "description": "Build user tools: cjxl and djxl" + "description": "Build user tools: cjxl and djxl", + "dependencies": [ + "giflib", + "libjpeg-turbo", + "libpng", + "lodepng", + "zlib" + ] } } } diff --git a/ports/libkeyfinder/portfile.cmake b/ports/libkeyfinder/portfile.cmake index e87077ddf2b17a..afd3dd1d1a2d3c 100644 --- a/ports/libkeyfinder/portfile.cmake +++ b/ports/libkeyfinder/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mixxxdj/libkeyfinder - REF v2.2.5 - SHA512 54463d1f1111dc474d3e43723fddd5579ea1a3842f99f43e50e85622a1d6ee6fe42b22c300ce5ba5807cf6b2d7067af741773af95974a42c5d863c53165893eb + REF v2.2.6 + SHA512 c1b771cebfb925db521a344e28fd1d3bc6e6e921e45dcc81f90926e5b2020fea201a4bc05a65177d3559208a45746fd7784eb6f37352bb10ab7d7b820b40c0b6 HEAD_REF main ) @@ -19,9 +19,10 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(PACKAGE_NAME KeyFinder CONFIG_PATH lib/cmake/KeyFinder) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libkeyfinder/vcpkg.json b/ports/libkeyfinder/vcpkg.json index 6c3fbfca19bf91..f362d64ccef439 100644 --- a/ports/libkeyfinder/vcpkg.json +++ b/ports/libkeyfinder/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libkeyfinder", - "version-string": "2.2.5", - "port-version": 1, + "version": "2.2.6", "description": "Musical key detection for digital audio", "homepage": "https://github.com/mixxxdj/libkeyfinder", "license": "GPL-3.0-or-later", diff --git a/ports/liblinear/portfile.cmake b/ports/liblinear/portfile.cmake index fab41c0396829e..245e35e2508f32 100644 --- a/ports/liblinear/portfile.cmake +++ b/ports/liblinear/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cjlin1/liblinear diff --git a/ports/liblinear/vcpkg.json b/ports/liblinear/vcpkg.json index a65229aa0d1b19..a7eff708c68fe5 100644 --- a/ports/liblinear/vcpkg.json +++ b/ports/liblinear/vcpkg.json @@ -1,6 +1,7 @@ { "name": "liblinear", - "version-string": "243", + "version": "243", + "port-version": 1, "description": "A Library for Large Linear Classification", "homepage": "https://github.com/cjlin1/liblinear", "supports": "!uwp", diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index b7d08179410927..7c1ce3b6e7d37f 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -13,8 +13,6 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG - "-DCMAKE_DEBUG_POSTFIX=d" # This was in the old vcpkg CMakeLists.txt and I don't intend to fix it all over vcpkg ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -27,91 +25,27 @@ set(PACKAGE_VERSION 5.2.5) if(NOT VCPKG_TARGET_IS_WINDOWS) set(PTHREAD_CFLAGS -pthread) endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(prefix "${CURRENT_INSTALLED_DIR}") - configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/liblzma.pc" @ONLY) -endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +set(prefix "${CURRENT_INSTALLED_DIR}") +configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/liblzma.pc" @ONLY) +if (NOT VCPKG_BUILD_TYPE) set(prefix "${CURRENT_INSTALLED_DIR}/debug") configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" "-llzma" "-llzmad") endif() vcpkg_fixup_pkgconfig() - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/liblzma) -file(WRITE "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzma-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/liblzmaConfig.cmake\")") -file(APPEND "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzmaConfig.cmake" -" -include(\${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) -find_path(LibLZMA_INCLUDE_DIR NAMES lzma.h PATHS \"\${_IMPORT_PREFIX}/include\" NO_DEFAULT_PATH REQUIRED) -if(NOT LibLZMA_LIBRARY) - find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma PATHS \"\${_IMPORT_PREFIX}/lib\" NO_DEFAULT_PATH) - find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad PATHS \"\${_IMPORT_PREFIX}/debug/lib\" NO_DEFAULT_PATH) - select_library_configurations(LibLZMA) -endif() -set(LibLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") -set(LibLZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\") -set(LZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") -set(LZMA_LIBRARY \${LibLZMA_LIBRARY} CACHE STRING \"\") -set(LZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") -set(LZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\") -set(LIBLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") -set(LIBLZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\") -set(LIBLZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") -set(LIBLZMA_LIBRARY \${LibLZMA_LIBRARY} CACHE STRING \"\") - -if(LIBLZMA_INCLUDE_DIR AND EXISTS \"\${LIBLZMA_INCLUDE_DIR}/lzma/version.h\") - file(STRINGS \"\${LIBLZMA_INCLUDE_DIR}/lzma/version.h\" LIBLZMA_HEADER_CONTENTS REGEX \"#define LZMA_VERSION_[A-Z]+ [0-9]+\") - - string(REGEX REPLACE \".*#define LZMA_VERSION_MAJOR ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_MAJOR \"\${LIBLZMA_HEADER_CONTENTS}\") - string(REGEX REPLACE \".*#define LZMA_VERSION_MINOR ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_MINOR \"\${LIBLZMA_HEADER_CONTENTS}\") - string(REGEX REPLACE \".*#define LZMA_VERSION_PATCH ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_PATCH \"\${LIBLZMA_HEADER_CONTENTS}\") - - set(LIBLZMA_VERSION_STRING \"\${LIBLZMA_VERSION_MAJOR}.\${LIBLZMA_VERSION_MINOR}.\${LIBLZMA_VERSION_PATCH}\") - unset(LIBLZMA_HEADER_CONTENTS) -endif() - -## We're using new code known now as XZ, even library still been called LZMA -## it can be found in http://tukaani.org/xz/ -## Avoid using old codebase -#if (LIBLZMA_LIBRARY) -# include(\${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake) -# CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_auto_decoder \"\" LIBLZMA_HAS_AUTO_DECODER) -# CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_easy_encoder \"\" LIBLZMA_HAS_EASY_ENCODER) -# CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_lzma_preset \"\" LIBLZMA_HAS_LZMA_PRESET) -#endif () - -set(LibLZMA_FOUND TRUE CACHE BOOL \"\") -set(LZMA_FOUND TRUE CACHE BOOL \"\") -set(LIBLZMA_FOUND TRUE CACHE BOOL \"\") -") - -file(READ ${CURRENT_PACKAGES_DIR}/include/lzma.h _contents) -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "defined(LZMA_API_STATIC)" "1" _contents "${_contents}") -else() - string(REPLACE "defined(LZMA_API_STATIC)" "0" _contents "${_contents}") -endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/lzma.h "${_contents}") - -if (VCPKG_BUILD_TYPE STREQUAL debug) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "1") else() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "0") endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/include/lzma.h" - "if !defined(LZMA_API_STATIC)" - "if 0" - ) -endif() - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -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/man" +) set(TOOLS xz xzdec) foreach(_tool IN LISTS TOOLS) @@ -127,5 +61,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +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) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file diff --git a/ports/liblzma/vcpkg-cmake-wrapper.cmake b/ports/liblzma/vcpkg-cmake-wrapper.cmake index cf22af021a6489..32ea801553f568 100644 --- a/ports/liblzma/vcpkg-cmake-wrapper.cmake +++ b/ports/liblzma/vcpkg-cmake-wrapper.cmake @@ -1,8 +1,64 @@ -list(REMOVE_ITEM ARGS "NO_MODULE") -list(REMOVE_ITEM ARGS "CONFIG") -list(REMOVE_ITEM ARGS "MODULE") # Always call CONFIG. -_find_package(${ARGS} CONFIG) -if(NOT TARGET LibLZMA::LibLZMA AND TARGET liblzma::liblzma) - add_library(LibLZMA::LibLZMA INTERFACE IMPORTED) # Too lazy to fix wrong target usage all over vcpkg. - set_target_properties(LibLZMA::LibLZMA PROPERTIES INTERFACE_LINK_LIBRARIES liblzma::liblzma) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(z_vcpkg_liblzma_fixup_needed 0) +if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND NOT CMAKE_DISABLE_FIND_PACKAGE_LibLZMA) + get_filename_component(z_vcpkg_liblzma_prefix "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) + get_filename_component(z_vcpkg_liblzma_prefix "${z_vcpkg_liblzma_prefix}" DIRECTORY) + find_path(LIBLZMA_INCLUDE_DIR NAMES lzma.h PATHS "${z_vcpkg_liblzma_prefix}/include" NO_DEFAULT_PATH) + # liblzma doesn't use a debug postfix, but FindLibLZMA.cmake expects it + find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/lib" NO_DEFAULT_PATH) + find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/debug/lib" NO_DEFAULT_PATH) + unset(z_vcpkg_liblzma_prefix) + if(CMAKE_VERSION VERSION_LESS 3.16) + # Older versions of FindLibLZMA.cmake need a single lib in LIBLZMA_LIBRARY. + set(z_vcpkg_liblzma_fixup_needed 1) + set(LIBLZMA_LIBRARY "${LIBLZMA_LIBRARY_RELEASE}") + elseif(NOT TARGET LibLZMA::LibLZMA) + set(z_vcpkg_liblzma_fixup_needed 1) + endif() + # Known values, and required. Skip expensive tests. + set(LIBLZMA_HAS_AUTO_DECODER 1 CACHE INTERNAL "") + set(LIBLZMA_HAS_EASY_ENCODER 1 CACHE INTERNAL "") + set(LIBLZMA_HAS_LZMA_PRESET 1 CACHE INTERNAL "") endif() + +_find_package(${ARGS}) + +if(z_vcpkg_liblzma_fixup_needed) + include(SelectLibraryConfigurations) + select_library_configurations(LIBLZMA) + if(NOT TARGET LibLZMA::LibLZMA) + # Backfill LibLZMA::LibLZMA to versions of cmake before 3.14 + add_library(LibLZMA::LibLZMA UNKNOWN IMPORTED) + if(DEFINED LIBLZMA_INCLUDE_DIRS) + set_target_properties(LibLZMA::LibLZMA PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${LIBLZMA_INCLUDE_DIRS}") + endif() + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(LibLZMA::LibLZMA PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C" + IMPORTED_LOCATION_RELEASE "${LIBLZMA_LIBRARY_RELEASE}") + if(EXISTS "${LIBLZMA_LIBRARY}") + set_target_properties(LibLZMA::LibLZMA PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${LIBLZMA_LIBRARY}") + endif() + endif() + if(LIBLZMA_LIBRARY_DEBUG) + # Backfill debug variant to versions of cmake before 3.16 + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(LibLZMA::LibLZMA PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBLZMA_LIBRARY_DEBUG}") + endif() +endif() +if(LIBLZMA_LIBRARIES AND NOT "Threads::Threads" IN_LIST LIBLZMA_LIBRARIES) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads) + list(APPEND LIBLZMA_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + if(TARGET LibLZMA::LibLZMA) + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads) + endif() +endif() +unset(z_vcpkg_liblzma_fixup_needed) +cmake_policy(POP) diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json index 5c1874023eda29..c2c5a5a84a2a46 100644 --- a/ports/liblzma/vcpkg.json +++ b/ports/liblzma/vcpkg.json @@ -1,9 +1,10 @@ { "name": "liblzma", "version-semver": "5.2.5", - "port-version": 4, + "port-version": 5, "description": "Compression library with an API similar to that of zlib.", - "homepage": "hhttps://github.com/xz-mirror/xz", + "homepage": "https://github.com/xz-mirror/xz", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/liblzma/win_output_name.patch b/ports/liblzma/win_output_name.patch index e1da52a46e8031..e3ce250a0463c7 100644 --- a/ports/liblzma/win_output_name.patch +++ b/ports/liblzma/win_output_name.patch @@ -1,13 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e80b524..1ecf908 100644 +index e80b524..cddbccb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -429,7 +429,7 @@ set_target_properties(liblzma PROPERTIES +@@ -429,8 +429,11 @@ set_target_properties(liblzma PROPERTIES # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll. # Avoid the name lzma.dll because it would conflict with LZMA SDK. - PREFIX "" + OUTPUT_NAME lzma ) ++if(WIN32 AND NOT MINGW) ++ set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma) ++endif() # Create liblzmaConfigVersion.cmake. + # diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake index 987fcdc9884535..40229288c1c0fb 100644 --- a/ports/libmediainfo/portfile.cmake +++ b/ports/libmediainfo/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MediaArea/MediaInfoLib - REF d5fb067e1539aa7a74c491e8262c81214f9c8bcb #v21.03 - SHA512 6d49c8187dca264b4d9fb1f93a82cb65435e81a2540cfb84f885d53737560f7e8e60c8209e7d184cb191f298495db90ffb3185481e3ed44bf5a1f5131f671d89 + REF v21.03 + SHA512 1317b27dc3ac1ad224ef9b7ca7c08a8f55983ac6984b5e8daf6309fa33094fbad8a0a5fbe0cff086b7a5c9233b3e24e26995b037d16adf83f63877f2c753f811 HEAD_REF master PATCHES vcpkg_support_in_cmakelists.patch ) @@ -24,7 +24,8 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/debug/share/MediaInfoLib") endif() vcpkg_cmake_config_fixup(PACKAGE_NAME MediaInfoLib CONFIG_PATH share/MediaInfoLib) +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json index 89db9dce1a7dc3..f6832d26565afe 100644 --- a/ports/libmediainfo/vcpkg.json +++ b/ports/libmediainfo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmediainfo", "version-string": "21.03", - "port-version": 1, + "port-version": 2, "description": "Get most relevant technical and tag data from video and audio files", "homepage": "https://github.com/MediaArea/MediaInfoLib", "dependencies": [ diff --git a/ports/libmicrohttpd/fix-msvc-project.patch b/ports/libmicrohttpd/fix-msvc-project.patch deleted file mode 100644 index 29071a2bee069c..00000000000000 --- a/ports/libmicrohttpd/fix-msvc-project.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/w32/common/libmicrohttpd-files.vcxproj b/w32/common/libmicrohttpd-files.vcxproj -index 6f1e03b..c0ddea8 100644 ---- a/w32/common/libmicrohttpd-files.vcxproj -+++ b/w32/common/libmicrohttpd-files.vcxproj -@@ -3,6 +3,7 @@ - - - -+ - - - diff --git a/ports/libmicrohttpd/portfile.cmake b/ports/libmicrohttpd/portfile.cmake index 74cde2f8f83cf1..4fcca42aa69e97 100644 --- a/ports/libmicrohttpd/portfile.cmake +++ b/ports/libmicrohttpd/portfile.cmake @@ -1,19 +1,16 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm") - -set(MICROHTTPD_VERSION 0.9.63) +set(MICROHTTPD_VERSION 0.9.75) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" FILENAME "libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" - SHA512 cb99e7af84fb6d7c0fd3894a9dc0fbff14959b35347506bd3211a65bbfad36455007b9e67493e97c9d8394834408df10eeabdc7758573e6aae0ba6f5f87afe17 + SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c ) vcpkg_extract_source_archive_ex( ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH - PATCHES fix-msvc-project.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/libmicrohttpd/vcpkg.json b/ports/libmicrohttpd/vcpkg.json index 368fd2a658d715..1418a7ff40e16e 100644 --- a/ports/libmicrohttpd/vcpkg.json +++ b/ports/libmicrohttpd/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmicrohttpd", - "version": "0.9.63", - "port-version": 7, + "version": "0.9.75", "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/", "supports": "!(arm | uwp)", diff --git a/ports/libmodbus/portfile.cmake b/ports/libmodbus/portfile.cmake index a607f5a9ed6b8d..24b6bdfa13de3c 100644 --- a/ports/libmodbus/portfile.cmake +++ b/ports/libmodbus/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephane/libmodbus @@ -29,4 +27,4 @@ endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) \ No newline at end of file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/libmodbus/vcpkg.json b/ports/libmodbus/vcpkg.json index cea78893150e31..08d6a1cda532db 100644 --- a/ports/libmodbus/vcpkg.json +++ b/ports/libmodbus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmodbus", - "version-string": "3.1.6", - "port-version": 1, + "version": "3.1.6", + "port-version": 2, "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", "supports": "!uwp" diff --git a/ports/libmodman/portfile.cmake b/ports/libmodman/portfile.cmake index 35bedf90796dbc..816160f3098d9f 100644 --- a/ports/libmodman/portfile.cmake +++ b/ports/libmodman/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - # Enable static build in UNIX if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) @@ -25,19 +23,20 @@ vcpkg_extract_source_archive_ex( fix-undefined-typeid.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/libmodman) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/libmodman) vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - ${CMAKE_CURRENT_LIST_DIR}/usage - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmodman/vcpkg.json b/ports/libmodman/vcpkg.json index a69e70e3b2059e..4b00d58511020e 100644 --- a/ports/libmodman/vcpkg.json +++ b/ports/libmodman/vcpkg.json @@ -1,9 +1,20 @@ { "name": "libmodman", "version-string": "2.0.1", - "port-version": 3, + "port-version": 4, "description": "a simple library for managing modules", "homepage": "https://code.google.com/p/libmodman", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tests": { "description": "Build libmodman tests", diff --git a/ports/libmpeg2/portfile.cmake b/ports/libmpeg2/portfile.cmake index 3813e0d6e46bca..181ff2d5e27f41 100644 --- a/ports/libmpeg2/portfile.cmake +++ b/ports/libmpeg2/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Windows Desktop platform." ON_TARGET "Linux" "OSX" "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # There is archived version of releases available at https://github.com/janisozaur/libmpeg2 diff --git a/ports/libmpeg2/vcpkg.json b/ports/libmpeg2/vcpkg.json index 4936a91dbc792f..7942b34272d86c 100644 --- a/ports/libmpeg2/vcpkg.json +++ b/ports/libmpeg2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmpeg2", - "version-string": "0.5.1", - "port-version": 1, + "version": "0.5.1", + "port-version": 2, "description": "a free MPEG-2 video stream decoder", "homepage": "http://libmpeg2.sourceforge.net/", "supports": "!(linux | osx | uwp)", diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index 88e7b7e375b26d..3ef0146ba631d5 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "osx") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/libmupdf/vcpkg.json b/ports/libmupdf/vcpkg.json index af307e1df2a62b..d6c2cd491311c4 100644 --- a/ports/libmupdf/vcpkg.json +++ b/ports/libmupdf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libmupdf", - "version-string": "1.19.0-rc2", + "version": "1.19.0-rc2", + "port-version": 1, "description": "a lightweight PDF, XPS, and E-book library", "homepage": "https://github.com/ArtifexSoftware/mupdf", "supports": "!osx", diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 061ed864137f32..525a995ee80232 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86") - if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") message(FATAL_ERROR "FATAL ERROR: ${PORT} and libmariadb are incompatible.") endif() @@ -101,14 +99,14 @@ endif() vcpkg_copy_tools(TOOL_NAMES ${MYSQL_TOOLS} AUTO_CLEAN) -file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/libmysql") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/libmysql") +file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${PORT}") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share") -file(RENAME "${CURRENT_PACKAGES_DIR}/libmysql" "${CURRENT_PACKAGES_DIR}/share/libmysql") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libmysql" "${CURRENT_PACKAGES_DIR}/debug/share/libmysql") +file(RENAME "${CURRENT_PACKAGES_DIR}/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/${PORT}" "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}") -vcpkg_cmake_config_fixup(CONFIG_PATH share/libmysql/unofficial-libmysql) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql CONFIG_PATH share/${PORT}/unofficial-libmysql) # switch mysql into /mysql file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index dbb1dda31bae8a..91fc043d171c1d 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmysql", "version": "8.0.20", - "port-version": 4, + "port-version": 5, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "supports": "!(windows & x86) & !uwp", diff --git a/ports/libnice/CMakeLists.txt b/ports/libnice/CMakeLists.txt deleted file mode 100644 index 0ca7cdafaa5d13..00000000000000 --- a/ports/libnice/CMakeLists.txt +++ /dev/null @@ -1,159 +0,0 @@ -cmake_minimum_required(VERSION 3.19) -project(libnice - LANGUAGES C - VERSION 0.1.15) -SET (this_target libnice) - -if (WIN32) - add_definitions( - -D_CRT_SECURE_NO_WARNINGS - -D_SCL_SECURE_NO_WARNINGS - -DHAVE_OPENSSL - -DPACKAGE_STRING="${PROJECT_VERSION}") -else() - add_definitions( - -DHAVE_OPENSSL - -DPACKAGE_STRING="${PROJECT_VERSION}" - -DHAVE_NETDB_H=1) -endif() - -configure_file(${CMAKE_SOURCE_DIR}/win32/vs9/config.h ${CMAKE_SOURCE_DIR}/config.h COPYONLY) -configure_file(${CMAKE_SOURCE_DIR}/win32/vs9/libnice.def ${CMAKE_SOURCE_DIR}/libnice.def COPYONLY) - -find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) -find_library(IPHLPAPI_LIBRARY iphlpapi) -find_library(WS2_32_LIB ws2_32) -find_library(ADVAPI32_LIB advapi32) -find_package(OpenSSL REQUIRED) -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/agent - ${CMAKE_CURRENT_SOURCE_DIR}/random - ${CMAKE_CURRENT_SOURCE_DIR}/socket - ${CMAKE_CURRENT_SOURCE_DIR}/stun - ${GLIB2_INCLUDE_DIRS}) - - -SET (SRCS - ./agent/address.c - ./agent/agent-enum-types.c - ./agent/agent.c - ./agent/candidate.c - ./agent/component.c - ./agent/conncheck.c - ./agent/debug.c - ./agent/discovery.c - ./agent/inputstream.c - ./agent/interfaces.c - ./agent/iostream.c - ./agent/outputstream.c - ./agent/pseudotcp.c - ./agent/stream.c - ./random/random-glib.c - ./random/random.c - ./random/test.c - ./socket/http.c - ./socket/pseudossl.c - ./socket/socket.c - ./socket/socks5.c - ./socket/tcp-active.c - ./socket/tcp-bsd.c - ./socket/tcp-passive.c - ./socket/udp-bsd.c - ./socket/udp-turn-over-tcp.c - ./socket/udp-turn.c - ./stun/debug.c - ./stun/rand.c - ./stun/stun5389.c - ./stun/stunagent.c - ./stun/stuncrc32.c - ./stun/stunhmac.c - ./stun/stunmessage.c - ./stun/usages/bind.c - ./stun/usages/ice.c - ./stun/usages/timer.c - ./stun/usages/turn.c - ./stun/utils.c - ./libnice.def - ) -SET(HEADERS - ./agent/address.h - ./agent/agent-enum-types.h - ./agent/agent-priv.h - ./agent/agent.h - ./agent/candidate.h - ./agent/component.h - ./agent/conncheck.h - ./agent/debug.h - ./agent/discovery.h - ./agent/inputstream.h - ./agent/interfaces.h - ./agent/iostream.h - ./agent/outputstream.h - ./agent/pseudotcp.h - ./agent/stream.h - ./config.h - ./nice/nice.h - ./random/random-glib.h - ./random/random.h - ./socket/http.h - ./socket/pseudossl.h - ./socket/socket-priv.h - ./socket/socket.h - ./socket/socks5.h - ./socket/tcp-active.h - ./socket/tcp-bsd.h - ./socket/tcp-passive.h - ./socket/udp-bsd.h - ./socket/udp-turn-over-tcp.h - ./socket/udp-turn.h - ./stun/constants.h - ./stun/debug.h - ./stun/rand.h - ./stun/stun5389.h - ./stun/stunagent.h - ./stun/stuncrc32.h - ./stun/stunhmac.h - ./stun/stunmessage.h - ./stun/tools/stund.h - ./stun/usages/bind.h - ./stun/usages/ice.h - ./stun/usages/timer.h - ./stun/usages/turn.h - ./stun/utils.h - ./stun/win32_common.h - ./win32/vs9/config.h - ) -add_library(libnice ${SRCS} ${HEADERS}) -if (MSVC) - set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4244 /wd4005 /wd4391 /wd4142 /wd4267") -endif() -if (WIN32) - target_link_libraries(libnice ${IPHLPAPI_LIBRARY} ${WS2_32_LIB} ${ADVAPI32_LIB} PkgConfig::GLIB2 OpenSSL::SSL) -else() - target_link_libraries(libnice PkgConfig::GLIB2 OpenSSL::SSL) -endif() -install(TARGETS libnice -RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -if (CMAKE_BUILD_TYPE STREQUAL "Release") -install(FILES agent/address.h DESTINATION include/nice) -install(FILES agent/agent.h DESTINATION include/nice) -install(FILES agent/candidate.h DESTINATION include/nice) -install(FILES agent/debug.h DESTINATION include/nice) -install(FILES agent/interfaces.h DESTINATION include/nice) -install(FILES nice/nice.h DESTINATION include/nice) -install(FILES agent/pseudotcp.h DESTINATION include/nice) -install(FILES stun/constants.h DESTINATION include/stun) -install(FILES stun/debug.h DESTINATION include/stun) -install(FILES stun/stunagent.h DESTINATION include/stun) -install(FILES stun/stunmessage.h DESTINATION include/stun) -install(FILES stun/usages/bind.h DESTINATION include/stun/usages) -install(FILES stun/usages/ice.h DESTINATION include/stun/usages) -install(FILES stun/usages/timer.h DESTINATION include/stun/usages) -install(FILES stun/usages/turn.h DESTINATION include/stun/usages) -install(FILES stun/win32_common.h DESTINATION include/stun) -endif() diff --git a/ports/libnice/portfile.cmake b/ports/libnice/portfile.cmake index 038b21ebbc079c..1f859664780d39 100644 --- a/ports/libnice/portfile.cmake +++ b/ports/libnice/portfile.cmake @@ -1,30 +1,40 @@ -vcpkg_download_distfile( - ARCHIVE - URLS "https://nice.freedesktop.org/releases/libnice-0.1.15.tar.gz" - FILENAME "libnice-0.1.15.tar.gz" - SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c -) -vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH - ) + REPO libnice/libnice + REF 55b71d47f2b427b3baa8812818ed3f059acc748d # 0.1.18 + SHA512 78575c487d74734d2dff1c04103fd55c76cf5e78edde03ffd68050348881a3efc985513cfd30553bfce0568c8edfcd61be7dea8991731efc749ee4fee2f503d6 + HEAD_REF master +) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( +vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} - OPTIONS_RELEASE -DOPTIMIZE=1 - OPTIONS_DEBUG -DDEBUGGABLE=1 + -Dgtk_doc=disabled #Enable generating the API reference (depends on GTK-Doc) + -Dintrospection=disabled #Enable GObject Introspection (depends on GObject)' + -Dtests=disabled + -Dexamples=disabled + -Dgstreamer=disabled + -Dcrypto-library=openssl + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ) -vcpkg_install_cmake() +# Could be features: +# option('gupnp', type: 'feature', value: 'auto', + # description: 'Enable or disable GUPnP IGD support') +# option('ignored-network-interface-prefix', type: 'array', value: ['docker', 'veth', 'virbr', 'vnet'], + # description: 'Ignore network interfaces whose name starts with a string from this list in the ICE connection check algorithm. For example, "virbr" to ignore virtual bridge interfaces added by virtd, which do not help in finding connectivity.') +# option('crypto-library', type: 'combo', choices : ['auto', 'gnutls', 'openssl'], value : 'auto') + +vcpkg_install_meson() vcpkg_copy_pdbs() +vcpkg_copy_tools(TOOL_NAMES stunbdc stund AUTO_CLEAN) +vcpkg_fixup_pkgconfig() -file(COPY ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(COPY ${SOURCE_PATH}/COPYING.MPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libnice/vcpkg.json b/ports/libnice/vcpkg.json index 16802d092bf276..59acb444cd527b 100644 --- a/ports/libnice/vcpkg.json +++ b/ports/libnice/vcpkg.json @@ -1,11 +1,16 @@ { "name": "libnice", - "version": "0.1.15", - "port-version": 7, + "version": "0.1.18", "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).", "homepage": "https://nice.freedesktop.org", + "license": "LGPL-2.1-only", "dependencies": [ "glib", + { + "name": "glib", + "host": true, + "default-features": false + }, "openssl" ] } diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake index c46102a6563db4..e289d493bcee05 100644 --- a/ports/libosip2/portfile.cmake +++ b/ports/libosip2/portfile.cmake @@ -18,8 +18,6 @@ vcpkg_extract_source_archive_ex( ) if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_ARCH "arm" "arm64") - # Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)" foreach(VCXPROJ IN ITEMS "${SOURCE_PATH}/platform/vsnet/osip2.vcxproj" diff --git a/ports/libosip2/vcpkg.json b/ports/libosip2/vcpkg.json index 8b3d9ecc804f7e..a524d3460a6be6 100644 --- a/ports/libosip2/vcpkg.json +++ b/ports/libosip2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libosip2", "version": "5.2.0", - "port-version": 1, + "port-version": 2, "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)", diff --git a/ports/libosmium/vcpkg.json b/ports/libosmium/vcpkg.json index 904c1e22a35bb5..ffd7c586163780 100644 --- a/ports/libosmium/vcpkg.json +++ b/ports/libosmium/vcpkg.json @@ -1,13 +1,15 @@ { "name": "libosmium", "version-semver": "2.17.1", + "port-version": 1, "description": "A fast and flexible C++ library for working with OpenStreetMap data", "homepage": "https://osmcode.org/libosmium/", + "license": "BSL-1.0", "dependencies": [ "boost", "bzip2", "expat", - "proj4", + "proj", "protozero", "utfcpp", { diff --git a/ports/libp7client/portfile.cmake b/ports/libp7client/portfile.cmake index 66a87883463593..95809babf0292c 100644 --- a/ports/libp7client/portfile.cmake +++ b/ports/libp7client/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx") - vcpkg_download_distfile(ARCHIVE URLS http://baical.net/files/libP7Client_v5.6.zip FILENAME libP7Client_v5.6.zip diff --git a/ports/libp7client/vcpkg.json b/ports/libp7client/vcpkg.json index dda660ebc884e2..d5a77d32f43aad 100644 --- a/ports/libp7client/vcpkg.json +++ b/ports/libp7client/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libp7client", "version-string": "5.6", - "port-version": 1, + "port-version": 2, "description": "Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application.", "homepage": "https://baical.net/", "supports": "!(arm | uwp | osx)" diff --git a/ports/libpcap/portfile.cmake b/ports/libpcap/portfile.cmake index 9fef5379d03eeb..4d1823bcb5f091 100644 --- a/ports/libpcap/portfile.cmake +++ b/ports/libpcap/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "OSX") - if(EXISTS "${CURRENT_INSTALLED_DIR}/share/winpcap") message(FATAL_ERROR "FATAL ERROR: winpcap and libpcap are incompatible.") endif() @@ -13,8 +11,6 @@ These can be installed on Ubuntu systems via sudo apt install flex libbison-dev" ) endif() -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO the-tcpdump-group/libpcap @@ -72,13 +68,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") endif() # Even if compiled with BUILD_SHARED_LIBS=ON, pcap also install a pcap_static library -if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pcap_static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/pcap_static.lib") endif() vcpkg_fixup_pkgconfig() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +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" "${CURRENT_PACKAGES_DIR}/share/man") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/man") diff --git a/ports/libpcap/vcpkg.json b/ports/libpcap/vcpkg.json index 56e2a86ae08d21..166a8ce90fd168 100644 --- a/ports/libpcap/vcpkg.json +++ b/ports/libpcap/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libpcap", "version-semver": "1.10.1", + "port-version": 1, "description": "A portable C/C++ library for network traffic capture", "homepage": "https://www.tcpdump.org/", - "supports": "!(uwp | osx)", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libpmemobj-cpp/portfile.cmake b/ports/libpmemobj-cpp/portfile.cmake index ba437d506f2fee..35cfe1eb179ab7 100644 --- a/ports/libpmemobj-cpp/portfile.cmake +++ b/ports/libpmemobj-cpp/portfile.cmake @@ -30,6 +30,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/libpmemobj++/cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib/libpmemobj++") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libpmemobj-cpp/vcpkg.json b/ports/libpmemobj-cpp/vcpkg.json index ba0000533ba7bd..9b0f936694092d 100644 --- a/ports/libpmemobj-cpp/vcpkg.json +++ b/ports/libpmemobj-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libpmemobj-cpp", "version-semver": "1.13.0", + "port-version": 1, "description": "C++ bindings for libpmemobj (https://github.com/pmem/pmdk)", "homepage": "https://github.com/pmem/libpmemobj-cpp", "dependencies": [ diff --git a/ports/libpq/patches/windows/Solution_DEBUG.patch b/ports/libpq/patches/windows/Solution_DEBUG.patch index e641f468a10924..7b8914e3ac052e 100644 --- a/ports/libpq/patches/windows/Solution_DEBUG.patch +++ b/ports/libpq/patches/windows/Solution_DEBUG.patch @@ -2,90 +2,35 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 51711c2bf..d33fdc3b0 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm -@@ -650,7 +650,7 @@ sub AddProject +@@ -658,7 +658,7 @@ sub AddProject if ($self->{options}->{zlib}) { $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); - $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib'); -+ $proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib'); } if ($self->{options}->{openssl}) { -@@ -661,7 +661,7 @@ sub AddProject - # changed their library names from: - # - libeay to libcrypto - # - ssleay to libssl -- if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') -+ if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated - { - my $dbgsuffix; - my $libsslpath; -@@ -670,27 +670,27 @@ sub AddProject - # The format name of the libraries is slightly - # different between the Win32 and Win64 platform, so - # adapt. -- if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") -+ if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated - { - # Win32 here, with a debugging library set. - $dbgsuffix = 1; -- $libsslpath = '\lib\VC\libssl32.lib'; -- $libcryptopath = '\lib\VC\libcrypto32.lib'; -+ $libsslpath = '\lib\VC\libssl32.lib'; # This must be updated -+ $libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated - } -- elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") -+ elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated - { - # Win64 here, with a debugging library set. - $dbgsuffix = 1; -- $libsslpath = '\lib\VC\libssl64.lib'; -- $libcryptopath = '\lib\VC\libcrypto64.lib'; -+ $libsslpath = '\lib\VC\libssl64.lib'; # This must be updated -+ $libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated - } - else - { +@@ -698,8 +698,8 @@ sub AddProject # On both Win32 and Win64 the same library # names are used without a debugging context. $dbgsuffix = 0; - $libsslpath = '\lib\libssl.lib'; - $libcryptopath = '\lib\libcrypto.lib'; -+ $libsslpath = '\debug\lib\libssl.lib'; # This must be updated -+ $libcryptopath = '\debug\lib\libcrypto.lib'; # This must be updated ++ $libsslpath = '\debug\lib\libssl.lib'; ++ $libcryptopath = '\debug\lib\libcrypto.lib'; } $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, -@@ -698,16 +698,16 @@ sub AddProject - $proj->AddLibrary($self->{options}->{openssl} . $libcryptopath, - $dbgsuffix); - } -- else -+ else - { - # Choose which set of libraries to use depending on if - # debugging libraries are in place in the installer. -- if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") -+ if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated - { - $proj->AddLibrary( -- $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); -+ $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated - $proj->AddLibrary( -- $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); -+ $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated - } - else - { -@@ -715,60 +715,60 @@ sub AddProject +@@ -715,16 +715,16 @@ sub AddProject # to be here, so don't ask for it in last # parameter. $proj->AddLibrary( - $self->{options}->{openssl} . '\lib\ssleay32.lib', 0); -+ $self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0); # This must be updated ++ $self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0); $proj->AddLibrary( - $self->{options}->{openssl} . '\lib\libeay32.lib', 0); -+ $self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0); # This must be updated ++ $self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0); } } } @@ -93,24 +38,16 @@ index 51711c2bf..d33fdc3b0 100644 { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); - $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); } if ($self->{options}->{gss}) { -- $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5'); -- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); -- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib'); -- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib'); -+ $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5'); # This must be updated -+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated -+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated -+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated - } +@@ -752,39 +752,39 @@ sub AddProject if ($self->{options}->{iconv}) { $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); - $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); } if ($self->{options}->{icu}) { @@ -120,18 +57,18 @@ index 51711c2bf..d33fdc3b0 100644 - $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); } else { - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); } } if ($self->{options}->{xml}) @@ -139,19 +76,19 @@ index 51711c2bf..d33fdc3b0 100644 $proj->AddIncludeDir($self->{options}->{xml} . '\include'); $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); - $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); -+ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); } if ($self->{options}->{xslt}) { $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); - $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); -+ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); } if ($self->{options}->{uuid}) { $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); - $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); -+ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); } return $proj; } diff --git a/ports/libpq/patches/windows/Solution_RELEASE.patch b/ports/libpq/patches/windows/Solution_RELEASE.patch index cc41b8d0b7d569..b690c18710c23c 100644 --- a/ports/libpq/patches/windows/Solution_RELEASE.patch +++ b/ports/libpq/patches/windows/Solution_RELEASE.patch @@ -2,156 +2,34 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 51711c2bf..d33fdc3b0 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm -@@ -650,7 +650,7 @@ sub AddProject +@@ -658,7 +658,7 @@ sub AddProject if ($self->{options}->{zlib}) { $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); - $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib'); -+ $proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib'); } if ($self->{options}->{openssl}) { -@@ -661,7 +661,7 @@ sub AddProject - # changed their library names from: - # - libeay to libcrypto - # - ssleay to libssl -- if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') -+ if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated - { - my $dbgsuffix; - my $libsslpath; -@@ -670,27 +670,27 @@ sub AddProject - # The format name of the libraries is slightly - # different between the Win32 and Win64 platform, so - # adapt. -- if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") -+ if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated - { - # Win32 here, with a debugging library set. - $dbgsuffix = 1; -- $libsslpath = '\lib\VC\libssl32.lib'; -- $libcryptopath = '\lib\VC\libcrypto32.lib'; -+ $libsslpath = '\lib\VC\libssl32.lib'; # This must be updated -+ $libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated - } -- elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") -+ elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated - { - # Win64 here, with a debugging library set. - $dbgsuffix = 1; -- $libsslpath = '\lib\VC\libssl64.lib'; -- $libcryptopath = '\lib\VC\libcrypto64.lib'; -+ $libsslpath = '\lib\VC\libssl64.lib'; # This must be updated -+ $libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated - } - else - { - # On both Win32 and Win64 the same library - # names are used without a debugging context. - $dbgsuffix = 0; -- $libsslpath = '\lib\libssl.lib'; -- $libcryptopath = '\lib\libcrypto.lib'; -+ $libsslpath = '\lib\libssl.lib'; # This must be updated -+ $libcryptopath = '\lib\libcrypto.lib'; # This must be updated - } - - $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, -@@ -698,16 +698,16 @@ sub AddProject - $proj->AddLibrary($self->{options}->{openssl} . $libcryptopath, - $dbgsuffix); - } -- else -+ else - { - # Choose which set of libraries to use depending on if - # debugging libraries are in place in the installer. -- if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") -+ if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated - { - $proj->AddLibrary( -- $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); -+ $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated - $proj->AddLibrary( -- $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); -+ $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated - } - else - { -@@ -715,60 +715,60 @@ sub AddProject - # to be here, so don't ask for it in last - # parameter. - $proj->AddLibrary( -- $self->{options}->{openssl} . '\lib\ssleay32.lib', 0); -+ $self->{options}->{openssl} . '\lib\ssleay32.lib', 0); # This must be updated - $proj->AddLibrary( -- $self->{options}->{openssl} . '\lib\libeay32.lib', 0); -+ $self->{options}->{openssl} . '\lib\libeay32.lib', 0); # This must be updated - } - } - } +@@ -724,7 +724,7 @@ sub AddProject if ($self->{options}->{nls}) { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); - $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); } if ($self->{options}->{gss}) { -- $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5'); -- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); -- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib'); -- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib'); -+ $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5'); # This must be updated -+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated -+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated -+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated - } - if ($self->{options}->{iconv}) - { - $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); -- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # This must be updated - } - if ($self->{options}->{icu}) - { - $proj->AddIncludeDir($self->{options}->{icu} . '\include'); - if ($self->{platform} eq 'Win32') - { -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated +@@ -765,9 +765,9 @@ sub AddProject } else { - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); } } if ($self->{options}->{xml}) - { - $proj->AddIncludeDir($self->{options}->{xml} . '\include'); - $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); -- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); -+ $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # This must be updated - } - if ($self->{options}->{xslt}) - { - $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); -- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); -+ $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # This must be updated - } - if ($self->{options}->{uuid}) - { - $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); -- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); -+ $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # This must be updated - } - return $proj; - } diff --git a/ports/libpq/patches/windows/install.patch b/ports/libpq/patches/windows/install.patch index 42713389bb6da8..ecc14ac7bf2b6e 100644 --- a/ports/libpq/patches/windows/install.patch +++ b/ports/libpq/patches/windows/install.patch @@ -2,35 +2,7 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index d109b2c90..75c7446e6 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm -@@ -63,8 +63,16 @@ sub Install - do "./config.pl" if (-f "config.pl"); - } - -- chdir("../../..") if (-f "../../../configure"); -- chdir("../../../..") if (-f "../../../../configure"); -+ # Move to the root path depending on the current location. -+ if (-f "../../../configure") -+ { -+ chdir("../../.."); -+ } -+ elsif (-f "../../../../configure") -+ { -+ chdir("../../../.."); -+ } -+ - my $conf = ""; - if (-d "debug") - { -@@ -106,7 +106,7 @@ sub Install - } - }, - @top_dir); -- CopySetOfFiles('config files', $sample_files, $target . '/share/'); -+ CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/'); - CopyFiles( - 'Import libraries', - $target . '/lib/', -@@ -78,10 +78,10 @@ sub Install +@@ -86,10 +86,10 @@ sub Install my $majorver = DetermineMajorVersion(); print "Installing version $majorver for $conf in $target\n"; @@ -44,7 +16,16 @@ index d109b2c90..75c7446e6 100644 if ($insttype eq "client") { EnsureDirectories($target, @client_dirs); -@@ -120,35 +120,35 @@ sub Install +@@ -114,7 +114,7 @@ sub Install + } + }, + @top_dir); +- CopySetOfFiles('config files', $sample_files, $target . '/share/'); ++ CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/'); + CopyFiles( + 'Import libraries', + $target . '/lib/', +@@ -128,35 +128,35 @@ sub Install CopySetOfFiles( 'timezone names', [ glob('src\timezone\tznames\*.txt') ], @@ -88,7 +69,7 @@ index d109b2c90..75c7446e6 100644 my $pl_extension_files = []; my @pldirs = ('src/pl/plpgsql/src'); -@@ -167,7 +167,7 @@ sub Install +@@ -175,7 +175,7 @@ sub Install }, @pldirs); CopySetOfFiles('PL Extension files', @@ -97,7 +78,7 @@ index d109b2c90..75c7446e6 100644 } GenerateNLSFiles($target, $config->{nls}, $majorver) if ($config->{nls}); -@@ -282,23 +282,26 @@ sub CopySolutionOutput +@@ -290,23 +290,26 @@ sub CopySolutionOutput { if ($1 == 1) { @@ -128,7 +109,7 @@ index d109b2c90..75c7446e6 100644 } } elsif ($vcproj eq 'vcxproj' -@@ -306,11 +309,11 @@ sub CopySolutionOutput +@@ -317,11 +317,11 @@ sub CopySolutionOutput { if ($1 eq 'Application') { @@ -142,7 +123,7 @@ index d109b2c90..75c7446e6 100644 if ($is_sharedlib) { push(@{ $install_list{'bin'} }, "dll"); -@@ -319,10 +322,9 @@ sub CopySolutionOutput +@@ -327,10 +330,9 @@ sub CopySolutionOutput } else # 'StaticLibrary' { @@ -154,7 +135,7 @@ index d109b2c90..75c7446e6 100644 } } else -@@ -339,7 +339,7 @@ sub CopySolutionOutput +@@ -349,7 +349,7 @@ sub CopySolutionOutput || croak "Could not copy $pf.$ext\n"; } } @@ -167,11 +148,11 @@ index d109b2c90..75c7446e6 100644 print "Generating timezone files..."; my @args = -- ("$conf/zic/zic", '-d', "$target/share/timezone", '-p', "$posixrules"); -+ ("$conf/zic/zic", '-d', "$target/share/libpq/timezone", '-p', "$posixrules"); +- ("$conf/zic/zic", '-d', "$target/share/timezone", ++ ("$conf/zic/zic", '-d', "$target/share/libpq/timezone", + '-p', "$posixrules", '-b', 'fat'); foreach (@tzfiles) { - my $tzfile = $_; @@ -391,7 +391,7 @@ sub GenerateTsearchFiles $mf =~ /^LANGUAGES\s*=\s*(.*)$/m || die "Could not find LANGUAGES line in snowball Makefile\n"; diff --git a/ports/libpq/patches/windows/python3_build_DEBUG.patch b/ports/libpq/patches/windows/python3_build_DEBUG.patch index fb267e9df12b81..0a261038638931 100644 --- a/ports/libpq/patches/windows/python3_build_DEBUG.patch +++ b/ports/libpq/patches/windows/python3_build_DEBUG.patch @@ -9,7 +9,7 @@ index 99f39caa5..21b5559d6 100644 - my $pythonprog = "import sys;print(sys.prefix);" - . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; - my $prefixcmd = -- $solution->{options}->{python} . "\\python -c \"$pythonprog\""; +- qq("$solution->{options}->{python}\\python" -c "$pythonprog"); - my $pyout = `$prefixcmd`; - die "Could not query for python version!\n" if $?; - my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); @@ -17,7 +17,7 @@ index 99f39caa5..21b5559d6 100644 + #my $pythonprog = "import sys;print(sys.prefix);" + # . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; + #my $prefixcmd = -+ # $solution->{options}->{python} . "\\python -c \"$pythonprog\""; ++ # qq("$solution->{options}->{python}\\python" -c "$pythonprog"); + #my $pyout = `$prefixcmd`; + #die "Could not query for python version!\n" if $?; + #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); diff --git a/ports/libpq/patches/windows/python3_build_RELEASE.patch b/ports/libpq/patches/windows/python3_build_RELEASE.patch index b89e435e4fb38b..5631d55e09d48a 100644 --- a/ports/libpq/patches/windows/python3_build_RELEASE.patch +++ b/ports/libpq/patches/windows/python3_build_RELEASE.patch @@ -9,7 +9,7 @@ index 99f39caa5..21b5559d6 100644 - my $pythonprog = "import sys;print(sys.prefix);" - . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; - my $prefixcmd = -- $solution->{options}->{python} . "\\python -c \"$pythonprog\""; +- qq("$solution->{options}->{python}\\python" -c "$pythonprog"); - my $pyout = `$prefixcmd`; - die "Could not query for python version!\n" if $?; - my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); @@ -17,7 +17,7 @@ index 99f39caa5..21b5559d6 100644 + #my $pythonprog = "import sys;print(sys.prefix);" + # . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; + #my $prefixcmd = -+ # $solution->{options}->{python} . "\\python -c \"$pythonprog\""; ++ # qq("$solution->{options}->{python}\\python" -c "$pythonprog"); + #my $pyout = `$prefixcmd`; + #die "Could not query for python version!\n" if $?; + #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); diff --git a/ports/libpq/patches/windows/win_bison_flex.patch b/ports/libpq/patches/windows/win_bison_flex.patch index 95df3f49507efc..fecf0bd365ebe8 100644 --- a/ports/libpq/patches/windows/win_bison_flex.patch +++ b/ports/libpq/patches/windows/win_bison_flex.patch @@ -11,7 +11,7 @@ index aceed5ffd..f6ed215e8 100644 $flexver = (split(/\s+/, $flexver))[1]; $flexver =~ s/[^0-9.]//g; my @verparts = split(/\./, $flexver); -@@ -48,7 +47,7 @@ close($mf); +@@ -48,7 +48,7 @@ close($mf); my $basetarg = basename($output); my $flexflags = ($make =~ /^$basetarg:\s*FLEXFLAGS\s*=\s*(\S.*)/m ? $1 : ''); @@ -34,10 +34,10 @@ index 895e398c0..f5b524a5d 100644 unless ($bisonver eq '1.875' || $bisonver ge '2.2') @@ -45,5 +45,5 @@ close($mf); - my $basetarg = basename($output); - my $headerflag = ($make =~ /^$basetarg:\s+BISONFLAGS\b.*-d/m ? '-d' : ''); - --system("bison $headerflag $input -o $output"); -+system("win_bison $headerflag $input -o $output"); + + my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : ""; + +-system("bison $nodep $headerflag $input -o $output"); ++system("win_bison $nodep $headerflag $input -o $output"); exit $? >> 8; diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 811ed613e09ba4..8d44094eebcb90 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -1,4 +1,4 @@ -set(PORT_VERSION 12.2) +set(PORT_VERSION 12.9) # NOTE: the python patches must be regenerated on version update macro(feature_unsupported) @@ -32,7 +32,7 @@ endif() vcpkg_download_distfile(ARCHIVE URLS "https://ftp.postgresql.org/pub/source/v${PORT_VERSION}/postgresql-${PORT_VERSION}.tar.bz2" FILENAME "postgresql-${PORT_VERSION}.tar.bz2" - SHA512 0e0ce8e21856e8f43e58b840c10c4e3ffae6d5207e0d778e9176e36f8e20e34633cbb06f0030a7c963c3491bb7e941456d91b55444c561cfc6f283fba76f33ee + SHA512 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f ) set(PATCHES @@ -281,6 +281,9 @@ else() if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26) list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no) endif() + if(VCPKG_OSX_SYSROOT) + list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_OSX_SYSROOT}") + endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} COPY_SOURCE @@ -332,4 +335,4 @@ endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/postgresql/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() \ No newline at end of file +vcpkg_fixup_pkgconfig() diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 0b5ff40a5c1c27..dc7adc983ce160 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", - "version": "12.2", - "port-version": 20, + "version": "12.9", + "port-version": 1, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "supports": "!uwp", diff --git a/ports/libpqxx/fix_build_with_apple_clang_13.patch b/ports/libpqxx/fix_build_with_apple_clang_13.patch new file mode 100644 index 00000000000000..9b9a26e9459b2b --- /dev/null +++ b/ports/libpqxx/fix_build_with_apple_clang_13.patch @@ -0,0 +1,15 @@ +# apple clang 13 has a bug where [[likely]] or [[unlikely]] returns +# don't count for checking that a constexpr function has a return, +# so at least one return must be unmarked +--- a/src/robusttransaction.cxx ++++ b/src/robusttransaction.cxx +@@ -62,9 +62,8 @@ constexpr tx_stat parse_status(std::string_view text) noexcept + case 'i': + if (text == in_progress) + PQXX_LIKELY return tx_in_progress; + break; + } +- PQXX_UNLIKELY + return tx_unknown; + } + diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index 53d7eea4d43f60..86d1813fdf01a1 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_build_with_vs2017.patch + fix_build_with_apple_clang_13.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in" DESTINATION "${SOURCE_PATH}") diff --git a/ports/libpqxx/vcpkg.json b/ports/libpqxx/vcpkg.json index 880ccb1974f81a..a0fe57f9b23e50 100644 --- a/ports/libpqxx/vcpkg.json +++ b/ports/libpqxx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpqxx", "version-semver": "7.6.0", - "port-version": 2, + "port-version": 3, "description": "The official C++ client API for PostgreSQL", "homepage": "https://www.postgresql.org/", "dependencies": [ diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake index 26842e7979d66d..594e4d09fd6bb3 100644 --- a/ports/libproxy/portfile.cmake +++ b/ports/libproxy/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - # Enable static build in UNIX if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index fb855d40c08877..f993e04dcb1712 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libproxy", "version": "0.4.17", - "port-version": 1, + "port-version": 2, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", + "supports": "!uwp", "dependencies": [ "libmodman", { diff --git a/ports/libqcow/portfile.cmake b/ports/libqcow/portfile.cmake index 043c72f407bfca..f43d288909c6db 100644 --- a/ports/libqcow/portfile.cmake +++ b/ports/libqcow/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) set(LIB_VERSION 20210419) diff --git a/ports/libqcow/vcpkg.json b/ports/libqcow/vcpkg.json index 5f8992d0be2f64..2436924ceacb71 100644 --- a/ports/libqcow/vcpkg.json +++ b/ports/libqcow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libqcow", "version-string": "20210419", - "port-version": 1, + "port-version": 2, "description": "Library and tools to access the QEMU Copy-On-Write (QCOW) image format.", "homepage": "https://github.com/libyal/libqcow", "supports": "!uwp", diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake index 7957cfbfd7b0f5..ac8e6f5cba5cec 100644 --- a/ports/librabbitmq/portfile.cmake +++ b/ports/librabbitmq/portfile.cmake @@ -1,30 +1,32 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alanxz/rabbitmq-c - REF d416b8b16d196085106cfe137a0ff6919a9f6752 - SHA512 3fc137893fc18509a3e583cc8d40a8e91f219063237b9fd018a65cf14da188914ddba3a031c4bc033a886fed19fc6291d1b28b55458b9163eb6d20425b0474dc + REF v0.11.0 + SHA512 0c3dbb6e2b862e9f25e3f76df798ea272bbd81de2865950b95adf1f1e5791eb20d7c9d5a76cb7d2fda54bad5f12bdf69cbfa7e9fd1afdede6f9ec729ca2287de HEAD_REF master PATCHES - fix-uwpwarning.patch + fix-uwpwarning.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/rabbitmq-c TARGET_PATH share/rabbitmq-c) +vcpkg_cmake_config_fixup(PACKAGE_NAME rabbitmq-c CONFIG_PATH lib/cmake/rabbitmq-c) + +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(INSTALL ${SOURCE_PATH}/LICENSE-MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/librabbitmq/vcpkg.json b/ports/librabbitmq/vcpkg.json index f79a890baf85cc..5204424d5d99de 100644 --- a/ports/librabbitmq/vcpkg.json +++ b/ports/librabbitmq/vcpkg.json @@ -1,10 +1,17 @@ { "name": "librabbitmq", - "version-string": "2020-06-03", - "port-version": 1, + "version": "0.11.0", "description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.", "homepage": "https://github.com/alanxz/rabbitmq-c", "dependencies": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/libraqm/portfile.cmake b/ports/libraqm/portfile.cmake index ad32f08c7cf382..f871328e03576f 100644 --- a/ports/libraqm/portfile.cmake +++ b/ports/libraqm/portfile.cmake @@ -1,23 +1,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(RAQM_VERSION_MAJOR 0) -set(RAQM_VERSION_MINOR 7) +set(RAQM_VERSION_MINOR 9) set(RAQM_VERSION_MICRO 0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HOST-Oman/libraqm REF v${RAQM_VERSION_MAJOR}.${RAQM_VERSION_MINOR}.${RAQM_VERSION_MICRO} - SHA512 fe2f5e5707334d72518e720adff4379666ba5c4c045531e92588c5f843d4f56111e7b66ea4e7a061621320fa98f13229624994a950a789a477674d3a359cb58c + SHA512 a45c442a087c806143e5a96878e1d84a31afb7b682d71931fcb014c8d56b974d5a0d6186b163067d44a15952b3c549763f84354ed799f20473795f15d719f060 HEAD_REF master ) file(COPY ${CURRENT_PORT_DIR}/FindFribidi.cmake DESTINATION ${SOURCE_PATH}) file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR} -DRAQM_VERSION_MAJOR=${RAQM_VERSION_MAJOR} @@ -25,7 +24,7 @@ vcpkg_configure_cmake( -DRAQM_VERSION_MICRO=${RAQM_VERSION_MICRO} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/libraqm/vcpkg.json b/ports/libraqm/vcpkg.json index 7e124e8639ccc4..34fd9966bd5883 100644 --- a/ports/libraqm/vcpkg.json +++ b/ports/libraqm/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libraqm", - "version-string": "0.7.0", - "port-version": 3, + "version-string": "0.9.0", "description": "A library for complex text layout", "dependencies": [ "freetype", "fribidi", - "harfbuzz" + "harfbuzz", + "vcpkg-cmake" ] } diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index ea5df3b855a139..ecdcf1da015bc7 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -23,9 +23,16 @@ vcpkg_from_github( file(COPY "${LIBRAW_CMAKE_SOURCE_PATH}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${LIBRAW_CMAKE_SOURCE_PATH}/cmake" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp ENABLE_OPENMP +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DINSTALL_CMAKE_MODULE_PATH=share/${PORT} -DENABLE_EXAMPLES=OFF -DCMAKE_DEBUG_POSTFIX=d diff --git a/ports/libraw/vcpkg-cmake-wrapper.cmake b/ports/libraw/vcpkg-cmake-wrapper.cmake index 5a9a047c38ed3e..dcd9826e265929 100644 --- a/ports/libraw/vcpkg-cmake-wrapper.cmake +++ b/ports/libraw/vcpkg-cmake-wrapper.cmake @@ -3,10 +3,23 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) _find_package(${ARGS}) set(CMAKE_MODULE_PATH ${LIBRAW_PREV_MODULE_PATH}) +if (@ENABLE_OPENMP@) + find_package(OpenMP REQUIRED) + if (OpenMP_FOUND) + list(APPEND LibRaw_LIBRARIES gomp) + list(APPEND LibRaw_r_LIBRARIES gomp) + endif() +endif() + if (@VCPKG_LIBRARY_LINKAGE@ STREQUAL "static") find_package(Jasper REQUIRED) if (Jasper_FOUND) list(APPEND LibRaw_LIBRARIES ${JASPER_LIBRARIES}) list(APPEND LibRaw_r_LIBRARIES ${JASPER_LIBRARIES}) endif () + find_package(lcms2 CONFIG REQUIRED) + if (lcms2_FOUND) + list(APPEND LibRaw_LIBRARIES lcms2::lcms2) + list(APPEND LibRaw_r_LIBRARIES lcms2::lcms2) + endif () endif() diff --git a/ports/libraw/vcpkg.json b/ports/libraw/vcpkg.json index 552b4d82e55b05..af3d6c63cae467 100644 --- a/ports/libraw/vcpkg.json +++ b/ports/libraw/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libraw", "version-string": "201903", - "port-version": 5, + "port-version": 7, "description": "raw image decoder library", "homepage": "https://www.libraw.org", "dependencies": [ @@ -11,5 +11,10 @@ "name": "vcpkg-cmake", "host": true } - ] + ], + "features": { + "openmp": { + "description": "Build library with OpenMP support" + } + } } diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index a8c181ec543c85..0ef9d5b7e0db61 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -28,7 +28,7 @@ vcpkg_cmake_configure( OPTIONS_DEBUG -DENABLE_SHAREDPTR_DEBUG=ON -DENABLE_DEVEL=ON - -DENABLE_REFCNT_DEBUG=ON + -DENABLE_REFCNT_DEBUG=OFF -DENABLE_SHAREDPTR_DEBUG=ON -DWITHOUT_OPTIMIZATION=ON OPTIONS_RELEASE @@ -50,21 +50,21 @@ vcpkg_cmake_config_fixup( if("lz4" IN_LIST FEATURES) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/rdkafka/RdKafkaConfig.cmake + "${CURRENT_PACKAGES_DIR}/share/rdkafka/RdKafkaConfig.cmake" "find_dependency(LZ4)" "include(\"\${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake\")\n find_dependency(LZ4)" ) endif() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) foreach(hdr rdkafka.h rdkafkacpp.h) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/librdkafka/${hdr} + "${CURRENT_PACKAGES_DIR}/include/librdkafka/${hdr}" "#ifdef LIBRDKAFKA_STATICLIB" "#if 1 // #ifdef LIBRDKAFKA_STATICLIB" ) @@ -72,9 +72,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() # Handle copyright -configure_file(${SOURCE_PATH}/LICENSES.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSES.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) # Install usage -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) vcpkg_fixup_pkgconfig() diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json index 75038f4f25484b..4af84c47e98c79 100644 --- a/ports/librdkafka/vcpkg.json +++ b/ports/librdkafka/vcpkg.json @@ -1,8 +1,10 @@ { "name": "librdkafka", "version": "1.8.2", + "port-version": 1, "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", + "license": null, "supports": "!uwp", "dependencies": [ { diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index 32ca4d767919e4..b8604ebfda33ad 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -4,22 +4,20 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") return() endif() -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - -set(LIBRESSL_VERSION 3.3.4) -set(LIBRESSL_HASH 11defdde8169d3653c24e149e698ffc5a8ead5ac0808111d1986cb11ef72e9912c463d4891d4635877021e73a8a045dbdbe5e83ec785a59150f170d2ca2031de) +set(LIBRESSL_VERSION 3.4.2) +set(LIBRESSL_HASH ae91a840b29330681dc2a4f55a9bd760e6fe1bdfb3399017aae3a16bd21b413e97cbb8ba504400f0a1f42757f6128b3fa763d06bae4fc9f2b9dbeea867a57ad2) vcpkg_download_distfile( LIBRESSL_SOURCE_ARCHIVE - URLS https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz - FILENAME ${PORT}-${LIBRESSL_VERSION}.tar.gz - SHA512 ${LIBRESSL_HASH} + URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" "https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" + FILENAME "${PORT}-${LIBRESSL_VERSION}.tar.gz" + SHA512 "${LIBRESSL_HASH}" ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${LIBRESSL_SOURCE_ARCHIVE}" - REF ${LIBRESSL_VERSION} + REF "${LIBRESSL_VERSION}" PATCHES 0001-enable-ocspcheck-on-msvc.patch 0002-suppress-msvc-warnings.patch @@ -67,6 +65,6 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib") foreach(LIB ${LIBS}) string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}") - execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "${LIB}" "${LINK}") + file(CREATE_LINK "${LIB}" "${LINK}") endforeach() endif() diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index ff08a3b587b5e4..3b784e025024b5 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libressl", - "version": "3.3.4", + "version": "3.4.2", "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "supports": "!(uwp | arm)", "dependencies": [ diff --git a/ports/librsync/portfile.cmake b/ports/librsync/portfile.cmake index e9bb64ab9cad2a..a0a07bad3d4d01 100644 --- a/ports/librsync/portfile.cmake +++ b/ports/librsync/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -12,8 +10,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_RDIFF:BOOL=OFF + OPTIONS + -DBUILD_RDIFF:BOOL=OFF -DENABLE_COMPRESSION:BOOL=OFF -DENABLE_TRACE:BOOL=OFF ) diff --git a/ports/librsync/vcpkg.json b/ports/librsync/vcpkg.json index 34aafdb9bcadf4..7fda0a64de099b 100644 --- a/ports/librsync/vcpkg.json +++ b/ports/librsync/vcpkg.json @@ -1,6 +1,7 @@ { "name": "librsync", "version-semver": "2.3.2", + "port-version": 1, "description": "librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.", "homepage": "http://librsync.sourcefrog.net/", "supports": "!uwp", diff --git a/ports/libsass/portfile.cmake b/ports/libsass/portfile.cmake index 9195b45628ad64..6428e9c07b66d3 100644 --- a/ports/libsass/portfile.cmake +++ b/ports/libsass/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sass/libsass diff --git a/ports/libsass/vcpkg.json b/ports/libsass/vcpkg.json index 1b7f9e1ce8c3ff..3d2fa450c9ba46 100644 --- a/ports/libsass/vcpkg.json +++ b/ports/libsass/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsass", "version": "3.6.5", + "port-version": 1, "description": "LibSass - Sass compiler written in C++", "homepage": "https://github.com/sass/libsass", "supports": "!uwp" diff --git a/ports/libsbml/portfile.cmake b/ports/libsbml/portfile.cmake index 9b88b13b09dc3c..e4961abb2b2c2a 100644 --- a/ports/libsbml/portfile.cmake +++ b/ports/libsbml/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sbmlteam/libsbml @@ -86,5 +84,5 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json index cc2cc215654fda..4d63730231f081 100644 --- a/ports/libsbml/vcpkg.json +++ b/ports/libsbml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsbml", "version": "5.19.0", - "port-version": 1, + "port-version": 2, "description": "A library for reading / writing SBML files", "supports": "!uwp", "dependencies": [ diff --git a/ports/libsecret/vcpkg.json b/ports/libsecret/vcpkg.json index 1fbcf7b7c5989f..3c57811cced893 100644 --- a/ports/libsecret/vcpkg.json +++ b/ports/libsecret/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsecret", "version": "0.20.4", + "port-version": 1, "description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.", "homepage": "https://gitlab.gnome.org/GNOME/libsecret/", "license": "LGPL-2.1-or-later", @@ -11,6 +12,10 @@ "name": "glib", "host": true }, - "libgcrypt" + "libgcrypt", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/libslirp/portfile.cmake b/ports/libslirp/portfile.cmake new file mode 100644 index 00000000000000..bf6b248d8e5c5c --- /dev/null +++ b/ports/libslirp/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO slirp/libslirp + REF v4.6.1 + SHA512 04a9dd88cd58c849a24b9cff405d951952760d99ea2bef0b070463dff088d79f44557a13c9427ba0043f58d4b9e06b68ff64a4f23a7b0d66df594e32e1521cae + HEAD_REF master +) + +vcpkg_acquire_msys(MSYS_ROOT) +vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${OPTIONS} +) + +vcpkg_install_meson(ADD_BIN_TO_PATH) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libslirp" RENAME copyright) diff --git a/ports/libslirp/vcpkg.json b/ports/libslirp/vcpkg.json new file mode 100644 index 00000000000000..bd6e8915e58f7e --- /dev/null +++ b/ports/libslirp/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libslirp", + "version-semver": "4.6.1", + "description": "libslirp is a user-mode networking library used by virtual machines, containers or various tools.", + "homepage": "https://gitlab.freedesktop.org/slirp/libslirp", + "license": "BSD-3-Clause", + "supports": "!windows | mingw", + "dependencies": [ + "glib", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake index 4558f3e0143523..bce687a7110b4b 100644 --- a/ports/libsmb2/portfile.cmake +++ b/ports/libsmb2/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "osx") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -23,5 +22,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") #the debug/share folder is generated empty by the provided cmake system file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json index 4b5b2b9a984f1f..8bed89ce6d6334 100644 --- a/ports/libsmb2/vcpkg.json +++ b/ports/libsmb2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsmb2", "version-date": "2021-04-29", + "port-version": 1, "description": "SMB2/3 Userspace Client", "homepage": "https://github.com/sahlberg/libsmb2", "supports": "!osx", diff --git a/ports/libsnoretoast/portfile.cmake b/ports/libsnoretoast/portfile.cmake index e97d5f637d20ec..295eb96eab1d46 100644 --- a/ports/libsnoretoast/portfile.cmake +++ b/ports/libsnoretoast/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "osx" "linux" "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/snoretoast @@ -12,7 +10,7 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_STATIC_RUNTIME=OFF ) diff --git a/ports/libsnoretoast/vcpkg.json b/ports/libsnoretoast/vcpkg.json index eb0c3838bc7b39..d9263bbd8cc13f 100644 --- a/ports/libsnoretoast/vcpkg.json +++ b/ports/libsnoretoast/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsnoretoast", "version": "0.8.0", - "port-version": 1, + "port-version": 2, "description": "A tool to create Windows Toast notifications and parse them on Windows 8 or later.", "homepage": "https://invent.kde.org/libraries/snoretoast", "supports": "windows & !uwp", diff --git a/ports/libsodium/CMakeLists.txt b/ports/libsodium/CMakeLists.txt index 429ab4c294feca..bedd2e50700339 100644 --- a/ports/libsodium/CMakeLists.txt +++ b/ports/libsodium/CMakeLists.txt @@ -257,7 +257,7 @@ else () sodium_check_func(getpid HAVE_GETPID) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - check_c_source_runs( + check_c_source_compiles( " #pragma GCC target(\"mmx\") #include @@ -274,7 +274,7 @@ else () target_compile_options(${PROJECT_NAME}_mmx_config INTERFACE -mmmx) endif () - check_c_source_runs( + check_c_source_compiles( " #pragma GCC target(\"sse2\") #ifndef __SSE2__ @@ -295,7 +295,7 @@ else () target_compile_options(${PROJECT_NAME}_sse2_config INTERFACE -msse2) endif () - check_c_source_runs( + check_c_source_compiles( " #pragma GCC target(\"sse3\") #include @@ -311,7 +311,7 @@ else () target_compile_options(${PROJECT_NAME}_sse3_config INTERFACE -msse3) endif () - check_c_source_runs( + check_c_source_compiles( " #pragma GCC target(\"ssse3\") #include @@ -327,7 +327,7 @@ else () target_compile_options(${PROJECT_NAME}_ssse3_config INTERFACE -mssse3) endif () - check_c_source_runs( + check_c_source_compiles( " #pragma GCC target(\"sse4.1\") #include @@ -343,7 +343,7 @@ else () target_compile_options(${PROJECT_NAME}_sse41_config INTERFACE -msse4.1) endif () - check_c_source_runs( + check_c_source_compiles( " #ifdef __native_client__ # error NativeClient detected - Avoiding AVX opcodes @@ -362,7 +362,7 @@ else () target_compile_options(${PROJECT_NAME}_avx_config INTERFACE -mavx) endif () - check_c_source_runs( + check_c_source_compiles( " #ifdef __native_client__ # error NativeClient detected - Avoiding AVX2 opcodes @@ -382,7 +382,7 @@ else () target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_AVX2INTRIN_H=1) target_compile_options(${PROJECT_NAME}_avx2_config INTERFACE -mavx2) - check_c_source_runs( + check_c_source_compiles( " #ifdef __native_client__ # error NativeClient detected - Avoiding AVX2 opcodes @@ -404,7 +404,7 @@ else () endif () endif () - check_c_source_runs( + check_c_source_compiles( " #ifdef __native_client__ # error NativeClient detected - Avoiding AVX512F opcodes @@ -437,7 +437,7 @@ else () target_compile_options(${PROJECT_NAME}_avx512f_config INTERFACE -mavx512f) endif () - check_c_source_runs( + check_c_source_compiles( " #ifdef __native_client__ # error NativeClient detected - Avoiding AESNI opcodes @@ -460,7 +460,7 @@ else () target_compile_options(${PROJECT_NAME}_pclmul_config INTERFACE -mpclmul) endif () - check_c_source_runs( + check_c_source_compiles( " #ifdef __native_client__ # error NativeClient detected - Avoiding RDRAND opcodes @@ -481,7 +481,7 @@ else () target_compile_options(${PROJECT_NAME}_rdrand_config INTERFACE -mrdrnd) endif () - check_c_source_runs( + check_c_source_compiles( " #include @@ -496,7 +496,7 @@ else () target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE__XGETBV=1) endif () - check_c_source_runs( + check_c_source_compiles( " int main(void) { int a = 42; @@ -511,7 +511,7 @@ else () target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_INLINE_ASM=1) endif () - check_c_source_runs( + check_c_source_compiles( " int main(void) { #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) @@ -538,7 +538,7 @@ else () target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_AMD64_ASM=1) endif () - check_c_source_runs( + check_c_source_compiles( " int main(void) { #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) @@ -559,7 +559,7 @@ else () target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_AVX_ASM=1) endif () - check_c_source_runs( + check_c_source_compiles( " #if !defined(__clang__) && !defined(__GNUC__) && !defined(__SIZEOF_INT128__) # error mode(TI) is a gcc extension, and __int128 is not available @@ -597,7 +597,7 @@ else () target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_TI_MODE=1) endif () - check_c_source_runs( + check_c_source_compiles( " int main(void) { unsigned int cpu_info[4]; @@ -615,7 +615,7 @@ else () endif () endif () - check_c_source_runs( + check_c_source_compiles( " #if !defined(__ELF__) && !defined(__APPLE_CC__) # error Support for weak symbols may not be available @@ -631,7 +631,7 @@ else () target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_WEAK_SYMBOLS=1) endif () - check_c_source_runs( + check_c_source_compiles( " int main(void) { static volatile int _sodium_lock; @@ -646,7 +646,7 @@ else () target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_ATOMIC_OPS=1) endif () - check_c_source_runs( + check_c_source_compiles( " #include #include diff --git a/ports/libsodium/vcpkg.json b/ports/libsodium/vcpkg.json index 522e476d313923..24a31c5be3de53 100644 --- a/ports/libsodium/vcpkg.json +++ b/ports/libsodium/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsodium", "version": "1.0.18", - "port-version": 5, + "port-version": 6, "description": "A modern and easy-to-use crypto library", "homepage": "https://github.com/jedisct1/libsodium", "dependencies": [ diff --git a/ports/libsoundio/fix_cmakelists.patch b/ports/libsoundio/fix_cmakelists.patch index ffe00adff2ff52..b25f58824a7d09 100644 --- a/ports/libsoundio/fix_cmakelists.patch +++ b/ports/libsoundio/fix_cmakelists.patch @@ -19,7 +19,16 @@ index 6541f1b..e81bdce 100644 endif() if(BUILD_STATIC_LIBS) -@@ -243,9 +245,26 @@ if(BUILD_STATIC_LIBS) +@@ -204,8 +206,7 @@ if(MSVC) + set(EXAMPLE_CFLAGS "/W4") + set(TEST_CFLAGS "${LIB_CFLAGS}") + set(TEST_LDFLAGS " ") + set(LIBM " ") + else() +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror -pedantic") + set(LIB_CFLAGS "-std=c11 -fvisibility=hidden -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L -Wno-missing-braces") + set(EXAMPLE_CFLAGS "-std=c99 -Wall") +@@ -243,9 +244,26 @@ if(BUILD_STATIC_LIBS) COMPILE_FLAGS ${LIB_CFLAGS} LINKER_LANGUAGE C ) diff --git a/ports/libsoundio/portfile.cmake b/ports/libsoundio/portfile.cmake index 3b5081cf970b23..1e5946189f2371 100644 --- a/ports/libsoundio/portfile.cmake +++ b/ports/libsoundio/portfile.cmake @@ -1,6 +1,3 @@ - -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO andrewrk/libsoundio diff --git a/ports/libsoundio/vcpkg.json b/ports/libsoundio/vcpkg.json index 6dc71724b929cf..52ca059cdf25ce 100644 --- a/ports/libsoundio/vcpkg.json +++ b/ports/libsoundio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsoundio", "version": "2.0.0", - "port-version": 4, + "port-version": 6, "description": "libsoundio is C library providing cross-platform audio input and output.", "homepage": "http://libsound.io/", "supports": "!uwp", diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 20971f65681107..db8d8bcda84b84 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -49,7 +49,20 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) PREFIX PKGCONFIG MODULES --msvc-syntax ${pkg_config_modules} LIBS + CFLAGS ) + + set(CL_FLAGS_RELEASE "${CL_FLAGS} ${PKGCONFIG_CFLAGS_RELEASE}") + set(CL_FLAGS_DEBUG "${CL_FLAGS} ${PKGCONFIG_CFLAGS_DEBUG}") + + # vcpkg_build_nmake doesn't supply cmake's implicit link libraries + if(PKGCONFIG_LIBS_DEBUG MATCHES "libcrypto") + string(APPEND PKGCONFIG_LIBS_DEBUG " user32.lib") + endif() + if(PKGCONFIG_LIBS_RELEASE MATCHES "libcrypto") + string(APPEND PKGCONFIG_LIBS_RELEASE " user32.lib") + endif() + string(JOIN " " LIBS_ALL_DEBUG "/LIBPATH:${CURRENT_INSTALLED_DIR}/debug/lib" "${PKGCONFIG_LIBS_DEBUG}" @@ -68,12 +81,12 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() vcpkg_install_nmake( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "CL_FLAGS=${CL_FLAGS}" OPTIONS_RELEASE + "CL_FLAGS=${CL_FLAGS_RELEASE}" "INST_DIR=${INST_DIR}" "LIBS_ALL=${LIBS_ALL_RELEASE}" OPTIONS_DEBUG + "CL_FLAGS=${CL_FLAGS_DEBUG}" "INST_DIR=${INST_DIR}\\debug" "LIBS_ALL=${LIBS_ALL_DEBUG}" "LINK_FLAGS=/debug" diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index fbea1b6af9d545..521ba15233cfe2 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,15 +1,22 @@ { "name": "libspatialite", "version": "5.0.1", - "port-version": 1, + "port-version": 4, "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": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later", "dependencies": [ "geos", "libiconv", "libxml2", - "proj4", - "sqlite3", + "proj", + { + "name": "sqlite3", + "default-features": false, + "features": [ + "rtree" + ] + }, "vcpkg-pkgconfig-get-modules", "zlib" ], diff --git a/ports/libspnav/portfile.cmake b/ports/libspnav/portfile.cmake index 35d012519480c5..89bf76c4457d94 100644 --- a/ports/libspnav/portfile.cmake +++ b/ports/libspnav/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "windows" "uwp" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeSpacenav/libspnav diff --git a/ports/libspnav/vcpkg.json b/ports/libspnav/vcpkg.json index f3bb1f791e0cc5..1c9557d3e6a22c 100644 --- a/ports/libspnav/vcpkg.json +++ b/ports/libspnav/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libspnav", - "version-string": "0.2.3", - "port-version": 1, + "version": "0.2.3", + "port-version": 2, "description": "Library for communicating with spacenavd or 3dxsrv to get input from 6-dof devices.", "homepage": "https://github.com/FreeSpacenav/libspnav", "supports": "linux" diff --git a/ports/libsrt/portfile.cmake b/ports/libsrt/portfile.cmake index 23ae59ccd53db0..35ebd06543b88d 100644 --- a/ports/libsrt/portfile.cmake +++ b/ports/libsrt/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Haivision/srt @@ -38,4 +36,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json index 5de788840aed97..02de23beb7f5b9 100644 --- a/ports/libsrt/vcpkg.json +++ b/ports/libsrt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsrt", "version": "1.4.4", - "port-version": 1, + "port-version": 2, "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.", "homepage": "https://github.com/Haivision/srt", "supports": "!uwp", diff --git a/ports/libsrtp/portfile.cmake b/ports/libsrtp/portfile.cmake index 2a1b5bea6e23c7..d4074da0e4ab90 100644 --- a/ports/libsrtp/portfile.cmake +++ b/ports/libsrtp/portfile.cmake @@ -1,8 +1,15 @@ +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} ) if (VCPKG_TARGET_IS_WINDOWS) @@ -10,12 +17,16 @@ if (VCPKG_TARGET_IS_WINDOWS) set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /wd4703") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/cmake/libSRTP +) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libsrtp/vcpkg.json b/ports/libsrtp/vcpkg.json index 234d7faf1bfd55..5ca1f135200830 100644 --- a/ports/libsrtp/vcpkg.json +++ b/ports/libsrtp/vcpkg.json @@ -1,5 +1,16 @@ { "name": "libsrtp", "version": "2.4.2", - "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel." + "port-version": 1, + "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index 4354177c10947e..77724f1db69252 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://git.libssh.org/projects/libssh.git @@ -50,10 +48,10 @@ vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/include/libssh/libssh.h" + "${CURRENT_PACKAGES_DIR}/include/libssh/libssh.h" "#ifdef LIBSSH_STATIC" "#if 1" - ) + ) endif() if(VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/libssh/vcpkg.json b/ports/libssh/vcpkg.json index 9bcc032dab26c4..d1f22ec076c731 100644 --- a/ports/libssh/vcpkg.json +++ b/ports/libssh/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libssh", "version": "0.9.6", - "port-version": 1, + "port-version": 2, "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", "homepage": "https://www.libssh.org/", "supports": "!(uwp | arm)", diff --git a/ports/libssh2/0002-fix-macros.patch b/ports/libssh2/0002-fix-macros.patch new file mode 100644 index 00000000000000..dc0f7193301b3e --- /dev/null +++ b/ports/libssh2/0002-fix-macros.patch @@ -0,0 +1,19 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2539607..eceb5a0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -355,9 +355,12 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + # Daniel's note: this should not be necessary and we need to work to + # get this removed. + if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") +- target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32) ++ target_compile_definitions(libssh2 PUBLIC LIBSSH2_WIN32) ++ if (BUILD_SHARED_LIBS) ++ target_compile_definitions(libssh2 PUBLIC _WINDLL PRIVATE LIBSSH2_LIBRARY) ++ endif() + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +- target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN) ++ target_compile_definitions(libssh2 PUBLIC LIBSSH2_DARWIN) + endif() + + if(MSVC) diff --git a/ports/libssh2/LICENSE b/ports/libssh2/LICENSE deleted file mode 100644 index d629fbd3f49bcd..00000000000000 --- a/ports/libssh2/LICENSE +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2004-2007 Sara Golemon - * Copyright (c) 2005,2006 Mikhail Gusarov - * Copyright (c) 2006-2007 The Written Word, Inc. - * Copyright (c) 2007 Eli Fant - * Copyright (c) 2009-2014 Daniel Stenberg - * Copyright (C) 2008, 2009 Simon Josefsson - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * Neither the name of the copyright holder nor the names - * of any other contributors may be used to endorse or - * promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - */ \ No newline at end of file diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index 7949dc64e69755..e99db47049eceb 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -4,29 +4,45 @@ vcpkg_from_github( REF libssh2-1.10.0 SHA512 615E28880695911F5700CC7AC3DDA6B894384C0B1D8B02B53C2EB58F1839F47211934A292F490AD7DDEF7E63F332E0EBF44F8E6334F64BE8D143C72032356C1F HEAD_REF master - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch" + PATCHES + 0001-Fix-UWP.patch + 0002-fix-macros.patch ) -vcpkg_configure_cmake( +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + zlib ENABLE_ZLIB_COMPRESSION +) + +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF - -DENABLE_ZLIB_COMPRESSION=ON + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DENABLE_DEBUG_LOGGING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef LIBSSH2_WIN32" "if 1") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 1") + else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 0") + endif() +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libssh2) +# Do not delete the entire share directory as it contains the *-config.cmake files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libssh2" RENAME copyright) -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index 9dc048318fad39..e57d86d68b822e 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,10 +1,30 @@ { "name": "libssh2", "version": "1.10.0", + "port-version": 2, "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "homepage": "https://www.libssh2.org", + "license": "BSD-3-Clause", "dependencies": [ "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ "zlib" - ] + ], + "features": { + "zlib": { + "description": "Use compressing via zlib", + "dependencies": [ + "zlib" + ] + } + } } diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index e28639eef3a647..155042f525c375 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.19.0 - SHA512 462c3deadaeaaf3adb44427d41c4e8c1acc2c37ef90677d8d60e8194f9c190bc7e02b0cf2b285e248171354f8d73f1dd28144cfe8a98a469e1071448bce9e68b + REF 1.20.1 + SHA512 bef3751dd1b190769163ff7c188479fe100d425fa98d3f0f97a3a81045fe0f0c24690b64bcde29f7af1eb7fd34915371223146598b1f0cab173e69a78c1dfc76 HEAD_REF develop ) diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index 2f3f2db951bd5f..8af4572e93a6eb 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtcod", - "version-semver": "1.19.0", + "version": "1.20.1", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", diff --git a/ports/libtess2/CMakeLists.txt b/ports/libtess2/CMakeLists.txt new file mode 100644 index 00000000000000..7924eea10c01e5 --- /dev/null +++ b/ports/libtess2/CMakeLists.txt @@ -0,0 +1,35 @@ +cmake_minimum_required(VERSION 3.21) + +project(libtess2) + +# Tesselator +add_library(libtess2 STATIC) + +target_sources(libtess2 PRIVATE + "${CMAKE_CURRENT_SOURCE_DIR}/Source/bucketalloc.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/dict.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/geom.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/mesh.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/priorityq.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/sweep.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/tess.c") + +target_include_directories(libtess2 PUBLIC + "$" + "$" +) +set_target_properties(libtess2 PROPERTIES LINKER_LANGUAGE CXX) + +install(TARGETS libtess2 EXPORT unofficial-libtess2-config) + +install( + FILES "${CMAKE_CURRENT_SOURCE_DIR}/Include/tesselator.h" + TYPE INCLUDE +) + +install( + EXPORT unofficial-libtess2-config + NAMESPACE unofficial::libtess2:: + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-libtess2" + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/ports/libtess2/portfile.cmake b/ports/libtess2/portfile.cmake new file mode 100644 index 00000000000000..7566e0946616dc --- /dev/null +++ b/ports/libtess2/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO memononen/libtess2 + REF fc52516467dfa124bdd967c15c7cf9faf02a34ca + SHA512 2b3efb8934d1da8c1b3f0a79139275e89d9187e1e881c699f8623993165eae04068ce5927fe2a5e21e1298b79ffc57eb3e9bbc4bc07872d757a91189bc5f1cce + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME "unofficial-${PORT}" + CONFIG_PATH "lib/cmake/unofficial-${PORT}" +) + +file(COPY "${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) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libtess2/usage b/ports/libtess2/usage new file mode 100644 index 00000000000000..34d5ddea277f48 --- /dev/null +++ b/ports/libtess2/usage @@ -0,0 +1,4 @@ +The package libtess2 provides CMake targets: + +find_package(unofficial-libtess2 CONFIG REQUIRED) +target_link_libraries(main PUBLIC unofficial::libtess2::libtess2) diff --git a/ports/libtess2/vcpkg.json b/ports/libtess2/vcpkg.json new file mode 100644 index 00000000000000..ce54d781589f26 --- /dev/null +++ b/ports/libtess2/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libtess2", + "version-date": "2021-12-27", + "description": "Game and tools oriented refactored version of GLU tesselator.", + "homepage": "https://github.com/memononen/libtess2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libtins/find-pcap_static.patch b/ports/libtins/find-pcap_static.patch new file mode 100644 index 00000000000000..7134b0c2b4dd62 --- /dev/null +++ b/ports/libtins/find-pcap_static.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake +index 388b30b..f5264c3 100644 +--- a/cmake/Modules/FindPCAP.cmake ++++ b/cmake/Modules/FindPCAP.cmake +@@ -38,7 +38,7 @@ if (${CMAKE_SIZEOF_VOID_P} EQUAL 8 AND WIN32) + endif () + + find_library(PCAP_LIBRARY +- NAMES pcap wpcap ++ NAMES pcap wpcap pcap_static NAMES_PER_DIR + HINTS ${HINT_DIR} + ) + diff --git a/ports/libtins/fix-source-writes.patch b/ports/libtins/fix-source-writes.patch new file mode 100644 index 00000000000000..251b4f2f779020 --- /dev/null +++ b/ports/libtins/fix-source-writes.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1e13def..eda8d68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -228,8 +228,9 @@ ENDIF(DOXYGEN_FOUND) + # Configuration file + CONFIGURE_FILE( + "${PROJECT_SOURCE_DIR}/include/tins/config.h.in" +- "${PROJECT_SOURCE_DIR}/include/tins/config.h" ++ "${PROJECT_BINARY_DIR}/include/tins/config.h" + ) ++INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/include") + + IF (NOT CMAKE_INSTALL_LIBDIR) + SET(CMAKE_INSTALL_LIBDIR lib) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e07772e..94bc8bf 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -82,7 +82,7 @@ set(HEADERS + ${LIBTINS_INCLUDE_DIR}/tins/handshake_capturer.h + ${LIBTINS_INCLUDE_DIR}/tins/stp.h + ${LIBTINS_INCLUDE_DIR}/tins/pppoe.h +- ${LIBTINS_INCLUDE_DIR}/tins/config.h ++ ${PROJECT_BINARY_DIR}/include/tins/config.h + ${LIBTINS_INCLUDE_DIR}/tins/constants.h + ${LIBTINS_INCLUDE_DIR}/tins/crypto.h + ${LIBTINS_INCLUDE_DIR}/tins/cxxstd.h +@@ -229,6 +229,7 @@ MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST) + FOREACH(HEADER ${HEADERS}) + # Extract directory name and remove leading '../' + get_filename_component(DIR ${HEADER} PATH) ++ string(REPLACE "${PROJECT_BINARY_DIR}/" "" DIR ${DIR}) + STRING(REGEX REPLACE "^\\.\\.\\/" "" DIR ${DIR}) + INSTALL(FILES ${HEADER} DESTINATION ${DIR}) + ENDFOREACH(HEADER) diff --git a/ports/libtins/portfile.cmake b/ports/libtins/portfile.cmake index 37bd4d915eea1a..62cbde451d43b3 100644 --- a/ports/libtins/portfile.cmake +++ b/ports/libtins/portfile.cmake @@ -4,28 +4,27 @@ vcpkg_from_github( REF v4.3 SHA512 29d606004fe9a440c9a53eede42fd5c6dbd049677d2cca2c5cfd26311ee2ca4c64ca3e665fbc81efd5bfab5577a5181ed0754c617e139317d9ae0cabba05aff7 HEAD_REF master + PATCHES + fix-source-writes.patch + find-pcap_static.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTINS_BUILD_SHARED) -set(ENABLE_PCAP FALSE) -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(ENABLE_PCAP TRUE) -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLIBTINS_BUILD_SHARED=${LIBTINS_BUILD_SHARED} - -DLIBTINS_ENABLE_PCAP=${ENABLE_PCAP} -DLIBTINS_ENABLE_CXX11=1 + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1 ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") #Windows +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_cmake_config_fixup(CONFIG_PATH CMake) -else() #Linux/Unix/Darwin +else() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libtins) endif() @@ -35,9 +34,15 @@ get_filename_component(LIBTINS_CMAKE_DIR "${LIBTINS_CMAKE_DIR}" PATH) set(LIBTINS_INCLUDE_DIRS "${LIBTINS_CMAKE_DIR}/include") ]]) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/libtins/libtinsConfig.cmake" "\${LIBTINS_CMAKE_DIR}/libtinsTargets.cmake" "\${CMAKE_CURRENT_LIST_DIR}/libtinsTargets.cmake") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/tins/macros.h" "!defined(TINS_STATIC)" "1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/tins/macros.h" "!defined(TINS_STATIC)" "0") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libtins" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/ports/libtins/vcpkg.json b/ports/libtins/vcpkg.json index 94000ec0970da5..c9a7daa96afa8a 100644 --- a/ports/libtins/vcpkg.json +++ b/ports/libtins/vcpkg.json @@ -1,11 +1,15 @@ { "name": "libtins", - "version-string": "4.3", - "port-version": 3, + "version": "4.3", + "port-version": 6, "description": "High-level, multiplatform C++ network packet sniffing and crafting library", + "license": "BSD-2-Clause", + "supports": "!uwp", "dependencies": [ "boost-any", "boost-icl", + "libpcap", + "openssl", { "name": "vcpkg-cmake", "host": true @@ -13,10 +17,6 @@ { "name": "vcpkg-cmake-config", "host": true - }, - { - "name": "winpcap", - "platform": "windows" } ] } diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index 0c11403fc11d0e..d80fa99f7be534 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - if(VCPKG_TARGET_IS_WINDOWS) # Building python bindings is currently broken on Windows if("python" IN_LIST FEATURES) @@ -21,42 +19,72 @@ vcpkg_check_features( tools build_tools ) -# Note: the python feature currently requires `python3-dev` and `python3-setuptools` installed on the system if("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) vcpkg_add_to_path(${PYTHON3_PATH}) - file(GLOB BOOST_PYTHON_LIB "${CURRENT_INSTALLED_DIR}/lib/*boost_python*") string(REGEX REPLACE ".*(python)([0-9])([0-9]+).*" "\\1\\2\\3" _boost-python-module-name "${BOOST_PYTHON_LIB}") endif() vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO arvidn/libtorrent - REF 33a10d5a723a6c27d9baee7d9bf2028eb81c88ed # v1.2.14 - SHA512 7be169625c9ab1319047aa025abb36579cf6c749faeee7788b5c0ca24ca32d0a4bfd898415159b9133302da4d26230edcb5585c12137edcab8f5b3548c67a268 - HEAD_REF RC_1_2 + OUT_SOURCE_PATH SOURCE_PATH + REPO arvidn/libtorrent + REF 44e285c30f06772e48f515580f961998e1037b7e # v2.0.5 + SHA512 c7ce747930ab8c1852d0efdc6268d9faa39643abd6b6560b4b5e0b06a12ab207ec61ac301a0bcc7622521a8ae490cc02cbe0b6e43208bc216c08bf472b40cb85 + HEAD_REF RC_2_0 +) + +vcpkg_from_github( + OUT_SOURCE_PATH TRYSIGNAL_SOURCE_PATH + REPO arvidn/try_signal + REF 334fd139e2bb387017b42d36753a03935e3bca75 + SHA512 a25d439b2d979e975f9dd125a34072f70bfc7a08fab950e3829130742c05c584ae88d9f58fc0f1b4fa0b51df2c0e32c5b24c5828d53b121b4bc183a4c68d6a5a + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH ASIO_GNUTLS_SOURCE_PATH + REPO paullouisageneau/boost-asio-gnutls + REF a57d4d36923c5fafa9698e14be16b8bc2913700a + SHA512 1e093dd4e999cce9c6d74f1d4c2d20f73512258b83505c307c7d53b8c7ed15626a8e90c8e6a6280827aafa069bc233c0c6f4c9276f1c332e4b141c7c350c47c0 + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_from_github( + OUT_SOURCE_PATH LIB_SIMULATOR_SOURCE_PATH + REPO arvidn/libsimulator + REF 64fb5b4fde1879abc09c018604d57e485a12e999 + SHA512 20b57eb436127028339528f34a9db7e7149d2c5d86149114444205370482d3f5284e76493f2fbc1c6904175e6482671bfcaeb98d0bee7d399e546abef02f32f3 + HEAD_REF master +) + +file(COPY ${TRYSIGNAL_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/deps/try_signal) +file(COPY ${ASIO_GNUTLS_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/deps/asio-gnutls) +file(COPY ${LIB_SIMULATOR_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/simulation/libsimulator) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} - -Dboost-python-module-name=${_boost-python-module-name} - -Dstatic_runtime=${_static_runtime} - -DPython3_USE_STATIC_LIBS=ON + ${FEATURE_OPTIONS} + -Dboost-python-module-name=${_boost-python-module-name} + -Dstatic_runtime=${_static_runtime} + -DPython3_USE_STATIC_LIBS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/LibtorrentRasterbar TARGET_PATH share/LibtorrentRasterbar) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME LibtorrentRasterbar CONFIG_PATH lib/cmake/LibtorrentRasterbar) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Do not duplicate include files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/cmake") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() \ No newline at end of file diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json index 7e0de91ddd6257..4b9eac63422315 100644 --- a/ports/libtorrent/vcpkg.json +++ b/ports/libtorrent/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libtorrent", - "version": "1.2.14", - "port-version": 1, + "version": "2.0.5", "maintainers": "Arvid Norberg ", "description": "An efficient feature complete C++ BitTorrent implementation", "homepage": "https://libtorrent.org", "documentation": "https://libtorrent.org/reference.html", + "license": "BSD-2-Clause", "supports": "!uwp & !(windows & arm)", "dependencies": [ "boost-asio", @@ -14,13 +14,23 @@ "boost-crc", "boost-date-time", "boost-iterator", + "boost-logic", + "boost-multi-index", "boost-multiprecision", "boost-pool", "boost-random", "boost-scope-exit", "boost-system", "boost-variant", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "iconv" diff --git a/ports/libudis86/CMakeLists.txt b/ports/libudis86/CMakeLists.txt index 8f412cf9003b64..fb47dd7f97084c 100644 --- a/ports/libudis86/CMakeLists.txt +++ b/ports/libudis86/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required (VERSION 3.9) project (udis86) +if (MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +endif() set( lib_sources diff --git a/ports/libudis86/fix-macbuild.patch b/ports/libudis86/fix-macbuild.patch new file mode 100644 index 00000000000000..c9bf1a932214a0 --- /dev/null +++ b/ports/libudis86/fix-macbuild.patch @@ -0,0 +1,37 @@ +diff --git a/libudis86/udis86.c b/libudis86/udis86.c +index e039c4e..8459012 100644 +--- a/libudis86/udis86.c ++++ b/libudis86/udis86.c +@@ -34,6 +34,10 @@ + # endif + #endif /* !__UD_STANDALONE__ */ + ++#if defined(__APPLE__) ++# include ++#endif ++ + static void ud_inp_init(struct ud *u); + + /* ============================================================================= +diff --git a/udcli/udcli.c b/udcli/udcli.c +index 9b044ca..ad1e4ab 100644 +--- a/udcli/udcli.c ++++ b/udcli/udcli.c +@@ -27,13 +27,11 @@ + #include + #include + #include +-#ifdef _MSC_VER +-#include "..\udis86.h" +-#define PACKAGE_STRING "udis86 pre-1.8" +-#else + #include +-#include +-#endif ++#define PACKAGE_STRING "udis86 pre-1.8" ++#ifdef HAVE_CONFIG_H ++# include ++#endif /* HAVE_CONFIG_H */ + + #if defined(__APPLE__) + # define FMT64 "ll" diff --git a/ports/libudis86/portfile.cmake b/ports/libudis86/portfile.cmake index 42d99d38a1e976..991b8039c0760d 100644 --- a/ports/libudis86/portfile.cmake +++ b/ports/libudis86/portfile.cmake @@ -4,9 +4,10 @@ vcpkg_from_github( REF 56ff6c87c11de0ffa725b14339004820556e343d SHA512 7a98333f9310f5f0466294bd980f03f9269c118a7557832015c59a7b6349a0eeab5642e0e6598d0be76d71f5d2d566d8b8af0ec75c26bdcff45646d60ff18e3a HEAD_REF master + PATCHES fix-macbuild.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_find_acquire_program(PYTHON2) @@ -16,16 +17,15 @@ vcpkg_execute_required_process( LOGNAME python-${TARGET_TRIPLET}-generate-sources ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libudis86) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libudis86/vcpkg.json b/ports/libudis86/vcpkg.json index a687a41045a274..c642dfaf49117c 100644 --- a/ports/libudis86/vcpkg.json +++ b/ports/libudis86/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libudis86", "version-string": "2018-01-28-56ff6c87", - "port-version": 1, + "port-version": 2, "description": "Disassembler Library for x86 and x86-64", - "homepage": "https://github.com/vmt/udis86" + "homepage": "https://github.com/vmt/udis86", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libunifex/allow-warnings.patch b/ports/libunifex/fix-compile-error.patch similarity index 76% rename from ports/libunifex/allow-warnings.patch rename to ports/libunifex/fix-compile-error.patch index 272624f0667c16..10d578feeaaeb2 100644 --- a/ports/libunifex/allow-warnings.patch +++ b/ports/libunifex/fix-compile-error.patch @@ -1,15 +1,15 @@ -diff --git a/cmake/unifex_env.cmake b/cmake/unifex_env.cmake -index cb99ae4..9825532 100644 ---- a/cmake/unifex_env.cmake -+++ b/cmake/unifex_env.cmake -@@ -21,8 +21,8 @@ endif() - - if (MSVC) - # warning level 3 and all warnings as errors -- add_compile_options(/W3 /WX) -+ add_compile_options(/W3) - else() - # lots of warnings and all warnings as errors -- add_compile_options(-Wall -Wextra -pedantic -Werror) -+ add_compile_options(-Wall -Wextra -pedantic) - endif() +diff --git a/cmake/unifex_env.cmake b/cmake/unifex_env.cmake +index cb99ae4..9825532 100644 +--- a/cmake/unifex_env.cmake ++++ b/cmake/unifex_env.cmake +@@ -21,8 +21,8 @@ endif() + + if (MSVC) + # warning level 3 and all warnings as errors +- add_compile_options(/W3 /WX) ++ add_compile_options(/W3 /WX /Zc:externConstexpr /EHsc) + else() + # lots of warnings and all warnings as errors +- add_compile_options(-Wall -Wextra -pedantic -Werror) ++ add_compile_options(-Wall -Wextra -pedantic) + endif() diff --git a/ports/libunifex/fix-install.patch b/ports/libunifex/fix-install.patch deleted file mode 100644 index 2b454c49c19a6c..00000000000000 --- a/ports/libunifex/fix-install.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 3f25517..3c34a54 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -67,10 +67,27 @@ configure_file( - target_include_directories(unifex - PUBLIC - $ -- "${PROJECT_BINARY_DIR}/include") -+ $ -+ $) - - target_compile_features(unifex PUBLIC cxx_std_17) - - if(CXX_COROUTINES_HAVE_COROUTINES) - target_link_libraries(unifex PUBLIC std::coroutines) - endif() -+ -+install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/unifex -+ DESTINATION include -+) -+install(FILES ${PROJECT_BINARY_DIR}/include/unifex/config.hpp -+ DESTINATION include/unifex -+) -+ -+install(TARGETS unifex -+ EXPORT unifex-config -+ DESTINATION lib -+) -+install(EXPORT unifex-config -+ NAMESPACE unofficial:: -+ DESTINATION lib/cmake/unifex -+) diff --git a/ports/libunifex/portfile.cmake b/ports/libunifex/portfile.cmake index f7379fc20c4d18..9ea2fcec67a503 100644 --- a/ports/libunifex/portfile.cmake +++ b/ports/libunifex/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookexperimental/libunifex - REF e36b43834329acc75f99910316d3ecec15c0f665 - SHA512 58f738b49d18982fd3916500c78e8090a266738ec4a8ba416b004fa2c7db718db5ce0e27f5e4e22eaddcc27c8d1618bcb2bc080eee1a31d98543e2595ccc1135 + REF 9df21c58d34ce8a1cd3b15c3a7347495e29417a0 + SHA512 2a1c6dbe0e66893be888c301e53b5d2813049047a817e9e1562acf2dec4ae79dec7db90409cd415c59238f2f3e2738e52f86a424041459390c720568ee52d860 HEAD_REF master PATCHES - fix-install.patch - allow-warnings.patch + fix-compile-error.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -21,10 +20,13 @@ vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} + -DCMAKE_CXX_STANDARD:STRING=20 ) + vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME unifex CONFIG_PATH lib/cmake/unifex) vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libunifex/vcpkg.json b/ports/libunifex/vcpkg.json index 82101d6b975265..3553e8964c40f5 100644 --- a/ports/libunifex/vcpkg.json +++ b/ports/libunifex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libunifex", - "version-date": "2021-08-01", + "version-date": "2021-12-07", "port-version": 1, "description": "Unified Executors", "homepage": "https://github.com/facebookexperimental/libunifex", diff --git a/ports/libunistring/portfile.cmake b/ports/libunistring/portfile.cmake index e9eef0641d09a9..e16d0a5bac1160 100644 --- a/ports/libunistring/portfile.cmake +++ b/ports/libunistring/portfile.cmake @@ -1,10 +1,6 @@ set(LIBUNISTRING_VERSION 0.9.10) set(LIBUNISTRING_FILENAME libunistring-${LIBUNISTRING_VERSION}.tar.gz) -if(NOT VCPKG_TARGET_IS_MINGW) - vcpkg_fail_port_install(ON_TARGET "Windows" "UWP") -endif() - vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/libunistring/${LIBUNISTRING_FILENAME}" diff --git a/ports/libunistring/vcpkg.json b/ports/libunistring/vcpkg.json index 585ddca79423ac..c2aa59fc2de7b8 100644 --- a/ports/libunistring/vcpkg.json +++ b/ports/libunistring/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libunistring", "version": "0.9.10", - "port-version": 1, + "port-version": 2, "description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.", "homepage": "https://www.gnu.org/software/libunistring/", "supports": "!windows", diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 304bef5ecc676a..276f68fb48aa3b 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "windows" "uwp" "osx" "ios" "android") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing @@ -15,14 +13,13 @@ vcpkg_from_github( vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} COPY_SOURCE - NO_DEBUG ) vcpkg_install_make() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/LICENSE +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/usage +file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) # note: {SOURCE_PATH}/src/Makefile makes liburing.so from liburing.a. diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index e2bb1b53e23a5f..17ba8c16cbd710 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,6 +1,7 @@ { "name": "liburing", "version": "2.0", + "port-version": 2, "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", "supports": "linux" diff --git a/ports/libusb-win32/portfile.cmake b/ports/libusb-win32/portfile.cmake index 1cca3bedb627b0..cbfe2b1ebb6177 100644 --- a/ports/libusb-win32/portfile.cmake +++ b/ports/libusb-win32/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX") - set(LIBUSB_VERSION 1.2.6.0) set(LIBUSB_HASH 972438b7465a22882bc91a1238291240ee3cdb09f374454a027d003b150656d4c262553104f74418bb49b4a7ca2f1a4f72d20e689fa3a7728881bafc876267f4) diff --git a/ports/libusb-win32/vcpkg.json b/ports/libusb-win32/vcpkg.json index 462fd2322f6cc2..9cbe7bc3551a0b 100644 --- a/ports/libusb-win32/vcpkg.json +++ b/ports/libusb-win32/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusb-win32", "version-string": "1.2.6.0", - "port-version": 7, + "port-version": 8, "description": "Allows user space applications to access many USB device on Windows.", "homepage": "https://sourceforge.net/projects/libusb-win32", "supports": "windows" diff --git a/ports/libusbmuxd/portfile.cmake b/ports/libusbmuxd/portfile.cmake index 5ad0cb01fa4095..92a82472db9d63 100644 --- a/ports/libusbmuxd/portfile.cmake +++ b/ports/libusbmuxd/portfile.cmake @@ -1,9 +1,7 @@ -vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/libusbmuxd - REF ac86b23f57879b8b702f3712ba66729008d059a3 # v1.2.219 + REF ac86b23f57879b8b702f3712ba66729008d059a3 # v1.2.219 SHA512 ced85088bc6ebb416ccb635d6b4e79662fb34f427d869b64b61847e5fde7b4ae094cebb1f7916d9387c314aeb84106a618fbd7497dc4b36151b236dcb55bd0e4 HEAD_REF msvc-master PATCHES fix-win-build.patch diff --git a/ports/libusbmuxd/vcpkg.json b/ports/libusbmuxd/vcpkg.json index f9bfb7f9fc1bf6..894b846af2fe2f 100644 --- a/ports/libusbmuxd/vcpkg.json +++ b/ports/libusbmuxd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusbmuxd", - "version-string": "1.2.219", - "port-version": 1, + "version": "1.2.219", + "port-version": 2, "description": "A client library to multiplex connections from and to iOS devices", "supports": "!(uwp | linux | osx)", "dependencies": [ diff --git a/ports/libuuid/portfile.cmake b/ports/libuuid/portfile.cmake index 3e29431f4b14fe..7ed5400c2f4b41 100644 --- a/ports/libuuid/portfile.cmake +++ b/ports/libuuid/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows") - set(LIBUUID_VERSION 1.0.3) vcpkg_from_sourceforge( @@ -28,8 +26,12 @@ set(exec_prefix \$\{prefix\}) set(libdir \$\{exec_prefix\}/lib) set(includedir \$\{prefix\}/include) configure_file(${SOURCE_PATH}/uuid.pc.in ${SOURCE_PATH}/uuid.pc @ONLY) -file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/unofficial-libuuid TARGET_PATH share/unofficial-libuuid) vcpkg_fixup_pkgconfig() diff --git a/ports/libuuid/vcpkg.json b/ports/libuuid/vcpkg.json index 0f88cf666f9721..0abea1e938d265 100644 --- a/ports/libuuid/vcpkg.json +++ b/ports/libuuid/vcpkg.json @@ -1,8 +1,8 @@ { "name": "libuuid", "version": "1.0.3", - "port-version": 8, + "port-version": 11, "description": "Universally unique id library", "homepage": "https://sourceforge.net/projects/libuuid", - "supports": "linux | osx" + "supports": "!osx & !windows" } diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 6c2c384bb64b3c..8b927ae8041d68 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF 6ce14710da7079eb248868171f6343bc409ea3a4 # v1.42.0 - SHA512 305b0e8beb9372d22b767f1f792c6351d4b2d747b31cda95a4657cfca101806a17dd0bfab2039d22e29387c9d5ee376fe1b22d63aba1baf0d88817cbcacd97b8 + REF v1.43.0 + SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3 HEAD_REF v1.x ) diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index c1ebc4f1ac44e0..5b11cc1fdc57e3 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libuv", - "version-semver": "1.42.0", - "port-version": 2, + "version-semver": "1.43.0", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "dependencies": [ diff --git a/ports/libuvc/portfile.cmake b/ports/libuvc/portfile.cmake index 1e76adcd916a63..6f68f14b7ac48d 100644 --- a/ports/libuvc/portfile.cmake +++ b/ports/libuvc/portfile.cmake @@ -27,5 +27,6 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME libuvc CONFIG_PATH lib/cmake/libuvc) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_pkgconfig() # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libuvc/vcpkg.json b/ports/libuvc/vcpkg.json index ee9766b69ebff1..ff87631085ec19 100644 --- a/ports/libuvc/vcpkg.json +++ b/ports/libuvc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libuvc", "version-date": "2020-11-24", - "port-version": 2, + "port-version": 3, "description": "a cross-platform library for USB video devices", "homepage": "https://github.com/libuvc/libuvc", "supports": "linux", diff --git a/ports/libvmdk/portfile.cmake b/ports/libvmdk/portfile.cmake index 505d5e68c4f947..1aac7f717b6ade 100644 --- a/ports/libvmdk/portfile.cmake +++ b/ports/libvmdk/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(LIB_VERSION 20200926) set(LIB_FILENAME libvmdk-alpha-${LIB_VERSION}.tar.gz) diff --git a/ports/libvmdk/vcpkg.json b/ports/libvmdk/vcpkg.json index e8211d6c62e367..9a9f7f705cdaa5 100644 --- a/ports/libvmdk/vcpkg.json +++ b/ports/libvmdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libvmdk", "version-string": "20200926", - "port-version": 1, + "port-version": 2, "description": "Library and tools to access the VMware Virtual Disk (VMDK) format", "homepage": "https://github.com/libyal/libvmdk", "supports": "!uwp", diff --git a/ports/libwandio/configure.lib.patch b/ports/libwandio/configure.lib.patch index 3898836b7bc082..7c0d1651bc1035 100644 --- a/ports/libwandio/configure.lib.patch +++ b/ports/libwandio/configure.lib.patch @@ -56,7 +56,7 @@ index 4579fbb3d..f6be008c8 100644 [ - AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no) + # AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no) -+ AC_SEARCH_LIBS(lzma_free, [lzma lzmad], have_lzma=yes, have_lzma=no) ++ AC_SEARCH_LIBS(lzma_free, [lzma], have_lzma=yes, have_lzma=no) ], [have_lzma=no]) AS_IF([test "x$have_lzma" = "xyes"], [ @@ -67,23 +67,6 @@ index 4579fbb3d..f6be008c8 100644 fi AC_DEFINE(HAVE_LIBLZMA, 1, "Compiled with lzma support") with_lzma=yes], -@@ -215,12 +219,13 @@ AC_ARG_WITH([zstd], - - AS_IF([test "x$with_zstd" != "xno"], - [ -- AC_CHECK_LIB(zstd, ZSTD_createDStream, have_zstd=yes, have_zstd=no) -+ AC_SEARCH_LIBS(ZSTD_createDStream, [zstd zstdd], have_zstd=yes, have_zstd=no) -+ # AC_CHECK_LIB(zstd, ZSTD_createDStream, have_zstd=yes, have_zstd=no) - ], [have_zstd=no]) - - AS_IF([test "x$have_zstd" = "xyes"], [ -- if test "$ac_cv_lib_zstd_code" != "none required"; then -- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lzstd" -+ if test "$ac_cv_search_ZSTD_createDStream" != "none required"; then -+ LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_ZSTD_createDStream" - fi - AC_DEFINE(HAVE_LIBZSTD, 1, "Compiled with zstd support") - with_zstd=yes], @@ -259,25 +264,28 @@ AC_ARG_WITH([lz4], AS_IF([test "x$with_lz4" != "xno"], diff --git a/ports/libwandio/vcpkg.json b/ports/libwandio/vcpkg.json index 94c493eca248bf..6c682a7c39601b 100644 --- a/ports/libwandio/vcpkg.json +++ b/ports/libwandio/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libwandio", - "version-string": "4.2.1", - "port-version": 4, + "version": "4.2.1", + "port-version": 6, "description": "C library for simple and efficient file IO.", "homepage": "https://github.com/wanduow/wandio", + "license": "LGPL-3.0-only", "supports": "!windows", "dependencies": [ "bzip2", diff --git a/ports/libwebm/Fix-cmake.patch b/ports/libwebm/Fix-cmake.patch index a188c81ae0efb2..79751e620110ae 100644 --- a/ports/libwebm/Fix-cmake.patch +++ b/ports/libwebm/Fix-cmake.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a83d23b..0f5ede3 100644 +index a83d23b..c5abf83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,8 @@ @@ -11,7 +11,7 @@ index a83d23b..0f5ede3 100644 include(GNUInstallDirs) include("${CMAKE_CURRENT_SOURCE_DIR}/build/cxx_flags.cmake") -@@ -330,6 +332,30 @@ add_library(webm ${libwebm_common_sources} +@@ -330,6 +332,50 @@ add_library(webm ${libwebm_common_sources} $ $) @@ -24,25 +24,45 @@ index a83d23b..0f5ede3 100644 + +install( + FILES -+ mkvmuxer/mkvmuxer.h -+ mkvmuxer/mkvmuxertypes.h -+ mkvmuxer/mkvmuxerutil.h -+ mkvmuxer/mkvwriter.h -+ mkvparser/mkvparser.h -+ mkvparser/mkvreader.h -+ webvtt/vttreader.h -+ webvtt/webvttparser.h -+ common/file_util.h -+ common/hdr_util.h -+ common/webmids.h ++ mkvmuxer.hpp ++ mkvmuxertypes.hpp ++ mkvmuxerutil.hpp ++ mkvparser.hpp ++ mkvreader.hpp ++ mkvwriter.hpp ++ webmids.hpp + DESTINATION -+ "include/libwebm/" ++ include/libwebm ++) ++ ++install( ++ DIRECTORY mkvmuxer/ ++ DESTINATION include/libwebm/mkvmuxer ++ FILES_MATCHING PATTERN "*.h" ++) ++ ++install( ++ DIRECTORY mkvparser/ ++ DESTINATION include/libwebm/mkvparser ++ FILES_MATCHING PATTERN "*.h" ++) ++ ++install( ++ DIRECTORY webvtt/ ++ DESTINATION include/libwebm/webvtt ++ FILES_MATCHING PATTERN "*.h" ++) ++ ++install( ++ DIRECTORY common/ ++ DESTINATION include/libwebm/common ++ FILES_MATCHING PATTERN "*.h" +) + if (WIN32) # Use libwebm and libwebm.lib for project and library name on Windows (instead # webm and webm.lib). -@@ -337,18 +363,22 @@ if (WIN32) +@@ -337,18 +383,22 @@ if (WIN32) set_target_properties(webm PROPERTIES PREFIX lib) endif () diff --git a/ports/libwebm/vcpkg.json b/ports/libwebm/vcpkg.json index 9e0714a8c375fb..0f986243668206 100644 --- a/ports/libwebm/vcpkg.json +++ b/ports/libwebm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libwebm", "version": "1.0.0.28", + "port-version": 1, "description": "WebM File Parser", "homepage": "https://github.com/webmproject/libwebm", "dependencies": [ diff --git a/ports/libwebsockets/fix-find-openssl.patch b/ports/libwebsockets/fix-find-openssl.patch new file mode 100644 index 00000000000000..4bd45af3bd75df --- /dev/null +++ b/ports/libwebsockets/fix-find-openssl.patch @@ -0,0 +1,11 @@ +diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt +--- a/lib/tls/CMakeLists.txt (revision a5aae049b2a386712e1be3b417915c0d44c7e675) ++++ b/lib/tls/CMakeLists.txt (date 1642427956730) +@@ -257,7 +257,6 @@ + find_package(PkgConfig QUIET) + pkg_check_modules(PC_OPENSSL openssl QUIET) + find_package(OpenSSL REQUIRED) +- list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES}) + set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} PARENT_SCOPE) + endif() + set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}") diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index 1e16e87a8f1a1c..6307aa306574f1 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO warmcat/libwebsockets @@ -10,6 +8,7 @@ vcpkg_from_github( fix-dependency-libuv.patch fix-build-error.patch export-include-path.patch + fix-find-openssl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LWS_WITH_STATIC) @@ -132,9 +131,15 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LWS_WITH_SHARED) # option(LWS_WITH_LWS_DSH "Support lws_dsh_t Disordered Shared Heap" OFF) ## +set(EXTRA_ARGS) +if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + set(EXTRA_ARGS "-DLWS_WITH_LIBUV=ON") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${EXTRA_ARGS} -DLWS_WITH_STATIC=${LWS_WITH_STATIC} -DLWS_WITH_SHARED=${LWS_WITH_SHARED} -DLWS_WITH_GENCRYPTO=ON @@ -144,7 +149,6 @@ vcpkg_cmake_configure( -DLWS_IPV6=ON -DLWS_WITH_HTTP2=ON -DLWS_WITH_HTTP_STREAM_COMPRESSION=ON # Since zlib is already a dependency - -DLWS_WITH_LIBUV=ON -DLWS_WITH_EXTERNAL_POLL=ON # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json index 611844fee9c4a0..f86174727d501c 100644 --- a/ports/libwebsockets/vcpkg.json +++ b/ports/libwebsockets/vcpkg.json @@ -1,11 +1,15 @@ { "name": "libwebsockets", "version-semver": "4.3.0", + "port-version": 2, "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.", "homepage": "https://github.com/warmcat/libwebsockets", "supports": "!uwp", "dependencies": [ - "libuv", + { + "name": "libuv", + "platform": "!emscripten" + }, "openssl", "pthreads", { diff --git a/ports/libxdiff/portfile.cmake b/ports/libxdiff/portfile.cmake index 05b7ade351ac97..e0813a12098fa1 100644 --- a/ports/libxdiff/portfile.cmake +++ b/ports/libxdiff/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports being built for desktop" ON_TARGET "UWP") - set(LIBXDIFF_REF 77e30f3190685efd87cce2c9c5d688cbaa1b0134) set(LIBXDIFF_SHA512 c559b575e6d6f06f3b3064f3e077a15d8f57422340199215a4cbd7beab527bc250347c8779a8d6f8c4e41799a032431e83c7336f86569527ab754444455b8c87) @@ -31,7 +29,7 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/xdiff.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xdiff.dll") diff --git a/ports/libxdiff/vcpkg.json b/ports/libxdiff/vcpkg.json index ab48b66baff822..40e9f6d3ec83ef 100644 --- a/ports/libxdiff/vcpkg.json +++ b/ports/libxdiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxdiff", - "version-string": "0.23", - "port-version": 1, + "version": "0.23", + "port-version": 2, "description": "The LibXDiff library implements basic and yet complete functionalities to create file differences/patches to both binary and text files. The library uses memory files as file abstraction to achieve both performance and portability.", "homepage": "https://github.com/Drako/libxdiff", "supports": "!uwp" diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index f80be639addbc8..dede4c83166e74 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -40,7 +40,7 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0 endif() endif() if(TARGET LibXml2::LibXml2) - set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "liblzma::liblzma" "ZLIB::ZLIB") + set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "LibLZMA::LibLZMA" "ZLIB::ZLIB") if(TARGET Iconv::Iconv) set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Iconv::Iconv") endif() diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 68cb1e3eb4da44..b28e844f3e1088 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libxml2", "version-semver": "2.9.12", - "port-version": 4, + "port-version": 5, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", + "license": "MIT", "dependencies": [ "libiconv", "liblzma", diff --git a/ports/libxmlpp/vcpkg.json b/ports/libxmlpp/vcpkg.json index c5f74dfbff22b9..ff1b69a481c275 100644 --- a/ports/libxmlpp/vcpkg.json +++ b/ports/libxmlpp/vcpkg.json @@ -1,11 +1,15 @@ { "name": "libxmlpp", "version": "5.0.0", - "port-version": 1, + "port-version": 2, "description": "a C++ wrapper for the libxml XML parser library.", "supports": "!(windows & static)", "dependencies": [ "glibmm", - "libxml2" + "libxml2", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/libxmp-lite/portfile.cmake b/ports/libxmp-lite/portfile.cmake index 4f3ce633990655..abcad6008d1478 100644 --- a/ports/libxmp-lite/portfile.cmake +++ b/ports/libxmp-lite/portfile.cmake @@ -10,14 +10,13 @@ vcpkg_from_sourceforge( 0001-msvc-buildfix.patch 0002-fix-symbols.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libxmp-lite/vcpkg.json b/ports/libxmp-lite/vcpkg.json index ec4ffce7847984..3e0d850444b87e 100644 --- a/ports/libxmp-lite/vcpkg.json +++ b/ports/libxmp-lite/vcpkg.json @@ -1,7 +1,14 @@ { "name": "libxmp-lite", - "version-string": "4.4.1", - "port-version": 7, + "version": "4.4.1", + "port-version": 8, "description": "Lightweight version of libxmp that supports MOD, S3M, XM and IT modules.", - "homepage": "https://sourceforge.net/projects/xmp/" + "homepage": "https://sourceforge.net/projects/xmp/", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libxslt/0001-Fix-makefile.patch b/ports/libxslt/0001-Fix-makefile.patch index db638886bcc557..65433e0d7ac859 100644 --- a/ports/libxslt/0001-Fix-makefile.patch +++ b/ports/libxslt/0001-Fix-makefile.patch @@ -8,11 +8,11 @@ index 2e4742bb..8bfe7d83 100644 LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) -LIBS = +# The libraries are needed for static builds (the makefile builds all tools and dlls) -+LIBS = iconv.lib charset.lib ws2_32.lib ++LIBS = iconv.lib charset.lib ws2_32.lib lzma.lib +!if "$(DEBUG)" == "1" -+LIBS = $(LIBS) zlibd.lib lzmad.lib ++LIBS = $(LIBS) zlibd.lib +!else -+LIBS = $(LIBS) zlib.lib lzma.lib ++LIBS = $(LIBS) zlib.lib +!endif # The archiver and its options. diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index 99ea78fa87d9b0..03e3bc74be0d95 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libxslt", "version": "1.1.34", - "port-version": 3, + "port-version": 4, "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", + "license": null, "supports": "!uwp", "dependencies": [ "liblzma", diff --git a/ports/libyaml/export-pkgconfig.patch b/ports/libyaml/export-pkgconfig.patch new file mode 100644 index 00000000000000..5e0d5a3b7479ea --- /dev/null +++ b/ports/libyaml/export-pkgconfig.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f81148..8006536 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,3 +158,11 @@ install( + FILES ${config_version_file} + DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development + ) ++ ++set(prefix ${CMAKE_INSTALL_PREFIX}) ++set(exec_prefix ${CMAKE_INSTALL_PREFIX}) ++set(includedir ${CMAKE_INSTALL_PREFIX}/include) ++set(libdir ${CMAKE_INSTALL_PREFIX}/lib) ++set(PACKAGE_VERSION 0.1) ++configure_file(yaml-0.1.pc.in ${PROJECT_BINARY_DIR}/yaml-0.1.pc @ONLY) ++install(FILES ${PROJECT_BINARY_DIR}/yaml-0.1.pc DESTINATION lib/pkgconfig) diff --git a/ports/libyaml/portfile.cmake b/ports/libyaml/portfile.cmake index a9b75c771fac77..577b426755083f 100644 --- a/ports/libyaml/portfile.cmake +++ b/ports/libyaml/portfile.cmake @@ -8,21 +8,26 @@ vcpkg_from_github( REF 2c891fc7a770e8ba2fec34fc6b545c672beb37e6 # 0.2.5 SHA512 7cdde7b48c937777b851747f7e0b9a74cb7da30173e09305dad931ef83c3fcee3e125e721166690fe6a0987ba897564500530e5518e4b66b1c9b1db8900bf320 HEAD_REF master - PATCHES ${PATCHES} + PATCHES + ${PATCHES} + export-pkgconfig.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DINSTALL_CMAKE_DIR=share/yaml ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/yaml TARGET_PATH share/yaml) +vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/config.h ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_cmake_config_fixup(PACKAGE_NAME yaml CONFIG_PATH share/yaml) -configure_file(${SOURCE_PATH}/License ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/config.h" "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file("${SOURCE_PATH}/License" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/libyaml/vcpkg.json b/ports/libyaml/vcpkg.json index da3bff85b96bbb..06a3e7600f0a86 100644 --- a/ports/libyaml/vcpkg.json +++ b/ports/libyaml/vcpkg.json @@ -1,7 +1,17 @@ { "name": "libyaml", "version-string": "0.2.5", - "port-version": 1, + "port-version": 3, "description": "A C library for parsing and emitting YAML.", - "homepage": "https://github.com/yaml/libyaml" + "homepage": "https://github.com/yaml/libyaml", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libyuv/deprecated-warning.patch b/ports/libyuv/deprecated-warning.patch new file mode 100644 index 00000000000000..d6bfb70302ff4d --- /dev/null +++ b/ports/libyuv/deprecated-warning.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cc49726..25d6ff1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,11 @@ OPTION( TEST "Built unit tests" OFF ) + + SET( CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON ) + ++if (MSVC) ++ # Allow deprecated functions ++ add_compile_definitions(_CRT_SECURE_NO_WARNINGS) ++endif() ++ + SET ( ly_base_dir ${PROJECT_SOURCE_DIR} ) + SET ( ly_src_dir ${ly_base_dir}/source ) + SET ( ly_inc_dir ${ly_base_dir}/include ) diff --git a/ports/libyuv/portfile.cmake b/ports/libyuv/portfile.cmake index aa5b81de149a78..fc2cfaf50939a5 100644 --- a/ports/libyuv/portfile.cmake +++ b/ports/libyuv/portfile.cmake @@ -7,20 +7,20 @@ vcpkg_from_git( PATCHES fix_cmakelists.patch fix-build-type.patch + deprecated-warning.patch ) set(POSTFIX d) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=${POSTFIX} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libyuv) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libyuv) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/libyuv/vcpkg.json b/ports/libyuv/vcpkg.json index fcf55453db756d..178ea03e335f03 100644 --- a/ports/libyuv/vcpkg.json +++ b/ports/libyuv/vcpkg.json @@ -1,9 +1,18 @@ { "name": "libyuv", "version-date": "2021-04-15", + "port-version": 1, "description": "libyuv is an open source project that includes YUV scaling and conversion functionality", "homepage": "https://chromium.googlesource.com/libyuv/libyuv", "dependencies": [ - "libjpeg-turbo" + "libjpeg-turbo", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/libzen/portfile.cmake b/ports/libzen/portfile.cmake index f7770454c1d652..7f49cb7221598e 100644 --- a/ports/libzen/portfile.cmake +++ b/ports/libzen/portfile.cmake @@ -5,21 +5,19 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MediaArea/ZenLib - REF v0.4.38 - SHA512 92c3fc3994bd7110021adbfa3ce48ed6e80f162946b912e9e06ed58edc224600e56e3aab3203ad3fa8759dab9790cb5536475f070f0c060b00585911a6cc0661 + REF 13b9d3dbd2088390fbdccab32ae4560526389fbc # v0.4.39 + SHA512 ec63af7ea60be2548d45702518a9b638b4f424044ecaebfbca97d9872b3ecafddc9c59aed4a5bae7bd5bbdffbd543c4ed9e106e5c406ec576a9c0970f0aadcac HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/Project/CMake - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/Project/CMake" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/zenlib TARGET_PATH share/zenlib) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME zenlib CONFIG_PATH share/zenlib) +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libzen RENAME copyright) +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libzen/vcpkg.json b/ports/libzen/vcpkg.json index 86b8cba2bef77d..6b53cd483faa1b 100644 --- a/ports/libzen/vcpkg.json +++ b/ports/libzen/vcpkg.json @@ -1,6 +1,16 @@ { "name": "libzen", - "version-string": "0.4.38", + "version": "0.4.39", "port-version": 1, - "description": "ZenLib is a C++ utility library for easiest cross-platform development" + "description": "ZenLib is a C++ utility library for easiest cross-platform development", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/licensepp/portfile.cmake b/ports/licensepp/portfile.cmake index aa4d009695228f..c7e3fe3dad76e6 100644 --- a/ports/licensepp/portfile.cmake +++ b/ports/licensepp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/licensepp/vcpkg.json b/ports/licensepp/vcpkg.json index 04de78675ebca8..6365f1567e305b 100644 --- a/ports/licensepp/vcpkg.json +++ b/ports/licensepp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "licensepp", - "version-string": "2020-05-19", - "port-version": 2, + "version-date": "2020-05-19", + "port-version": 3, "description": "Cross platform software licensing library", "homepage": "https://github.com/zuhd-org/licensepp", "supports": "!uwp", diff --git a/ports/lilv/portfile.cmake b/ports/lilv/portfile.cmake index 858c6c3bf88323..2bb18d8985463a 100644 --- a/ports/lilv/portfile.cmake +++ b/ports/lilv/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/lilv/vcpkg.json b/ports/lilv/vcpkg.json index bcebc1eca16337..aab088cc087a94 100644 --- a/ports/lilv/vcpkg.json +++ b/ports/lilv/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lilv", - "version-string": "0.24.10", + "version": "0.24.10", + "port-version": 1, "description": "Lilv is a C library for simple use of LV2 plugins in applications.", "homepage": "https://drobilla.net/software/lilv", "license": "ISC", diff --git a/ports/lionkor-commandline/add-install.patch b/ports/lionkor-commandline/add-install.patch new file mode 100644 index 00000000000000..5b794737336107 --- /dev/null +++ b/ports/lionkor-commandline/add-install.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b4db57c..7ace55c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,3 +22,5 @@ if(BUILD_EXAMPLES) + target_link_libraries(test commandline) + endif() + ++set_target_properties(commandline PROPERTIES PUBLIC_HEADER "commandline.h") ++install(TARGETS commandline RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include) diff --git a/ports/lionkor-commandline/portfile.cmake b/ports/lionkor-commandline/portfile.cmake new file mode 100644 index 00000000000000..cecb25de34f0ee --- /dev/null +++ b/ports/lionkor-commandline/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lionkor/commandline + REF 4a8000d6b767263a79c589fcc74099a4454e07a9 + SHA512 81ee2716b7048e51d26f75033be7a6d3a1aec9bfef833ad067112b26144023dfad8f5f8d145b4162dba2de3ad09de223dbe9143cf9e2f5f5102374d3412aebf7 + HEAD_REF master + PATCHES + add-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lionkor-commandline/vcpkg.json b/ports/lionkor-commandline/vcpkg.json new file mode 100644 index 00000000000000..0aaffc9833b4db --- /dev/null +++ b/ports/lionkor-commandline/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "lionkor-commandline", + "version-semver": "1.0.0", + "description": "A C++ commandline for use in servers and chat software. Provides very simple asynchronous input/output.", + "homepage": "https://github.com/lionkor/commandline/", + "license": "MIT", + "supports": "!osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/live555/CMakeLists.txt b/ports/live555/CMakeLists.txt index cb0854bb28f1d0..097102b5da950b 100644 --- a/ports/live555/CMakeLists.txt +++ b/ports/live555/CMakeLists.txt @@ -8,6 +8,10 @@ include_directories( UsageEnvironment/include ) +if (WIN32) + add_definitions(-DNO_GETIFADDRS) +endif(WIN32) + if (NOT MSVC) add_compile_options(-DSOCKLEN_T=socklen_t) endif() diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index d4a5c0600441a6..2897dd9502cb94 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,16 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if(NOT VCPKG_USE_HEAD_VERSION) - # Live555 only makes the latest releases available for download on their site - message(FATAL_ERROR "Live555 does not have persistent releases. Please re-run the installation with --head.") -endif() - -set(LIVE_VERSION latest) - vcpkg_download_distfile(ARCHIVE - URLS "http://www.live555.com/liveMedia/public/live555-${LIVE_VERSION}.tar.gz" - FILENAME "live555-${LIVE_VERSION}.tar.gz" - SKIP_SHA512 + URLS "http://www.live555.com/liveMedia/public/live.2021.12.18.tar.gz" + FILENAME "live.2021.12.18.tar.gz" + SHA512 072ae92a1a63687e33c659627fbf562e6f2cdf73cf1c3199959aa3a713636ccd4113d56270c4793c86b42338000f180e16a7b2cf3d893402226a04360f8b2e97 ) vcpkg_extract_source_archive_ex( @@ -20,14 +13,13 @@ vcpkg_extract_source_archive_ex( fix-RTSPClient.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(GLOB HEADERS "${SOURCE_PATH}/BasicUsageEnvironment/include/*.h*" @@ -36,7 +28,7 @@ file(GLOB HEADERS "${SOURCE_PATH}/UsageEnvironment/include/*.h*" ) -file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index 176110f2d57141..96a92764497dc9 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,10 +1,17 @@ { "name": "live555", - "version-string": "latest", - "port-version": 2, + "version-date": "2021-12-18", "description": "A complete RTSP server application", "homepage": "https://www.live555.com/liveMedia", "dependencies": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/llfio/issue-83-fix-backport.patch b/ports/llfio/issue-83-fix-backport.patch new file mode 100644 index 00000000000000..dbf4c53a921a21 --- /dev/null +++ b/ports/llfio/issue-83-fix-backport.patch @@ -0,0 +1,35 @@ +diff --git a/include/llfio/v2.0/map_handle.hpp b/include/llfio/v2.0/map_handle.hpp +index 55cefa8f..3962be16 100644 +--- a/include/llfio/v2.0/map_handle.hpp ++++ b/include/llfio/v2.0/map_handle.hpp +@@ -294,8 +294,8 @@ support this operation). You may find the `is_nvram()` observer of particular us + */ + inline io_handle::const_buffer_type nvram_barrier(io_handle::const_buffer_type req, bool evict = false) noexcept + { +- auto *tp = (io_handle::const_buffer_type::pointer)(((uintptr_t) req.data()) & ~63); +- io_handle::const_buffer_type ret{tp, (size_t)(req.data() + 63 + req.size() - tp) & ~63}; ++ auto *tp = (io_handle::const_buffer_type::pointer) (((uintptr_t) req.data()) & ~63); ++ io_handle::const_buffer_type ret{tp, (size_t) (req.data() + 63 + req.size() - tp) & ~63}; + if(memory_flush_none == mem_flush_stores(ret.data(), ret.size(), evict ? memory_flush_evict : memory_flush_retain)) + { + ret = {tp, 0}; +@@ -954,7 +954,8 @@ namespace detail + { + try + { +- auto make_shared = [](map_handle h) { ++ auto make_shared = [](map_handle h) -> io_handle::registered_buffer_type ++ { + struct registered_buffer_type_indirect : io_multiplexer::_registered_buffer_type + { + map_handle h; +@@ -964,8 +965,7 @@ namespace detail + { + } + }; +- auto ptr = std::make_shared(std::move(h)); +- return ptr; ++ return io_handle::registered_buffer_type(std::make_shared(std::move(h))); + }; + const auto &page_sizes = utils::page_sizes(true); + size_t idx = 0; diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index 569af09f8d6b2a..f896ba23920d19 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -1,25 +1,29 @@ -message(WARNING [=[ -LLFIO depends on Outcome which depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's, Outcome's and LLFIO's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. -]=]) +if (NOT "cxx20" IN_LIST FEATURES) + message(WARNING [=[ + LLFIO depends on Outcome which depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's, Outcome's and LLFIO's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. + ]=]) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/llfio - REF 721503d32fe35dbaa93bde0214ae8cd3799d14b8 - SHA512 b017a0fddcd3e53c22d9863454e7ad4ce364d9e4fa46cd909ceb395df57052b5d4334081a3405e1248452863c451c3174dc7eaab70907dc8d22f4db67930cbd5 + REF 4a117d683b82a2e3e456c2ecc47a99c8406280fa + SHA512 7880356dbff10664a146a09558ba15f95cf6883ebe8e0af3d392fbd6f86f3455b9b5c8b6c5c1281c8fca93c358fcafd3468ab575eee0b483ec5b136ca59eef04 HEAD_REF develop + PATCHES + # https://github.com/ned14/llfio/issues/83 + # To be removed on next update + issue-83-fix-backport.patch ) -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_from_github( - OUT_SOURCE_PATH NTKEC_SOURCE_PATH - REPO ned14/ntkernel-error-category - REF bbd44623594142155d49bd3ce8820d3cf9da1e1e - SHA512 589d3bc7bca98ca8d05ce9f5cf009dd98b8884bdf3739582f2f6cbf5a324ce95007ea041450ed935baa4a401b4a0242c181fb6d2dcf7ad91587d75f05491f50e - HEAD_REF master - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH NTKEC_SOURCE_PATH + REPO ned14/ntkernel-error-category + REF bbd44623594142155d49bd3ce8820d3cf9da1e1e + SHA512 589d3bc7bca98ca8d05ce9f5cf009dd98b8884bdf3739582f2f6cbf5a324ce95007ea041450ed935baa4a401b4a0242c181fb6d2dcf7ad91587d75f05491f50e + HEAD_REF master +) vcpkg_check_features( OUT_FEATURE_OPTIONS LLFIO_FEATURE_OPTIONS @@ -27,61 +31,57 @@ vcpkg_check_features( status-code LLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE ) -# LLFIO needs a copy of QuickCppLib with which to bootstrap its cmake -file(COPY "${CURRENT_INSTALLED_DIR}/include/quickcpplib" - DESTINATION "${SOURCE_PATH}/quickcpplib/repo/include/" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/ned14-internal-quickcpplib/" - DESTINATION "${SOURCE_PATH}/quickcpplib/repo/" -) - # LLFIO expects ntkernel-error-category to live inside its include directory file(REMOVE_RECURSE "${SOURCE_PATH}/include/llfio/ntkernel-error-category") -if(VCPKG_TARGET_IS_WINDOWS) - file(RENAME "${NTKEC_SOURCE_PATH}" "${SOURCE_PATH}/include/llfio/ntkernel-error-category") -endif() - -# Already installed dependencies don't appear on the include path, which LLFIO assumes. -string(APPEND VCPKG_CXX_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"") -string(APPEND VCPKG_C_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"") +file(RENAME "${NTKEC_SOURCE_PATH}" "${SOURCE_PATH}/include/llfio/ntkernel-error-category") set(extra_config) # cmake does not correctly set CMAKE_SYSTEM_PROCESSOR when targeting ARM on Windows if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) list(APPEND extra_config -DLLFIO_ASSUME_CROSS_COMPILING=On) endif() +# setting CMAKE_CXX_STANDARD here to prevent llfio from messing with compiler flags +# the cmake package config requires said C++ standard target transitively via quickcpplib +if ("cxx20" IN_LIST FEATURES) + list(APPEND extra_config -DCMAKE_CXX_STANDARD=20) +elseif("cxx17" IN_LIST FEATURES) + list(APPEND extra_config -DCMAKE_CXX_STANDARD=17) +endif() + +# quickcpplib parses CMAKE_MSVC_RUNTIME_LIBRARY and cannot support the default crt linkage generator expression from vcpkg +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND extra_config -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$$<$$:Debug>DLL) + else() + list(APPEND extra_config -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$$<$$:Debug>) + endif() +endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On - -Dquickcpplib_FOUND=1 - -Doutcome_FOUND=1 + -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib ${LLFIO_FEATURE_OPTIONS} -DLLFIO_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON ${extra_config} ) -# LLFIO install assumes that the static library is always built -vcpkg_build_cmake(TARGET _sl) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_build_cmake(TARGET _dl) + vcpkg_cmake_build(TARGET install.dl) +else(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_cmake_build(TARGET install.sl) endif() if("run-tests" IN_LIST FEATURES) - vcpkg_build_cmake(TARGET test) + vcpkg_cmake_build(TARGET test) endif() -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/llfio) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/llfio) 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() if("status-code" IN_LIST FEATURES) file(INSTALL "${CURRENT_PORT_DIR}/usage-status-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index 318b32816d583c..d35443deb38b3f 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,13 +1,52 @@ { "name": "llfio", - "version-string": "2.0-20210922", + "version-string": "2.0-20220112", "description": "P1031 low level file i/o and filesystem library for the C++ standard", "homepage": "https://github.com/ned14/llfio", - "supports": "!(uwp | static)", + "supports": "!uwp", "dependencies": [ - "outcome" + "outcome", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { + "cxx17": { + "description": "Do not polyfill C++17 entities", + "dependencies": [ + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "cxx17" + ] + } + ] + }, + "cxx20": { + "description": "Do not polyfill C++20 entities", + "dependencies": [ + { + "name": "llfio", + "default-features": false, + "features": [ + "cxx17" + ] + }, + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "cxx20" + ] + } + ] + }, "run-tests": { "description": "Build and run the dependency validation tests" }, diff --git a/ports/llvm/0002-fix-install-paths.patch b/ports/llvm/0002-fix-install-paths.patch index 84d973f6537fbb..3582bcbfd2cc61 100644 --- a/ports/llvm/0002-fix-install-paths.patch +++ b/ports/llvm/0002-fix-install-paths.patch @@ -9,10 +9,10 @@ 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt -index d233f552f01f..26f502ad2d23 100644 +index 561665d58cad..3c73878a4483 100644 --- a/clang/cmake/modules/CMakeLists.txt +++ b/clang/cmake/modules/CMakeLists.txt -@@ -1,11 +1,11 @@ +@@ -3,11 +3,11 @@ include(LLVMDistributionSupport) # Generate a list of CMake library targets so that other CMake projects can # link against them. LLVM calls its version of this file LLVMExports.cmake, but # the usual CMake convention seems to be ${Project}Targets.cmake. @@ -27,7 +27,7 @@ index d233f552f01f..26f502ad2d23 100644 get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS) diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt -index 4822124ca412..1ca3eff8f14e 100644 +index e46498a6bc35..2e922f8ca89d 100644 --- a/flang/cmake/modules/CMakeLists.txt +++ b/flang/cmake/modules/CMakeLists.txt @@ -1,11 +1,11 @@ @@ -45,7 +45,7 @@ index 4822124ca412..1ca3eff8f14e 100644 get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS) diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt -index fa505a533762..90413be34120 100644 +index 62d03fa901dd..09b0f54ee8c3 100644 --- a/lld/cmake/modules/CMakeLists.txt +++ b/lld/cmake/modules/CMakeLists.txt @@ -1,11 +1,11 @@ @@ -63,10 +63,10 @@ index fa505a533762..90413be34120 100644 get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS) diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index b74adc11ade9..0638aea2f8f6 100644 +index 29e40f45fef8..e9094e9b8eb2 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake -@@ -974,7 +974,7 @@ function(process_llvm_pass_plugins) +@@ -1033,7 +1033,7 @@ function(process_llvm_pass_plugins) ## Part 1: Extension header to be included whenever we need extension # processing. @@ -76,20 +76,22 @@ index b74adc11ade9..0638aea2f8f6 100644 file(WRITE "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt -index 4b8879f65fe4..9e097ab223b5 100644 +index 51b6a4fdc284..a818de2e116c 100644 --- a/llvm/cmake/modules/CMakeLists.txt +++ b/llvm/cmake/modules/CMakeLists.txt -@@ -1,4 +1,4 @@ +@@ -1,6 +1,6 @@ + include(LLVMDistributionSupport) + -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) +set(LLVM_INSTALL_PACKAGE_DIR share/llvm) set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") # First for users who use an installed LLVM, create the LLVMExports.cmake file. diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt -index b9fb9adce2ea..85a54f699f30 100644 +index 65efc4a14987..7c3213ab0c2b 100644 --- a/mlir/cmake/modules/CMakeLists.txt +++ b/mlir/cmake/modules/CMakeLists.txt -@@ -1,11 +1,11 @@ +@@ -3,11 +3,11 @@ include(LLVMDistributionSupport) # Generate a list of CMake library targets so that other CMake projects can # link against them. LLVM calls its version of this file LLVMExports.cmake, but # the usual CMake convention seems to be ${Project}Targets.cmake. @@ -104,7 +106,7 @@ index b9fb9adce2ea..85a54f699f30 100644 get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS) diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt -index 211f95512717..2abe3803f910 100644 +index 7cc129ba2e90..9776391cd535 100644 --- a/polly/cmake/CMakeLists.txt +++ b/polly/cmake/CMakeLists.txt @@ -1,7 +1,7 @@ @@ -118,7 +120,7 @@ index 211f95512717..2abe3803f910 100644 set(POLLY_EXPORTS_FILE_NAME "PollyExports-$>.cmake") else() diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt -index 8e6e1354707b..2ae7f7090025 100644 +index 8bea8843589b..3658c0a4414a 100644 --- a/pstl/CMakeLists.txt +++ b/pstl/CMakeLists.txt @@ -81,10 +81,10 @@ install(TARGETS ParallelSTL diff --git a/ports/llvm/0003-fix-openmp-debug.patch b/ports/llvm/0003-fix-openmp-debug.patch index adf3c8ad01289e..3eff4fa538902a 100644 --- a/ports/llvm/0003-fix-openmp-debug.patch +++ b/ports/llvm/0003-fix-openmp-debug.patch @@ -2,10 +2,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt -index 822f9ca2b825..814e25864610 100644 +index bdb867e352f7..16a13fa959ea 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt -@@ -157,7 +157,7 @@ else() +@@ -159,7 +159,7 @@ else() endif() set_target_properties(omp PROPERTIES @@ -14,7 +14,7 @@ index 822f9ca2b825..814e25864610 100644 LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}" LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE} ) -@@ -232,7 +232,7 @@ if(WIN32) +@@ -236,7 +236,7 @@ if(WIN32) # Create new import library that is just the previously created one + kmp_import.cpp add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp) set_target_properties(ompimp PROPERTIES diff --git a/ports/llvm/0004-fix-dr-1734.patch b/ports/llvm/0004-fix-dr-1734.patch index adfbe5a131e21d..3a2f4a28e3e956 100644 --- a/ports/llvm/0004-fix-dr-1734.patch +++ b/ports/llvm/0004-fix-dr-1734.patch @@ -1,13 +1,16 @@ + llvm/include/llvm/Support/type_traits.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h -index b7d48e8e1ad..53ba24efc00 100644 +index 7b7d5d991f3f..469b681deea3 100644 --- a/llvm/include/llvm/Support/type_traits.h +++ b/llvm/include/llvm/Support/type_traits.h -@@ -177,7 +177,8 @@ class is_trivially_copyable { +@@ -176,7 +176,8 @@ class is_trivially_copyable { (has_deleted_copy_assign || has_trivial_copy_assign) && (has_deleted_copy_constructor || has_trivial_copy_constructor); - + -#ifdef HAVE_STD_IS_TRIVIALLY_COPYABLE -+ // due to DR 1734, a type can be std::is_trivially_copyable but not llvm::is_trivially_copyable ++// due to DR 1734, a type can be std::is_trivially_copyable but not llvm::is_trivially_copyable +#if 0 static_assert(value == std::is_trivially_copyable::value, "inconsistent behavior between llvm:: and std:: implementation of is_trivially_copyable"); diff --git a/ports/llvm/0005-fix-tools-path.patch b/ports/llvm/0005-fix-tools-path.patch index bdfad617cc97f5..06fc8fc249ede7 100644 --- a/ports/llvm/0005-fix-tools-path.patch +++ b/ports/llvm/0005-fix-tools-path.patch @@ -1,14 +1,16 @@ + llvm/tools/llvm-config/llvm-config.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp -index 53ba24efc00..0badcafe000 100644 +index 1a2f04552d13..9370c5e28206 100644 --- a/llvm/tools/llvm-config/llvm-config.cpp +++ b/llvm/tools/llvm-config/llvm-config.cpp -@@ -304,8 +304,8 @@ int main(int argc, char **argv) { - // Create an absolute path, and pop up one directory (we expect to be inside a +@@ -305,7 +305,7 @@ int main(int argc, char **argv) { // bin dir). sys::fs::make_absolute(CurrentPath); CurrentExecPrefix = - sys::path::parent_path(sys::path::parent_path(CurrentPath)).str(); + sys::path::parent_path(sys::path::parent_path(sys::path::parent_path(CurrentPath))).str(); - + // Check to see if we are inside a development tree by comparing to possible // locations (prefix style or CMake style). diff --git a/ports/llvm/0007-fix-compiler-rt-install-path.patch b/ports/llvm/0007-fix-compiler-rt-install-path.patch index 286604623a24e1..6a585cd429da4a 100644 --- a/ports/llvm/0007-fix-compiler-rt-install-path.patch +++ b/ports/llvm/0007-fix-compiler-rt-install-path.patch @@ -4,10 +4,10 @@ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt -index 0692fe75a441..65f72c2da7da 100644 +index 8131f6005dc2..9afef2e5a4e7 100644 --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt -@@ -208,7 +208,7 @@ set_target_properties(clang-resource-headers PROPERTIES +@@ -222,7 +222,7 @@ set_target_properties(clang-resource-headers PROPERTIES FOLDER "Misc" RUNTIME_OUTPUT_DIRECTORY "${output_dir}") @@ -17,23 +17,23 @@ index 0692fe75a441..65f72c2da7da 100644 install( FILES ${files} ${generated_files} diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt -index 61bbbf8faedd..f6d0b73d9913 100644 +index 61b1c60bf590..c20a5a326f15 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt @@ -82,7 +82,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS} -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION} -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR} -- -DCOMPILER_RT_INSTALL_PATH:STRING=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION} -+ -DCOMPILER_RT_INSTALL_PATH:STRING=tools/llvm/lib/clang/${CLANG_VERSION} +- -DCOMPILER_RT_INSTALL_PATH:PATH=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION} ++ -DCOMPILER_RT_INSTALL_PATH:PATH=tools/llvm/lib/clang/${CLANG_VERSION} -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake -index 964dd598f102..7379a1ba06d1 100644 +index c11342e68813..61bb52135c43 100644 --- a/compiler-rt/cmake/base-config-ix.cmake +++ b/compiler-rt/cmake/base-config-ix.cmake -@@ -43,7 +43,7 @@ if (LLVM_TREE_AVAILABLE) +@@ -42,7 +42,7 @@ if (LLVM_TREE_AVAILABLE) # Setup the paths where compiler-rt runtimes and headers should be stored. set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}) set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) diff --git a/ports/llvm/0008-fix-libcxx-install.patch b/ports/llvm/0008-fix-libcxx-install.patch deleted file mode 100644 index ec4019dc2f86f4..00000000000000 --- a/ports/llvm/0008-fix-libcxx-install.patch +++ /dev/null @@ -1,18 +0,0 @@ - libcxx/src/CMakeLists.txt | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt -index 9965104cb5b2..0d2a33c6b33c 100644 ---- a/libcxx/src/CMakeLists.txt -+++ b/libcxx/src/CMakeLists.txt -@@ -372,9 +372,7 @@ endif() - # NOTE: This install command must go after the cxx install command otherwise - # it will not be executed after the library symlinks are installed. - if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT) -- # Replace the libc++ filename with $ -- # after we required CMake 3.0. -- install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" -+ install(FILES "$" - DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} - COMPONENT libcxx) - endif() diff --git a/ports/llvm/0009-fix-tools-install-path.patch b/ports/llvm/0009-fix-tools-install-path.patch index b544feec08ede3..bfc5c5fc2bb4b7 100644 --- a/ports/llvm/0009-fix-tools-install-path.patch +++ b/ports/llvm/0009-fix-tools-install-path.patch @@ -7,10 +7,11 @@ clang/utils/hmaptool/CMakeLists.txt | 2 +- flang/cmake/modules/AddFlang.cmake | 2 +- flang/tools/f18/CMakeLists.txt | 4 ++-- + flang/tools/flang-driver/CMakeLists.txt | 2 +- lld/cmake/modules/AddLLD.cmake | 2 +- lld/tools/lld/CMakeLists.txt | 2 +- lldb/cmake/modules/AddLLDB.cmake | 2 +- - 12 files changed, 13 insertions(+), 13 deletions(-) + 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt index 4caae81c49b6..8c459c51cc34 100644 @@ -24,11 +25,11 @@ index 4caae81c49b6..8c459c51cc34 100644 + RUNTIME DESTINATION tools/llvm COMPONENT clang-extras) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake -index 704278a0e93b..e8a87f574474 100644 +index 5752f4277444..00b7d21b8fef 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake -@@ -170,7 +170,7 @@ macro(add_clang_tool name) - +@@ -159,7 +159,7 @@ macro(add_clang_tool name) + get_target_export_arg(${name} Clang export_to_clangtargets) install(TARGETS ${name} ${export_to_clangtargets} - RUNTIME DESTINATION bin @@ -74,10 +75,10 @@ index ec0702d76f18..9a34a09921b1 100644 endforeach() diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt -index dd3d33439299..ded0b5530ad9 100644 +index eccc6b83195b..232976c0c227 100644 --- a/clang/tools/scan-view/CMakeLists.txt +++ b/clang/tools/scan-view/CMakeLists.txt -@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW) +@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} @@ -100,11 +101,11 @@ index 62f2de0cb15c..38dc821c76de 100644 add_custom_target(hmaptool ALL DEPENDS ${Depends}) diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake -index ba36a234babf..1197a8d8ff32 100644 +index 5da58a59ed12..c019d7fc50a9 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake -@@ -119,7 +119,7 @@ macro(add_flang_tool name) - +@@ -108,7 +108,7 @@ macro(add_flang_tool name) + get_target_export_arg(${name} Flang export_to_flangtargets) install(TARGETS ${name} ${export_to_flangtargets} - RUNTIME DESTINATION bin @@ -113,30 +114,41 @@ index ba36a234babf..1197a8d8ff32 100644 if(NOT LLVM_ENABLE_IDE) diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt -index 2e5350aecdc6..b4ab145846b5 100644 +index 239859b5e5b9..12d00f904f8a 100644 --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt -@@ -63,12 +63,12 @@ endforeach() +@@ -60,7 +60,7 @@ endforeach() add_custom_target(module_files ALL DEPENDS ${MODULE_FILES}) -install(TARGETS f18 DESTINATION bin) +install(TARGETS f18 DESTINATION tools/llvm) + set(FLANG_DEFAULT_DRIVER "flang-new") + if (NOT FLANG_BUILD_NEW_DRIVER) +@@ -70,5 +70,5 @@ endif() # This flang shell script will only work in a POSIX shell. if (NOT WIN32) - file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/flang - DESTINATION ${CMAKE_BINARY_DIR}/bin - FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.in ${CMAKE_BINARY_DIR}/bin/flang @ONLY) - install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin) + install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION tools/llvm) endif() +diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt +index 4c7ad220d223..f4206913e76f 100644 +--- a/flang/tools/flang-driver/CMakeLists.txt ++++ b/flang/tools/flang-driver/CMakeLists.txt +@@ -27,4 +27,4 @@ clang_target_link_libraries(flang-new + clangBasic + ) + +-install(TARGETS flang-new DESTINATION bin) ++install(TARGETS flang-new DESTINATION tools/llvm) diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake -index 23df41312403..86f4eafeed07 100644 +index 9883475d1aa5..48e46586f387 100644 --- a/lld/cmake/modules/AddLLD.cmake +++ b/lld/cmake/modules/AddLLD.cmake -@@ -54,7 +54,7 @@ macro(add_lld_tool name) - +@@ -46,7 +46,7 @@ macro(add_lld_tool name) + get_target_export_arg(${name} LLD export_to_lldtargets) install(TARGETS ${name} ${export_to_lldtargets} - RUNTIME DESTINATION bin @@ -145,7 +157,7 @@ index 23df41312403..86f4eafeed07 100644 if(NOT CMAKE_CONFIGURATION_TYPES) diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt -index 5cff736ff57f..32f43bc1c9be 100644 +index e77b2161a873..b325b934640c 100644 --- a/lld/tools/lld/CMakeLists.txt +++ b/lld/tools/lld/CMakeLists.txt @@ -21,7 +21,7 @@ target_link_libraries(lld @@ -158,7 +170,7 @@ index 5cff736ff57f..32f43bc1c9be 100644 if(NOT LLD_SYMLINKS_TO_CREATE) set(LLD_SYMLINKS_TO_CREATE diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake -index 4ed5c647c5d2..cb31901dddbb 100644 +index 8be214a8509a..4a5d0fa39be3 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -187,7 +187,7 @@ function(add_lldb_executable name) diff --git a/ports/llvm/0010-fix-libffi.patch b/ports/llvm/0010-fix-libffi.patch index e98825595d3c69..93d0cb4da4d421 100644 --- a/ports/llvm/0010-fix-libffi.patch +++ b/ports/llvm/0010-fix-libffi.patch @@ -2,10 +2,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake -index 818fafbce148..66fc9f509ac7 100644 +index dd0aaadb47c7..279435b5b27d 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake -@@ -335,7 +335,7 @@ if( LLVM_ENABLE_FFI ) +@@ -343,7 +343,7 @@ if( LLVM_ENABLE_FFI ) message(FATAL_ERROR "libffi includes are not found.") endif() diff --git a/ports/llvm/0011-fix-libxml2.patch b/ports/llvm/0011-fix-libxml2.patch index b5deff09f9b60f..d3f953f320df6b 100644 --- a/ports/llvm/0011-fix-libxml2.patch +++ b/ports/llvm/0011-fix-libxml2.patch @@ -3,7 +3,7 @@ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt -index ceef4b086..40b9e9955 100644 +index ceef4b08637c..40b9e995597f 100644 --- a/clang/tools/c-index-test/CMakeLists.txt +++ b/clang/tools/c-index-test/CMakeLists.txt @@ -40,11 +40,7 @@ set_target_properties(c-index-test @@ -20,10 +20,10 @@ index ceef4b086..40b9e9955 100644 endif() diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake -index 2fdf1502d..beeeeb9b1 100644 +index b62cd7d24438..a8c78ee1bccd 100644 --- a/lldb/cmake/modules/LLDBConfig.cmake +++ b/lldb/cmake/modules/LLDBConfig.cmake -@@ -214,7 +214,7 @@ if (LLDB_ENABLE_LZMA) +@@ -215,7 +215,7 @@ if (LLDB_ENABLE_LZMA) endif() if (LLDB_ENABLE_LIBXML2) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 1b2dcf6939360f..205d250396b6cb 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -1,4 +1,4 @@ -set(LLVM_VERSION "12.0.1") +set(LLVM_VERSION "13.0.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project REF llvmorg-${LLVM_VERSION} - SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 + SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 HEAD_REF master PATCHES 0002-fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. @@ -14,7 +14,6 @@ vcpkg_from_github( 0004-fix-dr-1734.patch 0005-fix-tools-path.patch 0007-fix-compiler-rt-install-path.patch - 0008-fix-libcxx-install.patch 0009-fix-tools-install-path.patch 0010-fix-libffi.patch 0011-fix-libxml2.patch @@ -27,6 +26,7 @@ vcpkg_check_features( tools LLVM_INCLUDE_TOOLS utils LLVM_BUILD_UTILS utils LLVM_INCLUDE_UTILS + utils LLVM_INSTALL_UTILS enable-rtti LLVM_ENABLE_RTTI enable-ffi LLVM_ENABLE_FFI enable-terminfo LLVM_ENABLE_TERMINFO @@ -112,9 +112,8 @@ if("compiler-rt" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "compiler-rt") endif() if("flang" IN_LIST FEATURES) - # Disable Flang on Windows (see http://lists.llvm.org/pipermail/flang-dev/2020-July/000448.html). - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Building Flang with MSVC is not supported. Disable it until issues are fixed.") + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + message(FATAL_ERROR "Building Flang with MSVC is not supported on x86. Disable it until issues are fixed.") endif() list(APPEND LLVM_ENABLE_PROJECTS "flang") list(APPEND FEATURE_OPTIONS @@ -157,9 +156,8 @@ if("openmp" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "openmp") # Perl is required for the OpenMP run-time vcpkg_find_acquire_program(PERL) - list(APPEND FEATURE_OPTIONS - "-DPERL_EXECUTABLE=${PERL}" - ) + get_filename_component(PERL_PATH ${PERL} DIRECTORY) + vcpkg_add_to_path(${PERL_PATH}) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") list(APPEND FEATURE_OPTIONS -DLIBOMP_DEFAULT_LIB_NAME=libompd @@ -236,9 +234,8 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESS endif() endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/llvm - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ${CROSS_OPTIONS} @@ -246,6 +243,7 @@ vcpkg_configure_cmake( -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_BUILD_TESTS=OFF + -DLLDB_ENABLE_CURSES=OFF # Force TableGen to be built with optimization. This will significantly improve build time. -DLLVM_OPTIMIZED_TABLEGEN=ON "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}" @@ -261,57 +259,63 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d ) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/llvm" TARGET_PATH "share/llvm") -file(INSTALL ${SOURCE_PATH}/llvm/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME copyright) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/llvm_usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME usage) - -if("clang" IN_LIST FEATURES) - vcpkg_fixup_cmake_targets(CONFIG_PATH "share/clang" TARGET_PATH "share/clang" DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(INSTALL ${SOURCE_PATH}/clang/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/clang RENAME copyright) - file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/clang_usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/clang RENAME usage) -endif() +vcpkg_cmake_install(ADD_BIN_TO_PATH) -if("clang-tools-extra" IN_LIST FEATURES) - # Remove empty include directory include/clang-tidy/plugin - file(GLOB_RECURSE INCLUDE_CLANG_TIDY_PLUGIN_FILES "${CURRENT_PACKAGES_DIR}/include/clang-tidy/plugin/*") - if(NOT INCLUDE_CLANG_TIDY_PLUGIN_FILES) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/clang-tidy/plugin") +function(llvm_cmake_package_config_fixup package_name) + cmake_parse_arguments("arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH" "FEATURE_NAME" "" ${ARGN}) + if(NOT DEFINED arg_FEATURE_NAME) + set(arg_FEATURE_NAME ${package_name}) endif() -endif() - -if("flang" IN_LIST FEATURES) - vcpkg_fixup_cmake_targets(CONFIG_PATH "share/flang" TARGET_PATH "share/flang" DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(INSTALL ${SOURCE_PATH}/flang/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/flang RENAME copyright) - file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/flang_usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/flang RENAME usage) - # Remove empty include directory /include/flang/Config - file(GLOB_RECURSE INCLUDE_FLANG_CONFIG_FILES "${CURRENT_PACKAGES_DIR}/include/flang/Config/*") - if(NOT INCLUDE_FLANG_CONFIG_FILES) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/flang/Config") + if("${arg_FEATURE_NAME}" STREQUAL "${PORT}" OR "${arg_FEATURE_NAME}" IN_LIST FEATURES) + set(args) + list(APPEND args PACKAGE_NAME "${package_name}") + if(arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) + list(APPEND args "DO_NOT_DELETE_PARENT_CONFIG_PATH") + endif() + vcpkg_cmake_config_fixup(${args}) + file(INSTALL "${SOURCE_PATH}/${package_name}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${package_name}" RENAME copyright) + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${package_name}_usage") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/${package_name}_usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${package_name}" RENAME usage) + endif() endif() -endif() +endfunction() -if("lld" IN_LIST FEATURES) - vcpkg_fixup_cmake_targets(CONFIG_PATH "share/lld" TARGET_PATH "share/lld" DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(INSTALL ${SOURCE_PATH}/lld/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lld RENAME copyright) - file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/lld_usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/lld RENAME usage) -endif() +llvm_cmake_package_config_fixup("clang" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("flang" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("lld" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("mlir" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("polly" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("ParallelSTL" FEATURE_NAME "pstl" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("llvm") -if("mlir" IN_LIST FEATURES) - vcpkg_fixup_cmake_targets(CONFIG_PATH "share/mlir" TARGET_PATH "share/mlir" DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(INSTALL ${SOURCE_PATH}/mlir/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/mlir RENAME copyright) - file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/mlir_usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/mlir RENAME usage) +set(empty_dirs) + +if("clang-tools-extra" IN_LIST FEATURES) + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/clang-tidy/plugin") endif() -if("polly" IN_LIST FEATURES) - vcpkg_fixup_cmake_targets(CONFIG_PATH "share/polly" TARGET_PATH "share/polly" DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(INSTALL ${SOURCE_PATH}/polly/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/polly RENAME copyright) +if("flang" IN_LIST FEATURES) + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Config") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/CodeGen/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/Dialect/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/Transforms/CMakeFiles") endif() -if("pstl" IN_LIST FEATURES) - vcpkg_fixup_cmake_targets(CONFIG_PATH "share/ParallelSTL" TARGET_PATH "share/ParallelSTL" DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(INSTALL ${SOURCE_PATH}/pstl/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ParallelSTL RENAME copyright) +if(empty_dirs) + foreach(empty_dir IN LISTS empty_dirs) + if(NOT EXISTS "${empty_dir}") + message(SEND_ERROR "Directory '${empty_dir}' is not exist. Please remove it from the checking.") + else() + file(GLOB_RECURSE files_in_dir "${empty_dir}/*") + if(files_in_dir) + message(SEND_ERROR "Directory '${empty_dir}' is not empty. Please remove it from the checking.") + else() + file(REMOVE_RECURSE "${empty_dir}") + endif() + endif() + endforeach() endif() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index afa41a8abe7ebd..29be0e7bb0924d 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,9 +1,21 @@ { "name": "llvm", - "version-string": "12.0.1", + "version": "13.0.0", + "port-version": 3, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", - "supports": "!uwp", + "license": "Apache-2.0", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "clang", "default-options", @@ -150,6 +162,7 @@ "name": "llvm", "default-features": false, "features": [ + "clang", "mlir", "tools" ] @@ -324,7 +337,16 @@ "description": "Build with XCore backend." }, "tools": { - "description": "Build LLVM tools." + "description": "Build LLVM tools.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "enable-threads" + ] + } + ] }, "utils": { "description": "Build LLVM utils." diff --git a/ports/lodepng-c/CMakeLists.txt b/ports/lodepng-c/CMakeLists.txt deleted file mode 100644 index bd58c435e181d5..00000000000000 --- a/ports/lodepng-c/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -cmake_minimum_required(VERSION 3.8.0) -project(lodepng-c C) - -configure_file(${CMAKE_CURRENT_LIST_DIR}/lodepng.cpp ${CMAKE_CURRENT_LIST_DIR}/lodepng.c COPYONLY) -add_library(lodepng-c lodepng.c) -target_include_directories(lodepng-c PUBLIC - $ -) - -file(WRITE "${CMAKE_BINARY_DIR}/lodepng-c-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/lodepng-c-targets.cmake\")") -install(FILES "${CMAKE_BINARY_DIR}/lodepng-c-config.cmake" DESTINATION "share/lodepng-c/") - -install(TARGETS lodepng-c EXPORT lodepng-c-targets) - -install(EXPORT lodepng-c-targets DESTINATION share/lodepng-c/) - -if(NOT DDISABLE_INSTALL_EXAMPLES) - install(DIRECTORY examples DESTINATION share/lodepng-c/) -endif() - -if(NOT DISABLE_INSTALL_HEADERS) - install(FILES lodepng.h DESTINATION include) -endif() diff --git a/ports/lodepng-c/portfile.cmake b/ports/lodepng-c/portfile.cmake index 6593d2598c12ed..dba1f83f42edee 100644 --- a/ports/lodepng-c/portfile.cmake +++ b/ports/lodepng-c/portfile.cmake @@ -1,33 +1 @@ -if (EXISTS ${CURRENT_INSTALLED_DIR}/share/lodepng/copyright) - message(FATAL_ERROR "${PORT} conflict with lodepng, please remove lodepng before install ${PORT}.") -endif() - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO lvandeve/lodepng - REF e34ac04553e51a6982ae234d98ce6b76dd57a6a1 - SHA512 ab79fb2c6403e5d7bdf0b94a3f93f6513889eda8e6b74fb2b569fbc6f95fb79474654818cb0e71eff88214ca7c42ebd7c95f734a2faa77259fe06bfddcb6967a - HEAD_REF master -) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE - OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON - -DDISABLE_INSTALL_TOOLS=ON - -DDDISABLE_INSTALL_EXAMPLES=ON -) - -vcpkg_install_cmake() -vcpkg_copy_pdbs() - -# Moves all .cmake files from /debug/share/lodepng/ to /share/lodepng/ -vcpkg_fixup_cmake_targets() - -file(INSTALL "${SOURCE_PATH}/lodepng.h" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/lodepng-c/vcpkg.json b/ports/lodepng-c/vcpkg.json index 3e027e6328b3d5..4f33b1778465b1 100644 --- a/ports/lodepng-c/vcpkg.json +++ b/ports/lodepng-c/vcpkg.json @@ -1,7 +1,8 @@ { "name": "lodepng-c", - "version-date": "2021-03-01", - "port-version": 1, - "description": "PNG encoder and decoder in C", - "homepage": "https://github.com/lvandeve/lodepng" + "version-string": "deprecated", + "description": "Legacy port. Use port lodepng instead.", + "dependencies": [ + "lodepng" + ] } diff --git a/ports/lodepng/CMakeLists.txt b/ports/lodepng/CMakeLists.txt index 1cf1865c067b02..6c80b126cf1f36 100644 --- a/ports/lodepng/CMakeLists.txt +++ b/ports/lodepng/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.8.0) project(lodepng) -add_library(lodepng lodepng.cpp lodepng_util.cpp) +add_library(lodepng lodepng.cpp) target_include_directories(lodepng PUBLIC - $ + $ ) file(WRITE "${CMAKE_BINARY_DIR}/lodepng-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/lodepng-targets.cmake\")") @@ -13,10 +13,18 @@ install(TARGETS lodepng EXPORT lodepng-targets) install(EXPORT lodepng-targets DESTINATION share/lodepng/) -if(NOT DDISABLE_INSTALL_EXAMPLES) - install(DIRECTORY examples DESTINATION share/lodepng/) -endif() +add_library(lodepng-c lodepng.c) +target_include_directories(lodepng-c PUBLIC + $ +) + +file(WRITE "${CMAKE_BINARY_DIR}/lodepng-c-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/lodepng-c-targets.cmake\")") +install(FILES "${CMAKE_BINARY_DIR}/lodepng-c-config.cmake" DESTINATION "share/lodepng-c/") + +install(TARGETS lodepng-c EXPORT lodepng-c-targets) + +install(EXPORT lodepng-c-targets DESTINATION share/lodepng-c/) if(NOT DISABLE_INSTALL_HEADERS) - install(FILES lodepng.h lodepng_util.h DESTINATION include) + install(FILES lodepng.h DESTINATION include) endif() diff --git a/ports/lodepng/portfile.cmake b/ports/lodepng/portfile.cmake index 2075d678993e1c..6a3e0e90101660 100644 --- a/ports/lodepng/portfile.cmake +++ b/ports/lodepng/portfile.cmake @@ -5,28 +5,27 @@ endif() vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO lvandeve/lodepng - REF e34ac04553e51a6982ae234d98ce6b76dd57a6a1 - SHA512 ab79fb2c6403e5d7bdf0b94a3f93f6513889eda8e6b74fb2b569fbc6f95fb79474654818cb0e71eff88214ca7c42ebd7c95f734a2faa77259fe06bfddcb6967a - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO lvandeve/lodepng + REF 8c6a9e30576f07bf470ad6f09458a2dcd7a6a84a + SHA512 2e0abc063be45dc04a070656260e9a2b9fa1172433cdd7d4988f0afc11751ad28aa802350598ef0e2b27c2c011fd9d9f7ab7f267b0bfcdf28f9f708b888c4411 + 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}") +configure_file("${SOURCE_PATH}/lodepng.cpp" "${SOURCE_PATH}/lodepng.c" COPYONLY) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON - -DDISABLE_INSTALL_TOOLS=ON - -DDDISABLE_INSTALL_EXAMPLES=ON + -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -# Moves all .cmake files from /debug/share/lodepng/ to /share/lodepng/ -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(PACKAGE_NAME lodepng-c) -file(INSTALL ${SOURCE_PATH}/lodepng.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +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) diff --git a/ports/lodepng/usage b/ports/lodepng/usage new file mode 100644 index 00000000000000..6eeeb738fdc110 --- /dev/null +++ b/ports/lodepng/usage @@ -0,0 +1,9 @@ +The package lodepng provides CMake targets: + + # C API + find_package(lodepng-c CONFIG REQUIRED) + target_link_libraries(main PRIVATE lodepng-c) + + # C++ API + find_package(lodepng CONFIG REQUIRED) + target_link_libraries(main PRIVATE lodepng) diff --git a/ports/lodepng/vcpkg.json b/ports/lodepng/vcpkg.json index 7a004463c55631..651f85f8722b2e 100644 --- a/ports/lodepng/vcpkg.json +++ b/ports/lodepng/vcpkg.json @@ -1,7 +1,17 @@ { "name": "lodepng", - "version-string": "2020-03-15", + "version-date": "2021-12-04", "port-version": 1, "description": "PNG encoder and decoder in C++", - "homepage": "https://github.com/lvandeve/lodepng" + "homepage": "https://github.com/lvandeve/lodepng", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/log4cplus/vcpkg.json b/ports/log4cplus/vcpkg.json index 9ba37aec96aba5..a70adf2990f4bf 100644 --- a/ports/log4cplus/vcpkg.json +++ b/ports/log4cplus/vcpkg.json @@ -1,10 +1,10 @@ { "name": "log4cplus", "version": "2.0.7", + "port-version": 1, "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration", "homepage": "https://github.com/log4cplus/log4cplus", "dependencies": [ - "catch", { "name": "vcpkg-cmake", "host": true diff --git a/ports/log4cpp/portfile.cmake b/ports/log4cpp/portfile.cmake index e36923d62e508a..2548807f7d7b72 100644 --- a/ports/log4cpp/portfile.cmake +++ b/ports/log4cpp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO orocos-toolchain/log4cpp diff --git a/ports/log4cpp/vcpkg.json b/ports/log4cpp/vcpkg.json index e2e16680553d77..a7729f41e0b931 100644 --- a/ports/log4cpp/vcpkg.json +++ b/ports/log4cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "log4cpp", - "version-string": "2.9.1", - "port-version": 6, + "version": "2.9.1", + "port-version": 7, "description": "Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.", "homepage": "https://github.com/orocos-toolchain/log4cpp", "supports": "!uwp" diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index 102d5eb3edbdd7..13ac8ce5b2ed94 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -1,8 +1,8 @@ -set(VERSION 0.12.0) +set(VERSION 0.12.1) 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 00fe571f9c511bf93b17cac8269ce00f7e817e8d723acf62bddff1bbe0e7facd0ab2fd75c01a93870f7e5c66718b2b73fc22c5f193bfd204e34d052b1123e60d + SHA512 807058734cebf7c92e99484313becbc6be63e48bd930889c733318bb78dfec498b66aaa12255ed30879abb005b32e2b965f9dd87ec50d0421ca067f3f66280d9 ) vcpkg_extract_source_archive_ex( diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json index e0092cba635ac9..55d257ad7151c7 100644 --- a/ports/log4cxx/vcpkg.json +++ b/ports/log4cxx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "log4cxx", - "version-string": "0.12.0", + "version": "0.12.1", "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", "supports": "!uwp", diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index 1a7fac53caa838..0a034611ab35b7 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://www.lua.org/ftp/lua-5.4.3.tar.gz" - FILENAME "lua-5.4.3.tar.gz" - SHA512 3a1a3ee8694b72b4ec9d3ce76705fe179328294353604ca950c53f41b41161b449877d43318ef4501fee44ecbd6c83314ce7468d7425ba9b2903c9c32a28bbc0 + URLS "https://www.lua.org/ftp/lua-5.4.4.tar.gz" + FILENAME "lua-5.4.4.tar.gz" + SHA512 af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH @@ -11,7 +11,7 @@ vcpkg_extract_source_archive_ex( fix-ios-system.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") # Used in cmake wrapper set(ENABLE_LUA_CPP 0) @@ -31,22 +31,21 @@ if(VCPKG_TARGET_IS_IOS AND "tools" IN_LIST FEATURES) message(FATAL_ERROR "lua[tools] is not supported for iOS platform build") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-lua TARGET_PATH share/unofficial-lua) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lua CONFIG_PATH share/unofficial-lua) if("cpp" IN_LIST FEATURES) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-lua-cpp TARGET_PATH share/unofficial-lua-cpp) + vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lua-cpp CONFIG_PATH "share/unofficial-lua-cpp") endif() if ("tools" IN_LIST FEATURES) @@ -55,15 +54,13 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_TARGET_IS_WINDOWS) - file(READ ${CURRENT_PACKAGES_DIR}/include/luaconf.h LUA_CONF_H) - string(REPLACE "defined(LUA_BUILD_AS_DLL)" "1" LUA_CONF_H "${LUA_CONF_H}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/luaconf.h "${LUA_CONF_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/luaconf.h" "defined(LUA_BUILD_AS_DLL)" "1") endif() endif() # Suitable for old version -configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lua/vcpkg.json b/ports/lua/vcpkg.json index e381a077ead1d0..2017af76562172 100644 --- a/ports/lua/vcpkg.json +++ b/ports/lua/vcpkg.json @@ -1,9 +1,19 @@ { "name": "lua", - "version-semver": "5.4.3", - "port-version": 3, + "version": "5.4.4", + "port-version": 1, "description": "A powerful, fast, lightweight, embeddable scripting language", "homepage": "https://www.lua.org", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "cpp": { "description": "Builds Lua for C++ linkage" diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index 262f7ec0908686..e8a39ff25d1fcf 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports being built for desktop" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LuaJIT/LuaJIT @@ -21,17 +19,17 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) message(STATUS "Building ${TARGET_TRIPLET}-dbg") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - + vcpkg_execute_required_process_repeat( COUNT 1 COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" LOGNAME build-${TARGET_TRIPLET}-dbg ) - + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) file(COPY ${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) @@ -44,17 +42,17 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) message(STATUS "Building ${TARGET_TRIPLET}-rel") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - + vcpkg_execute_required_process_repeat(d8un COUNT 1 COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" LOGNAME build-${TARGET_TRIPLET}-rel ) - + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) @@ -70,4 +68,4 @@ file(INSTALL ${SOURCE_PATH}/src/lauxlib.h DESTINATION ${CURRENT_PACKAGES_D file(INSTALL ${SOURCE_PATH}/src/lua.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) # Handle copyright -file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) \ No newline at end of file +file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index e4cd839f458aea..22c50d2682cac0 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "luajit", - "version-string": "2.0.5", - "port-version": 4, + "version": "2.0.5", + "port-version": 5, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", "supports": "!uwp" diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake index 5b4bc34002be77..b48185c8de6840 100644 --- a/ports/luasocket/portfile.cmake +++ b/ports/luasocket/portfile.cmake @@ -5,34 +5,33 @@ vcpkg_from_github( SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb 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_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Remove debug share -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/luasocket) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE ${CURRENT_PACKAGES_DIR}/share/luasocket/copyright) +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/luasocket") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE" "${CURRENT_PACKAGES_DIR}/share/luasocket/copyright") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # Handle socket dll name - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll ${CURRENT_PACKAGES_DIR}/bin/socket/core.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb ${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll ${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/bin/socket/core.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb") # Handle mime dll name - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll ${CURRENT_PACKAGES_DIR}/bin/mime/core.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb ${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll ${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb") endif() # Allow empty include directory diff --git a/ports/luasocket/vcpkg.json b/ports/luasocket/vcpkg.json index 064972699205e2..0fe9652f2aba97 100644 --- a/ports/luasocket/vcpkg.json +++ b/ports/luasocket/vcpkg.json @@ -1,10 +1,15 @@ { "name": "luasocket", - "version-string": "2020-09-14", - "port-version": 1, + "version-date": "2020-09-14", + "port-version": 2, "description": "LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.", "homepage": "https://github.com/diegonehab/luasocket", + "supports": "windows", "dependencies": [ - "lua" + "lua", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/magnum/003-fix-FindGLFW.patch b/ports/magnum/003-fix-FindGLFW.patch new file mode 100644 index 00000000000000..a6b9cdfb740e9f --- /dev/null +++ b/ports/magnum/003-fix-FindGLFW.patch @@ -0,0 +1,16 @@ +diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake +index 8761448..17321af 100644 +--- a/modules/FindMagnum.cmake ++++ b/modules/FindMagnum.cmake +@@ -647,9 +647,9 @@ foreach(_component ${Magnum_FIND_COMPONENTS}) + + # GLFW application dependencies + elseif(_component STREQUAL GlfwApplication) +- find_package(GLFW) ++ find_package(glfw3 CONFIG REQUIRED) + set_property(TARGET Magnum::${_component} APPEND PROPERTY +- INTERFACE_LINK_LIBRARIES GLFW::GLFW) ++ INTERFACE_LINK_LIBRARIES glfw) + # Use the Foundation framework on Apple to query the DPI awareness + if(CORRADE_TARGET_APPLE) + find_library(_MAGNUM_APPLE_FOUNDATION_FRAMEWORK_LIBRARY Foundation) diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index ae6c6340d3c244..e1dcd30e870e99 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -6,15 +6,11 @@ vcpkg_from_github( HEAD_REF master PATCHES 002-sdl-includes.patch + 003-fix-FindGLFW.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILD_STATIC 1) - set(BUILD_PLUGINS_STATIC 1) -else() - set(BUILD_STATIC 0) - set(BUILD_PLUGINS_STATIC 0) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_PLUGINS_STATIC) # Remove platform-specific feature that are not available # on current target platform from all features. @@ -71,7 +67,7 @@ endforeach() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DBUILD_STATIC=${BUILD_STATIC} @@ -108,8 +104,8 @@ if(_TOOL_EXEC_NAMES) vcpkg_copy_tools(TOOL_NAMES ${_TOOL_EXEC_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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Special handling for plugins. # @@ -133,20 +129,20 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # See https://github.com/microsoft/vcpkg/pull/1235#issuecomment-308805989 for # futher info. if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") # move plugin libs to conventional place - file(GLOB_RECURSE LIB_TO_MOVE ${CURRENT_PACKAGES_DIR}/lib/magnum/*) - file(COPY ${LIB_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum) + file(GLOB_RECURSE LIB_TO_MOVE "${CURRENT_PACKAGES_DIR}/lib/magnum/*") + file(COPY ${LIB_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum") - file(GLOB_RECURSE LIB_TO_MOVE_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*) - file(COPY ${LIB_TO_MOVE_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum) + file(GLOB_RECURSE LIB_TO_MOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*") + file(COPY ${LIB_TO_MOVE_DBG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum") else() if(WIN32) - file(GLOB_RECURSE LIB_TO_REMOVE ${CURRENT_PACKAGES_DIR}/lib/magnum/*) - file(GLOB_RECURSE LIB_TO_KEEP ${CURRENT_PACKAGES_DIR}/lib/magnum/*Any*) + file(GLOB_RECURSE LIB_TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/magnum/*") + file(GLOB_RECURSE LIB_TO_KEEP "${CURRENT_PACKAGES_DIR}/lib/magnum/*Any*") if(LIB_TO_KEEP) list(REMOVE_ITEM LIB_TO_REMOVE ${LIB_TO_KEEP}) endif() @@ -154,8 +150,8 @@ else() file(REMOVE ${LIB_TO_REMOVE}) endif() - file(GLOB_RECURSE LIB_TO_REMOVE_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*) - file(GLOB_RECURSE LIB_TO_KEEP_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*Any*) + file(GLOB_RECURSE LIB_TO_REMOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*") + file(GLOB_RECURSE LIB_TO_KEEP_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*Any*") if(LIB_TO_KEEP_DBG) list(REMOVE_ITEM LIB_TO_REMOVE_DBG ${LIB_TO_KEEP_DBG}) endif() @@ -164,16 +160,14 @@ else() endif() # fonts and fontconverters don't have Any* plugins - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum/fonts) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum/fontconverters) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fonts) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fontconverters) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fonts") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fontconverters") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fonts") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fontconverters") endif() - file(COPY ${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/bin/magnum) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/magnum") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d") endif() -file(INSTALL ${SOURCE_PATH}/COPYING - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json index c592dfaec92cc8..43d3b8224ba367 100644 --- a/ports/magnum/vcpkg.json +++ b/ports/magnum/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magnum", "version-string": "2020.06", - "port-version": 8, + "port-version": 9, "description": "C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "dependencies": [ diff --git a/ports/mailio/vcpkg.json b/ports/mailio/vcpkg.json index f3c01cd5a5a4cc..be8c009cd17b11 100644 --- a/ports/mailio/vcpkg.json +++ b/ports/mailio/vcpkg.json @@ -1,11 +1,11 @@ { "name": "mailio", "version": "0.20.0", - "port-version": 1, + "port-version": 2, "maintainers": "Tomislav Karastojković ", "description": "mailio is a cross platform C++ library for MIME format and SMTP, POP3 and IMAP protocols. It is based on the standard C++ 17 and Boost library.", "homepage": "https://github.com/karastojko/mailio", - "license": "BSD-2-clause", + "license": "BSD-2-Clause", "supports": "!uwp", "dependencies": [ "boost-asio", diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index a093014a901588..7140f07f6b0c65 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik - REF 14f913d6ab3b0903dd36a1cb2d22f7d5493b8bb8 - SHA512 f90762594d46946ddc512bb19b21c4d6a2f1ce81b7500a326ad512fae3a3f77e49ef3eb727ff8f98a31596e4132528212e0fa146e2eee0a9965a16551cfd0386 + REF d7b83c0f7d11397aff5b5d8e0bb294ef6ea4354d + SHA512 62b47cb753e9698e55fe88593009016676b6c0c0a90c3f29be6f44a45f9f783ec5beca6916e549f9adbdc750e2e0334a9e927fc0dcb6a88431e40c2e920ff962 HEAD_REF master - PATCHES - proj-find-fix.patch # Quiet search with version range somehow fails for proj8+ ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/mapnik/proj-find-fix.patch b/ports/mapnik/proj-find-fix.patch deleted file mode 100644 index 4fb3537610e061..00000000000000 --- a/ports/mapnik/proj-find-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 47bbaa1..43f384d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -304,7 +304,7 @@ if(USE_WEBP) - - if(USE_PROJ) - #https://proj.org/development/cmake.html -- mapnik_find_package(PROJ ${PROJ_MIN_VERSION} QUIET) -+ mapnik_find_package(PROJ REQUIRED) - # currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config - if(NOT PROJ_FOUND) - message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...") diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 64f53ec587f94c..c1dc491aea2459 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mapnik", - "version-date": "2021-11-15", + "version-date": "2022-01-28", "port-version": 1, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", + "license": "LGPL-2.1-only", "supports": "!(static & windows)", "dependencies": [ "boost-assign", @@ -157,7 +158,7 @@ "proj": { "description": "PROJ Functionalities", "dependencies": [ - "proj4" + "proj" ] }, "svg-renderer": { diff --git a/ports/marble/portfile.cmake b/ports/marble/portfile.cmake index 173892360c496b..7136b47c2cd6cf 100644 --- a/ports/marble/portfile.cmake +++ b/ports/marble/portfile.cmake @@ -1,48 +1,46 @@ -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm" "x86" ON_LIBRARY_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/marble REF 552cb9ae1f34482d1ec56532a703e0d820856286 #v20.04.3 SHA512 ac6106a6db53534c96d7281b1a07624c2852ed8c78cce0b91c5f865b106487f1f49aaa4c72d00ffb1f79a761d8d2eca18129ef9517bef463a1840554ed3e51fb - HEAD_REF master + HEAD_REF master PATCHES "qtfix.patch" -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DCMAKE_DISABLE_FIND_PACKAGE_I18n=ON +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_I18n=ON -DWITH_KF5=OFF -) +) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) # Install plugins and data files -file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*") -file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") +file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*") +file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*") file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins) -file(COPY ${PLUGINS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/plugins) +file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins) +file(COPY ${PLUGINS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/plugins) file(COPY "${CURRENT_PACKAGES_DIR}/data" DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) # have to keep folder structure here file(COPY ${MKSPECS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/mkspecs) # remove plugin folder file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins - ${CURRENT_PACKAGES_DIR}/data ${CURRENT_PACKAGES_DIR}/debug/data + ${CURRENT_PACKAGES_DIR}/data ${CURRENT_PACKAGES_DIR}/debug/data ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/mkspecs ${CURRENT_PACKAGES_DIR}/debug/mkspecs - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/lib/plugins + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/lib/plugins ) - + vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/marble/vcpkg.json b/ports/marble/vcpkg.json index bf8d085c05819c..96ee0b95b91bc6 100644 --- a/ports/marble/vcpkg.json +++ b/ports/marble/vcpkg.json @@ -1,7 +1,7 @@ { "name": "marble", "version-string": "19.08.2", - "port-version": 2, + "port-version": 3, "description": "Marble KDE library", "homepage": "https://marble.kde.org", "supports": "windows & x64 & !static", @@ -9,6 +9,14 @@ "qt5-base", "qt5-quickcontrols", "qt5-svg", - "qt5-webchannel" + "qt5-webchannel", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/marl/portfile.cmake b/ports/marl/portfile.cmake index 53e13ef79c311a..53cb52f850a9e6 100644 --- a/ports/marl/portfile.cmake +++ b/ports/marl/portfile.cmake @@ -1,24 +1,21 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/marl - REF 4c1b662da7d7a35f0fba9156a08cb49d129f5189 #2021-04-25 - SHA512 a3f8f65ef870075fac96dc67e8efbbe62596787a623aab02509c34f80a7cae523412d4bf94450c400a4637a0fffee6ef0cbf8f38286707e9d001e628cc11177f + REF 9929747c9ba6354691dbacaf14f9b35433871e5b #2022-03-02 + SHA512 454399485d292526333417474a312302aaff90cf63bc06a95c2e8b87cb92eaea547457ba3c06413e079ca29f9ea64990b9da467aeaec6ec2aa3233efddab2407 HEAD_REF main ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MARL_BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMARL_BUILD_SHARED=${MARL_BUILD_SHARED} -DMARL_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(MARL_BUILD_SHARED) vcpkg_replace_string( @@ -28,10 +25,10 @@ if(MARL_BUILD_SHARED) ) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/marl/vcpkg.json b/ports/marl/vcpkg.json index 30c2aa24008f73..c641ba3e6bd591 100644 --- a/ports/marl/vcpkg.json +++ b/ports/marl/vcpkg.json @@ -1,8 +1,18 @@ { "name": "marl", - "version-date": "2021-04-25", + "version-date": "2022-03-02", "description": "A hybrid thread/fiber task scheduler written in modern C++", "homepage": "https://github.com/google/marl", "license": "Apache-2.0", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/mathgl/fix_arma_sprintf.patch b/ports/mathgl/fix_arma_sprintf.patch new file mode 100644 index 00000000000000..25223455fbc962 --- /dev/null +++ b/ports/mathgl/fix_arma_sprintf.patch @@ -0,0 +1,14 @@ +diff --git "a/include/mgl2/define.h" "b/include/mgl2/define.h" +index e23ec04..8e79086 100644 +--- "a/include/mgl2/define.h" ++++ "b/include/mgl2/define.h" +@@ -141,7 +140,9 @@ typedef long msize; + #define getcwd _getcwd + #define chdir _chdir // BORLAND has chdir + #endif ++#if (_MSC_VER<1500) + #define snprintf _snprintf ++#endif + #if (_MSC_VER<1600) // based on https://hg.python.org/cpython/rev/9aedb876c2d7 + #define hypot _hypot + #endif diff --git a/ports/mathgl/fix_attribute.patch b/ports/mathgl/fix_attribute.patch new file mode 100644 index 00000000000000..11a5acdfbc8bac --- /dev/null +++ b/ports/mathgl/fix_attribute.patch @@ -0,0 +1,11 @@ +--- a/include/mgl2/define.h 2021-12-08 13:59:55.000000000 +0800 ++++ a/include/mgl2/define.h 2021-12-15 10:39:09.701079400 +0800 +@@ -66,6 +66,8 @@ + #else + #define MGL_FUNC_CONST + #define MGL_FUNC_PURE ++#define MGL_FUNC_INIT ++#define MGL_FUNC_FINI + #endif + #define MGL_EXPORT_CONST MGL_EXPORT MGL_FUNC_CONST + #define MGL_EXPORT_PURE MGL_EXPORT MGL_FUNC_PURE diff --git a/ports/mathgl/fix_cmakelists_and_cpp.patch b/ports/mathgl/fix_cmakelists_and_cpp.patch index a929f1ebe8f059..2b88746dd857cc 100644 --- a/ports/mathgl/fix_cmakelists_and_cpp.patch +++ b/ports/mathgl/fix_cmakelists_and_cpp.patch @@ -15,121 +15,6 @@ index 1649104..eeec1c1 100644 install( TARGETS mgllab RUNTIME DESTINATION bin ) -diff --git a/mgllab/table.cpp b/mgllab/table.cpp -index 5243549..23eebe5 100644 ---- a/mgllab/table.cpp -+++ b/mgllab/table.cpp -@@ -559,8 +559,13 @@ public: - o->tooltip(_("Change data values and close this window")); - w->set_modal(); w->end(); - } -- double min() { return wmin->value(); } -- double max() { return wmax->value(); } -+ #if WIN32 -+ double _min() { return wmin->value(); } -+ double _max() { return wmax->value(); } -+ #else -+ double min() { return wmin->value(); } -+ double max() { return wmax->value(); } -+ #endif - int sym() { return wsym->value(); } - bool ok() { return !result.empty(); } - void cb_ok() -@@ -581,8 +586,14 @@ void fill_cb(Fl_Widget*, void*v) - HMDT d = dynamic_cast(e->var); - HADT c = dynamic_cast(e->var); - char ch = nrm_dlg.result[0]; -- if(d) { d->Fill(nrm_dlg.min(),nrm_dlg.max(),ch); e->refresh(); } -- if(c) { c->Fill(nrm_dlg.min(),nrm_dlg.max(),ch); e->refresh(); } -+ #if WIN32 -+ if(d) { d->Fill(nrm_dlg._min(),nrm_dlg._max(),ch); e->refresh(); } -+ if(c) { c->Fill(nrm_dlg._min(),nrm_dlg._max(),ch); e->refresh(); } -+ #else -+ if(d) { d->Fill(nrm_dlg.min(),nrm_dlg.max(),ch); e->refresh(); } -+ if(c) { c->Fill(nrm_dlg.min(),nrm_dlg.max(),ch); e->refresh(); } -+ #endif -+ - } - } - //----------------------------------------------------------------------------- -@@ -594,8 +605,13 @@ void normal_cb(Fl_Widget*, void*v) - { - HMDT d = dynamic_cast(e->var); - HADT c = dynamic_cast(e->var); -- if(d) { d->Norm(nrm_dlg.min(),nrm_dlg.max(),nrm_dlg.sym()); e->refresh(); } -- if(c) { c->Fill(nrm_dlg.min(),nrm_dlg.max(),nrm_dlg.sym()); e->refresh(); } -+ #if WIN32 -+ if(d) { d->Norm(nrm_dlg._min(),nrm_dlg._max(),nrm_dlg.sym()); e->refresh(); } -+ if(c) { c->Fill(nrm_dlg._min(),nrm_dlg._max(),nrm_dlg.sym()); e->refresh(); } -+ #else -+ if(d) { d->Norm(nrm_dlg.min(),nrm_dlg.max(),nrm_dlg.sym()); e->refresh(); } -+ if(c) { c->Fill(nrm_dlg.min(),nrm_dlg.max(),nrm_dlg.sym()); e->refresh(); } -+ #endif - } - } - //----------------------------------------------------------------------------- -diff --git a/src/parser.cpp b/src/parser.cpp -index 577191d..e6909a1 100644 ---- a/src/parser.cpp -+++ b/src/parser.cpp -@@ -58,7 +58,10 @@ void mglParser::FillBaseCmd() - HMDT MGL_NO_EXPORT mglFormulaCalc(std::wstring string, mglParser *arg, const std::vector &head); - HADT MGL_NO_EXPORT mglFormulaCalcC(std::wstring string, mglParser *arg, const std::vector &head); - //----------------------------------------------------------------------------- -+#ifndef MGL_ASK_FUNC -+#define MGL_ASK_FUNC - MGL_EXPORT void (*mgl_ask_func)(const wchar_t *, wchar_t *)=0; -+#endif - void MGL_EXPORT mgl_ask_gets(const wchar_t *quest, wchar_t *res) - { printf("%ls\n",quest); if(!fgetws(res,1024,stdin)) *res=0; } - //----------------------------------------------------------------------------- -@@ -69,7 +72,10 @@ void MGL_EXPORT mgl_progress_txt(int value, int maximal, HMGL) - else for(int i=prev;i anim; - mglParse p(true); -diff --git a/include/mgl2/datac.h b/include/mgl2/datac.h -index f2c0251..0e69de7 100644 ---- a/include/mgl2/datac.h -+++ b/include/mgl2/datac.h -@@ -474,7 +474,7 @@ using mglDataA::Momentum; - void set_v(mreal val, long i,long j=0,long k=0) { a[i+nx*(j+ny*k)]=val; } - #else - /// Get the value in given cell of the data with border checking -- mreal v(long i,long j=0,long k=0) const { return mgl_abs(mgl_datac_get_value(this,i,j,k)); } -+ mreal v(long i,long j=0,long k=0) const { return abs(a[i+nx*(j+ny*k)]); } - /// Set the value in given cell of the data - void set_v(mreal val, long i,long j=0,long k=0) { mgl_datac_set_value(this,val,i,j,k); } - #endif diff --git a/CMakeLists.txt b/CMakeLists.txt index d0c779d..acd9d7f 100644 --- a/CMakeLists.txt diff --git a/ports/mathgl/fix_default_graph_init.patch b/ports/mathgl/fix_default_graph_init.patch new file mode 100644 index 00000000000000..700273b1709826 --- /dev/null +++ b/ports/mathgl/fix_default_graph_init.patch @@ -0,0 +1,21 @@ +diff --git "a/src/canvas_cf.cpp" "b/src/canvas_cf.cpp" +index 5e1443a..26a0a8e 100644 +--- "a/src/canvas_cf.cpp" ++++ "b/src/canvas_cf.cpp" +@@ -50,7 +50,6 @@ void MGL_EXPORT MGL_FUNC_INIT mgl_init() // TODO try to add ld option: "-init mg + #endif + for(long i=0;i<360;i++) mgl_cos[i] = cos(i*M_PI/180.); + if(!mglDefFont) mglDefFont = new mglFont(MGL_DEF_FONT_NAME); +- if(!mglDefaultGr) mglDefaultGr = new mglCanvas(600,400); + } + } + void MGL_EXPORT MGL_FUNC_FINI mgl_fini() // TODO try to add ld option: "-fini mgl_fini" +@@ -434,7 +433,7 @@ void MGL_EXPORT mgl_set_legend_marks(HMGL gr, int num) + uintptr_t MGL_EXPORT mgl_create_graph_(int *width, int *height) + { return uintptr_t(new mglCanvas(*width,*height)); } + void MGL_EXPORT mgl_delete_graph_(uintptr_t *gr) { delete _GR_; } +-uintptr_t MGL_EXPORT mgl_default_graph_() { return uintptr_t(&mglDefaultGr); } ++uintptr_t MGL_EXPORT mgl_default_graph_() { return uintptr_t(mgl_default_graph()); } + void MGL_EXPORT mgl_set_size_scl_(double *scl) { mgl_set_size_scl(*scl); } + void MGL_EXPORT mgl_set_size_(uintptr_t *gr, int *width, int *height) + { mgl_set_size(_GR_,*width,*height); } diff --git a/ports/mathgl/fix_mglDataList.patch b/ports/mathgl/fix_mglDataList.patch new file mode 100644 index 00000000000000..9856ea364ec163 --- /dev/null +++ b/ports/mathgl/fix_mglDataList.patch @@ -0,0 +1,28 @@ +diff --git a/include/mgl2/abstract.h b/include/mgl2/abstract.h +index c8c53b8..245333b 100644 +--- a/include/mgl2/abstract.h ++++ b/include/mgl2/abstract.h +@@ -235,7 +235,11 @@ struct MGL_EXPORT mglNum + }; + //----------------------------------------------------------------------------- + /// List of user-defined data arrays ++#ifndef MGL_WIDGETS_DLL + MGL_EXPORT extern std::vector mglDataList; ++#else ++__declspec(dllimport) extern std::vector mglDataList; ++#endif + //----------------------------------------------------------------------------- + /// Abstract class for data array + class MGL_EXPORT mglDataA +diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt +index a9e1269..4c1d0d4 100644 +--- a/widgets/CMakeLists.txt ++++ b/widgets/CMakeLists.txt +@@ -2,6 +2,7 @@ include(GenerateExportHeader) + + if(MSVC) + add_definitions(-DMGL_LIB_MSVC) ++ add_definitions(-DMGL_WIDGETS_DLL) + endif(MSVC) + + if(MGL_HAVE_FLTK) diff --git a/ports/mathgl/portfile.cmake b/ports/mathgl/portfile.cmake index 7eee4cafb30ef6..65c1abe18f368f 100644 --- a/ports/mathgl/portfile.cmake +++ b/ports/mathgl/portfile.cmake @@ -1,20 +1,25 @@ -set(MATHGL_VERSION "2.4.3") +set(MATHGL_VERSION "2.5") vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO mathgl/mathgl REF mathgl%20${MATHGL_VERSION} FILENAME "mathgl-${MATHGL_VERSION}.tar.gz" - SHA512 e47fc8171ce80c8b33a8f03d9375bc036455dae539b47cf4ee922f8fa36f5afcf8b3f0666997764e453eb698c0e8c03da36dd0ac2bf71c158e95309b247d27de + SHA512 1fe27962ffef8d7127c4e1294d735e5da4dd2d647397f09705c3ca860f90bd06fd447ff614e584f3d2b874a02262c5518be37d59e9e0a838dd5b8b64fd77ef9d PATCHES - type_fix.patch fix_cmakelists_and_cpp.patch + fix_attribute.patch + fix_default_graph_init.patch + fix_mglDataList.patch + fix_arma_sprintf.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES hdf5 enable-hdf5 fltk enable-fltk gif enable-gif + arma enable-arma png enable-png zlib enable-zlib jpeg enable-jpeg @@ -38,7 +43,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore file(REMOVE "${CURRENT_PACKAGES_DIR}/mathgl2-config.cmake") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/mathgl2-config.cmake") else() - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mathgl) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mathgl2) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/mathgl/type_fix.patch b/ports/mathgl/type_fix.patch deleted file mode 100644 index 288f6b1a0d1a06..00000000000000 --- a/ports/mathgl/type_fix.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/src/complex.cpp b/src/complex.cpp -index 2fcc14c..fb3498f 100755 ---- a/src/complex.cpp -+++ b/src/complex.cpp -@@ -863,12 +863,12 @@ void MGL_EXPORT mgl_datac_insert_(uintptr_t *d, const char *dir, int *at, int *n - void MGL_EXPORT mgl_datac_delete_(uintptr_t *d, const char *dir, int *at, int *num, int) - { mgl_datac_delete(_DC_,*dir,*at,*num); } - //----------------------------------------------------------------------------- --void MGL_EXPORT mgl_datac_set_value(HADT dat, dual v, long i, long j, long k) -+void MGL_EXPORT mgl_datac_set_value(HADT dat, mdual v, long i, long j, long k) - { - if(i>=0 && inx && j>=0 && jny && k>=0 && knz) - dat->a[i+dat->nx*(j+dat->ny*k)]=v; - } --void MGL_EXPORT mgl_datac_set_value_(uintptr_t *d, dual *v, int *i, int *j, int *k) -+void MGL_EXPORT mgl_datac_set_value_(uintptr_t *d, mdual *v, int *i, int *j, int *k) - { mgl_datac_set_value(_DC_,*v,*i,*j,*k); } - //----------------------------------------------------------------------------- - cmdual MGL_EXPORT mgl_datac_get_value(HCDT dat, long i, long j, long k) -diff --git a/src/complex_io.cpp b/src/complex_io.cpp -index 2fcd40a..49feb5c 100755 ---- a/src/complex_io.cpp -+++ b/src/complex_io.cpp -@@ -343,14 +343,14 @@ void MGL_EXPORT mgl_datac_create(HADT d,long mx,long my,long mz) - void MGL_EXPORT mgl_datac_create_(uintptr_t *d, int *nx,int *ny,int *nz) - { mgl_datac_create(_DC_,*nx,*ny,*nz); } - //----------------------------------------------------------------------------- --void MGL_EXPORT mgl_datac_link(HADT d, dual *A, long mx,long my,long mz) -+void MGL_EXPORT mgl_datac_link(HADT d, mdual *A, long mx,long my,long mz) - { - if(!A) return; - if(!d->link && d->a) delete [](d->a); - d->nx = mx>0 ? mx:1; d->ny = my>0 ? my:1; d->nz = mz>0 ? mz:1; -- d->link=true; d->a=A; d->NewId(); -+ d->link=true; d->a=(dual*)A; d->NewId(); - } --void MGL_EXPORT mgl_datac_link_(uintptr_t *d, dual *A, int *nx,int *ny,int *nz) -+void MGL_EXPORT mgl_datac_link_(uintptr_t *d, mdual *A, int *nx,int *ny,int *nz) - { mgl_datac_link(_DC_,A,*nx,*ny,*nz); } - //----------------------------------------------------------------------------- - int MGL_EXPORT mgl_datac_read_dim(HADT d, const char *fname,long mx,long my,long mz) -diff --git a/utils/mgltask.cpp b/utils/mgltask.cpp -index b9bb7da..4566512 100755 ---- a/utils/mgltask.cpp -+++ b/utils/mgltask.cpp -@@ -2,6 +2,7 @@ - #include - #include - #include -+#define _USE_MATH_DEFINES - #include - #include - //=================================================================== -@@ -100,7 +101,7 @@ int main(int argc, char *argv[]) - double x1[10],x2[10],dx[10],x[10]; - int k,i,n=argc-3;//=(argc==4) ? 1:2; - FILE *fm,*fo; -- -+ - // first place zeros - for(i=0;i<10;i++) - { diff --git a/ports/mathgl/vcpkg.json b/ports/mathgl/vcpkg.json index 615eea5772dcca..54661f76b29fa8 100644 --- a/ports/mathgl/vcpkg.json +++ b/ports/mathgl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mathgl", - "version": "2.4.3", - "port-version": 8, + "version": "2.5", "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions", "dependencies": [ { @@ -20,6 +19,12 @@ "zlib" ], "features": { + "arma": { + "description": "Armadillo support", + "dependencies": [ + "armadillo" + ] + }, "fltk": { "description": "fltk module", "dependencies": [ diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 3bd961fbce827f..a6f1e152b53868 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( @@ -38,4 +36,4 @@ if (VCPKG_TARGET_IS_WINDOWS AND pthreads IN_LIST FEATURES) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) endif () -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/mbedtls/vcpkg.json b/ports/mbedtls/vcpkg.json index ec036a05f62094..d3079e1259afb4 100644 --- a/ports/mbedtls/vcpkg.json +++ b/ports/mbedtls/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mbedtls", - "version-string": "2.24.0", - "port-version": 3, + "version": "2.24.0", + "port-version": 4, "description": "An open source, portable, easy to use, readable and flexible SSL library", "homepage": "https://github.com/ARMmbed/mbedtls", "supports": "!uwp", diff --git a/ports/mdnsresponder/portfile.cmake b/ports/mdnsresponder/portfile.cmake index 99dbbdd2d18694..5a391a45a0e7ca 100644 --- a/ports/mdnsresponder/portfile.cmake +++ b/ports/mdnsresponder/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm") - vcpkg_download_distfile(ARCHIVE URLS https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-878.270.2.tar.gz FILENAME mDNSResponder-878.270.2.tar.gz diff --git a/ports/mdnsresponder/vcpkg.json b/ports/mdnsresponder/vcpkg.json index 86839bd05993e7..920ce4c4ad2b7e 100644 --- a/ports/mdnsresponder/vcpkg.json +++ b/ports/mdnsresponder/vcpkg.json @@ -1,7 +1,8 @@ { "name": "mdnsresponder", "version": "878.270.2", + "port-version": 1, "description": "The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.", "homepage": "https://developer.apple.com/bonjour/", - "supports": "!arm" + "supports": "windows & !uwp & !arm" } diff --git a/ports/mesa/d3d10sw.patch b/ports/mesa/d3d10sw.patch new file mode 100644 index 00000000000000..98221873b0673b --- /dev/null +++ b/ports/mesa/d3d10sw.patch @@ -0,0 +1,383 @@ +diff --git a/src/gallium/frontends/d3d10umd/D3DKMT.cpp b/src/gallium/frontends/d3d10umd/D3DKMT.cpp +index 1649eddc41e8f17fd9e0854acbb8e0c882d94cb5..dc31e9931876cac6ae4e52a80f6da7aa5284415c 100644 +--- a/src/gallium/frontends/d3d10umd/D3DKMT.cpp ++++ b/src/gallium/frontends/d3d10umd/D3DKMT.cpp +@@ -244,7 +244,7 @@ D3DKMTGetMultisampleMethodList(D3DKMT_GETMULTISAMPLEMETHODLIST *pData) + + + EXTERN_C NTSTATUS APIENTRY +-D3DKMTPresent(CONST D3DKMT_PRESENT *pData) ++D3DKMTPresent(D3DKMT_PRESENT *pData) + { + LOG_UNSUPPORTED_ENTRYPOINT(); + return STATUS_NOT_IMPLEMENTED; +@@ -409,7 +409,7 @@ D3DKMTSetVidPnSourceOwner(CONST D3DKMT_SETVIDPNSOURCEOWNER *pData) + + + EXTERN_C NTSTATUS APIENTRY +-D3DKMTSetVidPnSourceOwner1(const void *pData) ++D3DKMTSetVidPnSourceOwner1(CONST D3DKMT_SETVIDPNSOURCEOWNER1 *pData) + { + LOG_UNSUPPORTED_ENTRYPOINT(); + return STATUS_NOT_IMPLEMENTED; +diff --git a/src/gallium/frontends/d3d10umd/Device.cpp b/src/gallium/frontends/d3d10umd/Device.cpp +index afca18819ce04f28b23fee9ebdaa57b52a04426c..cd2c6cd9180eb03612500aa8d8475994a2f836fc 100644 +--- a/src/gallium/frontends/d3d10umd/Device.cpp ++++ b/src/gallium/frontends/d3d10umd/Device.cpp +@@ -32,7 +32,7 @@ + + + #include "Draw.h" +-#include "Dxgi.h" ++#include "DxgiFns.h" + #include "InputAssembly.h" + #include "OutputMerger.h" + #include "Query.h" +diff --git a/src/gallium/frontends/d3d10umd/DriverIncludes.h b/src/gallium/frontends/d3d10umd/DriverIncludes.h +index e78d46fafc55557f3266e700fdc2a72305827ce6..c7df64042b5b013680ec3c8190cfac7b4b958ded 100644 +--- a/src/gallium/frontends/d3d10umd/DriverIncludes.h ++++ b/src/gallium/frontends/d3d10umd/DriverIncludes.h +@@ -43,12 +43,21 @@ + + #include + +-#include "winddk/winddk_compat.h" ++#include "winddk_compat.h" + + //typedef LARGE_INTEGER PHYSICAL_ADDRESS; + //typedef __success(return >= 0) LONG NTSTATUS; + +-#define D3D10DDI_MINOR_HEADER_VERSION 1 ++#define D3D10DDI_MINOR_HEADER_VERSION 2 ++ ++/* Unfortunately WinDDK's d3d10umddi.h defines D3D10.x constants as global ++ * const variables instead of preprocessor defines, causing LINK to fail due ++ * to duplicate symbols. Include d3d10_1.h to avoid the issue. ++ */ ++#ifdef _MSC_VER ++#include ++#endif ++ + #include + + #include "Debug.h" +diff --git a/src/gallium/frontends/d3d10umd/Dxgi.cpp b/src/gallium/frontends/d3d10umd/DxgiFns.cpp +similarity index 97% +rename from src/gallium/frontends/d3d10umd/Dxgi.cpp +rename to src/gallium/frontends/d3d10umd/DxgiFns.cpp +index 253f81ed283b55dd4bff29df8658f386c08cbc95..cd844a2b0fa19e23c46da0ddc3a92a9a2c9d81b6 100644 +--- a/src/gallium/frontends/d3d10umd/Dxgi.cpp ++++ b/src/gallium/frontends/d3d10umd/DxgiFns.cpp +@@ -26,13 +26,13 @@ + **************************************************************************/ + + /* +- * Dxgi.cpp -- ++ * DxgiFns.cpp -- + * DXGI related functions. + */ + + #include + +-#include "Dxgi.h" ++#include "DxgiFns.h" + #include "Format.h" + #include "State.h" + +@@ -97,11 +97,11 @@ _Present(DXGI_DDI_ARG_PRESENT *pPresentData) + + void *map; + struct pipe_transfer *transfer; +- map = pipe_transfer_map(pipe, +- pSrcResource->resource, +- 0, 0, PIPE_MAP_READ, +- 0, 0, w, h, +- &transfer); ++ map = pipe_texture_map(pipe, ++ pSrcResource->resource, ++ 0, 0, PIPE_MAP_READ, ++ 0, 0, w, h, ++ &transfer); + if (map) { + + BITMAPINFO bmi; +@@ -172,7 +172,7 @@ _Present(DXGI_DDI_ARG_PRESENT *pPresentData) + DeleteDC(hdcMem); + DeleteObject(hBmp); + +- pipe_transfer_unmap(pipe, transfer); ++ pipe_texture_unmap(pipe, transfer); + } + + ReleaseDC(hWnd, hDC); +diff --git a/src/gallium/frontends/d3d10umd/Dxgi.h b/src/gallium/frontends/d3d10umd/DxgiFns.h +similarity index 96% +rename from src/gallium/frontends/d3d10umd/Dxgi.h +rename to src/gallium/frontends/d3d10umd/DxgiFns.h +index dedc2542d6ab016111a78b713b9cbe54581ba92a..3689faa307c07deb62c3f5c39b4788dd8d60cb35 100644 +--- a/src/gallium/frontends/d3d10umd/Dxgi.h ++++ b/src/gallium/frontends/d3d10umd/DxgiFns.h +@@ -26,8 +26,8 @@ + **************************************************************************/ + + /* +- * Dxgi.h -- +- * Functions that manipulate GPU resources. ++ * DxgiFns.h -- ++ * DXGI related functions + */ + + #ifndef WRAP_DXGI_H +diff --git a/src/gallium/frontends/d3d10umd/Resource.cpp b/src/gallium/frontends/d3d10umd/Resource.cpp +index a7910d2e3cf186597bb35d7c5a98464c4e844cf7..3dd91365b23e5608108a0e09e1296cb0a7bc65df 100644 +--- a/src/gallium/frontends/d3d10umd/Resource.cpp ++++ b/src/gallium/frontends/d3d10umd/Resource.cpp +@@ -270,6 +270,7 @@ CreateResource(D3D10DDI_HDEVICE hDevice, // IN + + templat.target = translate_texture_target( pCreateResource->ResourceDimension, + pCreateResource->ArraySize ); ++ pResource->buffer = templat.target == PIPE_BUFFER; + + if (pCreateResource->Format == DXGI_FORMAT_UNKNOWN) { + assert(pCreateResource->ResourceDimension == D3D10DDIRESOURCE_BUFFER); +@@ -315,37 +316,62 @@ CreateResource(D3D10DDI_HDEVICE hDevice, // IN + sizeof *pResource->transfers); + + if (pCreateResource->pInitialDataUP) { +- for (UINT SubResource = 0; SubResource < pResource->NumSubResources; ++SubResource) { ++ if (pResource->buffer) { ++ assert(pResource->NumSubResources == 1); + const D3D10_DDIARG_SUBRESOURCE_UP* pInitialDataUP = +- &pCreateResource->pInitialDataUP[SubResource]; ++ &pCreateResource->pInitialDataUP[0]; + + unsigned level; + struct pipe_box box; +- subResourceBox(pResource->resource, SubResource, &level, &box); ++ subResourceBox(pResource->resource, 0, &level, &box); + + struct pipe_transfer *transfer; + void *map; +- map = pipe->transfer_map(pipe, +- pResource->resource, +- level, +- PIPE_MAP_WRITE | +- PIPE_MAP_UNSYNCHRONIZED, +- &box, +- &transfer); ++ map = pipe->buffer_map(pipe, ++ pResource->resource, ++ level, ++ PIPE_MAP_WRITE | ++ PIPE_MAP_UNSYNCHRONIZED, ++ &box, ++ &transfer); + assert(map); + if (map) { +- for (int z = 0; z < box.depth; ++z) { +- ubyte *dst = (ubyte*)map + z*transfer->layer_stride; +- const ubyte *src = (const ubyte*)pInitialDataUP->pSysMem + z*pInitialDataUP->SysMemSlicePitch; +- util_copy_rect(dst, +- templat.format, +- transfer->stride, +- 0, 0, box.width, box.height, +- src, +- pInitialDataUP->SysMemPitch, +- 0, 0); ++ memcpy(map, pInitialDataUP->pSysMem, box.width); ++ pipe_buffer_unmap(pipe, transfer); ++ } ++ } else { ++ for (UINT SubResource = 0; SubResource < pResource->NumSubResources; ++SubResource) { ++ const D3D10_DDIARG_SUBRESOURCE_UP* pInitialDataUP = ++ &pCreateResource->pInitialDataUP[SubResource]; ++ ++ unsigned level; ++ struct pipe_box box; ++ subResourceBox(pResource->resource, SubResource, &level, &box); ++ ++ struct pipe_transfer *transfer; ++ void *map; ++ map = pipe->texture_map(pipe, ++ pResource->resource, ++ level, ++ PIPE_MAP_WRITE | ++ PIPE_MAP_UNSYNCHRONIZED, ++ &box, ++ &transfer); ++ assert(map); ++ if (map) { ++ for (int z = 0; z < box.depth; ++z) { ++ ubyte *dst = (ubyte*)map + z*transfer->layer_stride; ++ const ubyte *src = (const ubyte*)pInitialDataUP->pSysMem + z*pInitialDataUP->SysMemSlicePitch; ++ util_copy_rect(dst, ++ templat.format, ++ transfer->stride, ++ 0, 0, box.width, box.height, ++ src, ++ pInitialDataUP->SysMemPitch, ++ 0, 0); ++ } ++ pipe_texture_unmap(pipe, transfer); + } +- pipe_transfer_unmap(pipe, transfer); + } + } + } +@@ -423,7 +449,11 @@ DestroyResource(D3D10DDI_HDEVICE hDevice, // IN + + for (UINT SubResource = 0; SubResource < pResource->NumSubResources; ++SubResource) { + if (pResource->transfers[SubResource]) { +- pipe_transfer_unmap(pipe, pResource->transfers[SubResource]); ++ if (pResource->buffer) { ++ pipe_buffer_unmap(pipe, pResource->transfers[SubResource]); ++ } else { ++ pipe_texture_unmap(pipe, pResource->transfers[SubResource]); ++ } + pResource->transfers[SubResource] = NULL; + } + } +@@ -493,12 +523,21 @@ ResourceMap(D3D10DDI_HDEVICE hDevice, // IN + assert(!pResource->transfers[SubResource]); + + void *map; +- map = pipe->transfer_map(pipe, +- resource, +- level, +- usage, +- &box, +- &pResource->transfers[SubResource]); ++ if (pResource->buffer) { ++ map = pipe->buffer_map(pipe, ++ resource, ++ level, ++ usage, ++ &box, ++ &pResource->transfers[SubResource]); ++ } else { ++ map = pipe->texture_map(pipe, ++ resource, ++ level, ++ usage, ++ &box, ++ &pResource->transfers[SubResource]); ++ } + if (!map) { + DebugPrintf("%s: failed to map resource\n", __FUNCTION__); + SetError(hDevice, E_FAIL); +@@ -534,7 +573,11 @@ ResourceUnmap(D3D10DDI_HDEVICE hDevice, // IN + assert(SubResource < pResource->NumSubResources); + + if (pResource->transfers[SubResource]) { +- pipe_transfer_unmap(pipe, pResource->transfers[SubResource]); ++ if (pResource->buffer) { ++ pipe_buffer_unmap(pipe, pResource->transfers[SubResource]); ++ } else { ++ pipe_texture_unmap(pipe, pResource->transfers[SubResource]); ++ } + pResource->transfers[SubResource] = NULL; + } + } +@@ -834,7 +877,8 @@ ResourceUpdateSubResourceUP(D3D10DDI_HDEVICE hDevice, // IN + } + + struct pipe_context *pipe = pDevice->pipe; +- struct pipe_resource *dst_resource = CastPipeResource(hDstResource); ++ Resource *pDstResource = CastResource(hDstResource); ++ struct pipe_resource *dst_resource = pDstResource->resource; + + unsigned level; + struct pipe_box box; +@@ -855,12 +899,21 @@ ResourceUpdateSubResourceUP(D3D10DDI_HDEVICE hDevice, // IN + + struct pipe_transfer *transfer; + void *map; +- map = pipe->transfer_map(pipe, +- dst_resource, +- level, +- PIPE_MAP_WRITE | PIPE_MAP_DISCARD_RANGE, +- &box, +- &transfer); ++ if (pDstResource->buffer) { ++ map = pipe->buffer_map(pipe, ++ dst_resource, ++ level, ++ PIPE_MAP_WRITE | PIPE_MAP_DISCARD_RANGE, ++ &box, ++ &transfer); ++ } else { ++ map = pipe->texture_map(pipe, ++ dst_resource, ++ level, ++ PIPE_MAP_WRITE | PIPE_MAP_DISCARD_RANGE, ++ &box, ++ &transfer); ++ } + assert(map); + if (map) { + for (int z = 0; z < box.depth; ++z) { +@@ -874,7 +927,11 @@ ResourceUpdateSubResourceUP(D3D10DDI_HDEVICE hDevice, // IN + RowPitch, + 0, 0); + } +- pipe_transfer_unmap(pipe, transfer); ++ if (pDstResource->buffer) { ++ pipe_buffer_unmap(pipe, transfer); ++ } else { ++ pipe_texture_unmap(pipe, transfer); ++ } + } + } + +diff --git a/src/gallium/frontends/d3d10umd/ShaderParse.c b/src/gallium/frontends/d3d10umd/ShaderParse.c +index e4b6b88aa72909b6dc02c23dd13e442f9d3f4361..1995d381880d172ac49fe0d4461d439f35cf32b5 100644 +--- a/src/gallium/frontends/d3d10umd/ShaderParse.c ++++ b/src/gallium/frontends/d3d10umd/ShaderParse.c +@@ -392,7 +392,7 @@ Shader_parse_opcode(struct Shader_parser *parser, + if (opcode_is_extended) { + /* NOTE: DECODE_IS_D3D10_SB_OPCODE_DOUBLE_EXTENDED is broken. + */ +- assert(!((*curr & D3D10_SB_OPCODE_DOUBLE_EXTENDED_MASK) >> D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT)); ++ assert(!((*curr & D3D10_SB_OPERAND_DOUBLE_EXTENDED_MASK) >> D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT)); + + switch (DECODE_D3D10_SB_EXTENDED_OPCODE_TYPE(*curr)) { + case D3D10_SB_EXTENDED_OPCODE_EMPTY: +diff --git a/src/gallium/frontends/d3d10umd/ShaderParse.h b/src/gallium/frontends/d3d10umd/ShaderParse.h +index 5e8fba044ab5faf92f78d4f2bb75ec110752adb8..df95536f2b53eef900961f221100d4f2821a0f5d 100644 +--- a/src/gallium/frontends/d3d10umd/ShaderParse.h ++++ b/src/gallium/frontends/d3d10umd/ShaderParse.h +@@ -35,9 +35,6 @@ + + #include "DriverIncludes.h" + +-//#include "winddk/winddk_compat.h" +-#include "winddk/d3d10tokenizedprogramformat.hpp" +- + #ifdef __cplusplus + extern "C" { + #endif +diff --git a/src/gallium/frontends/d3d10umd/State.h b/src/gallium/frontends/d3d10umd/State.h +index 5cb865ce69573a16e24e14df88e53a0e48c80130..3e45cb797435b40da0a4a1f5476fab2aecca08fd 100644 +--- a/src/gallium/frontends/d3d10umd/State.h ++++ b/src/gallium/frontends/d3d10umd/State.h +@@ -150,6 +150,7 @@ struct Resource + DXGI_FORMAT Format; + UINT MipLevels; + UINT NumSubResources; ++ bool buffer; + struct pipe_resource *resource; + struct pipe_transfer **transfers; + struct pipe_stream_output_target *so_target; +diff --git a/src/gallium/frontends/d3d10umd/meson.build b/src/gallium/frontends/d3d10umd/meson.build +index 90774d9217d3ab5f4267974ae9018f55ab709f42..7141c8da17f7500b2d6e8e20faba9b5c70ab01d8 100644 +--- a/src/gallium/frontends/d3d10umd/meson.build ++++ b/src/gallium/frontends/d3d10umd/meson.build +@@ -14,7 +14,7 @@ libd3d10umd = static_library( + 'Debug.cpp', + 'Device.cpp', + 'Draw.cpp', +- 'Dxgi.cpp', ++ 'DxgiFns.cpp', + 'Format.cpp', + 'InputAssembly.cpp', + 'OutputMerger.cpp', diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 0039249051c52f..f0277f0b924d0f 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -5,6 +5,14 @@ set(PATCHES # Fix swrAVX512 build swravx512-post-static-link.patch + # Fix swr build with MSVC + swr-msvc-2.patch + # Fix swr build with LLVM 13 + swr-llvm13.patch + # Fix radv MSVC build with LLVM 13 + radv-msvc-llvm13-2.patch + # Fix d3d10sw MSVC build + d3d10sw.patch ) vcpkg_check_linkage(ONLY_DYNAMIC_CRT) @@ -16,8 +24,9 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO mesa/mesa - REF mesa-21.2.0 - SHA512 4837e42474d69861fbce4fa03d120b56997094d61b3045c417bbab73774dda86e4b7adf54af98585511a3517860c33c77898e6171cd845f760bada4b000ff52d + REF mesa-21.2.5 + SHA512 a9ead27f08e862738938cf728928b7937ff37e4c26967f2e46e40a3c8419159397f75b2f4ce43f9b453b35bb3716df581087fb7ba8434fafdfab9488c3db6f92 + FILE_DISAMBIGUATOR 1 HEAD_REF master PATCHES ${PATCHES} ) @@ -161,8 +170,12 @@ list(APPEND MESA_OPTIONS -Dshared-glapi=enabled) #shared GLAPI required when bu if(VCPKG_TARGET_IS_WINDOWS) list(APPEND MESA_OPTIONS -Dplatforms=['windows']) list(APPEND MESA_OPTIONS -Dmicrosoft-clc=disabled) + if(NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") + endif() endif() - + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -174,14 +187,14 @@ vcpkg_configure_meson( vcpkg_install_meson() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") #installed by egl-registry -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/egl.h) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglext.h) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglplatform.h) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/EGL/egl.h") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/EGL/eglext.h") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/EGL/eglplatform.h") #installed by opengl-registry set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h include/GLES/egl.h include/GLES/gl.h include/GLES/glext.h include/GLES/glplatform.h @@ -190,8 +203,8 @@ set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h list(TRANSFORM _double_files PREPEND "${CURRENT_PACKAGES_DIR}/") file(REMOVE ${_double_files}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES2) -# # Handle copyright +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/GLES") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/GLES2") +# Handle copyright file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/mesa/radv-msvc-llvm13-2.patch b/ports/mesa/radv-msvc-llvm13-2.patch new file mode 100644 index 00000000000000..039ef66d93fe0f --- /dev/null +++ b/ports/mesa/radv-msvc-llvm13-2.patch @@ -0,0 +1,14 @@ +diff --git a/src/amd/compiler/aco_print_asm.cpp b/src/amd/compiler/aco_print_asm.cpp +index dcc7c4bc747..413e6464c79 100644 +--- a/src/amd/compiler/aco_print_asm.cpp ++++ b/src/amd/compiler/aco_print_asm.cpp +@@ -24,6 +24,9 @@ + + #include "aco_ir.h" + ++#if defined(_MSC_VER) && defined(restrict) ++#undef restrict ++#endif + #include "llvm/ac_llvm_util.h" + + #include "llvm-c/Disassembler.h" diff --git a/ports/mesa/swr-llvm13.patch b/ports/mesa/swr-llvm13.patch new file mode 100644 index 00000000000000..e0da05bf5b53c8 --- /dev/null +++ b/ports/mesa/swr-llvm13.patch @@ -0,0 +1,334 @@ +diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp +index 44482939c7649a2bcc39f3b2eb75720de90bcef0..1124e3773b99430c8da5ccb061d92b1b3a1bf1a6 100644 +--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp ++++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp +@@ -56,6 +56,14 @@ + using namespace llvm; + using namespace SwrJit; + ++#if LLVM_VERSION_MAJOR >= 7 ++static constexpr llvm::sys::fs::OpenFlags OF_NONE = llvm::sys::fs::OF_None; ++static constexpr llvm::sys::fs::OpenFlags OF_TEXT = llvm::sys::fs::OF_Text; ++#else ++static constexpr llvm::sys::fs::OpenFlags OF_NONE = llvm::sys::fs::F_None; ++static constexpr llvm::sys::fs::OpenFlags OF_TEXT = llvm::sys::fs::F_Text; ++#endif ++ + ////////////////////////////////////////////////////////////////////////// + /// @brief Contructor for JitManager. + /// @param simdWidth - SIMD width to be used in generated program. +@@ -437,7 +445,7 @@ void JitManager::DumpAsm(Function* pFunction, const char* fileName) + sprintf(fName, "%s.%s.asm", funcName, fileName); + #endif + +- raw_fd_ostream filestream(fName, EC, llvm::sys::fs::F_None); ++ raw_fd_ostream filestream(fName, EC, OF_NONE); + + legacy::PassManager* pMPasses = new legacy::PassManager(); + auto* pTarget = mpExec->getTargetMachine(); +@@ -490,7 +498,7 @@ void JitManager::DumpToFile(Module* M, + #else + sprintf(fName, "%s.%s.ll", funcName, fileName); + #endif +- raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None); ++ raw_fd_ostream fd(fName, EC, OF_NONE); + M->print(fd, annotater); + fd.flush(); + } +@@ -512,7 +520,7 @@ void JitManager::DumpToFile(Function* f, const char* fileName) + #else + sprintf(fName, "%s.%s.ll", funcName, fileName); + #endif +- raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None); ++ raw_fd_ostream fd(fName, EC, OF_NONE); + f->print(fd, nullptr); + + #if defined(_WIN32) +@@ -522,7 +530,7 @@ void JitManager::DumpToFile(Function* f, const char* fileName) + #endif + fd.flush(); + +- raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::F_Text); ++ raw_fd_ostream fd_cfg(fName, EC, OF_TEXT); + WriteGraph(fd_cfg, (const Function*)f); + + fd_cfg.flush(); +@@ -726,7 +734,7 @@ void JitCache::notifyObjectCompiled(const llvm::Module* M, llvm::MemoryBufferRef + + { + std::error_code err; +- llvm::raw_fd_ostream fileObj(objPath.c_str(), err, llvm::sys::fs::F_None); ++ llvm::raw_fd_ostream fileObj(objPath.c_str(), err, OF_NONE); + fileObj << Obj.getBuffer(); + fileObj.flush(); + } +@@ -734,7 +742,7 @@ void JitCache::notifyObjectCompiled(const llvm::Module* M, llvm::MemoryBufferRef + + { + std::error_code err; +- llvm::raw_fd_ostream fileObj(filePath.c_str(), err, llvm::sys::fs::F_None); ++ llvm::raw_fd_ostream fileObj(filePath.c_str(), err, OF_NONE); + + uint32_t objcrc = ComputeCRC(0, Obj.getBufferStart(), Obj.getBufferSize()); + +diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h +index c361959b76ff0799f5102ad4b8ddf23d345105d9..64a690b47fac9ee99eba8f1259ffccf20f0e5fa0 100644 +--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h ++++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h +@@ -41,31 +41,29 @@ namespace SwrJit + BuilderGfxMem(JitManager* pJitMgr); + virtual ~BuilderGfxMem() {} + +- virtual Value* GEP(Value* Ptr, Value* Idx, Type* Ty = nullptr, bool isReadOnly = true, const Twine& Name = ""); +- virtual Value* GEP(Type* Ty, Value* Ptr, Value* Idx, const Twine& Name = ""); +- virtual Value* +- GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr); +- virtual Value* +- GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr); ++ virtual Value* GEP(Value* Ptr, Value* Idx, Type* Ty = nullptr, bool isReadOnly = true, const Twine& Name = "") override; ++ virtual Value* GEP(Type* Ty, Value* Ptr, Value* Idx, const Twine& Name = "") override; ++ virtual Value* GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr) override; ++ virtual Value* GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr) override; + + virtual LoadInst* LOAD(Value* Ptr, + const char* Name, + Type* Ty = nullptr, +- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); ++ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; + virtual LoadInst* LOAD(Value* Ptr, + const Twine& Name = "", + Type* Ty = nullptr, +- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); ++ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; + virtual LoadInst* LOAD(Value* Ptr, + bool isVolatile, + const Twine& Name = "", + Type* Ty = nullptr, +- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); ++ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; + virtual LoadInst* LOAD(Value* BasePtr, + const std::initializer_list& offset, + const llvm::Twine& Name = "", + Type* Ty = nullptr, +- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); ++ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; + + virtual CallInst* MASKED_LOAD(Value* Ptr, + unsigned Align, +@@ -73,32 +71,32 @@ namespace SwrJit + Value* PassThru = nullptr, + const Twine& Name = "", + Type* Ty = nullptr, +- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); ++ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; + +- virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); +- +- virtual StoreInst* STORE(Value* Val, Value* BasePtr, const std::initializer_list& offset, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); ++ virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; + +- virtual CallInst* MASKED_STORE(Value *Val, Value *Ptr, unsigned Align, Value *Mask, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); ++ virtual StoreInst* STORE(Value* Val, Value* BasePtr, const std::initializer_list& offset, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; ++ ++ virtual CallInst* MASKED_STORE(Value *Val, Value *Ptr, unsigned Align, Value *Mask, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; + + virtual Value* GATHERPS(Value* src, + Value* pBase, + Value* indices, + Value* mask, + uint8_t scale = 1, +- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); ++ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; + virtual Value* GATHERDD(Value* src, + Value* pBase, + Value* indices, + Value* mask, + uint8_t scale = 1, +- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); ++ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; + + virtual void SCATTERPS(Value* pDst, + Value* vSrc, + Value* vOffsets, + Value* vMask, +- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); ++ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; + + Value* TranslateGfxAddressForRead(Value* xpGfxAddress, + Type* PtrTy = nullptr, +@@ -108,13 +106,13 @@ namespace SwrJit + Type* PtrTy = nullptr, + const Twine& Name = "", + MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); +- ++ + protected: + void AssertGFXMemoryParams(Value* ptr, MEM_CLIENT usage); + + virtual void NotifyPrivateContextSet(); + +- virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant* offset); ++ virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant* offset) override; + + Value* TranslationHelper(Value* Ptr, Type* Ty, Value* pfnTranslateGfxAddress); + void TrackerHelper(Value* Ptr, Type* Ty, MEM_CLIENT usage, bool isRead); +diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp +index b5eb0a782b15214bcf954a7893cd628649a990fc..a16b5d11dbb2f2f1a0bcdc07e4d306b14a90dc4c 100644 +--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp ++++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp +@@ -82,7 +82,12 @@ namespace SwrJit + std::vector indices; + for (auto i : indexList) + indices.push_back(i); ++#if LLVM_VERSION_MAJOR >= 13 ++ Type *EltTy = cast(ptr->getType())->getElementType(); ++ return IN_BOUNDS_GEP(EltTy, ptr, indices); ++#else + return IN_BOUNDS_GEP(ptr, indices); ++#endif + } + + Value* Builder::IN_BOUNDS_GEP(Value* ptr, const std::initializer_list& indexList) +@@ -90,7 +95,12 @@ namespace SwrJit + std::vector indices; + for (auto i : indexList) + indices.push_back(C(i)); ++#if LLVM_VERSION_MAJOR >= 13 ++ Type *EltTy = cast(ptr->getType())->getElementType(); ++ return IN_BOUNDS_GEP(EltTy, ptr, indices); ++#else + return IN_BOUNDS_GEP(ptr, indices); ++#endif + } + + LoadInst* Builder::LOAD(Value* Ptr, const char* Name, Type* Ty, MEM_CLIENT usage) +@@ -130,6 +140,22 @@ namespace SwrJit + return Builder::LOAD(GEPA(basePtr, valIndices), name); + } + ++ CallInst* Builder::MASKED_LOAD(Value* Ptr, ++ unsigned Align, ++ Value* Mask, ++ Value* PassThru, ++ const Twine& Name, ++ Type* Ty, ++ MEM_CLIENT usage) ++ { ++#if LLVM_VERSION_MAJOR >= 13 ++ Type *EltTy = cast(Ptr->getType())->getElementType(); ++ return IRB()->CreateMaskedLoad(EltTy, Ptr, AlignType(Align), Mask, PassThru, Name); ++#else ++ return IRB()->CreateMaskedLoad(Ptr, AlignType(Align), Mask, PassThru, Name); ++#endif ++ } ++ + LoadInst* Builder::LOADV(Value* basePtr, + const std::initializer_list& indices, + const llvm::Twine& name) +@@ -234,7 +260,12 @@ namespace SwrJit + /// @param pVecPassthru - SIMD wide vector of values to load when lane is inactive + Value* Builder::GATHER_PTR(Value* pVecSrcPtr, Value* pVecMask, Value* pVecPassthru) + { ++#if LLVM_VERSION_MAJOR >= 13 ++ Type *EltTy = cast(pVecSrcPtr->getType())->getElementType(); ++ return MASKED_GATHER(EltTy, pVecSrcPtr, AlignType(4), pVecMask, pVecPassthru); ++#else + return MASKED_GATHER(pVecSrcPtr, AlignType(4), pVecMask, pVecPassthru); ++#endif + } + + void Builder::SCATTER_PTR(Value* pVecDstPtr, Value* pVecSrc, Value* pVecMask) +diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h +index 429d5779a4db2a6a3b6c7a7d02169773c935bb95..6682ad892b4038d4b3172b932a34e31a89cd7790 100644 +--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h ++++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h +@@ -82,10 +82,7 @@ virtual CallInst* MASKED_LOAD(Value* Ptr, + Value* PassThru = nullptr, + const Twine& Name = "", + Type* Ty = nullptr, +- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) +-{ +- return IRB()->CreateMaskedLoad(Ptr, AlignType(Align), Mask, PassThru, Name); +-} ++ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); + + virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) + { +diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp +index bd5f7588c9189275ddaf3075b0a75e2e8fc1ecf5..2a4cf74722bc9ef1831d25fe6c2bb2f510b8fceb 100644 +--- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp ++++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp +@@ -276,7 +276,8 @@ Function* FetchJit::Create(const FETCH_COMPILE_STATE& fetchState) + JitManager::DumpToFile(fetch, "src"); + + #if defined(_DEBUG) +- verifyFunction(*fetch); ++ // Note that false is returned if there are no errors ++ SWR_ASSERT(!verifyFunction(*fetch, &llvm::errs())); + #endif + + ::FunctionPassManager setupPasses(JM()->mpCurrentModule); +diff --git a/src/gallium/drivers/swr/swr_shader.cpp b/src/gallium/drivers/swr/swr_shader.cpp +index 315036920fb3ad364d0039349e148c70e5ba1818..a643b46cd081c026b5a3558d22be557338d4f220 100644 +--- a/src/gallium/drivers/swr/swr_shader.cpp ++++ b/src/gallium/drivers/swr/swr_shader.cpp +@@ -1557,8 +1557,10 @@ BuilderSWR::CompileGS(struct swr_context *ctx, swr_jit_gs_key &key) + AttributeSet attrSet = AttributeSet::get( + JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); + pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); +-#else ++#elif LLVM_VERSION_MAJOR < 14 + pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); ++#else ++ pFunction->addFnAttrs(attrBuilder); + #endif + + BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); +@@ -1785,8 +1787,10 @@ BuilderSWR::CompileTES(struct swr_context *ctx, swr_jit_tes_key &key) + AttributeSet attrSet = AttributeSet::get( + JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); + pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); +-#else ++#elif LLVM_VERSION_MAJOR < 14 + pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); ++#else ++ pFunction->addFnAttrs(attrBuilder); + #endif + + BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); +@@ -2086,8 +2090,10 @@ BuilderSWR::CompileTCS(struct swr_context *ctx, swr_jit_tcs_key &key) + AttributeSet attrSet = AttributeSet::get( + JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); + pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); +-#else ++#elif LLVM_VERSION_MAJOR < 14 + pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); ++#else ++ pFunction->addFnAttrs(attrBuilder); + #endif + + BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); +@@ -2341,8 +2347,10 @@ BuilderSWR::CompileVS(struct swr_context *ctx, swr_jit_vs_key &key) + AttributeSet attrSet = AttributeSet::get( + JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); + pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); +-#else ++#elif LLVM_VERSION_MAJOR < 14 + pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); ++#else ++ pFunction->addFnAttrs(attrBuilder); + #endif + + BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); +@@ -2646,8 +2654,10 @@ BuilderSWR::CompileFS(struct swr_context *ctx, swr_jit_fs_key &key) + AttributeSet attrSet = AttributeSet::get( + JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); + pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); +-#else ++#elif LLVM_VERSION_MAJOR < 14 + pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); ++#else ++ pFunction->addFnAttrs(attrBuilder); + #endif + + BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); diff --git a/ports/mesa/swr-msvc-2.patch b/ports/mesa/swr-msvc-2.patch new file mode 100644 index 00000000000000..f202fa0e865dc6 --- /dev/null +++ b/ports/mesa/swr-msvc-2.patch @@ -0,0 +1,57 @@ +From 68d1addf6f0cf693fdb42db3555112e257a3d771 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= +Date: Sun, 24 Oct 2021 21:36:09 -0400 +Subject: [PATCH] swr: fix MSVC build + +--- + src/gallium/drivers/swr/swr_draw.cpp | 6 +++--- + src/gallium/drivers/swr/swr_state.cpp | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/gallium/drivers/swr/swr_draw.cpp b/src/gallium/drivers/swr/swr_draw.cpp +index 4b42a8e0390..5d862adb39d 100644 +--- a/src/gallium/drivers/swr/swr_draw.cpp ++++ b/src/gallium/drivers/swr/swr_draw.cpp +@@ -62,7 +62,7 @@ swr_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info, + + if (!indirect && + !info->primitive_restart && +- !u_trim_pipe_prim(info->mode, (unsigned*)&draws[0].count)) ++ !u_trim_pipe_prim((enum pipe_prim_type)info->mode, (unsigned*)&draws[0].count)) + return; + + if (!swr_check_render_cond(pipe)) +@@ -102,7 +102,7 @@ swr_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info, + STREAMOUT_COMPILE_STATE state = {0}; + struct pipe_stream_output_info *so = &ctx->vs->pipe.stream_output; + +- state.numVertsPerPrim = u_vertices_per_prim(info->mode); ++ state.numVertsPerPrim = u_vertices_per_prim((enum pipe_prim_type)info->mode); + + uint32_t offsets[MAX_SO_STREAMS] = {0}; + uint32_t num = 0; +@@ -221,7 +221,7 @@ swr_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info, + if (ctx->gs) + topology = (pipe_prim_type)ctx->gs->info.base.properties[TGSI_PROPERTY_GS_OUTPUT_PRIM]; + else +- topology = info->mode; ++ topology = (enum pipe_prim_type)info->mode; + + switch (topology) { + case PIPE_PRIM_TRIANGLE_FAN: +diff --git a/src/gallium/drivers/swr/swr_state.cpp b/src/gallium/drivers/swr/swr_state.cpp +index 5f1464e6d0e..818328750bd 100644 +--- a/src/gallium/drivers/swr/swr_state.cpp ++++ b/src/gallium/drivers/swr/swr_state.cpp +@@ -1731,7 +1731,7 @@ swr_update_derived(struct pipe_context *pipe, + /* Has to be before fragment shader, since it sets SWR_NEW_FS */ + if (p_draw_info) { + bool new_prim_is_poly = +- (u_reduced_prim(p_draw_info->mode) == PIPE_PRIM_TRIANGLES) && ++ (u_reduced_prim((enum pipe_prim_type)p_draw_info->mode) == PIPE_PRIM_TRIANGLES) && + (ctx->derived.rastState.fillMode == SWR_FILLMODE_SOLID); + if (new_prim_is_poly != ctx->poly_stipple.prim_is_poly) { + ctx->dirty |= SWR_NEW_FS; +-- +2.25.1 + diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 2030dfe0e450c6..31d79225cf2bd2 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,11 +1,15 @@ { "name": "mesa", - "version": "21.2.0", + "version": "21.2.5", + "port-version": 2, "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "supports": "!(windows & arm)", "dependencies": [ - "tool-meson", + { + "name": "vcpkg-tool-meson", + "host": true + }, "zlib", "zstd" ], diff --git a/ports/mhook/portfile.cmake b/ports/mhook/portfile.cmake index 51b47c316073ed..f89536f73d136a 100644 --- a/ports/mhook/portfile.cmake +++ b/ports/mhook/portfile.cmake @@ -7,14 +7,13 @@ vcpkg_from_github( PATCHES fix-windows-packing-mismatch.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mhook RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/mhook" RENAME copyright) -vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/mhook/vcpkg.json b/ports/mhook/vcpkg.json index 8c55068ce6dabf..13dc895dd7d8c0 100644 --- a/ports/mhook/vcpkg.json +++ b/ports/mhook/vcpkg.json @@ -1,6 +1,13 @@ { "name": "mhook", - "version-string": "2.5.1", - "port-version": 2, - "description": "A Windows API hooking library." + "version": "2.5.1", + "port-version": 3, + "description": "A Windows API hooking library.", + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/milerius-sfml-imgui/cpp11.patch b/ports/milerius-sfml-imgui/cpp11.patch new file mode 100644 index 00000000000000..61dd830d584c9b --- /dev/null +++ b/ports/milerius-sfml-imgui/cpp11.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27b8bd8..ac65300 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,7 @@ find_package(OpenGL REQUIRED) + ##! Library + add_library(${PROJECT_NAME} SHARED sfml-imgui/imgui-SFML.cpp) + target_link_libraries(${PROJECT_NAME} PUBLIC imgui::imgui sfml-graphics OpenGL::GL) ++target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) + + target_include_directories(${PROJECT_NAME} PUBLIC + $ diff --git a/ports/milerius-sfml-imgui/portfile.cmake b/ports/milerius-sfml-imgui/portfile.cmake index 63ce4e7c548d7d..01199388516b1f 100644 --- a/ports/milerius-sfml-imgui/portfile.cmake +++ b/ports/milerius-sfml-imgui/portfile.cmake @@ -6,18 +6,18 @@ vcpkg_from_github( REF 1.1 SHA512 191184f7b302f643bd7c241b69d9f9edc0d03c6f5a0b3a49f57ac84f3828202f8065291fb17993073a2c07f1237ba491de677c47e2f8160dc70ea77f20eb1946 HEAD_REF master - PATCHES FixFindPackageIssue.patch + PATCHES + FixFindPackageIssue.patch + cpp11.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/milerius-sfml-imgui) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/milerius-sfml-imgui) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/copyright) \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/milerius-sfml-imgui/vcpkg.json b/ports/milerius-sfml-imgui/vcpkg.json index e208a73f3b863e..62abc101bb08e4 100644 --- a/ports/milerius-sfml-imgui/vcpkg.json +++ b/ports/milerius-sfml-imgui/vcpkg.json @@ -1,10 +1,18 @@ { "name": "milerius-sfml-imgui", - "version-string": "1.1", - "port-version": 3, + "version": "1.1", + "port-version": 4, "description": "imgui dll for sfml usage", "dependencies": [ "imgui", - "sfml" + "sfml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/mimalloc/fix-cmake.patch b/ports/mimalloc/fix-cmake.patch index 2824055a5a25ab..eb43278d04b58e 100644 --- a/ports/mimalloc/fix-cmake.patch +++ b/ports/mimalloc/fix-cmake.patch @@ -1,38 +1,25 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b56953c..d7ad3e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -279,10 +279,12 @@ if(MI_BUILD_SHARED) +@@ -315,11 +315,11 @@ target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.lib) add_custom_command(TARGET mimalloc POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $ COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory") -+ install ( -+ FILES $/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll -+ DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ) +- install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir}) ++ install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() -- + - install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -- install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) + install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) + install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION lib RUNTIME DESTINATION bin LIBRARY DESTINATION lib NAMELINK_SKIP) endif() # static library -@@ -308,6 +310,8 @@ if (MI_BUILD_STATIC) - install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) - endif() - -+install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) -+ - # install include files - install(FILES include/mimalloc.h DESTINATION ${mi_install_incdir}) - install(FILES include/mimalloc-override.h DESTINATION ${mi_install_incdir}) -@@ -342,9 +346,6 @@ if (MI_BUILD_OBJECT) +@@ -370,9 +370,6 @@ # install(TARGETS mimalloc-obj EXPORT mimalloc DESTINATION ${mi_install_objdir}) # the FILES expression can also be: $ # but that fails cmake versions less than 3.10 so we leave it as is for now - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION} -- DESTINATION ${mi_install_libdir} +- DESTINATION ${mi_install_objdir} - RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} ) endif() diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index 7703c5a419196b..ff0f06366fb238 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc - REF v2.0.2 - SHA512 d6f1749a6df86346220fc190a3fd6aa67deff5439b26846c33ff95e91ce5fea73837ee39348dd432db3592575298e6e87856329d0236d2c6959abd8bf7756cdc + REF v2.0.5 + SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d HEAD_REF master PATCHES fix-cmake.patch @@ -33,6 +31,8 @@ vcpkg_cmake_configure( -DMI_BUILD_STATIC=${MI_BUILD_STATIC} -DMI_BUILD_SHARED=${MI_BUILD_SHARED} -DMI_INSTALL_TOPLEVEL=ON + MAYBE_UNUSED_VARIABLES + MI_INTERPOSE ) vcpkg_cmake_install() @@ -43,7 +43,7 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mimalloc) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string( @@ -55,4 +55,4 @@ endif() 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) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index dfa772aaabefa9..31f7d57b752ca5 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mimalloc", - "version": "2.0.2", + "version": "2.0.5", "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", + "license": "MIT", "supports": "!(arm | uwp)", "dependencies": [ { diff --git a/ports/minhook/portfile.cmake b/ports/minhook/portfile.cmake index bd022d5bcbcfb0..8c95a4dcd917fc 100644 --- a/ports/minhook/portfile.cmake +++ b/ports/minhook/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(BUILD_ARCH "Win32") set(OUTPUT_DIR "Win32") @@ -29,15 +27,14 @@ vcpkg_from_github( fix-usage.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/minhook) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/minhook) 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) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/minhook/vcpkg.json b/ports/minhook/vcpkg.json index 707945cccce056..e2a0b7b777e8e3 100644 --- a/ports/minhook/vcpkg.json +++ b/ports/minhook/vcpkg.json @@ -1,7 +1,17 @@ { "name": "minhook", - "version-string": "1.3.3", - "port-version": 2, + "version": "1.3.3", + "port-version": 3, "description": "The Minimalistic x86/x64 API Hooking Library for Windows.", - "supports": "!uwp" + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/minio-cpp/fix_cmake_file.patch b/ports/minio-cpp/fix_cmake_file.patch new file mode 100644 index 00000000000000..f4f6d95b417714 --- /dev/null +++ b/ports/minio-cpp/fix_cmake_file.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6df202c..98eeeb0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,6 +114,6 @@ else (DOXYGEN_FOUND) + message("Doxygen need to be installed to generate the doxygen documentation") + endif (DOXYGEN_FOUND) + + configure_file(miniocpp.pc.in miniocpp.pc @ONLY) +-install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) ++install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + diff --git a/ports/minio-cpp/portfile.cmake b/ports/minio-cpp/portfile.cmake new file mode 100644 index 00000000000000..1fe1394579d2f0 --- /dev/null +++ b/ports/minio-cpp/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO minio/minio-cpp + REF 0847e56f31e13d32c924029d5ffaa865f8396462 + SHA512 47817c8acc92060afca5ebd7c9bc7c9a9e09a50046180d7d3d67993f207d295c90e491417702ebb1ab2b0a6e85a5fcc334054ce4f6d542cb42c3675b5aed1c3f + HEAD_REF main + PATCHES + fix_cmake_file.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/minio-cpp/vcpkg.json b/ports/minio-cpp/vcpkg.json new file mode 100644 index 00000000000000..ce272682456c7d --- /dev/null +++ b/ports/minio-cpp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "minio-cpp", + "version-date": "2022-01-03", + "description": "MinIO C++ Client SDK for Amazon S3 Compatible Cloud Storage", + "supports": "!uwp", + "dependencies": [ + "curlpp", + "openssl", + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index 20cc0184e76cc8..5e5a56e38ad1c6 100644 --- a/ports/minizip/portfile.cmake +++ b/ports/minizip/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json index 9e8c24b8135fb1..c8bc8dbb6d4518 100644 --- a/ports/minizip/vcpkg.json +++ b/ports/minizip/vcpkg.json @@ -1,7 +1,7 @@ { "name": "minizip", "version-semver": "1.2.11", - "port-version": 9, + "port-version": 10, "description": "Zip compression library", "homepage": "https://github.com/madler/zlib", "supports": "!uwp", diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake index 058bcf9f8740a0..33df7e97207fc3 100644 --- a/ports/mlpack/portfile.cmake +++ b/ports/mlpack/portfile.cmake @@ -11,16 +11,16 @@ vcpkg_from_github( fix-dependencies.patch ) -file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACML.cmake) -file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACMLMP.cmake) -file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindARPACK.cmake) -file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindBLAS.cmake) -file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindCBLAS.cmake) -file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindCLAPACK.cmake) -file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindLAPACK.cmake) -file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindMKL.cmake) -file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindOpenBLAS.cmake) -file(REMOVE ${SOURCE_PATH}/CMake/FindArmadillo.cmake) +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindACML.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindACMLMP.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindARPACK.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindBLAS.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindCBLAS.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindCLAPACK.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindLAPACK.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindMKL.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindOpenBLAS.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/FindArmadillo.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -28,9 +28,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS openmp USE_OPENMP ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTS=OFF -DDOWNLOAD_STB_IMAGE=OFF @@ -39,12 +39,14 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mlpack) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mlpack) vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + if("tools" IN_LIST FEATURES) vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES mlpack_adaboost @@ -99,6 +101,6 @@ if("tools" IN_LIST FEATURES) ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mlpack/vcpkg.json b/ports/mlpack/vcpkg.json index 2998ba1f5ce855..382e885d3cba6f 100644 --- a/ports/mlpack/vcpkg.json +++ b/ports/mlpack/vcpkg.json @@ -1,10 +1,10 @@ { "name": "mlpack", "version": "3.4.1", - "port-version": 2, + "port-version": 5, "description": "mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.", "homepage": "https://github.com/mlpack/mlpack", - "supports": "uwp", + "supports": "!uwp", "dependencies": [ "armadillo", "boost-heap", @@ -14,14 +14,25 @@ "boost-serialization", "boost-serialization", "ensmallen", - "stb" + "stb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "openmp": { "description": "use OpenMP for parallelization." }, "tools": { - "description": "Build command-line executables." + "description": "Build command-line executables.", + "dependencies": [ + "boost-format" + ] } } } diff --git a/ports/mman/portfile.cmake b/ports/mman/portfile.cmake index 7482a7f74a69b2..4e57ba973acd7c 100644 --- a/ports/mman/portfile.cmake +++ b/ports/mman/portfile.cmake @@ -8,12 +8,11 @@ vcpkg_from_github( mman-static.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/mman) file(RENAME ${CURRENT_PACKAGES_DIR}/include/sys ${CURRENT_PACKAGES_DIR}/include/mman/sys) @@ -23,9 +22,7 @@ file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ ${CURRENT_PACKAGES_DIR}/include/mman/sys/mman.h _contents) - string(REPLACE "__declspec(dllimport)" "" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/mman/sys/mman.h "${_contents}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mman/sys/mman.h" "__declspec(dllimport)" "") endif() vcpkg_copy_pdbs() diff --git a/ports/mman/vcpkg.json b/ports/mman/vcpkg.json index 37516b67990c0a..2554140e89890e 100644 --- a/ports/mman/vcpkg.json +++ b/ports/mman/vcpkg.json @@ -1,7 +1,14 @@ { "name": "mman", "version-string": "git-f5ff813", - "port-version": 4, + "port-version": 5, "description": "A light implementation of the mmap functions for MinGW.", - "homepage": "https://github.com/witwall/mman-win32" + "homepage": "https://github.com/witwall/mman-win32", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/mmloader/fix_c_and_cxx_flags.patch b/ports/mmloader/fix_c_and_cxx_flags.patch deleted file mode 100644 index 501ce40cd7f880..00000000000000 --- a/ports/mmloader/fix_c_and_cxx_flags.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7a22b56..2ce1bd8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,24 +47,11 @@ set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CONFIGURATION_TYPES Debug Release) - - # Default compile flags --set(CMAKE_CXX_FLAGS -- "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG" -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS-" - CACHE STRING "default C++ compile flags" FORCE) --set(CMAKE_CXX_FLAGS_DEBUG -- "/MTd /Ob0 /Od" -- CACHE STRING "default C++ compile flags for debug build" FORCE) --set(CMAKE_CXX_FLAGS_RELEASE -- "/MT /O2 /Ob2 /DNDEBUG" -- CACHE STRING "default C++ compile flags for release build" FORCE) --set(CMAKE_C_FLAGS -- "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG" -+set(CMAKE_C_FLAGS -+ "${CMAKE_C_FLAGS} /GS-" - CACHE STRING "default C++ compile flags" FORCE) --set(CMAKE_C_FLAGS_DEBUG -- "/MTd /Ob0 /Od" -- CACHE STRING "default C++ compile flags for debug build" FORCE) --set(CMAKE_C_FLAGS_RELEASE -- "/MT /O2 /Ob2 /DNDEBUG" -- CACHE STRING "default C++ compile flags for release build" FORCE) - - message(STATUS "CMAKE_CXX_FLAGS=" ${CMAKE_CXX_FLAGS}) - message(STATUS "CMAKE_CXX_FLAGS_DEBUG=" ${CMAKE_CXX_FLAGS_DEBUG}) diff --git a/ports/mmloader/portfile.cmake b/ports/mmloader/portfile.cmake index c1f1684468af6a..72d6534846e1df 100644 --- a/ports/mmloader/portfile.cmake +++ b/ports/mmloader/portfile.cmake @@ -1,26 +1,16 @@ -# fail early for unsupported triplets -vcpkg_fail_port_install( - MESSAGE "mmLoader supports only x86/x64-windows-static triplets" - ON_TARGET "UWP" "LINUX" "OSX" "ANDROID" "FREEBSD" - ON_ARCH "arm" "arm64" - ON_CRT_LINKAGE "dynamic" - ON_LIBRARY_LINKAGE "dynamic" -) - # source vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tishion/mmLoader - REF 1.0.0 - SHA512 ceb2ab4b60d74209fa46d198cde6fd87a97d911abb875ac35383288a67828d0420bb38ff8d2f17dd4a3f46ba3abf554152d1246eeb05215258e8af64ac4a39de + REF 1.0.1 + SHA512 a41749e1b62d5549b821429a03e456a0cb41fbc1ea3fe5e8067f80994fb4645c3145dd1e2a3ccaed13b091ec24338d4e542849628d346f26d2275b0cbff8f4c6 HEAD_REF master - PATCHES - fix_c_and_cxx_flags.patch ) # feature vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - shellcode BUILD_SHELLCODE_GEN + FEATURES + shellcode BUILD_SHELLCODE_GEN ) # config diff --git a/ports/mmloader/vcpkg.json b/ports/mmloader/vcpkg.json index a48ecb38b209a5..30d49748ff60f7 100644 --- a/ports/mmloader/vcpkg.json +++ b/ports/mmloader/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mmloader", - "version-string": "2020-05-15", + "version-date": "2021-12-13", "port-version": 1, "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)", "homepage": "http://tishion.github.io/mmLoader/", diff --git a/ports/mnn/portfile.cmake b/ports/mnn/portfile.cmake index 8147fddb1dba20..b3a7dc3fcf6f74 100644 --- a/ports/mnn/portfile.cmake +++ b/ports/mnn/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "ios" "android") if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() diff --git a/ports/mnn/vcpkg.json b/ports/mnn/vcpkg.json index 27676e8630fd49..0b21ba2f4a8251 100644 --- a/ports/mnn/vcpkg.json +++ b/ports/mnn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mnn", "version": "1.1.0", - "port-version": 1, + "port-version": 2, "description": "MNN is a blazing fast, lightweight deep learning framework, battle-tested by business-critical use cases in Alibaba", "homepage": "https://www.mnn.zone/", "license": "Apache-2.0", diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index a570ac689d93c0..1b208519e96988 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -38,7 +38,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMONGOCXX_HEADER_INSTALL_DIR=include -DBSONCXX_HEADER_INSTALL_DIR=include @@ -62,12 +62,14 @@ set(LIBBSONCXX_VERSION_MINOR ${VERSION_MINOR}) set(LIBBSONCXX_VERSION_PATCH ${VERSION_PATCH}) set(LIBBSONCXX_PACKAGE_VERSION ${VERSION_FULL}) -get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE) - -set(LIBBSONCXX_INCLUDE_DIRS \"\${PACKAGE_PREFIX_DIR}/include\") -find_library(LIBBSONCXX_LIBRARY_PATH_RELEASE bsoncxx bsoncxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/lib\" NO_DEFAULT_PATH) -find_library(LIBBSONCXX_LIBRARY_PATH_DEBUG bsoncxx bsoncxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/debug/lib\" NO_DEFAULT_PATH) -set(LIBBSONCXX_LIBRARIES optimized \${LIBBSONCXX_LIBRARY_PATH_RELEASE} debug \${LIBBSONCXX_LIBRARY_PATH_DEBUG}) +include(CMakeFindDependencyMacro) +find_dependency(bsoncxx CONFIG REQUIRED) +get_filename_component(LIBBSONCXX_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/../../include\" ABSOLUTE) +if (TARGET mongo::bsoncxx_shared) + set(LIBBSONCXX_LIBRARIES mongo::bsoncxx_shared) +else() + set(LIBBSONCXX_LIBRARIES mongo::bsoncxx_static) +endif() " ) file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongocxx/libmongocxx-config.cmake @@ -80,48 +82,27 @@ set(LIBMONGOCXX_VERSION_PATCH ${VERSION_PATCH}) set(LIBMONGOCXX_PACKAGE_VERSION ${VERSION_FULL}) include(CMakeFindDependencyMacro) - -find_dependency(libbsoncxx) - -get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE) - -set(LIBMONGOCXX_INCLUDE_DIRS \"\${PACKAGE_PREFIX_DIR}/include\" \${LIBBSONCXX_INCLUDE_DIRS}) -find_library(LIBMONGOCXX_LIBRARY_PATH_RELEASE NAMES mongocxx mongocxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/lib\" NO_DEFAULT_PATH) -find_library(LIBMONGOCXX_LIBRARY_PATH_DEBUG NAMES mongocxx mongocxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/debug/lib\" NO_DEFAULT_PATH) -set(LIBMONGOCXX_LIBRARIES optimized \${LIBMONGOCXX_LIBRARY_PATH_RELEASE} debug \${LIBMONGOCXX_LIBRARY_PATH_DEBUG} \${LIBBSONCXX_LIBRARIES}) +find_dependency(mongocxx CONFIG REQUIRED) +get_filename_component(LIBMONGOCXX_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/../../include\" ABSOLUTE) +if (TARGET mongo::bsoncxx_shared) + set(LIBMONGOCXX_LIBRARIES mongo::mongocxx_shared) +else() + set(LIBMONGOCXX_LIBRARIES mongo::mongocxx_static) +endif() " ) +vcpkg_fixup_pkgconfig() + if (NOT BSONCXX_POLY STREQUAL MNMLSTC) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party") endif() file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/include/bsoncxx/cmake" - "${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/private" - "${CURRENT_PACKAGES_DIR}/include/bsoncxx/private" - "${CURRENT_PACKAGES_DIR}/include/bsoncxx/test" - "${CURRENT_PACKAGES_DIR}/include/bsoncxx/test_util" - - "${CURRENT_PACKAGES_DIR}/include/mongocxx/cmake" - "${CURRENT_PACKAGES_DIR}/include/mongocxx/config/private" - "${CURRENT_PACKAGES_DIR}/include/mongocxx/exception/private" - "${CURRENT_PACKAGES_DIR}/include/mongocxx/options/private" - "${CURRENT_PACKAGES_DIR}/include/mongocxx/gridfs/private" - "${CURRENT_PACKAGES_DIR}/include/mongocxx/private" - "${CURRENT_PACKAGES_DIR}/include/mongocxx/test" - "${CURRENT_PACKAGES_DIR}/include/mongocxx/test_util" - "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/bin" - "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" - "${CURRENT_PACKAGES_DIR}/bin" - "${CURRENT_PACKAGES_DIR}/lib/cmake" ) file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/uninstall.sh") -vcpkg_fixup_pkgconfig() - file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(COPY "${SOURCE_PATH}/THIRD-PARTY-NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index 27d8f07beb0e4c..6b0216a30fa6cc 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mongo-cxx-driver", "version": "3.6.5", - "port-version": 1, + "port-version": 2, "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "dependencies": [ diff --git a/ports/mongoose/portfile.cmake b/ports/mongoose/portfile.cmake index 972a36a0fecdba..d5912f6e0b2b8c 100644 --- a/ports/mongoose/portfile.cmake +++ b/ports/mongoose/portfile.cmake @@ -1,32 +1,30 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cesanta/mongoose - REF 8e520756366ca5739f13dc6ad65fcf269dbbc994 #v7.1 - SHA512 a966a8b4e47e36da0f630c3cf343c85a1c1138508a82e506b21e4b8bd72573d0e0145318f97b32a67f423e033b348de76a00b780430e4e69d1a98bd7494a3e0a + REF 9d38e26b817b6b151fd925e9a8420a46c99a8375 #v7.5 + SHA512 ce488a6b9dc1e7437b17ea32e62c2c90fe05b298df995e624f24f05c539ee96444fa892dab7958a81541c711bb3e399808f793c8ce317b0fd904b037955d81fa 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_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - ssl ENABLE_SSL + FEATURES + ssl ENABLE_SSL ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mongoose/vcpkg.json b/ports/mongoose/vcpkg.json index 9313383b64ab11..1177b737ea83e6 100644 --- a/ports/mongoose/vcpkg.json +++ b/ports/mongoose/vcpkg.json @@ -1,9 +1,20 @@ { "name": "mongoose", - "version": "7.1", + "version": "7.5", + "port-version": 1, "description": "Embedded web server / embedded networking library", "homepage": "https://cesanta.com/", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "ssl": { "description": "Build with openssl", diff --git a/ports/monkeys-audio/portfile.cmake b/ports/monkeys-audio/portfile.cmake index 40c2bccdecb300..39cc578537d121 100644 --- a/ports/monkeys-audio/portfile.cmake +++ b/ports/monkeys-audio/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "OSX" "Linux") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) set(MA_VERSION 570) diff --git a/ports/monkeys-audio/vcpkg.json b/ports/monkeys-audio/vcpkg.json index ceb22ba8b1b63e..208a85119d8774 100644 --- a/ports/monkeys-audio/vcpkg.json +++ b/ports/monkeys-audio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "monkeys-audio", - "version-string": "5.70", - "port-version": 1, + "version": "5.70", + "port-version": 2, "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." diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 82512c96021570..59354a99e5b050 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -1,3 +1,7 @@ +if (VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} currently requires the following packages:\n autoconf-archive\nThese can be installed on Ubuntu systems via\n sudo apt-get update -y\n sudo apt-get install -y autoconf-archive\n") +endif() + set(VERSION 4.1.0) 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" @@ -7,17 +11,18 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES gmpd.patch dll.patch + src-only.patch ) - file(REMOVE_RECURSE "${SOURCE_PATH}/m4") + vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG - ADDITIONAL_MSYS_PACKAGES texinfo gettext autoconf-archive + ADDITIONAL_MSYS_PACKAGES autoconf-archive ) vcpkg_install_make() @@ -32,4 +37,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") 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 "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mpfr/src-only.patch b/ports/mpfr/src-only.patch new file mode 100644 index 00000000000000..5055709862aafc --- /dev/null +++ b/ports/mpfr/src-only.patch @@ -0,0 +1,20 @@ +diff --git a/Makefile.am b/Makefile.am +index 89242c6..662ce24 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,12 +24,14 @@ AUTOMAKE_OPTIONS = gnu + # old Automake version. + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = doc src tests tune tools/bench ++SUBDIRS = src # Skipping: doc tests tune tools/bench + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = mpfr.pc + + nobase_dist_doc_DATA = AUTHORS BUGS COPYING COPYING.LESSER NEWS TODO \ ++ # BREAK ++VCPKG_SKIP_EXAMPLES = \ + examples/ReadMe examples/can_round.c examples/divworst.c \ + examples/rndo-add.c examples/sample.c examples/threads.c \ + examples/version.c diff --git a/ports/mpfr/vcpkg.json b/ports/mpfr/vcpkg.json index 7f742a50c4727d..2033a12bb1551d 100644 --- a/ports/mpfr/vcpkg.json +++ b/ports/mpfr/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mpfr", "version-string": "4.1.0", - "port-version": 1, + "port-version": 3, "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", "dependencies": [ "gmp" ] diff --git a/ports/mpg123/fix-modulejack.patch b/ports/mpg123/fix-modulejack.patch new file mode 100644 index 00000000000000..fd4113270990c3 --- /dev/null +++ b/ports/mpg123/fix-modulejack.patch @@ -0,0 +1,13 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index 7147174..76e1743 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -238,7 +238,7 @@ if(BUILD_LIBOUT123) + endif() + endif() + +- if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1) ++ if(0) + pkg_search_module(JACK jack) + if(JACK_FOUND) + list(APPEND OUTPUT_MODULES jack) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 6af3d50f0436d4..ceca50482f06d1 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -7,14 +7,16 @@ vcpkg_from_sourceforge( REF ${MPG123_VERSION} FILENAME "mpg123-${MPG123_VERSION}.tar.bz2" SHA512 ${MPG123_HASH} - PATCHES no-executables.patch + PATCHES + no-executables.patch + fix-modulejack.patch ) -include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) +include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") yasm_tool_helper(APPEND_TO_PATH) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/ports/cmake + SOURCE_PATH "${SOURCE_PATH}/ports/cmake" OPTIONS -DUSE_MODULES=OFF ) vcpkg_cmake_install() @@ -24,4 +26,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index e293e914496ba4..dba644357495be 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mpg123", "version": "1.29.2", + "port-version": 1, "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "dependencies": [ diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index 856e4e273d4b55..1b8e188c32d80b 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR "${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() @@ -8,31 +6,25 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynam message(FATAL_ERROR "${PORT} currently can only be built using the dynamic CRT when building DLLs") endif() -set(MPIR_VERSION 3.0.0) +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 +) if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - vcpkg_download_distfile( - ARCHIVE - URLS "http://mpir.org/mpir-${MPIR_VERSION}.tar.bz2" - FILENAME mpir-${MPIR_VERSION}.tar.bz2 - SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e - ) - - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${MPIR_VERSION} - ) - vcpkg_find_acquire_program(YASM) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SHARED_STATIC --enable-static --disable-shared) + set(SHARED_STATIC "--enable-static --disable-shared") else() - set(SHARED_STATIC --disable-static --enable-shared) + set(SHARED_STATIC "--disable-static --enable-shared") endif() - set(OPTIONS --disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}) + set(OPTIONS "--disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}") string(APPEND VCPKG_C_FLAGS " -Wno-implicit-function-declaration") string(APPEND VCPKG_CXX_FLAGS " -Wno-implicit-function-declaration") @@ -41,32 +33,21 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) if(VCPKG_TARGET_IS_LINUX) set(AUTOCONFIG "AUTOCONFIG") endif() - + vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ${AUTOCONFIG} - OPTIONS ${OPTIONS} + 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) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() - - configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) elseif(VCPKG_TARGET_IS_WINDOWS) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO wbhart/mpir - REF mpir-${MPIR_VERSION} - SHA512 7d37f60645c533a6638dde5d9c48f5535022fa0ea02bafd5b714649c70814e88c5e5e3b0bef4c5a749aaf8772531de89c331716ee00ba1c2f9521c2cc8f3c61b - HEAD_REF master - PATCHES enable-runtimelibrary-toggle.patch - ) - if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") set(MSVC_VERSION 15) else() @@ -85,69 +66,69 @@ elseif(VCPKG_TARGET_IS_WINDOWS) 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}) + 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 + 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}" ) - + 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 + 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}" ) 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) + 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) + 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 + "${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) + 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 + "${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) + 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(INSTALL ${DBG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL ${DBG_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + 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() endif() - - vcpkg_copy_pdbs() - file(INSTALL ${SOURCE_PATH}/COPYING.lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + vcpkg_copy_pdbs() endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mpir/vcpkg.json b/ports/mpir/vcpkg.json index 29754ccd9ace40..3d5a05a43ed122 100644 --- a/ports/mpir/vcpkg.json +++ b/ports/mpir/vcpkg.json @@ -1,8 +1,8 @@ { "name": "mpir", - "version-string": "3.0.0", - "port-version": 10, + "version-date": "2022-03-02", "description": "Multiple Precision Integers and Rationals", "homepage": "https://github.com/wbhart/mpir", + "license": "GPL-3.0-only", "supports": "!(uwp | arm)" } diff --git a/ports/ms-gltf/portfile.cmake b/ports/ms-gltf/portfile.cmake index 1382dc046c22a1..c59b61bbebac14 100644 --- a/ports/ms-gltf/portfile.cmake +++ b/ports/ms-gltf/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "ms-gltf currently only supports Windows and Mac platforms" ON_TARGET "linux" "ios") if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() diff --git a/ports/ms-gltf/vcpkg.json b/ports/ms-gltf/vcpkg.json index 9b7983b2737d97..34728d11be19e3 100644 --- a/ports/ms-gltf/vcpkg.json +++ b/ports/ms-gltf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ms-gltf", "version-string": "r1.9.5.4", + "port-version": 1, "description": "glTF-SDK is a C++ Software Development Kit for glTF", "homepage": "https://github.com/microsoft/glTF-SDK", "supports": "!linux", diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake index 73ce94674d00ed..5713e346a84e6e 100644 --- a/ports/ms-gsl/portfile.cmake +++ b/ports/ms-gsl/portfile.cmake @@ -2,23 +2,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/GSL - REF 0f6dbc9e2915ef5c16830f3fa3565738de2a9230 - SHA512 f72d7d9a18b8055401feb99d99f17c70c0c2015b1a2112ae13fedd27949ff7f9b30718b6afd0b5730ed5573390cb1cc987cd45b7e7fbb92f4134f11d1637ddb7 - HEAD_REF master + REF a3534567187d2edc428efd3f13466ff75fe5805c + SHA512 5bd6aad37fee3b56a2ee2fed10d6ef02fdcf37a1f40b3fb1bbec8146a573e235169b315405d010ab75175674ed82658c8202f40b128a849c5250b4a1b8b0a1b3 + HEAD_REF main ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DGSL_TEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( +vcpkg_cmake_config_fixup( + PACKAGE_NAME Microsoft.GSL CONFIG_PATH share/cmake/Microsoft.GSL - TARGET_PATH share/Microsoft.GSL ) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/ms-gsl/vcpkg.json b/ports/ms-gsl/vcpkg.json index e8f6f9adc785fe..ace0f12e7e90a8 100644 --- a/ports/ms-gsl/vcpkg.json +++ b/ports/ms-gsl/vcpkg.json @@ -1,7 +1,16 @@ { "name": "ms-gsl", - "version-string": "3.1.0", - "port-version": 1, + "version": "4.0.0", "description": "Microsoft implementation of the Guidelines Support Library", - "homepage": "https://github.com/Microsoft/GSL" + "homepage": "https://github.com/Microsoft/GSL", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index cf5b69afe9db8f..c94e2c30490624 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP") - set(MSMPI_VERSION "10.1.12498") set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}) vcpkg_download_distfile(SDK_ARCHIVE URLS "https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisdk.msi" FILENAME "msmpisdk-${MSMPI_VERSION}-b0087dfd.msi" - SHA512 b0087dfd21423bf87b94b17d7cb03576838585371bbf8b03cca95c3ad73670108c7bc6517b0de852ef595072cc4143be2011636e7242bcb080394d94294848a7 + SHA512 b0087dfd21423bf87b94b17d7cb03576838585371bbf8b03cca95c3ad73670108c7bc6517b0de852ef595072cc4143be2011636e7242bcb080394d94294848a7 ) diff --git a/ports/msmpi/vcpkg.json b/ports/msmpi/vcpkg.json index fa32759b43af2e..d220c1d6189cfb 100644 --- a/ports/msmpi/vcpkg.json +++ b/ports/msmpi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "msmpi", "version": "10.1.12498", - "port-version": 2, + "port-version": 3, "description": "Microsoft MPI (MS-MPI) is a Microsoft implementation of the Message Passing Interface standard for developing and running parallel applications on the Windows platform.", "homepage": "https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi", "license": "MIT", diff --git a/ports/munit/portfile.cmake b/ports/munit/portfile.cmake index 6a8c8e194d2fa8..37802974dd7295 100644 --- a/ports/munit/portfile.cmake +++ b/ports/munit/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -21,5 +19,5 @@ vcpkg_install_meson() vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/munit/vcpkg.json b/ports/munit/vcpkg.json index a729d1df72ee14..4f5cfb85c93690 100644 --- a/ports/munit/vcpkg.json +++ b/ports/munit/vcpkg.json @@ -1,11 +1,14 @@ { "name": "munit", - "version-string": "2019-04-06", - "port-version": 3, + "version-date": "2019-04-06", + "port-version": 5, "description": "A small but full-featured unit testing framework for C", "homepage": "https://github.com/nemequ/munit", - "supports": "!(arm | arm64 | uwp)", + "supports": "!(arm | uwp)", "dependencies": [ - "tool-meson" + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/muparser/portfile.cmake b/ports/muparser/portfile.cmake index dcc548737f8532..57efea012b635a 100644 --- a/ports/muparser/portfile.cmake +++ b/ports/muparser/portfile.cmake @@ -1,27 +1,34 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beltoforion/muparser - REF 207d5b77c05c9111ff51ab91082701221220c477 # v2.3.2 - SHA512 75cebef831eeb08c92c08d2b29932a4af550edbda56c2adb6bc86b1228775294013a07d51974157b39460e60dab937b0b641553cd7ddeef72ba0b23f65c52bf4 + REF 6d65387be8f4ef329829c6d6ace779b26942e075 # v2.3.3-1 + SHA512 cda1133b534b1c77d80b15d50d71f372a423fab2bc7b9204d106589350b3cfc955dbfdcfe8c17890e3cfd747b559f4d3c4f0ea6c9c3c73e6aa159afc82bcc6c0 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DENABLE_SAMPLES=OFF -DENABLE_OPENMP=OFF - OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON + -DENABLE_WIDE_CHAR=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() 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_cmake_config_fixup(CONFIG_PATH "lib/cmake/muparser") vcpkg_fixup_pkgconfig() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserDef.h" "#if defined(_UNICODE)" "#if 0") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserDLL.h" "#ifndef _UNICODE" "#if 1") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserFixes.h" "#ifndef MUPARSER_STATIC" "#if 0") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserFixes.h" "#ifndef MUPARSER_STATIC" "#if 1") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/muparser/vcpkg.json b/ports/muparser/vcpkg.json index 967c3712e894f3..87f52f1dcd87af 100644 --- a/ports/muparser/vcpkg.json +++ b/ports/muparser/vcpkg.json @@ -1,8 +1,19 @@ { "name": "muparser", - "version-string": "2.3.2", + "version": "2.3.3", "port-version": 2, "description": "Fast math parser library", "homepage": "https://github.com/beltoforion/muparser", - "supports": "!uwp" + "license": "BSD-2-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/murmurhash/portfile.cmake b/ports/murmurhash/portfile.cmake index 380570b2f21f18..c83ebe084bd5e2 100644 --- a/ports/murmurhash/portfile.cmake +++ b/ports/murmurhash/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/murmurhash/vcpkg.json b/ports/murmurhash/vcpkg.json index 98789370d04218..34166cf24389b1 100644 --- a/ports/murmurhash/vcpkg.json +++ b/ports/murmurhash/vcpkg.json @@ -1,7 +1,8 @@ { "name": "murmurhash", - "version-string": "2016-01-09", - "port-version": 4, + "version-date": "2016-01-09", + "port-version": 5, "description": "MurmurHash a family of hash functions.", - "homepage": "https://github.com/aappleby/smhasher" + "homepage": "https://github.com/aappleby/smhasher", + "supports": "!uwp & !arm" } diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake new file mode 100644 index 00000000000000..b830c685883366 --- /dev/null +++ b/ports/mvfst/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookincubator/mvfst + REF e569853 + SHA512 66697d8149defe43f7b91ed509117a6330556ad89dfb64a3a778c6cdd706f01d8df7d356e2896d04dffc91e51c68735283b2a27915f3d909834dd0b0a95640de + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF +) + +# Prefer installed config files +file(REMOVE + ${SOURCE_PATH}/fizz/cmake/FindGMock.cmake + ${SOURCE_PATH}/fizz/cmake/FindGflags.cmake + ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake + ${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mvfst) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json new file mode 100644 index 00000000000000..3e91aee1d2b2e1 --- /dev/null +++ b/ports/mvfst/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "mvfst", + "version": "0.2", + "port-version": 1, + "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", + "supports": "!windows", + "dependencies": [ + "boost", + "fizz", + "fmt", + "folly", + "glog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/mygui/fix-generation.patch b/ports/mygui/fix-generation.patch index 9e517318a45ec9..80d69009ed351f 100644 --- a/ports/mygui/fix-generation.patch +++ b/ports/mygui/fix-generation.patch @@ -1,5 +1,5 @@ diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt -index b0fc12a82..6e545edea 100644 +index a0ef573..b77566e 100644 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt @@ -5,7 +5,7 @@ @@ -12,10 +12,10 @@ index b0fc12a82..6e545edea 100644 set(MYGUI_CMAKE_DIR "lib/MYGUI/cmake") endif(WIN32) diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake -index d1dbd016d..25c8bbac6 100644 +index 8fb1ce4..6483339 100644 --- a/CMake/Utils/MyGUIConfigTargets.cmake +++ b/CMake/Utils/MyGUIConfigTargets.cmake -@@ -6,10 +6,10 @@ if (WIN32) +@@ -7,10 +7,10 @@ if (WIN32) set(MYGUI_RELWDBG_PATH "/RelWithDebInfo") set(MYGUI_MINSIZE_PATH "/MinSizeRel") set(MYGUI_DEBUG_PATH "/Debug") @@ -28,28 +28,3 @@ index d1dbd016d..25c8bbac6 100644 set(MYGUI_PLUGIN_PATH "/opt") elseif (UNIX) set(MYGUI_RELEASE_PATH "") -diff --git a/CMake/Utils/PrecompiledHeader.cmake b/CMake/Utils/PrecompiledHeader.cmake -index a8bf3ce49..104703282 100644 ---- a/CMake/Utils/PrecompiledHeader.cmake -+++ b/CMake/Utils/PrecompiledHeader.cmake -@@ -16,7 +16,7 @@ - macro(use_precompiled_header TARGET HEADER_FILE SRC_FILE) - get_filename_component(HEADER ${HEADER_FILE} NAME) - -- if (MSVC AND NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") -+ if (FALSE) - add_definitions(/Yu"${HEADER}") - set_source_files_properties(${SRC_FILE} - PROPERTIES COMPILE_FLAGS /Yc"${HEADER}" -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fea0bff8b..5831dfa8a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,6 +9,7 @@ cmake_minimum_required(VERSION 2.6) - set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) - cmake_policy(SET CMP0003 NEW) - cmake_policy(SET CMP0011 NEW) -+cmake_policy(SET CMP0021 OLD) - - project(MYGUI) - diff --git a/ports/mygui/portfile.cmake b/ports/mygui/portfile.cmake index 3f3bd9016f3139..c728aefecc7d3c 100644 --- a/ports/mygui/portfile.cmake +++ b/ports/mygui/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MyGUI/mygui - REF 26109822f36a4f7d72d5d8ecd41659897f085a40 - SHA512 4d1f001e8c04d08ad911bc0345a2287b5e17e21284728cf23d7a930e8befb2f85902053e3c90283444bf9e32c7dada2f37c498e735d6314732b297d97ed339e4 + REF 81e5c67e92920607d16bc2aee1ac32f6fd7d446b #v3.4.1 + SHA512 b13e0a08559b3ddfe42ffcc6cf017fb20d50168785fb551e16f613c60b9ea28a65056a9bc42bdab876368f40dcba1772bc704ad0928c45d8b32e909abc0f1916 HEAD_REF master PATCHES fix-generation.patch @@ -18,9 +18,8 @@ else() set(MYGUI_RENDERSYSTEM 1) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMYGUI_STATIC=TRUE -DMYGUI_BUILD_DEMOS=FALSE @@ -33,12 +32,14 @@ vcpkg_configure_cmake( -DMYGUI_RENDERSYSTEM=${MYGUI_RENDERSYSTEM} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) +vcpkg_fixup_pkgconfig() + # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mygui/vcpkg.json b/ports/mygui/vcpkg.json index 28a32c06074bdc..aabd5655a9107e 100644 --- a/ports/mygui/vcpkg.json +++ b/ports/mygui/vcpkg.json @@ -1,12 +1,21 @@ { "name": "mygui", - "version-string": "2020-06-17", - "port-version": 1, + "version": "3.4.1", + "port-version": 2, "description": "Fast, flexible and simple GUI", "homepage": "http://mygui.info", + "supports": "!uwp", "dependencies": [ "freetype", - "sdl2-image" + "sdl2-image", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "opengl": { diff --git a/ports/nanobench/portfile.cmake b/ports/nanobench/portfile.cmake index 86b144ca5f102b..77b60e3805ece7 100644 --- a/ports/nanobench/portfile.cmake +++ b/ports/nanobench/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/nanobench - REF ee8b36e956bb2b8753dd1f6732b4d9d90afb09f9 #v4.3.0 - SHA512 46807f3b945d062dd3c829ec349cc892f9b2334c8a3c74c1225b0cd918af6864a1e539ac2bbad0ee6e20d285b5ad8e307e72996f2531377c55683cb0593ed3e7 + REF v4.3.6 + SHA512 03e92a9fe903d273ee76c30bb6474c739858f0a65adebdcdd1e4b9ae294bd790a8e20161cb2d493fc1ea2987dbfa25a2a620cf7c3739d909595f81693f1f17d4 HEAD_REF master ) diff --git a/ports/nanobench/vcpkg.json b/ports/nanobench/vcpkg.json index d8c6a583ee55d3..ebcf47cdc187a0 100644 --- a/ports/nanobench/vcpkg.json +++ b/ports/nanobench/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanobench", - "version-string": "4.3.0", - "port-version": 1, + "version": "4.3.6", "description": "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20", - "homepage": "https://nanobench.ankerl.com" + "homepage": "https://nanobench.ankerl.com", + "license": "MIT" } diff --git a/ports/nanogui/portfile.cmake b/ports/nanogui/portfile.cmake index 06c899c5e790ec..937c2c0a00d94e 100644 --- a/ports/nanogui/portfile.cmake +++ b/ports/nanogui/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wjakob/nanogui @@ -22,4 +20,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/nanogui/vcpkg.json b/ports/nanogui/vcpkg.json index c4c7b43254aae1..f075b3dc6a87e2 100644 --- a/ports/nanogui/vcpkg.json +++ b/ports/nanogui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanogui", - "version-string": "2019-09-23", - "port-version": 2, + "version-date": "2019-09-23", + "port-version": 3, "description": "NanoGUI is a minimalistic cross-platform widget library for OpenGL 3.x or higher.", "homepage": "https://github.com/wjakob/nanogui", "supports": "!uwp", diff --git a/ports/nanovg/portfile.cmake b/ports/nanovg/portfile.cmake index 6a838808bb0da4..5df6def4e6fc44 100644 --- a/ports/nanovg/portfile.cmake +++ b/ports/nanovg/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO memononen/nanovg diff --git a/ports/nanovg/vcpkg.json b/ports/nanovg/vcpkg.json index 39e3cd017f68bd..b5f854527f37fd 100644 --- a/ports/nanovg/vcpkg.json +++ b/ports/nanovg/vcpkg.json @@ -1,9 +1,10 @@ { "name": "nanovg", - "version-string": "2019-8-30", - "port-version": 4, + "version-date": "2019-08-30", + "port-version": 5, "description": "NanoVG is small antialiased vector graphics rendering library for OpenGL.", "homepage": "https://github.com/memononen/nanovg", + "supports": "!uwp", "dependencies": [ "stb" ] diff --git a/ports/nativefiledialog/portfile.cmake b/ports/nativefiledialog/portfile.cmake index c31caab408c300..5b4bf0e1887514 100644 --- a/ports/nativefiledialog/portfile.cmake +++ b/ports/nativefiledialog/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mlabbe/nativefiledialog - REF ceb75f7abf30736aa8ee4800cde0d444c798f8b9 - SHA512 dd2bff28bb08fb1f6b07ad28530da039f176fb641e300b816040a2b2b840611e418cad44fdaf395ec565c50149ce58c80f88f6a77b403b843f2b14f1f2c91d7d + REF 67345b80ebb429ecc2aeda94c478b3bcc5f7888e + SHA512 55edb3730b718b18d4fee7ec9bb479794d0e193ff13f05f26cbcf9ff44c43adb93e228ed7fd708e30c08476366f098bf69139031a84f5e4d6a85eba096fe4654 HEAD_REF master ) @@ -20,8 +20,7 @@ vcpkg_check_features( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) @@ -31,8 +30,8 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/nativefiledialog/vcpkg.json b/ports/nativefiledialog/vcpkg.json index a9fb973797db15..e78d27349ef89d 100644 --- a/ports/nativefiledialog/vcpkg.json +++ b/ports/nativefiledialog/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nativefiledialog", - "version-date": "2019-08-28", - "port-version": 1, + "version-date": "2022-01-20", "description": "A tiny, neat C library that portably invokes native file open and save dialogs", "homepage": "https://github.com/mlabbe/nativefiledialog", "supports": "!uwp", diff --git a/ports/nayuki-qr-code-generator/CMakeLists.txt b/ports/nayuki-qr-code-generator/CMakeLists.txt new file mode 100644 index 00000000000000..8ef0f2dd6e84dd --- /dev/null +++ b/ports/nayuki-qr-code-generator/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.14) + +project(nayuki-qr-code-generator LANGUAGES CXX) + +include(GNUInstallDirs) + +add_library(nayuki-qr-code-generator qrcodegen.cpp) +target_compile_features(nayuki-qr-code-generator PUBLIC cxx_std_11) +target_include_directories( + nayuki-qr-code-generator + PUBLIC + $ +) + +install(FILES qrcodegen.hpp DESTINATION include) + +install(TARGETS nayuki-qr-code-generator EXPORT unofficial-nayuki-qr-code-generator-config) + +install( + EXPORT unofficial-nayuki-qr-code-generator-config + NAMESPACE unofficial::nayuki-qr-code-generator:: + DESTINATION share/nayuki-qr-code-generator + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/ports/nayuki-qr-code-generator/portfile.cmake b/ports/nayuki-qr-code-generator/portfile.cmake new file mode 100644 index 00000000000000..cd09aff5f6860e --- /dev/null +++ b/ports/nayuki-qr-code-generator/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nayuki/QR-Code-generator + REF v1.7.0 + SHA512 34efa40c382b6e7d060a764936c4e2faa4fbbecd5ea4730492a2cb1960656ed67242d84e20a42400ffdee063ed6bcf3b860fef309d09ee71303f44abaafe9328 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/cpp") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/cpp" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +configure_file("${SOURCE_PATH}/Readme.markdown" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/nayuki-qr-code-generator/vcpkg.json b/ports/nayuki-qr-code-generator/vcpkg.json new file mode 100644 index 00000000000000..cce8d1dc6c2315 --- /dev/null +++ b/ports/nayuki-qr-code-generator/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "nayuki-qr-code-generator", + "version": "1.7.0", + "description": "High-quality QR Code generator library in C++", + "homepage": "https://github.com/nayuki/QR-Code-generator", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/nccl/portfile.cmake b/ports/nccl/portfile.cmake index e6c184daabe01b..5909c49d5acb20 100644 --- a/ports/nccl/portfile.cmake +++ b/ports/nccl/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows" "OSX" ON_ARCH "x86" "arm") # Find NCCL. We can use FindNCCL directly since it doesn't call any functions # that are disallowed in CMake script mode @@ -16,4 +15,6 @@ else() message(FATAL_ERROR "Please install NCCL using your system package manager (the same way you installed CUDA). For example: apt install libnccl2 libnccl-dev.") endif() +file(INSTALL "${CURRENT_PORT_DIR}/FindNCCL.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/nccl/vcpkg.json b/ports/nccl/vcpkg.json index 479c4df48ea0ab..47aeef6a62af7f 100644 --- a/ports/nccl/vcpkg.json +++ b/ports/nccl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nccl", - "version-string": "2.4.6", - "port-version": 1, + "version": "2.4.6", + "port-version": 2, "description": "Optimized primitives for collective multi-GPU communication.", "supports": "linux & x64", "dependencies": [ diff --git a/ports/ncurses/portfile.cmake b/ports/ncurses/portfile.cmake index 71ccfda8b11826..f93d4d9c328ce1 100644 --- a/ports/ncurses/portfile.cmake +++ b/ports/ncurses/portfile.cmake @@ -1,43 +1,52 @@ -vcpkg_fail_port_install(ON_TARGET "Windows" "UWP") - +set(NCURSES_VERSION_STR 6.3) vcpkg_download_distfile( ARCHIVE_PATH URLS - "https://invisible-mirror.net/archives/ncurses/ncurses-6.2.tar.gz" - "ftp://ftp.invisible-island.net/ncurses/ncurses-6.2.tar.gz" - "https://ftp.gnu.org/gnu/ncurses/ncurses-6.2.tar.gz" - FILENAME "ncurses-6.2.tgz" - SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d + "https://invisible-mirror.net/archives/ncurses/ncurses-${NCURSES_VERSION_STR}.tar.gz" + "ftp://ftp.invisible-island.net/ncurses/ncurses-${NCURSES_VERSION_STR}.tar.gz" + "https://ftp.gnu.org/gnu/ncurses/ncurses-${NCURSES_VERSION_STR}.tar.gz" + FILENAME "ncurses-${NCURSES_VERSION_STR}.tgz" + SHA512 5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE_PATH} + ARCHIVE "${ARCHIVE_PATH}" ) set(OPTIONS --disable-db-install --enable-pc-files + --without-ada --without-manpages --without-progs --without-tack --without-tests ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND OPTIONS --with-shared --with-cxx-shared --without-normal ) endif() +if(VCPKG_TARGET_IS_MINGW) + list(APPEND OPTIONS + --disable-home-terminfo + --enable-term-driver + --disable-termcap + ) +endif() set(OPTIONS_DEBUG - --with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig + "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" --with-debug + --without-normal ) set(OPTIONS_RELEASE - --with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/lib/pkgconfig + "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/lib/pkgconfig" --without-debug + --with-normal ) vcpkg_configure_make( @@ -56,4 +65,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ncurses/usage b/ports/ncurses/usage new file mode 100644 index 00000000000000..e82f435588f013 --- /dev/null +++ b/ports/ncurses/usage @@ -0,0 +1,7 @@ +The package ncurses is compatible with built-in CMake variables: + + set(CURSES_NEED_NCURSES TRUE) + find_package(Curses REQUIRED) + target_include_directories(main ${CURSES_INCLUDE_DIRS}) + target_compile_options(main ${CURSES_CFLAGS}) + target_link_libraries(main PRIVATE ${CURSES_LIBRARIES}) diff --git a/ports/ncurses/vcpkg.json b/ports/ncurses/vcpkg.json index a0aa9df575e10d..465e15d472ca88 100644 --- a/ports/ncurses/vcpkg.json +++ b/ports/ncurses/vcpkg.json @@ -1,7 +1,9 @@ { "name": "ncurses", - "version-string": "6.2", + "version": "6.3", "port-version": 1, "description": "free software emulation of curses in System V Release 4.0", - "supports": "!(windows | uwp)" + "homepage": "https://invisible-island.net/ncurses/announce.html", + "license": "MIT", + "supports": "!windows | mingw" } diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index 124fa3157030ab..d4c6318e6d4aa9 100644 --- a/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/ports/ned14-internal-quickcpplib/portfile.cmake @@ -10,14 +10,16 @@ include(${CURRENT_PORT_DIR}/sha_manifest.cmake) -message(WARNING [=[ -QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against gsl-lite version 0.38.1 and byte-lite version 0.3.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: - "overrides": [ - { "name": "gsl-lite", "version": "0.38.1" }, - { "name": "byte-lite", "version": "0.3.0" } - ] -Do not report issues to upstream without first pinning these previous versions. -]=]) +if (NOT "cxx20" IN_LIST FEATURES) + message(WARNING [=[ + QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against gsl-lite version 0.38.1 and byte-lite version 0.3.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: + "overrides": [ + { "name": "gsl-lite", "version": "0.38.1" }, + { "name": "byte-lite", "version": "0.3.0" } + ] + Do not report issues to upstream without first pinning these previous versions. + ]=]) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -30,12 +32,16 @@ vcpkg_from_github( ) # Quickcpplib deploys subsets of the dependency headers into a private subdirectory -file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/byte.hpp" - DESTINATION "${SOURCE_PATH}/include/quickcpplib/byte/include/nonstd") -file(COPY "${CURRENT_INSTALLED_DIR}/include/gsl/gsl-lite.hpp" - DESTINATION "${SOURCE_PATH}/include/quickcpplib/gsl-lite/include/gsl") -file(COPY "${CURRENT_INSTALLED_DIR}/include/gsl-lite/gsl-lite.hpp" - DESTINATION "${SOURCE_PATH}/include/quickcpplib/gsl-lite/include/gsl-lite") +if (NOT "cxx17" IN_LIST FEATURES) + file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/byte.hpp" + DESTINATION "${SOURCE_PATH}/include/quickcpplib/byte/include/nonstd") +endif() +if (NOT "cxx20" IN_LIST FEATURES) + file(COPY "${CURRENT_INSTALLED_DIR}/include/gsl/gsl-lite.hpp" + DESTINATION "${SOURCE_PATH}/include/quickcpplib/gsl-lite/include/gsl") + file(COPY "${CURRENT_INSTALLED_DIR}/include/gsl-lite/gsl-lite.hpp" + DESTINATION "${SOURCE_PATH}/include/quickcpplib/gsl-lite/include/gsl-lite") +endif() vcpkg_from_github( OUT_SOURCE_PATH OPT_SOURCE_PATH @@ -50,25 +56,35 @@ file(COPY "${OPT_SOURCE_PATH}/." DESTINATION "${SOURCE_PATH}/include/quickcpplib # Because quickcpplib's deployed files are header-only, the debug build it not necessary set(VCPKG_BUILD_TYPE release) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cxx17 QUICKCPPLIB_REQUIRE_CXX17 + cxx20 QUICKCPPLIB_REQUIRE_CXX20 +) + # Use QuickCppLib's own build process, skipping examples and tests. -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On - -DQUICKCPPLIB_USE_VCPKG_BYTE_LITE=ON - -DQUICKCPPLIB_USE_VCPKG_GSL_LITE=ON -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DCMAKE_INSTALL_DATADIR=${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_Doxygen ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/quickcpplib) +vcpkg_cmake_config_fixup( + PACKAGE_NAME quickcpplib + CONFIG_PATH lib/cmake/quickcpplib +) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmakelib" "${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib/cmakelib") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/scripts" "${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib/scripts") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ned14-internal-quickcpplib/sha_manifest.cmake b/ports/ned14-internal-quickcpplib/sha_manifest.cmake index 78b7c36ee8cbb4..2ac6943a6e54de 100644 --- a/ports/ned14-internal-quickcpplib/sha_manifest.cmake +++ b/ports/ned14-internal-quickcpplib/sha_manifest.cmake @@ -1,5 +1,5 @@ -set(QUICKCPPLIB_REF e691a6dc0358c1091d59022af06a97d68fcc074d) -set(QUICKCPPLIB_SHA512 8e3213a4d730a3db842fcb61da970badf82a42bd169c8d65f64f1edc1098d1103513f901081ee004395437ae90cb8536040ccb8e44dea764646cb27274caaa6a) +set(QUICKCPPLIB_REF cad832c8083c8eb984c26ee995609817f27f9847) +set(QUICKCPPLIB_SHA512 4a2cd3d3e90317a201088291781d13bbc66f4beadfead61ed894f6f5fa38001fb94b68f0965ae77efd9e43c274583e74c00a0781018cd1714ec99e00c9b17824) set(OPTIONAL_REF 2b43315458a99fc5de1da6e7bc0ddd364b26d643) set(OPTIONAL_SHA512 1952386cd3c7b963861f9634055e1baa4181d398d6f1b068a8a3f411368432bdcd42e47aadfa856584ed9a7c724a1c83369243ccb653e650af5c9155b42a84f4) diff --git a/ports/ned14-internal-quickcpplib/vcpkg.json b/ports/ned14-internal-quickcpplib/vcpkg.json index a0e89d5941f7f7..d79bfba9533086 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,10 +1,35 @@ { "name": "ned14-internal-quickcpplib", - "version-string": "0.0.0-e691a6dc", + "version-string": "0.0.0-cad832c8", "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", "homepage": "https://github.com/ned14/quickcpplib", "dependencies": [ "byte-lite", - "gsl-lite" - ] + "gsl-lite", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cxx17": { + "description": "Do not polyfill C++17 entities" + }, + "cxx20": { + "description": "Do not polyfill C++20 entities", + "dependencies": [ + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "cxx17" + ] + } + ] + } + } } diff --git a/ports/netcdf-c/fix-dependency-mpi.patch b/ports/netcdf-c/fix-dependency-mpi.patch new file mode 100644 index 00000000000000..91eb2434b12f5d --- /dev/null +++ b/ports/netcdf-c/fix-dependency-mpi.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1207,7 +1207,8 @@ + IF(NOT HDF5_PARALLEL) + SET(USE_PARALLEL OFF CACHE BOOL "") + MESSAGE(STATUS "Cannot find HDF5 library built with parallel support. Disabling parallel build.") + ELSE() + FIND_PACKAGE(MPI REQUIRED) ++ list(REMOVE_ITEM MPI_C_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") + SET(HDF5_PARALLEL ON CACHE BOOL "") + SET(USE_PARALLEL ON CACHE BOOL "") diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 36282b471c3d98..441d422cc61035 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( fix-pkgconfig.patch fix-manpage-msys.patch fix-dependency-libzip.patch + fix-dependency-mpi.patch ) #Remove outdated find modules @@ -55,8 +56,8 @@ if(ENABLE_HDF5) endif() if(VCPKG_TARGET_IS_UWP) - set(ENV{CFLAGS} "$ENV{CFLAGS} /wd4996 /wd4703") - set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} /wd4996 /wd4703") + string(APPEND VCPKG_C_FLAGS " /wd4996 /wd4703") + string(APPEND VCPKG_CXX_FLAGS " /wd4996 /wd4703") endif() vcpkg_cmake_configure( diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index e1ba70f343dfcc..77df76e4d85f14 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -1,6 +1,7 @@ { "name": "netcdf-c", "version": "4.8.1", + "port-version": 2, "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", "homepage": "https://github.com/Unidata/netcdf-c", "dependencies": [ diff --git a/ports/nethost/portfile.cmake b/ports/nethost/portfile.cmake index 3809d9872b38d8..c7d4aae3b89ede 100644 --- a/ports/nethost/portfile.cmake +++ b/ports/nethost/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(COMMIT_HASH 188427d7e18102c45fc6d0e20c135e226f215992) vcpkg_from_github( diff --git a/ports/nethost/vcpkg.json b/ports/nethost/vcpkg.json index 467d4249c8b13b..0f65e50da87bbe 100644 --- a/ports/nethost/vcpkg.json +++ b/ports/nethost/vcpkg.json @@ -1,7 +1,8 @@ { "name": "nethost", - "version-string": "2019-12-21", - "port-version": 1, + "version-date": "2019-12-21", + "port-version": 2, "description": "Provides a set of APIs that can be used to host .NET Core (dotnet)", - "homepage": "https://github.com/dotnet/runtime/tree/master/src/installer/corehost/cli/nethost" + "homepage": "https://github.com/dotnet/runtime/tree/master/src/installer/corehost/cli/nethost", + "supports": "!uwp" } diff --git a/ports/networkdirect-sdk/portfile.cmake b/ports/networkdirect-sdk/portfile.cmake index 2b97eb8a1a0215..bd378607f61318 100644 --- a/ports/networkdirect-sdk/portfile.cmake +++ b/ports/networkdirect-sdk/portfile.cmake @@ -1,6 +1,3 @@ -#only supports windows -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "linux" "osx") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/networkdirect-sdk/vcpkg.json b/ports/networkdirect-sdk/vcpkg.json index ec8ec3f989082f..8313f8f606db8e 100644 --- a/ports/networkdirect-sdk/vcpkg.json +++ b/ports/networkdirect-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "networkdirect-sdk", - "version-string": "2.0.1", - "port-version": 2, + "version": "2.0.1", + "port-version": 3, "description": "The Network Direct architecture allows hardware vendors to expose the advanced capabilities of their networking devices.", "homepage": "https://www.nuget.org/packages/NetworkDirect", "supports": "windows & (x64 | x86) & !uwp" diff --git a/ports/ngspice/Fix-C2065.patch b/ports/ngspice/Fix-C2065.patch new file mode 100644 index 00000000000000..527b2bf44ad019 --- /dev/null +++ b/ports/ngspice/Fix-C2065.patch @@ -0,0 +1,170 @@ +diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj +index 51a5725..6f41ea1 100644 +--- a/visualc/sharedspice.vcxproj ++++ b/visualc/sharedspice.vcxproj +@@ -113,7 +113,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + false + false +@@ -157,7 +157,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + false + + MultiThreaded +@@ -199,7 +199,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + false + false +@@ -248,7 +248,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + false + + +@@ -292,7 +292,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + MultiThreaded +@@ -337,7 +337,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + +diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj +index a9d916e..393a128 100644 +--- a/visualc/vngspice.vcxproj ++++ b/visualc/vngspice.vcxproj +@@ -212,7 +212,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + + +@@ -259,7 +259,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + false + + +@@ -310,7 +310,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -361,7 +361,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -411,7 +411,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;%(PreprocessorDefinitions) + false + + +@@ -458,7 +458,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;%(PreprocessorDefinitions) + false + + +@@ -508,7 +508,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -559,7 +559,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -610,7 +610,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + +@@ -664,7 +664,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -718,7 +718,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;USE_OMP;%(PreprocessorDefinitions) + false + + +@@ -772,7 +772,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;USE_OMP;%(PreprocessorDefinitions) + false + + diff --git a/ports/ngspice/portfile.cmake b/ports/ngspice/portfile.cmake index e128d737ec52cb..ecf9cf9677bd52 100644 --- a/ports/ngspice/portfile.cmake +++ b/ports/ngspice/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" "arm64") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) # ngspice produces self-contained DLLs @@ -16,7 +14,7 @@ vcpkg_from_sourceforge( use-winbison-vngspice.patch remove-post-build.patch remove-64-in-codemodel-name.patch - + Fix-C2065.patch ) vcpkg_find_acquire_program(BISON) @@ -27,14 +25,14 @@ 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} + SOURCE_PATH "${SOURCE_PATH}" INCLUDES_SUBPATH /src/include LICENSE_SUBPATH COPYING # install_msbuild swaps x86 for win32(bad) if we dont force our own setting @@ -46,12 +44,12 @@ vcpkg_install_msbuild( 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}) + set(BUILDTREE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(REMOVE_RECURSE "${BUILDTREE_PATH}") + file(COPY "${SOURCE_PATH}/" DESTINATION "${BUILDTREE_PATH}") vcpkg_build_msbuild( - PROJECT_PATH ${BUILDTREE_PATH}/visualc/vngspice.sln + PROJECT_PATH "${BUILDTREE_PATH}/visualc/vngspice.sln" # build_msbuild swaps x86 for win32(bad) if we dont force our own setting PLATFORM ${TRIPLET_SYSTEM_ARCH} TARGET Build @@ -66,29 +64,29 @@ if("codemodels" IN_LIST FEATURES) else() message(FATAL_ERROR "Unsupported target architecture") endif() - + #put the code models in the intended location file(GLOB NGSPICE_CODEMODELS_DEBUG - ${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Debug/*.cm + "${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Debug/*.cm" ) - file(COPY ${NGSPICE_CODEMODELS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/ngspice) - + file(COPY ${NGSPICE_CODEMODELS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/ngspice") + file(GLOB NGSPICE_CODEMODELS_RELEASE - ${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Release/*.cm + "${BUILDTREE_PATH}/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(RENAME "${BUILDTREE_PATH}/visualc/spinit_all" "${BUILDTREE_PATH}/visualc/spinit") + file(COPY "${BUILDTREE_PATH}/visualc/spinit" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ngspice") 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 1b6da85d1545cc..11517e0c1ed7bb 100644 --- a/ports/ngspice/vcpkg.json +++ b/ports/ngspice/vcpkg.json @@ -1,8 +1,10 @@ { "name": "ngspice", - "version-string": "35", + "version": "35", + "port-version": 2, "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)", "default-features": [ "codemodels" diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index 623392a7805994..74c4c048c4d4f7 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nlohmann/json - REF v3.10.4 - SHA512 f78592db6218165cbc74c10bcba40366f1bfea84405b7ee25fe97a056d5b7a15aeeb956d93296673928dcbd6e26ffcfb152f885b4a44d5d55751396ccf090835 + REF v3.10.5 + SHA512 4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2 HEAD_REF master ) diff --git a/ports/nlohmann-json/vcpkg.json b/ports/nlohmann-json/vcpkg.json index 1b13bdbbcfa783..2052e976b95678 100644 --- a/ports/nlohmann-json/vcpkg.json +++ b/ports/nlohmann-json/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nlohmann-json", - "version-semver": "3.10.4", + "version-semver": "3.10.5", "description": "JSON for Modern C++", "homepage": "https://github.com/nlohmann/json", "dependencies": [ diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake index 1ca78c8119ff73..a6f6a0bd4f2a79 100644 --- a/ports/nmslib/portfile.cmake +++ b/ports/nmslib/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/nmslib/vcpkg.json b/ports/nmslib/vcpkg.json index 1d53e2e02f4b6a..eb475f07dcdaa7 100644 --- a/ports/nmslib/vcpkg.json +++ b/ports/nmslib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nmslib", "version": "2.1.1", + "port-version": 1, "description": "Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.", "homepage": "https://github.com/searchivarius/nmslib", "supports": "!(arm | uwp)", diff --git a/ports/nnpack/portfile.cmake b/ports/nnpack/portfile.cmake index 51432669a93dc8..9cde055f9337ce 100644 --- a/ports/nnpack/portfile.cmake +++ b/ports/nnpack/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Maratyszcza/nnpack diff --git a/ports/nnpack/vcpkg.json b/ports/nnpack/vcpkg.json index a0e0a4ea211d7c..e039985aea5282 100644 --- a/ports/nnpack/vcpkg.json +++ b/ports/nnpack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nnpack", "version-date": "2021-02-21", - "port-version": 1, + "port-version": 2, "description": "Acceleration package for neural networks on multi-core CPUs", "homepage": "https://github.com/Maratyszcza/NNPACK", "supports": "linux & osx", diff --git a/ports/nowide/portfile.cmake b/ports/nowide/portfile.cmake index 48af04d8ce7f72..159486f1cfaa23 100644 --- a/ports/nowide/portfile.cmake +++ b/ports/nowide/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/boostorg/nowide/releases/download/v11.1.2/nowide_standalone_v11.1.2.tar.gz" - FILENAME "nowide_standalone_v11.1.2.tar.gz" - SHA512 8a4dcd6ead15b2b0eeabaccd306df88c54b282bbef33aca3d8303be86b39de5958f2f11b8f8e00e6f0190ece8f90f940e26d0b702323b7b005ea21dd8bae6393 + URLS "https://github.com/boostorg/nowide/releases/download/v11.1.3/nowide_standalone_v11.1.3.tar.gz" + FILENAME "nowide_standalone_v11.1.3.tar.gz" + SHA512 8e493b9ee7f3f218dcc1a0c2f040c040f8f3d10ec7c204caee92986a2cc54d4fc06f530b13e7b14cfdbbd42fd106e151916e2f8fae524a051688d6785d7c2993 ) vcpkg_extract_source_archive_ex( @@ -9,15 +9,14 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nowide TARGET_PATH share/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nowide) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/nowide/vcpkg.json b/ports/nowide/vcpkg.json index 8635a7cd9fe8eb..82269b0566dc85 100644 --- a/ports/nowide/vcpkg.json +++ b/ports/nowide/vcpkg.json @@ -1,6 +1,16 @@ { "name": "nowide", - "version": "11.1.2", + "version": "11.1.3", "description": "Boost nowide module (standalone)", - "homepage": "https://github.com/boostorg/nowide" + "homepage": "https://github.com/boostorg/nowide", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch b/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch new file mode 100644 index 00000000000000..6a69fc0b6c7189 --- /dev/null +++ b/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch @@ -0,0 +1,12 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 7a2db60..17e0a52 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -474,7 +474,4 @@ if(MSVC) + set_target_properties(ZXing PROPERTIES + COMPILE_PDB_NAME ZXing + COMPILE_PDB_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ZXing.pdb +- DESTINATION ${CMAKE_INSTALL_LIBDIR} +- CONFIGURATIONS Debug RelWithDebInfo) + endif() diff --git a/ports/nu-book-zxing-cpp/portfile.cmake b/ports/nu-book-zxing-cpp/portfile.cmake new file mode 100644 index 00000000000000..2facb6b5d0bebb --- /dev/null +++ b/ports/nu-book-zxing-cpp/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nu-book/zxing-cpp + REF v1.2.0 + SHA512 e61b4e44ccaf0871b5d8badf9ce0a81576f55e5d6a9458907b9b599a66227adceabb8d51a0c47b32319d8aeff93e758b4785d3bd0440375247471d95999de487 + HEAD_REF master + PATCHES ignore-pdb-install-symbols-in-lib.patch +) + +if (VCPKG_TARGET_IS_UWP) + set(ENV{CL} "$ENV{CL} -wd4996") +endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_BLACKBOX_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_SYSTEM_DEPS=ALWAYS + MAYBE_UNUSED_VARIABLES + # Currently no dependencies, but this defends against future additions + BUILD_SYSTEM_DEPS +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/cmake/ZXing + PACKAGE_NAME ZXing +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nu-book-zxing-cpp" RENAME copyright) diff --git a/ports/nu-book-zxing-cpp/vcpkg.json b/ports/nu-book-zxing-cpp/vcpkg.json new file mode 100644 index 00000000000000..1dae685b1635c5 --- /dev/null +++ b/ports/nu-book-zxing-cpp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "nu-book-zxing-cpp", + "version": "1.2.0", + "description": "Barcode detection and decoding library.", + "homepage": "https://github.com/nu-book/zxing-cpp", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/numactl/portfile.cmake b/ports/numactl/portfile.cmake index 302f1ba7f8b75d..17a058022fe149 100644 --- a/ports/numactl/portfile.cmake +++ b/ports/numactl/portfile.cmake @@ -6,10 +6,6 @@ vcpkg_from_github( HEAD_REF master ) -if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - message(FATAL_ERROR "Package only supports linux platform.") -endif() - message( "numactl currently requires the following libraries from the system package manager: autoconf libtool @@ -67,5 +63,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/numactl/copyright COPYONLY) diff --git a/ports/numactl/vcpkg.json b/ports/numactl/vcpkg.json index 62684dd4d82505..267e8300da8d10 100644 --- a/ports/numactl/vcpkg.json +++ b/ports/numactl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "numactl", "version": "2.0.14", + "port-version": 1, "description": "NUMA support for Linux", "homepage": "https://github.com/numactl/numactl", "supports": "linux" diff --git a/ports/nvtt/portfile.cmake b/ports/nvtt/portfile.cmake index f235be2d0cde52..def4097606d321 100644 --- a/ports/nvtt/portfile.cmake +++ b/ports/nvtt/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/nvtt/vcpkg.json b/ports/nvtt/vcpkg.json index 24ad40926d3072..3e9688b2453f97 100644 --- a/ports/nvtt/vcpkg.json +++ b/ports/nvtt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nvtt", - "version-string": "2.1.2", - "port-version": 2, + "version": "2.1.2", + "port-version": 3, "description": "Texture processing tools with support for Direct3D 10 and 11 formats.", "homepage": "https://github.com/castano/nvidia-texture-tools", "supports": "!x86", diff --git a/ports/oatpp-consul/portfile.cmake b/ports/oatpp-consul/portfile.cmake index 83c1889bd8067c..bb7e363e0f3a21 100644 --- a/ports/oatpp-consul/portfile.cmake +++ b/ports/oatpp-consul/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,21 +6,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-consul REF ${OATPP_VERSION} - SHA512 6d73b869e5fea966451d15cbdc389f7c6c367a8e10124aadaa33121f0ef78bbf5b702a094b2ca6ad8583257ab7cb4187a7a0571b119c96d5d5e20b2d5cb4beae + SHA512 b7bfff564e70fe94f99e959e8bc095b6cda704764c54e3837fc5f808b610c9197fbd0d601cb481a9cbf0d17fc1dece8d7cce6881a604fccbe63bd9b1c2b871f0 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-consul-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-consul CONFIG_PATH lib/cmake/oatpp-consul-${OATPP_VERSION}) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp-consul/vcpkg.json b/ports/oatpp-consul/vcpkg.json index 0f3a90df3594d8..e606a276c8014f 100644 --- a/ports/oatpp-consul/vcpkg.json +++ b/ports/oatpp-consul/vcpkg.json @@ -1,9 +1,17 @@ { "name": "oatpp-consul", - "version": "1.2.5", + "version": "1.3.0", "description": "OAT++ Modern web framework consul module.", "homepage": "https://github.com/oatpp/oatpp-consul", "dependencies": [ - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/oatpp-curl/portfile.cmake b/ports/oatpp-curl/portfile.cmake index 9340560a5f3e74..f80968ec896b2d 100644 --- a/ports/oatpp-curl/portfile.cmake +++ b/ports/oatpp-curl/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,22 +6,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-curl REF ${OATPP_VERSION} - SHA512 db2b4ab07dbf1140e44c131a1919c6ac29e9cea3df8dde8951028d6096ed5a66a248d3ddeeaabc32cac0fde38fd5905e706daaa7c9fbf6bcb49ccb9ba1cfb50e + SHA512 d9437a6b3a214bf0f17561e905709d741cd7d5fcad30ec0cdddeaacb3a72142bf8b24034d13201cd416898ffd0ab07ca50ec66d4025406acee1518ae65dac45e HEAD_REF master PATCHES "fix-find-curl.patch" ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-curl-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-curl CONFIG_PATH lib/cmake/oatpp-curl-${OATPP_VERSION}) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp-curl/vcpkg.json b/ports/oatpp-curl/vcpkg.json index c552f8beeff292..5980921c11975e 100644 --- a/ports/oatpp-curl/vcpkg.json +++ b/ports/oatpp-curl/vcpkg.json @@ -1,10 +1,18 @@ { "name": "oatpp-curl", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient.", "homepage": "https://github.com/oatpp/oatpp-curl", "dependencies": [ "curl", - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/oatpp-libressl/portfile.cmake b/ports/oatpp-libressl/portfile.cmake index e53766e3a50bc9..b21fb9af2f6933 100644 --- a/ports/oatpp-libressl/portfile.cmake +++ b/ports/oatpp-libressl/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -7,23 +7,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-libressl REF ${OATPP_VERSION} - SHA512 64b596576b7c976cd8ebd68ba16a38e7b9c65794d9dcea82d3537d2433f11645a25eb567aea6d16ddc51f8ff5f90e83f29e24555c3ae87f80883ec2f53366d99 + SHA512 8f16c4e0341dc20e4a8a5fcdcf8e58bac1cfbef51b8cac6f5ca4894acf296333fcc2b8f34c6353cbd31a1f2f2be021550ce859489a45f388f4b5ccec4c67eee9 HEAD_REF master PATCHES "libress-submodule-downgrade-required-libressl-version.patch" ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" "-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-libressl-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-libressl CONFIG_PATH lib/cmake/oatpp-libressl-${OATPP_VERSION}) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp-libressl/vcpkg.json b/ports/oatpp-libressl/vcpkg.json index 3c34c9a991a165..96d4cc93857e2d 100644 --- a/ports/oatpp-libressl/vcpkg.json +++ b/ports/oatpp-libressl/vcpkg.json @@ -1,10 +1,18 @@ { "name": "oatpp-libressl", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ libressl module providing secure server and client connection providers.", "homepage": "https://github.com/oatpp/oatpp-libressl", "dependencies": [ "libressl", - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/oatpp-mbedtls/portfile.cmake b/ports/oatpp-mbedtls/portfile.cmake index fd95c8c33bb09f..581d190498db7d 100644 --- a/ports/oatpp-mbedtls/portfile.cmake +++ b/ports/oatpp-mbedtls/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,21 +6,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-mbedtls REF ${OATPP_VERSION} - SHA512 ffc7ef3614a4b3ef44c61af3db8c5b5a75ecc657b2f9f5ade4f9e78260427ca113be700065b6fcdc3e6f553648601fe4d8c68a54e10234949e004f40def0d343 + SHA512 3eea805f2a02110daec25b7455543c59d8e72acd37d412fa98cb1c90f58e4edcd9cc62c16331efcca36a524834fa0f314f2f69a7a4d0d1108a758f811a68e021 HEAD_REF master PATCHES find-mbedtls.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-mbedtls-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-mbedtls CONFIG_PATH lib/cmake/oatpp-mbedtls-${OATPP_VERSION}) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp-mbedtls/vcpkg.json b/ports/oatpp-mbedtls/vcpkg.json index 1c4b07d4809228..035f841b88c5b9 100644 --- a/ports/oatpp-mbedtls/vcpkg.json +++ b/ports/oatpp-mbedtls/vcpkg.json @@ -1,10 +1,18 @@ { "name": "oatpp-mbedtls", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ Mbed TLS submodule providing secure server and client connection providers.", "homepage": "https://github.com/oatpp/oatpp-mbedtls", "dependencies": [ "mbedtls", - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/oatpp-mongo/portfile.cmake b/ports/oatpp-mongo/portfile.cmake index 2a244eda1c1f3e..e4cccfcd301741 100644 --- a/ports/oatpp-mongo/portfile.cmake +++ b/ports/oatpp-mongo/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,22 +6,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-mongo REF ${OATPP_VERSION} - SHA512 b4d15b40521fc731213decbb4a68edf9f04d918ebd6539ec56e71bdc5aa3536bcd170d4d1f5ee828dc666294f520140241dbcd2c4498247c6d9ea363d7f8ec56 + SHA512 11f4164948feb63ed3f5e8554a54348e29cd4d90333761f98c37f4eb49f129c6589955755e8e052c5c29e6b2980f1bb899657415d6480c3ae7a50fc2445afbfe HEAD_REF master ) set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-mongo-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-mongo CONFIG_PATH lib/cmake/oatpp-mongo-${OATPP_VERSION}) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/oatpp-mongo/vcpkg.json b/ports/oatpp-mongo/vcpkg.json index cbdf48c1af96ca..6441e67d1ea6e5 100644 --- a/ports/oatpp-mongo/vcpkg.json +++ b/ports/oatpp-mongo/vcpkg.json @@ -1,9 +1,17 @@ { "name": "oatpp-mongo", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ MongoDB adapter for Oat++ ORM (native client). It contains DTO to BSON mapper plus database driver.", "homepage": "https://github.com/oatpp/oatpp-mongo", "dependencies": [ - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/oatpp-openssl/portfile.cmake b/ports/oatpp-openssl/portfile.cmake index 9445ee7006a2f1..feada9b69f270f 100644 --- a/ports/oatpp-openssl/portfile.cmake +++ b/ports/oatpp-openssl/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -7,7 +7,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-openssl REF ${OATPP_VERSION} - SHA512 c5a40691d846703378c2965f2ad9b99edb2025d47854719bab4e80a4771258c2b72cfba0135b63dd9e2387da4549b5bc6cebfc1913a8006d14d59e250be19060 + SHA512 a358a98e4c7e779c4c799e55667af67530fea537103500bf07b62ee434e87241c8ce3899bd19945a942b81ae9df86e318f0a725a56f4cb7cfceb0f98e3c0378b HEAD_REF master ) @@ -18,8 +18,8 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/oatpp-openssl-${OATPP_VERSION}") +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-openssl CONFIG_PATH "lib/cmake/oatpp-openssl-${OATPP_VERSION}") vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp-openssl/vcpkg.json b/ports/oatpp-openssl/vcpkg.json index b844deaa36f7c7..daa2c185077718 100644 --- a/ports/oatpp-openssl/vcpkg.json +++ b/ports/oatpp-openssl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "oatpp-openssl", - "version-semver": "1.2.5", + "version-semver": "1.3.0", "description": "Oat++ openssl module providing secure server and client connection providers.", "homepage": "https://github.com/oatpp/oatpp-openssl", "dependencies": [ diff --git a/ports/oatpp-postgresql/fix-windows-build.patch b/ports/oatpp-postgresql/fix-windows-build.patch deleted file mode 100644 index 0b6a57d869d088..00000000000000 --- a/ports/oatpp-postgresql/fix-windows-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/oatpp-postgresql/mapping/Serializer.hpp b/src/oatpp-postgresql/mapping/Serializer.hpp -index af76701..615d11b 100644 ---- a/src/oatpp-postgresql/mapping/Serializer.hpp -+++ b/src/oatpp-postgresql/mapping/Serializer.hpp -@@ -201,7 +201,7 @@ private: - - outData.oid = _this->getArrayTypeOid(itemType); - outData.dataSize = stream.getCurrentPosition(); -- outData.dataBuffer.template reset(new char[outData.dataSize]); -+ outData.dataBuffer.reset(new char[outData.dataSize]); - outData.data = outData.dataBuffer.get(); - outData.dataFormat = 1; - diff --git a/ports/oatpp-postgresql/portfile.cmake b/ports/oatpp-postgresql/portfile.cmake index ce8af28f8a54ba..3a080846f8aba4 100644 --- a/ports/oatpp-postgresql/portfile.cmake +++ b/ports/oatpp-postgresql/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,24 +6,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-postgresql REF ${OATPP_VERSION} - SHA512 43381422224f0254a823fdc702d1a007c405930157e6ea361f51e5232df4b04073181de175f61ab4986f3468d21f9ac25a0820d14efcecb0afb0096bdd674dcb + SHA512 6926194ae7d77db2a071fcb805ce048954908cf18d59f3095e1bf779748d9e5b9ceb657d97b1fc8a6ebfcf71936b211e2b10e68a62983e847c68ab58e1f3f2ba HEAD_REF master - PATCHES - fix-windows-build.patch # see https://github.com/oatpp/oatpp-postgresql/pull/8 ) set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-postgresql-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-postgresql CONFIG_PATH lib/cmake/oatpp-postgresql-${OATPP_VERSION}) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/oatpp-postgresql/vcpkg.json b/ports/oatpp-postgresql/vcpkg.json index 7a5eb7b01788b6..ebc8584c5c4b09 100644 --- a/ports/oatpp-postgresql/vcpkg.json +++ b/ports/oatpp-postgresql/vcpkg.json @@ -1,10 +1,18 @@ { "name": "oatpp-postgresql", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ PostgreSQL adapter for Oat++ ORM (alpha - not all datatypes are supported).", "homepage": "https://github.com/oatpp/oatpp-postgresql", "dependencies": [ "libpq", - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake index f446876ad19cc4..68ce88266719a6 100644 --- a/ports/oatpp-sqlite/portfile.cmake +++ b/ports/oatpp-sqlite/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,21 +6,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-sqlite REF ${OATPP_VERSION} - SHA512 b92d8c8b2afbbca38ecef7030648dcd7e15d7b2dd221bc32ea9778533ffcc9923b628308aa86bc53451b1ea4bb15dae8727bc6e0d8345fa611ef32469d850064 + SHA512 8a208145ee10ed858767b4b56c220b6befd83e6858759128103ce679b889e6218a95ed6627af5098e4d26367be8add82de26e1f1f8ef581b1913b8386f9d56de HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" "-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-sqlite-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-sqlite CONFIG_PATH lib/cmake/oatpp-sqlite-${OATPP_VERSION}) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp-sqlite/vcpkg.json b/ports/oatpp-sqlite/vcpkg.json index 85fa464937ded1..cb307cc1a87a67 100644 --- a/ports/oatpp-sqlite/vcpkg.json +++ b/ports/oatpp-sqlite/vcpkg.json @@ -1,10 +1,18 @@ { "name": "oatpp-sqlite", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ SQLite adapter for Oat++ ORM.", "homepage": "https://github.com/oatpp/oatpp-sqlite", "dependencies": [ "oatpp", - "sqlite3" + "sqlite3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/oatpp-ssdp/fix_String_to_string.patch b/ports/oatpp-ssdp/fix_String_to_string.patch new file mode 100644 index 00000000000000..28c506a31e7fc4 --- /dev/null +++ b/ports/oatpp-ssdp/fix_String_to_string.patch @@ -0,0 +1,20 @@ +diff --git i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +index d351c1e..7c430e9 100644 +--- i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp ++++ w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +@@ -106,7 +106,7 @@ v_io_handle SimpleUdpStreamProvider::instantiateServer() { + hints.ai_flags = AI_PASSIVE; + auto portStr = oatpp::utils::conversion::int32ToStr(m_port); + +- ret = getaddrinfo(NULL, (const char*)portStr->getData(), &hints, &result); ++ ret = getaddrinfo(NULL, (const char*)portStr->c_str(), &hints, &result); + if (ret != 0) { + OATPP_LOGE("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]", "Error. Call to getaddrinfo() failed with result=%d: %s", ret, strerror(errno)); + throw std::runtime_error("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]: Error. Call to getaddrinfo() failed."); +@@ -233,4 +233,4 @@ provider::ResourceHandle SimpleUdpStreamProvider::get() + ); + } + +-}} +\ No newline at end of file ++}} diff --git a/ports/oatpp-ssdp/fix_win_close.patch b/ports/oatpp-ssdp/fix_win_close.patch new file mode 100644 index 00000000000000..c6410187996a55 --- /dev/null +++ b/ports/oatpp-ssdp/fix_win_close.patch @@ -0,0 +1,20 @@ +diff --git i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +index d351c1e..f5774bd 100644 +--- i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp ++++ w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +@@ -129,7 +129,7 @@ v_io_handle SimpleUdpStreamProvider::instantiateServer() { + + ret = bind(serverHandle, result->ai_addr, (int)result->ai_addrlen); + if (ret != 0) { +- ::close(serverHandle); ++ ::_close(serverHandle); + OATPP_LOGE("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]", "Error. Failed to bind port %d: %s", m_port, strerror(errno)); + throw std::runtime_error("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]: Error. Can't bind to address: %s"); + } +@@ -233,4 +233,4 @@ provider::ResourceHandle SimpleUdpStreamProvider::get() + ); + } + +-}} +\ No newline at end of file ++}} diff --git a/ports/oatpp-ssdp/portfile.cmake b/ports/oatpp-ssdp/portfile.cmake new file mode 100644 index 00000000000000..05381b317e052a --- /dev/null +++ b/ports/oatpp-ssdp/portfile.cmake @@ -0,0 +1,28 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-ssdp + REF ${OATPP_VERSION} + SHA512 ab6f10bb79cb058eb7ce4115327e2f2d85133753d02dc2b4339505cc2ed4ef8b6284b5e832d0e190de17b8ae70e0b9a99b1b074d0691ca9a613873e8d4e1ace8 + HEAD_REF master + PATCHES + fix_String_to_string.patch + fix_win_close.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-ssdp CONFIG_PATH lib/cmake/oatpp-ssdp-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp-ssdp/vcpkg.json b/ports/oatpp-ssdp/vcpkg.json new file mode 100644 index 00000000000000..fc169d634e08b8 --- /dev/null +++ b/ports/oatpp-ssdp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "oatpp-ssdp", + "version": "1.3.0", + "description": "Oat++ SSDP (Simple Service Discovery Protocol) submodule.", + "homepage": "https://github.com/oatpp/oatpp-ssdp", + "dependencies": [ + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/oatpp-swagger/portfile.cmake b/ports/oatpp-swagger/portfile.cmake index c94eda0b618936..2e24c320a713da 100644 --- a/ports/oatpp-swagger/portfile.cmake +++ b/ports/oatpp-swagger/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,21 +6,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-swagger REF ${OATPP_VERSION} - SHA512 ad9b92a2b8ef7c54533bde92d5a12eb4b62553ee0a5252a5dd15aba7dc7293202931acc0ad40fc6f3be566813221a309a0bfec8bdbefca2197767387fe68fa6c + SHA512 5b4ced90690f484ebe15c3a0be47b1b851fb7b650e70c99fddc20430724aac8eff89d8c6187df750bd2ceff0e1144336f258d740fc10cdfa67a65a2f3b00d80b HEAD_REF master ) -vcpkg_configure_cmake( +if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(OATPP_MSVC_LINK_STATIC_RUNTIME TRUE) +else() + set(OATPP_MSVC_LINK_STATIC_RUNTIME FALSE) +endif() + +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-swagger-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-swagger CONFIG_PATH lib/cmake/oatpp-swagger-${OATPP_VERSION}) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp-swagger/vcpkg.json b/ports/oatpp-swagger/vcpkg.json index da63d6133bd187..65dba327e55980 100644 --- a/ports/oatpp-swagger/vcpkg.json +++ b/ports/oatpp-swagger/vcpkg.json @@ -1,9 +1,17 @@ { "name": "oatpp-swagger", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ OpenApi (Swagger) UI submodule.", "homepage": "https://github.com/oatpp/oatpp-swagger", "dependencies": [ - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/oatpp-websocket/portfile.cmake b/ports/oatpp-websocket/portfile.cmake index b0cbf4fe0f49b3..1c6e9912887685 100644 --- a/ports/oatpp-websocket/portfile.cmake +++ b/ports/oatpp-websocket/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,20 +6,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-websocket REF ${OATPP_VERSION} - SHA512 7bf4d8c8adf158e1b46b617d0aea201db32802dc89238d50c39bb10228ae59c8536ec198696f4e403da293c9b2dcc25a3c81aff1dedc49b38d4c7d94e97557e0 + SHA512 e5d5f974da4fd95599352d04d18422c74b274be50a803cdb0b65674ebde8dfe8587c44ddb8b376ad866de06841935687be4294ac5954f33f0a087b009da23177 HEAD_REF master ) -vcpkg_configure_cmake( +if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(OATPP_MSVC_LINK_STATIC_RUNTIME TRUE) +else() + set(OATPP_MSVC_LINK_STATIC_RUNTIME FALSE) +endif() + +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-websocket-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-websocket CONFIG_PATH lib/cmake/oatpp-websocket-${OATPP_VERSION}) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp-websocket/vcpkg.json b/ports/oatpp-websocket/vcpkg.json index be7aa11769d504..5a28f2bdd3d598 100644 --- a/ports/oatpp-websocket/vcpkg.json +++ b/ports/oatpp-websocket/vcpkg.json @@ -1,9 +1,17 @@ { "name": "oatpp-websocket", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ websocket module.", "homepage": "https://github.com/oatpp/oatpp-websocket", "dependencies": [ - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/oatpp-zlib/portfile.cmake b/ports/oatpp-zlib/portfile.cmake index 84a4cf84a8d7f3..3759757ef0999f 100644 --- a/ports/oatpp-zlib/portfile.cmake +++ b/ports/oatpp-zlib/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,22 +6,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-zlib REF ${OATPP_VERSION} - SHA512 da132edc8c6476bf8d6d1df7d05eac45ac05057153fb0042f0fae54c1a20b3866174cffce2813a0cde7dbf0d8674babf61c84b62cba8dd22c440fef5f81e322b + SHA512 574f0440cbb2cd2bc14ad89e33538a1a300ad23ecc941629b74aa8ccb9aeae5158b1b57e2f1af09d7a6b9b97430a5685354677002dab2261120afa9c6ea74381 HEAD_REF master ) set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-zlib-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-zlib CONFIG_PATH lib/cmake/oatpp-zlib-${OATPP_VERSION}) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/oatpp-zlib/vcpkg.json b/ports/oatpp-zlib/vcpkg.json index 4f624c3aa69570..5b0feb18478696 100644 --- a/ports/oatpp-zlib/vcpkg.json +++ b/ports/oatpp-zlib/vcpkg.json @@ -1,9 +1,17 @@ { "name": "oatpp-zlib", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.", "homepage": "https://github.com/oatpp/oatpp-zlib", "dependencies": [ - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/oatpp/fix-windows-build.patch b/ports/oatpp/fix-windows-build.patch deleted file mode 100644 index d017f7480d8d40..00000000000000 --- a/ports/oatpp/fix-windows-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/oatpp/core/base/Environment.cpp b/src/oatpp/core/base/Environment.cpp -index b870835..ae36970 100644 ---- a/src/oatpp/core/base/Environment.cpp -+++ b/src/oatpp/core/base/Environment.cpp -@@ -36,14 +36,9 @@ - #include - #endif - --#if (defined(WIN32) || defined(_WIN32)) && defined(_WIN64) --struct tm* localtime_r(time_t *_clock, struct tm *_result) { -- _localtime64_s(_result, _clock); -- return _result; --} --#elif (defined(WIN32) || defined(_WIN32)) && not defined(_WIN64) -+#if defined(WIN32) || defined(_WIN32) - struct tm* localtime_r(time_t *_clock, struct tm *_result) { -- _localtime32_s(_result, _clock); -+ localtime_s(_result, _clock); - return _result; - } - #endif diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake index 233bc2f22ac64c..cf8513449f06dc 100644 --- a/ports/oatpp/portfile.cmake +++ b/ports/oatpp/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,22 +6,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp REF ${OATPP_VERSION} - SHA512 8c7c939860c02ade86234e46f907051b088c07d6975cf90190c9263bb7fd8081a7aaccd3e08bfe8a962c07ae39ff771cf17099a48812ecc69df20272a856d0ed + SHA512 4fe8587efe1b4ecae14554ec8edb209e5558a3e4a4e6ff49bbfaaf06d2cc12f2cc306c5edc43b8dafc465aff53098ad4bebb9971694761b91a553730d5acb59a HEAD_REF master - PATCHES - fix-windows-build.patch # see https://github.com/oatpp/oatpp/pull/428 ) -vcpkg_configure_cmake( +if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(OATPP_MSVC_LINK_STATIC_RUNTIME TRUE) +else() + set(OATPP_MSVC_LINK_STATIC_RUNTIME FALSE) +endif() + +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp CONFIG_PATH lib/cmake/oatpp-${OATPP_VERSION}) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/oatpp/vcpkg.json b/ports/oatpp/vcpkg.json index 594939dcf638c2..8e7a8184073478 100644 --- a/ports/oatpp/vcpkg.json +++ b/ports/oatpp/vcpkg.json @@ -1,6 +1,16 @@ { "name": "oatpp", - "version": "1.2.5", + "version": "1.3.0", "description": "Modern web framework.", - "homepage": "https://github.com/oatpp/oatpp" + "homepage": "https://github.com/oatpp/oatpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/ocilib/fix-DisableWC4191.patch b/ports/ocilib/fix-DisableWC4191.patch new file mode 100644 index 00000000000000..2e835bf07cb1d8 --- /dev/null +++ b/ports/ocilib/fix-DisableWC4191.patch @@ -0,0 +1,40 @@ +diff --git a/proj/dll/ocilib_dll_vs2019.vcxproj b/proj/dll/ocilib_dll_vs2019.vcxproj +index 2d5b3bf..35e4684 100644 +--- a/proj/dll/ocilib_dll_vs2019.vcxproj ++++ b/proj/dll/ocilib_dll_vs2019.vcxproj +@@ -116,7 +116,7 @@ + + + EnableAllWarnings +- true ++ false + + + CompileAsC +@@ -173,7 +173,7 @@ + + CompileAsC + 4255;4668;4996;4710;4711;4738;4774;4820;5045 +- true ++ false + + + OCI_CHARSET_ANSI;%(PreprocessorDefinitions) +@@ -223,7 +223,7 @@ + + CompileAsC + 4255;4668;4996;4710;4711;4738;4774;4820;5045 +- true ++ false + + + OCI_CHARSET_WIDE;%(PreprocessorDefinitions) +@@ -276,7 +276,7 @@ + + CompileAsC + 4255;4668;4996;4710;4711;4738;4774;4820;5045 +- true ++ false + + + OCI_CHARSET_WIDE;%(PreprocessorDefinitions) diff --git a/ports/ocilib/portfile.cmake b/ports/ocilib/portfile.cmake index 139ccab3f4049f..2c53be8c9dcb8a 100644 --- a/ports/ocilib/portfile.cmake +++ b/ports/ocilib/portfile.cmake @@ -1,11 +1,10 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vrogier/ocilib REF v4.7.3 SHA512 80cf1f76420b506789b1f7edd9af826801236499dd0757be3438e3cdf286b95ddd7dd35909622b3862244f6b535a8744f0b25989fb3740a4a0fd984410fb420b HEAD_REF master + PATCHES fix-DisableWC4191.patch ) if(VCPKG_TARGET_IS_WINDOWS) @@ -14,7 +13,7 @@ if(VCPKG_TARGET_IS_WINDOWS) else() set(PLATFORM x64) endif() - + # 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) @@ -39,7 +38,7 @@ else() COPY_SOURCE AUTOCONFIG SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS --with-oracle-import=runtime ) diff --git a/ports/ocilib/vcpkg.json b/ports/ocilib/vcpkg.json index 6c7a56a11c9a96..741304b0aa858a 100644 --- a/ports/ocilib/vcpkg.json +++ b/ports/ocilib/vcpkg.json @@ -1,7 +1,9 @@ { "name": "ocilib", "version": "4.7.3", + "port-version": 2, "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": "!(arm | uwp)" } diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index c14da2fac93b22..89d49b28d9faaa 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -30,10 +30,11 @@ endif() # Configure features 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 + csharp OGRE_BUILD_COMPONENT_CSHARP overlay OGRE_BUILD_COMPONENT_OVERLAY zziplib OGRE_CONFIG_ENABLE_ZIP strict OGRE_RESOURCEMANAGER_STRICT @@ -43,10 +44,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=ON" "OGRE_RESOURCEMANAGER_STRICT=1" FEATURE_OPTIONS "${FEATURE_OPTIONS}") string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=OFF" "OGRE_RESOURCEMANAGER_STRICT=0" FEATURE_OPTIONS "${FEATURE_OPTIONS}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DOGRE_BUILD_DEPENDENCIES=OFF -DOGRE_BUILD_SAMPLES=OFF -DOGRE_BUILD_TESTS=OFF @@ -68,14 +69,11 @@ vcpkg_configure_cmake( -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF -DFREETYPE_FOUND=ON -# Optional stuff - ${FEATURE_OPTIONS} -# vcpkg specific stuff -DOGRE_CMAKE_DIR=share/ogre ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -99,15 +97,13 @@ endif() #Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #manual-link subfolder is here to the rescue! if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) - else() - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) - endif() + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) + else() + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") + if(NOT VCPKG_BUILD_TYPE) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) @@ -124,7 +120,13 @@ if(VCPKG_TARGET_IS_WINDOWS) endforeach() endif() +file(GLOB share_cfgs ${CURRENT_PACKAGES_DIR}/share/OGRE/*.cfg) +foreach(file ${share_cfgs}) + vcpkg_replace_string("${file}" "${CURRENT_PACKAGES_DIR}" "../..") +endforeach() + # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index d084653e719bfb..1abf6edaca8bde 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,12 +1,21 @@ { "name": "ogre", - "version-string": "1.12.9", - "port-version": 5, + "version": "1.12.9", + "port-version": 7, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", + "license": "MIT", "dependencies": [ "pugixml", "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ diff --git a/ports/ois/0001_install_pkgconfig_win32.patch b/ports/ois/0001_install_pkgconfig_win32.patch new file mode 100644 index 00000000000000..2568e3f7c996f1 --- /dev/null +++ b/ports/ois/0001_install_pkgconfig_win32.patch @@ -0,0 +1,29 @@ +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-05-14 03:09:42.000000000 +0800 ++++ b/CMakeLists.txt 2022-03-08 12:48:17.012589000 +0800 +@@ -255,7 +255,12 @@ + install(FILES $ DESTINATION bin OPTIONAL) + endif(MSVC AND BUILD_SHARED_LIBS) + +-if(UNIX) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY) +- install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig) ++if (CMAKE_DEBUG_POSTFIX AND CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(OIS_POSTFIX ${CMAKE_DEBUG_POSTFIX}) ++else() ++ set(OIS_POSTFIX "") + endif() ++ ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY) ++install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig) ++ +diff -Naur a/OIS.pc.in b/OIS.pc.in +--- a/OIS.pc.in 2021-05-14 03:09:42.000000000 +0800 ++++ b/OIS.pc.in 2022-03-08 12:48:33.599696300 +0800 +@@ -6,5 +6,5 @@ + Name: OIS + Description: Cross platform C++ Input Framework + Version: @OIS_VERSION@ +-Libs: -L${libdir} -lOIS ++Libs: -L${libdir} -lOIS@OIS_POSTFIX@ + Cflags: -I${includedir} -I${includedir}/ois diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake index 69e24c4393a2cd..e7b5d2bce00fca 100644 --- a/ports/ois/portfile.cmake +++ b/ports/ois/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v1.5.1 SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340 HEAD_REF master + PATCHES + 0001_install_pkgconfig_win32.patch ) vcpkg_cmake_configure( diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json index 9daa139ed56793..c73ac9131e911c 100644 --- a/ports/ois/vcpkg.json +++ b/ports/ois/vcpkg.json @@ -1,8 +1,10 @@ { "name": "ois", "version": "1.5.1", + "port-version": 1, "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.", "homepage": "https://wgois.github.io/OIS/", + "license": "Zlib", "supports": "!(arm | arm64 | uwp)", "dependencies": [ { diff --git a/ports/ompl/0002_Fix_config.patch b/ports/ompl/0002_Fix_config.patch index 974b1b6ad73de5..ec82b556b2a2c1 100644 --- a/ports/ompl/0002_Fix_config.patch +++ b/ports/ompl/0002_Fix_config.patch @@ -1,11 +1,12 @@ diff --git a/omplConfig.cmake.in b/omplConfig.cmake.in -index 465de25..ad373fa 100644 +index 465de25d..d1e91929 100644 --- a/omplConfig.cmake.in +++ b/omplConfig.cmake.in -@@ -18,8 +18,10 @@ set(OMPL_MAJOR_VERSION @PROJECT_VERSION_MAJOR@) +@@ -18,8 +18,11 @@ set(OMPL_MAJOR_VERSION @PROJECT_VERSION_MAJOR@) set(OMPL_MINOR_VERSION @PROJECT_VERSION_MINOR@) set(OMPL_PATCH_VERSION @PROJECT_VERSION_PATCH@) ++include(CMakeFindDependencyMacro) +find_dependency(Boost 1.58 COMPONENTS serialization filesystem system program_options) +find_dependency(Eigen3) set_and_check(OMPL_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") @@ -14,7 +15,7 @@ index 465de25..ad373fa 100644 foreach(_dir @FLANN_INCLUDE_DIRS@;@ODE_INCLUDE_DIRS@;@SPOT_INCLUDE_DIRS@;@TRIANGLE_INCLUDE_DIR@;@FCL_INCLUDE_DIRS@;@PQP_INCLUDE_DIR@;@ASSIMP_INCLUDE_DIRS@;@OPENGL_INCLUDE_DIR@) if(_dir) list(APPEND OMPL_INCLUDE_DIRS "${_dir}") -@@ -29,7 +31,7 @@ list(REMOVE_DUPLICATES OMPL_INCLUDE_DIRS) +@@ -29,7 +32,7 @@ list(REMOVE_DUPLICATES OMPL_INCLUDE_DIRS) set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIRS}" CACHE STRING "Include path for OMPL and its dependencies") set_and_check(OMPL_LIBRARY_DIR @PACKAGE_LIB_INSTALL_DIR@) @@ -23,7 +24,7 @@ index 465de25..ad373fa 100644 foreach(_dir @FLANN_LIBRARY_DIRS@;@ODE_LIBRARY_DIRS@;@SPOT_LIBRARY_DIRS@;@FCL_LIBRARY_DIRS@;@ASSIMP_LIBRARY_DIRS@) if(_dir) list(APPEND OMPL_LIBRARY_DIRS "${_dir}") -@@ -40,7 +42,7 @@ set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIRS}" CACHE STRING "Library path for OMPL +@@ -40,7 +43,7 @@ set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIRS}" CACHE STRING "Library path for OMPL find_library(OMPL_LIBRARIES NAMES ompl.${OMPL_VERSION} ompl PATHS ${OMPL_LIBRARY_DIR} NO_DEFAULT_PATH) @@ -32,7 +33,7 @@ index 465de25..ad373fa 100644 if(_lib) list(APPEND OMPL_LIBRARIES "${_lib}") endif() -@@ -61,3 +63,4 @@ endif() +@@ -61,3 +64,4 @@ endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(ompl DEFAULT_MSG OMPL_INCLUDE_DIRS OMPL_LIBRARY_DIRS OMPL_LIBRARIES) diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake index 04d55d7f4427e5..5f32ad49982f4d 100644 --- a/ports/ompl/portfile.cmake +++ b/ports/ompl/portfile.cmake @@ -1,5 +1,12 @@ vcpkg_buildpath_length_warning(37) +# See https://github.com/ompl/ompl/blob/main/src/ompl/CMakeLists.txt#L49-L54 +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +else() + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + set(OMPL_VERSION 1.5.1) vcpkg_from_github( diff --git a/ports/ompl/vcpkg.json b/ports/ompl/vcpkg.json index 25602adc2c5f57..5b8be4e388cc33 100644 --- a/ports/ompl/vcpkg.json +++ b/ports/ompl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ompl", - "version-string": "1.5.1", - "port-version": 3, + "version": "1.5.1", + "port-version": 5, "description": "The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms", "homepage": "https://ompl.kavrakilab.org/", "dependencies": [ diff --git a/ports/omplapp/fix_boost_static_link.patch b/ports/omplapp/fix_boost_static_link.patch index fd74fb8a7b7cd3..af7c3f43e251cc 100644 --- a/ports/omplapp/fix_boost_static_link.patch +++ b/ports/omplapp/fix_boost_static_link.patch @@ -1,5 +1,5 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5c3c88..3a4a7d4 100644 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4b391b5..24d2c66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,10 +36,10 @@ set(OMPL_DEMO_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/ompl/demos" diff --git a/ports/omplapp/fix_dependency.patch b/ports/omplapp/fix_dependency.patch index 4a19f81b84281e..08b1fcacf1dac5 100644 --- a/ports/omplapp/fix_dependency.patch +++ b/ports/omplapp/fix_dependency.patch @@ -1,32 +1,128 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4c7e6901..a433b7da 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -136,7 +136,7 @@ find_package(Drawstuff QUIET) - set_package_properties(assimp PROPERTIES - URL "http://assimp.org" - PURPOSE "Used in ompl_app for reading meshes representing robots and environments.") --find_package(assimp REQUIRED) -+find_package(assimp CONFIG REQUIRED) - set_package_properties(ccd PROPERTIES - URL "https://github.com/danfis/libccd" - PURPOSE "Collision detection library used by fcl.") -@@ -178,8 +178,7 @@ include_directories( - "${OMPLAPP_INCLUDE_DIRS}" - "${OMPL_INCLUDE_DIRS}" - "${EIGEN3_INCLUDE_DIR}" -- "${FCL_INCLUDE_DIRS}" -- "${ASSIMP_INCLUDE_DIRS}") -+ "${FCL_INCLUDE_DIRS}") - - # ROS installs fcl in /usr. In /usr/include/fcl/config.h it says octomap was - # enabled. Octomap is installed in /opt/ros/${ROS_DISTRO}/include (most -@@ -195,7 +194,7 @@ set(OMPLAPP_MODULE_LIBRARIES - ${FCL_LIBRARIES}) - set(OMPLAPP_LIBRARIES - ${OPENGL_LIBRARIES} -- ${ASSIMP_LIBRARIES} -+ assimp::assimp - ${FCL_LIBRARIES}) - link_directories(${ASSIMP_LIBRARY_DIRS} ${CCD_LIBRARY_DIRS} ${OCTOMAP_LIBRARY_DIRS} ${FCL_LIBRARY_DIRS}) - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c7e690..4b391b5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,12 +73,15 @@ set_package_properties(OpenGL PROPERTIES + URL "http://opengl.org" + PURPOSE "Used to render graphics in ompl_app.") + set(OpenGL_GL_PREFERENCE GLVND) +-find_package(OpenGL) ++if (OMPLAPP_WITH_OPENGL) ++find_package(OpenGL REQUIRED) ++endif() + set_package_properties(Python PROPERTIES + URL "http://python.org" + PURPOSE "Used for python bindings.") + # This includes our own FindPython.cmake in ompl/CMakeModules. It defines, + # among other things, the find_python_module() function used below. ++if (OMPLAPP_WITH_PYTHON) + find_package(Python) + find_boost_python() + +@@ -105,55 +108,76 @@ find_python_module(OpenGL) + if (NOT OPENGL_FOUND OR NOT PY_OPENGL) + message(WARNING "Both OpenGL and the Python OpenGL module need to be installed to use the GUI") + endif() ++endif() + set_package_properties(Eigen3 PROPERTIES + URL "http://eigen.tuxfamily.org" + PURPOSE "A linear algebra library used throughout OMPL.") +-find_package(Eigen3 REQUIRED) ++find_package(Eigen3 CONFIG REQUIRED) + set_package_properties(Triangle PROPERTIES + URL "http://www.cs.cmu.edu/~quake/triangle.html" + PURPOSE "Used to create triangular decompositions of polygonal 2D environments.") ++if (OMPLAPP_WITH_TRIANGLE) + find_package(Triangle QUIET) ++endif() + set_package_properties(flann PROPERTIES + URL "https://github.com/mariusmuja/flann" + PURPOSE "If detetected, FLANN can be used for nearest neighbor queries by OMPL.") ++if (OMPLAPP_WITH_FLANN) + find_package(flann 1.8.3 QUIET) ++endif() + set_package_properties(spot PROPERTIES + URL "http://spot.lrde.epita.fr" + PURPOSE "Used for constructing finite automata from LTL formulae.") ++if (OMPLAPP_WITH_SPOT) + find_package(spot) ++endif() + set_package_properties(MORSE PROPERTIES + URL "https://www.openrobots.org/wiki/morse" + PURPOSE "OMPL includes a plugin for the MORSE Robot Simulation engine.") ++if (OMPLAPP_WITH_MORSE) + find_package(MORSE QUIET) ++endif() + set_package_properties(ODE PROPERTIES + URL "http://ode.org" + PURPOSE "The Open Dynamics Engine can be used as a \"black box\" for kinodynamic planning.") +-find_package(ODE QUIET) ++if (OMPLAPP_WITH_ODE) ++find_package(ODE CONFIG REQUIRED) ++set(ODE_LIBRARIES ODE::ODE) ++endif() + set_package_properties(Drawstuff PROPERTIES + URL "http://ode.org" + PURPOSE "Part of the ODE source distribution, used in one demo program.") ++if (OMPLAPP_WITH_DRAWSTUFF) + find_package(Drawstuff QUIET) ++endif() + set_package_properties(assimp PROPERTIES + URL "http://assimp.org" + PURPOSE "Used in ompl_app for reading meshes representing robots and environments.") +-find_package(assimp REQUIRED) ++find_package(assimp CONFIG REQUIRED) ++set(ASSIMP_LIBRARIES assimp::assimp) + set_package_properties(ccd PROPERTIES + URL "https://github.com/danfis/libccd" + PURPOSE "Collision detection library used by fcl.") +-find_package(ccd REQUIRED) ++find_package(ccd CONFIG REQUIRED) + set_package_properties(fcl PROPERTIES + URL "https://github.com/flexible-collision-library/fcl" + PURPOSE "The default collision checking library.") ++if (OMPLAPP_WITH_OCTOMAP) + find_package(octomap QUIET) ++endif() + find_package(fcl REQUIRED) + set_package_properties(Threads PROPERTIES + URL "https://en.wikipedia.org/wiki/POSIX_Threads" + PURPOSE "Pthreads is sometimes needed, depending on OS / compiler.") ++if (OMPLAPP_WITH_THREADS) + find_package(Threads QUIET) ++endif() + set_package_properties(Doxygen PROPERTIES + URL "http://doxygen.org" + PURPOSE "Used to create the OMPL documentation (i.e., http://ompl.kavrakilab.org).") ++if (OMPLAPP_WITH_DOXYGEN) + find_package(Doxygen) ++endif() + + enable_testing() + +@@ -177,9 +201,7 @@ include_directories(SYSTEM "${Boost_INCLUDE_DIR}") + include_directories( + "${OMPLAPP_INCLUDE_DIRS}" + "${OMPL_INCLUDE_DIRS}" +- "${EIGEN3_INCLUDE_DIR}" +- "${FCL_INCLUDE_DIRS}" +- "${ASSIMP_INCLUDE_DIRS}") ++ "${FCL_INCLUDE_DIRS}") + + # ROS installs fcl in /usr. In /usr/include/fcl/config.h it says octomap was + # enabled. Octomap is installed in /opt/ros/${ROS_DISTRO}/include (most +@@ -242,12 +264,14 @@ endif() + set_package_properties(PQP PROPERTIES + URL "http://gamma.cs.unc.edu/SSV/" + PURPOSE "Used as an alternative, additional collision checking library (the default is FCL).") ++IF (OMPLAPP_WITH_PQP) + find_package(PQP QUIET) + if(PQP_FOUND) + include_directories("${PQP_INCLUDE_DIR}") + set(OMPLAPP_MODULE_LIBRARIES ${OMPLAPP_MODULE_LIBRARIES} ${PQP_LIBRARY}) + set(OMPLAPP_LIBRARIES ${OMPLAPP_LIBRARIES} ${PQP_LIBRARY}) + endif() ++endif() + + add_subdirectory(ompl/doc) + add_subdirectory(ompl/src) diff --git a/ports/omplapp/portfile.cmake b/ports/omplapp/portfile.cmake index 768f24453b0d51..8b14bd147d5c42 100644 --- a/ports/omplapp/portfile.cmake +++ b/ports/omplapp/portfile.cmake @@ -21,20 +21,35 @@ vcpkg_extract_source_archive_ex( ${STATIC_PATCH} ) -# Based on selected features different files get downloaded, so use the following command instead of patch. -vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(Eigen3 REQUIRED)" "find_package(Eigen3 REQUIRED CONFIG)") -vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(ccd REQUIRED)" "find_package(ccd REQUIRED CONFIG)") +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ode OMPLAPP_WITH_ODE + opengl OMPLAPP_WITH_OPENGL + threads OMPLAPP_WITH_THREADS +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS + ${FEATURE_OPTIONS} -DOMPL_VERSIONED_INSTALL=OFF -DOMPL_REGISTRATION=OFF -DOMPL_BUILD_DEMOS=OFF -DOMPL_BUILD_TESTS=OFF -DOMPL_BUILD_PYBINDINGS=OFF -DOMPL_BUILD_PYTESTS=OFF + # Not implement + -DOMPLAPP_WITH_PYTHON=OFF + -DOMPLAPP_WITH_TRIANGLE=OFF + -DOMPLAPP_WITH_OCTOMAP=OFF + -DOMPLAPP_WITH_FLANN=OFF # Requires 1.8.3 + # Missing dependencies in vcpkg + -DOMPLAPP_WITH_SPOT=OFF + -DOMPLAPP_WITH_MORSE=OFF + -DOMPLAPP_WITH_DRAWSTUFF=OFF + -DOMPLAPP_WITH_PQP=OFF + -DOMPLAPP_WITH_DOXYGEN=OFF ) vcpkg_cmake_install() @@ -62,5 +77,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ompl.pc" "assimp::assimp" "assimp") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ompl.pc" "assimp::assimp" "assimp") + endif() + vcpkg_fixup_pkgconfig() +endif() + # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/omplapp/vcpkg.json b/ports/omplapp/vcpkg.json index c4b74f1973bb25..6b1493f4427699 100644 --- a/ports/omplapp/vcpkg.json +++ b/ports/omplapp/vcpkg.json @@ -1,11 +1,17 @@ { "name": "omplapp", "version": "1.5.1", - "port-version": 1, + "port-version": 3, "description": "Use OMPL for reading meshes and performing collision checking", "homepage": "https://ompl.kavrakilab.org/", "dependencies": [ "assimp", + "boost-filesystem", + "boost-program-options", + "boost-serialization", + "boost-system", + "ccd", + "eigen3", "fcl", "ompl", { @@ -16,5 +22,25 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "ode": { + "description": "Build with Open Dynamics Engine support", + "dependencies": [ + "ode" + ] + }, + "opengl": { + "description": "Build with OpenGL support", + "dependencies": [ + "opengl" + ] + }, + "threads": { + "description": "Build with Threads support", + "dependencies": [ + "pthreads" + ] + } + } } diff --git a/ports/onednn/portfile.cmake b/ports/onednn/portfile.cmake index 964ed488c278e7..f254c4e3750ba6 100644 --- a/ports/onednn/portfile.cmake +++ b/ports/onednn/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneDNN diff --git a/ports/onednn/vcpkg.json b/ports/onednn/vcpkg.json index c34f03429ef5cd..b06a952641a0f3 100644 --- a/ports/onednn/vcpkg.json +++ b/ports/onednn/vcpkg.json @@ -1,6 +1,7 @@ { "name": "onednn", "version-semver": "2.4.3", + "port-version": 1, "description": "oneAPI Deep Neural Network Library (oneDNN)", "homepage": "https://github.com/oneapi-src/oneDNN", "supports": "x64 & !uwp", diff --git a/ports/onnx/fix-dependency-protobuf.patch b/ports/onnx/fix-dependency-protobuf.patch new file mode 100644 index 00000000000000..6ccdac66502656 --- /dev/null +++ b/ports/onnx/fix-dependency-protobuf.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1295eab..0fb9f17 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -126,6 +126,7 @@ if(ONNX_BUILD_TESTS) + include(googletest) + endif() + ++find_package(protobuf CONFIG REQUIRED) + if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf)) + # Sometimes we need to use protoc compiled for host architecture while linking + # libprotobuf against target architecture. See https://github.com/caffe2/caffe diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake index 61c36b56f24c7f..8070f6dd9f494e 100644 --- a/ports/onnx/portfile.cmake +++ b/ports/onnx/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( SHA512 7519d326cd2b2b13a269ec0d01af07c32115d183dae6e1eaae55f5b23b6c92b2aadbb2b1e555557f4201bbcf921fa563d09d45d7f1d3bd2399c1a94a6ef63303 PATCHES fix-cmakelists.patch + fix-dependency-protobuf.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json index 069934dd73562a..2eaace7ced619b 100644 --- a/ports/onnx/vcpkg.json +++ b/ports/onnx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "onnx", "version-semver": "1.10.2", + "port-version": 1, "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", "license": "Apache-2.0", diff --git a/ports/onnxruntime-gpu/portfile.cmake b/ports/onnxruntime-gpu/portfile.cmake index 524936ac26c74b..bce266e9433a52 100644 --- a/ports/onnxruntime-gpu/portfile.cmake +++ b/ports/onnxruntime-gpu/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "UWP" "LINUX" "ANDROID" "FREEBSD" "OSX") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) set(VERSION 1.5.1) diff --git a/ports/onnxruntime-gpu/vcpkg.json b/ports/onnxruntime-gpu/vcpkg.json index b656e7df3a0466..53723298a77e19 100644 --- a/ports/onnxruntime-gpu/vcpkg.json +++ b/ports/onnxruntime-gpu/vcpkg.json @@ -1,6 +1,7 @@ { "name": "onnxruntime-gpu", - "version-string": "1.5.1", + "version": "1.5.1", + "port-version": 1, "description": "onnxruntime (GPU)", "homepage": "https://github.com/microsoft/onnxruntime", "supports": "windows & !x86 & !uwp & !static & !arm" diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index e6612315cda4bd..b035be3f521cbc 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -1,10 +1,10 @@ -set(VERSION v1.2.2) +set(VERSION v1.2.3) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open62541/open62541 REF "${VERSION}" - SHA512 E6A1EC2208EC29D8685D2A957FAE6F3FEDC0E847D6AB1BB8AC5C7980223BC377692334C87575956B53BB37A9B71C5DEDD1B5C4F19F122561543D04661FEFE1D5 + SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2 HEAD_REF master ) @@ -14,6 +14,7 @@ vcpkg_check_features( openssl UA_ENABLE_ENCRYPTION_OPENSSL mbedtls UA_ENABLE_ENCRYPTION_MBEDTLS amalgamation UA_ENABLE_AMALGAMATION + historizing UA_ENABLE_HISTORIZING ) vcpkg_find_acquire_program(PYTHON3) @@ -30,8 +31,9 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index a1e80fc4cca295..a4f545428391a6 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,8 +1,9 @@ { "name": "open62541", - "version": "1.2.2", + "version": "1.2.3", "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", "homepage": "https://open62541.org", + "license": "MPL-2.0", "dependencies": [ { "name": "vcpkg-cmake", @@ -20,6 +21,9 @@ "amalgamation": { "description": "Concatenate the library to a single file open62541.h/.c" }, + "historizing": { + "description": "Enable basic support for historical access (client and server)" + }, "mbedtls": { "description": "Enable encryption support (uses MbedTLS)", "dependencies": [ diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 30c413ff43df8b..c090c7406671d4 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kcat/openal-soft diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index 8f86e6bd5946ac..4988f6635261d8 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version-semver": "1.21.1", - "port-version": 3, + "port-version": 4, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "supports": "!uwp" diff --git a/ports/openblas/fix-marco-conflict.patch b/ports/openblas/fix-marco-conflict.patch deleted file mode 100644 index 939461875ea6c9..00000000000000 --- a/ports/openblas/fix-marco-conflict.patch +++ /dev/null @@ -1,244 +0,0 @@ -diff --git a/cmake/utils.cmake b/cmake/utils.cmake -index 1c21e77..3894011 100644 ---- a/cmake/utils.cmake -+++ b/cmake/utils.cmake -@@ -251,6 +251,19 @@ function(GenerateNamedObjects sources_in) - # now add the object and set the defines - set(obj_defines ${defines_in}) - -+ list(FIND obj_defines "RC" def_idx) -+ if (${def_idx} GREATER -1) -+ # list(REMOVE_AT ${obj_defines} ${def_idx}) -+ list (REMOVE_ITEM obj_defines "RC") -+ list(APPEND obj_defines "RC=RC") -+ endif () -+ list(FIND obj_defines "CR" def_idx) -+ if (${def_idx} GREATER -1) -+ # list(REMOVE_AT ${obj_defines} ${def_idx}) -+ list (REMOVE_ITEM obj_defines "CR") -+ list(APPEND obj_defines "CR=CR") -+ endif () -+ - if (use_cblas) - set(obj_name "cblas_${obj_name}") - list(APPEND obj_defines "CBLAS") -diff --git a/driver/level3/Makefile b/driver/level3/Makefile -index 09a62d9..970bc58 100644 ---- a/driver/level3/Makefile -+++ b/driver/level3/Makefile -@@ -371,7 +371,7 @@ cgemm_rr.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm_rc.$(SUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm_cn.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -419,7 +419,7 @@ zgemm_rr.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm_rc.$(SUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm_cn.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -467,7 +467,7 @@ xgemm_rr.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm_rc.$(SUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm_cn.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -578,7 +578,7 @@ cgemm_thread_rr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm_thread_rc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm_thread_cn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -626,7 +626,7 @@ zgemm_thread_rr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm_thread_rc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm_thread_cn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -674,7 +674,7 @@ xgemm_thread_rr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm_thread_rc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm_thread_cn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -1841,7 +1841,7 @@ cgemm3m_rr.$(SUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm3m_rc.$(SUFFIX) : gemm3m.c gemm3m_level3.c -- $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm3m_cn.$(SUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -1889,7 +1889,7 @@ zgemm3m_rr.$(SUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm3m_rc.$(SUFFIX) : gemm3m.c gemm3m_level3.c -- $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm3m_cn.$(SUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -1937,7 +1937,7 @@ xgemm3m_rr.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm3m_rc.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm3m_cn.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -1994,7 +1994,7 @@ cgemm3m_thread_rr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm3m_thread_rc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm3m_thread_cn.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2042,7 +2042,7 @@ zgemm3m_thread_rr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm3m_thread_rc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm3m_thread_cn.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2090,7 +2090,7 @@ xgemm3m_thread_rr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm3m_thread_rc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm3m_thread_cn.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2763,7 +2763,7 @@ cgemm_rr.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm_rc.$(PSUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm_cn.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2811,7 +2811,7 @@ zgemm_rr.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm_rc.$(PSUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm_cn.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2859,7 +2859,7 @@ xgemm_rr.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm_rc.$(PSUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm_cn.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2971,7 +2971,7 @@ cgemm_thread_rr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm_thread_rc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm_thread_cn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -3019,7 +3019,7 @@ zgemm_thread_rr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm_thread_rc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm_thread_cn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -3067,7 +3067,7 @@ xgemm_thread_rr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm_thread_rc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm_thread_cn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4234,7 +4234,7 @@ cgemm3m_rr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm3m_rc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c -- $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm3m_cn.$(PSUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4282,7 +4282,7 @@ zgemm3m_rr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm3m_rc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c -- $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm3m_cn.$(PSUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4330,7 +4330,7 @@ xgemm3m_rr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm3m_rc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm3m_cn.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4387,7 +4387,7 @@ cgemm3m_thread_rr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm3m_thread_rc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm3m_thread_cn.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4435,7 +4435,7 @@ zgemm3m_thread_rr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm3m_thread_rc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm3m_thread_cn.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4483,7 +4483,7 @@ xgemm3m_thread_rr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm3m_thread_rc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm3m_thread_cn.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 34e321a6864de5..45c1f86c51e7e5 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -1,15 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS - REF 904f9a267dddb30e9f187e57231ed160ab2f2704 # v0.3.15 - SHA512 ddb1eba7b0def08483d7610675335648017eff41de3cbe24357bd15c6938c7997f12c449f32d8225abbb5ef8f7a2e7501320ec05e970e8ddf8e4c25fd81e8002 + REF 2480e5046e3b0120da8a7fd1442eca628df55f87 # v0.3.19 + SHA512 b85a96c8cd75bf7197732f3b923b8b0ffdc6261d7d6dc7b622d4bf24f061d02273ad99571cabe4686d92f77ff8e6f7e2de0851758cbb3c529d7c2ca96a0bc34d HEAD_REF develop PATCHES uwp.patch fix-space-path.patch fix-redefinition-function.patch fix-uwp-build.patch - fix-marco-conflict.patch install-tools.patch ) diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 041c0f3e309b4a..eaafc620b11f1c 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openblas", - "version": "0.3.15", - "port-version": 1, + "version": "0.3.19", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "dependencies": [ diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake index ad68c29b229203..f9d4a97fe740b3 100644 --- a/ports/opencc/portfile.cmake +++ b/ports/opencc/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BYVoid/OpenCC @@ -49,5 +47,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json index 3645c6d13632e8..ef89e10e72b318 100644 --- a/ports/opencc/vcpkg.json +++ b/ports/opencc/vcpkg.json @@ -1,10 +1,10 @@ { "name": "opencc", - "version-string": "2020-04-26", - "port-version": 9, + "version-date": "2020-04-26", + "port-version": 10, "description": "A project for conversion between Traditional and Simplified Chinese", "homepage": "https://github.com/BYVoid/OpenCC", - "supports": "!(arm | arm64 | uwp)", + "supports": "!(arm | uwp)", "features": { "tools": { "description": "Build OpenCC command-line tools" diff --git a/ports/opencensus-cpp/fix-install.patch b/ports/opencensus-cpp/fix-install.patch index ac8781da3f3596..a8c76248a3baea 100644 --- a/ports/opencensus-cpp/fix-install.patch +++ b/ports/opencensus-cpp/fix-install.patch @@ -1,12 +1,12 @@ diff --git a/cmake/OpenCensusHelpers.cmake b/cmake/OpenCensusHelpers.cmake -index c8d35e6..a15231a 100644 +index 8fdfe96..53bc877 100644 --- a/cmake/OpenCensusHelpers.cmake +++ b/cmake/OpenCensusHelpers.cmake -@@ -38,6 +38,13 @@ function(opencensus_test NAME SRC) - gmock - gtest_main) +@@ -37,6 +37,13 @@ function(opencensus_test NAME SRC) + prepend_opencensus(DEPS "${ARGN}") + target_link_libraries(${_NAME} "${DEPS}" gmock gtest_main) add_test(NAME ${_NAME} COMMAND ${_NAME}) -+ ++ + install( + TARGETS ${_NAME} + RUNTIME DESTINATION tools @@ -16,11 +16,11 @@ index c8d35e6..a15231a 100644 endif() endfunction() -@@ -51,6 +58,13 @@ function(opencensus_benchmark NAME SRC) +@@ -50,6 +57,13 @@ function(opencensus_benchmark NAME SRC) add_executable(${_NAME} ${SRC}) prepend_opencensus(DEPS "${ARGN}") target_link_libraries(${_NAME} "${DEPS}" benchmark) -+ ++ + install( + TARGETS ${_NAME} + RUNTIME DESTINATION tools @@ -30,11 +30,10 @@ index c8d35e6..a15231a 100644 endif() endfunction() -@@ -76,6 +90,13 @@ function(opencensus_lib NAME) +@@ -71,6 +85,12 @@ function(opencensus_lib NAME) if(ARG_PUBLIC) add_library(${PROJECT_NAME}::${NAME} ALIAS ${_NAME}) endif() -+ + install( + TARGETS ${_NAME} + RUNTIME DESTINATION bin @@ -44,11 +43,11 @@ index c8d35e6..a15231a 100644 endfunction() # Helper function for fuzzing. Usage: -@@ -88,5 +109,12 @@ function(opencensus_fuzzer NAME SRC) +@@ -83,5 +103,12 @@ function(opencensus_fuzzer NAME SRC) prepend_opencensus(DEPS "${ARGN}") target_link_libraries(${_NAME} "${DEPS}" ${FUZZER}) target_compile_options(${_NAME} PRIVATE ${FUZZER}) -+ ++ + install( + TARGETS ${_NAME} + RUNTIME DESTINATION tools @@ -58,97 +57,148 @@ index c8d35e6..a15231a 100644 endif() endfunction() diff --git a/examples/helloworld/CMakeLists.txt b/examples/helloworld/CMakeLists.txt -index 456169f..71e43d1 100644 +index 86cc1f4..cbbcb29 100644 --- a/examples/helloworld/CMakeLists.txt +++ b/examples/helloworld/CMakeLists.txt -@@ -22,3 +22,10 @@ target_link_libraries(opencensus_examples_helloworld - opencensus-cpp::stats - opencensus-cpp::trace - Threads::Threads) +@@ -23,3 +23,10 @@ target_link_libraries( + opencensus-cpp::stats + opencensus-cpp::trace + Threads::Threads) + +install( -+ TARGETS opencensus_examples_helloworld -+ RUNTIME DESTINATION tools -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib ++ TARGETS opencensus_examples_helloworld ++ RUNTIME DESTINATION tools ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib +) -\ No newline at end of file diff --git a/opencensus/common/internal/CMakeLists.txt b/opencensus/common/internal/CMakeLists.txt -index c18859d..55a1121 100644 +index a9dbd87..810a8c8 100644 --- a/opencensus/common/internal/CMakeLists.txt +++ b/opencensus/common/internal/CMakeLists.txt -@@ -21,6 +21,8 @@ opencensus_lib(common_random - absl::base - absl::synchronization - absl::time) -+ -+install(FILES ${CMAKE_CURRENT_LIST_DIR}/../version.h DESTINATION include/opencensus-cpp/common/internal) +@@ -23,6 +23,12 @@ opencensus_lib( + absl::synchronization + absl::time) ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/common/internal) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/grpc/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/common/internal/grpc) ++ opencensus_lib(common_stats_object DEPS absl::time) + # Define NOMINMAX to fix build errors when compiling with MSVC. diff --git a/opencensus/context/CMakeLists.txt b/opencensus/context/CMakeLists.txt -index 525885b..537de02 100644 +index 149958c..2474a66 100644 --- a/opencensus/context/CMakeLists.txt +++ b/opencensus/context/CMakeLists.txt -@@ -21,6 +21,10 @@ opencensus_lib(context - tags - trace) +@@ -22,6 +22,9 @@ opencensus_lib( + tags + trace) -+install(FILES ${CMAKE_CURRENT_LIST_DIR}/context.h -+ ${CMAKE_CURRENT_LIST_DIR}/with_context.h -+ DESTINATION include/opencensus-cpp/context) ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/context) + - opencensus_test(context_context_test - internal/context_test.cc - context + opencensus_test( + context_context_test + internal/context_test.cc diff --git a/opencensus/exporters/stats/prometheus/CMakeLists.txt b/opencensus/exporters/stats/prometheus/CMakeLists.txt -index 4da7de7..39121f5 100644 +index 01038cc..0ad712b 100644 --- a/opencensus/exporters/stats/prometheus/CMakeLists.txt +++ b/opencensus/exporters/stats/prometheus/CMakeLists.txt -@@ -28,6 +28,8 @@ opencensus_lib(exporters_stats_prometheus_utils - absl::strings - absl::time - prometheus-cpp::core) -+ -+install(FILES ${CMAKE_CURRENT_LIST_DIR}/prometheus_exporter.h DESTINATION include/opencensus-cpp/exporters/stats/prometheus) +@@ -21,6 +21,12 @@ opencensus_lib( + exporters_stats_prometheus_utils + stats) - opencensus_test(exporters_stats_prometheus_utils_test - internal/prometheus_utils_test.cc ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/stats/prometheus) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/internal/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/stats/prometheus/internal) ++ + opencensus_lib( + exporters_stats_prometheus_utils + SRCS diff --git a/opencensus/exporters/stats/stdout/CMakeLists.txt b/opencensus/exporters/stats/stdout/CMakeLists.txt -index b4f3110..31bc991 100644 +index 5278e65..2930817 100644 --- a/opencensus/exporters/stats/stdout/CMakeLists.txt +++ b/opencensus/exporters/stats/stdout/CMakeLists.txt -@@ -21,6 +21,8 @@ opencensus_lib(exporters_stats_stdout - absl::memory - absl::strings - absl::time) -+ -+install(FILES ${CMAKE_CURRENT_LIST_DIR}/stdout_exporter.h DESTINATION include/opencensus-cpp/exporters/stats/stdout) +@@ -23,5 +23,8 @@ opencensus_lib( + absl::strings + absl::time) - opencensus_test(exporters_stats_stdout_test - internal/stdout_exporter_test.cc ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/stats/stdout) ++ + opencensus_test(exporters_stats_stdout_test internal/stdout_exporter_test.cc + exporters_stats_stdout stats stats_test_utils absl::time) diff --git a/opencensus/exporters/trace/stdout/CMakeLists.txt b/opencensus/exporters/trace/stdout/CMakeLists.txt -index 2b8bc78..fce50e7 100644 +index c7c580f..d9befa1 100644 --- a/opencensus/exporters/trace/stdout/CMakeLists.txt +++ b/opencensus/exporters/trace/stdout/CMakeLists.txt -@@ -21,6 +21,7 @@ opencensus_lib(exporters_trace_stdout - absl::base - absl::memory) +@@ -22,5 +22,8 @@ opencensus_lib( + absl::base + absl::memory) -+install(FILES ${CMAKE_CURRENT_LIST_DIR}/stdout_exporter.h DESTINATION include/opencensus-cpp/exporters/trace/stdout) - opencensus_test(exporters_trace_stdout_test - internal/stdout_exporter_test.cc - exporters_trace_stdout ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/trace/stdout) ++ + opencensus_test(exporters_trace_stdout_test internal/stdout_exporter_test.cc + exporters_trace_stdout trace absl::time) +diff --git a/opencensus/stats/CMakeLists.txt b/opencensus/stats/CMakeLists.txt +index 9b0d7af..a8a9d50 100644 +--- a/opencensus/stats/CMakeLists.txt ++++ b/opencensus/stats/CMakeLists.txt +@@ -71,6 +71,12 @@ opencensus_lib( + absl::strings + absl::time) + ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/stats) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/internal/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/stats/internal) ++ + # ---------------------------------------------------------------------- + # Tests + # ---------------------------------------------------------------------- diff --git a/opencensus/tags/CMakeLists.txt b/opencensus/tags/CMakeLists.txt -index dbc4c9b..1b304ce 100644 +index 7219a2a..97a0de1 100644 --- a/opencensus/tags/CMakeLists.txt +++ b/opencensus/tags/CMakeLists.txt -@@ -40,6 +40,8 @@ opencensus_lib(tags_with_tag_map - context - absl::strings) +@@ -53,6 +53,12 @@ opencensus_lib( + context + absl::strings) + ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/tags) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/propagation/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/tags/propagation) ++ + opencensus_test(tags_context_util_test internal/context_util_test.cc tags + tags_context_util tags_with_tag_map context) + +diff --git a/opencensus/trace/CMakeLists.txt b/opencensus/trace/CMakeLists.txt +index 2c4e656..25d7241 100644 +--- a/opencensus/trace/CMakeLists.txt ++++ b/opencensus/trace/CMakeLists.txt +@@ -122,6 +122,18 @@ opencensus_lib( + trace + context) -+file(GLOB TAGS_HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) -+install(FILES ${TAGS_HDRS} DESTINATION include/opencensus-cpp/tags) - opencensus_test(tags_context_util_test - internal/context_util_test.cc - tags ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/exporter/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace/exporter) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/internal/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace/internal) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/propagation/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace/propagation) ++ + # ---------------------------------------------------------------------- + # Tests + # ---------------------------------------------------------------------- diff --git a/ports/opencensus-cpp/portfile.cmake b/ports/opencensus-cpp/portfile.cmake index be9283a5ec8b0f..c914bc38dc49be 100644 --- a/ports/opencensus-cpp/portfile.cmake +++ b/ports/opencensus-cpp/portfile.cmake @@ -1,25 +1,23 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO census-instrumentation/opencensus-cpp - REF 2b0725c2d0f809351300c634c54e70e0a8c3f4ed #v0.4.0 - SHA512 16f3975ed0580aec83e0dd98f15a04d614cf45bfa7e07b0b94e881afc12e8e4bac3c0efde1f8e7da9f5dc66365415ae1e3ab10dfcbd9e078879246db6e81cd56 + REF 62d8281899a1cfd1084793f64295329a6b5d22b3 # 2021-08-26 + SHA512 35df40d7e5ce933384fe6ba4ac2d704e0801ac47765fca97ea3f8d787886abe5c588855c3aac5745f047c1c8f2047e1f69b62340dd702042a61c3dc430ca36b4 HEAD_REF master PATCHES fix-install.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - test BUILD_TESTING + FEATURES + test BUILD_TESTING ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/opencensus-cpp/vcpkg.json b/ports/opencensus-cpp/vcpkg.json index 892a8754e7c715..4481e60fd801b3 100644 --- a/ports/opencensus-cpp/vcpkg.json +++ b/ports/opencensus-cpp/vcpkg.json @@ -1,12 +1,19 @@ { "name": "opencensus-cpp", - "version-string": "0.4.0", - "port-version": 2, + "version-date": "2021-08-26", "description": "OpenCensus is a toolkit for collecting application performance and behavior data. It currently includes an API for tracing and stats.", "homepage": "https://github.com/census-instrumentation/opencensus-cpp", "supports": "!windows", "dependencies": [ - "abseil" + "abseil", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "test": { diff --git a/ports/opencolorio/fix-buildTools.patch b/ports/opencolorio/fix-buildTools.patch new file mode 100644 index 00000000000000..24b1c3fd850a4c --- /dev/null +++ b/ports/opencolorio/fix-buildTools.patch @@ -0,0 +1,13 @@ +diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt +index b992bbc..804d3c5 100644 +--- a/src/OpenColorIO/CMakeLists.txt ++++ b/src/OpenColorIO/CMakeLists.txt +@@ -248,7 +248,7 @@ if(NOT BUILD_SHARED_LIBS) + else() + # Only exports selected symbols. + target_compile_definitions(OpenColorIO +- PUBLIC ++ PRIVATE + OpenColorIO_EXPORTS + ) + endif() diff --git a/ports/opencolorio/fix-dependency.patch b/ports/opencolorio/fix-dependency.patch new file mode 100644 index 00000000000000..1ddda42ec02fb4 --- /dev/null +++ b/ports/opencolorio/fix-dependency.patch @@ -0,0 +1,117 @@ +diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake +index 8787b87..f953ceb 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 + + # expat + # https://github.com/libexpat/libexpat +-find_package(expat 2.2.8 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 CONFIG REQUIRED) + + # pystring + # https://github.com/imageworks/pystring +-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.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() + + # OpenEXR/IlmBase (<=2.5) + # https://github.com/AcademySoftwareFoundation/openexr +- find_package(Half 2.4.0 REQUIRED) ++ find_package(Half 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,13 +65,13 @@ if(OCIO_BUILD_APPS) + + # lcms2 + # https://github.com/mm2/Little-CMS +- find_package(lcms2 2.2 REQUIRED) ++ find_package(lcms2 CONFIG REQUIRED) + endif() + + if(OCIO_BUILD_OPENFX) + # openfx + # https://github.com/ofxa/openfx +- find_package(openfx 1.4 REQUIRED) ++ find_package(openfx CONFIG REQUIRED) + endif() + + if (OCIO_PYTHON_VERSION AND NOT OCIO_BUILD_PYTHON) +@@ -100,6 +100,6 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS) + if(OCIO_BUILD_PYTHON) + # pybind11 + # https://github.com/pybind/pybind11 +- find_package(pybind11 2.6.1 REQUIRED) ++ find_package(pybind11 CONFIG REQUIRED) + endif() + endif() +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 + ) + +@@ -242,13 +242,13 @@ endif() + + if(NOT BUILD_SHARED_LIBS) + target_compile_definitions(OpenColorIO +- PRIVATE ++ PUBLIC + OpenColorIO_SKIP_IMPORTS + ) + else() + # Only exports selected symbols. + target_compile_definitions(OpenColorIO +- PRIVATE ++ PUBLIC + OpenColorIO_EXPORTS + ) + endif() +diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in +index eebb2c1..7147dc3 100644 +--- a/src/cmake/Config.cmake.in ++++ b/src/cmake/Config.cmake.in +@@ -2,4 +2,14 @@ + + include(CMakeFindDependencyMacro) + ++find_dependency(expat CONFIG REQUIRED) ++find_dependency(imath CONFIG REQUIRED) ++find_dependency(pystring CONFIG REQUIRED) ++find_dependency(yaml-cpp CONFIG REQUIRED) ++ ++if(@OCIO_BUILD_APPS@) ++ find_dependency(lcms2 CONFIG REQUIRED) ++ find_dependency(GLEW) ++endif() ++ + include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index b5dc0fb29a6c55..9465e4978a9b30 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -1,13 +1,20 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenColorIO - REF v2.1.0 - SHA512 a0f4fb62c768b392ca1129e2046df96d670d785fc057d4103768440b7adb65d8faf5b7d39729060791794e83e6cd4e67821aed9b30f3f04b410c60809cd72267 + REF v2.1.1 + SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194 HEAD_REF master + PATCHES + fix-dependency.patch + fix-buildTools.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 FEATURES tools OCIO_BUILD_APPS @@ -21,6 +28,9 @@ vcpkg_cmake_configure( -DOCIO_BUILD_TESTS:BOOL=OFF -DOCIO_BUILD_GPU_TESTS:BOOL=OFF -DOCIO_BUILD_PYTHON:BOOL=OFF + -DOCIO_BUILD_OPENFX:BOOL=OFF + -DOCIO_BUILD_JAVA:BOOL=OFF + -DOCIO_USE_OPENEXR_HALF:BOOL=OFF -DOCIO_INSTALL_EXT_PACKAGES=NONE -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=On ${FEATURE_OPTIONS} @@ -28,7 +38,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OpenColorIO") +vcpkg_cmake_config_fixup(PACKAGE_NAME OpenColorIO CONFIG_PATH "lib/cmake/OpenColorIO") vcpkg_copy_pdbs() @@ -46,4 +56,9 @@ if(OCIO_BUILD_APPS) ) endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +vcpkg_fixup_pkgconfig() +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ocio/setup_ocio.sh" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../../") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json index 7166c48edce125..751770137964ee 100644 --- a/ports/opencolorio/vcpkg.json +++ b/ports/opencolorio/vcpkg.json @@ -1,8 +1,10 @@ { "name": "opencolorio", - "version-semver": "2.1.0", + "version-semver": "2.1.1", + "port-version": 2, "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", "supports": "!uwp", "dependencies": [ "expat", @@ -12,6 +14,10 @@ "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "yaml-cpp" ], "features": { diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 11a6d7736688b1..6732038cd64853 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opencv", - "version": "4.5.4", + "version": "4.5.5", "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -122,6 +122,18 @@ } ] }, + "freetype": { + "description": "freetype support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "freetype" + ] + } + ] + }, "gdcm": { "description": "GDCM support for opencv", "dependencies": [ @@ -290,6 +302,18 @@ } ] }, + "python": { + "description": "Python wrapper support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "python" + ] + } + ] + }, "qt": { "description": "Qt GUI support for opencv", "dependencies": [ diff --git a/ports/opencv2/0002-install-options.patch b/ports/opencv2/0002-install-options.patch index ea4d55e736b6c6..73d941a30eb6fb 100644 --- a/ports/opencv2/0002-install-options.patch +++ b/ports/opencv2/0002-install-options.patch @@ -114,11 +114,14 @@ if(GIT_EXECUTABLE) execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*" -@@ -501,7 +470,6 @@ if(BUILD_DOCS) +@@ -501,7 +470,9 @@ if(BUILD_DOCS) endif(BUILD_DOCS) # --- Python Support --- -include(cmake/OpenCVDetectPython.cmake) ++if(WITH_PYTHON) ++ include(cmake/OpenCVDetectPython.cmake) ++endif() # --- Java Support --- include(cmake/OpenCVDetectApacheAnt.cmake) diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index 6d767630eec742..d06f17ac1b3f2f 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -68,6 +68,57 @@ if("ffmpeg" IN_LIST FEATURES) endif() endif() +set(WITH_PYTHON OFF) +if("python" IN_LIST FEATURES) + set(WITH_PYTHON ON) + vcpkg_find_acquire_program(PYTHON2) + get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) + vcpkg_add_to_path("${PYTHON2_DIR}") + vcpkg_add_to_path("${PYTHON2_DIR}/Scripts") + set(ENV{PYTHON} "${PYTHON2}") + + function(vcpkg_get_python_package PYTHON_DIR ) + cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") + + if(NOT _vgpp_PYTHON_EXECUTABLE) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") + endif() + if(NOT _vgpp_PACKAGES) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") + endif() + if(NOT _vgpp_PYTHON_DIR) + get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) + endif() + + if (WIN32) + set(PYTHON_OPTION "") + else() + set(PYTHON_OPTION "--user") + endif() + + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_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 "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) + endif() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) + endforeach() + else() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) + endforeach() + endif() + endfunction() + vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON2}" PACKAGES numpy) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -101,6 +152,7 @@ vcpkg_cmake_configure( -DWITH_MSMF=${WITH_MSMF} -DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENMP=OFF + -DWITH_PYTHON=${WITH_PYTHON} -DWITH_ZLIB=ON -WITH_GTK=${WITH_GTK} -DWITH_CUBLAS=OFF # newer libcublas cannot be found by the old cuda cmake script in opencv2, requires a fix diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json index a1e0a8bd05774d..0ef359dc38f87d 100644 --- a/ports/opencv2/vcpkg.json +++ b/ports/opencv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 8, + "port-version": 9, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -105,6 +105,9 @@ "libpng" ] }, + "python": { + "description": "Python wrapper support for opencv" + }, "qt": { "description": "Qt GUI support for opencv", "dependencies": [ diff --git a/ports/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch index 2c76f7d1c0f572..e47724bfc847d5 100644 --- a/ports/opencv3/0002-install-options.patch +++ b/ports/opencv3/0002-install-options.patch @@ -5,7 +5,7 @@ # --- Python Support --- -if(NOT IOS) -+if(FALSE) ++if(WITH_PYTHON) include(cmake/OpenCVDetectPython.cmake) endif() diff --git a/ports/opencv3/0011-remove-python2.patch b/ports/opencv3/0011-remove-python2.patch new file mode 100644 index 00000000000000..bee0faa87c593e --- /dev/null +++ b/ports/opencv3/0011-remove-python2.patch @@ -0,0 +1,18 @@ +--- a/cmake/OpenCVDetectPython.cmake ++++ b/cmake/OpenCVDetectPython.cmake +@@ -268,15 +268,6 @@ if(OPENCV_PYTHON_SKIP_DETECTION) + return() + endif() + +-find_python("" "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR +- PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING +- PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND +- PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY +- PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH +- PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH +- PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION) +- +-option(OPENCV_PYTHON3_VERSION "Python3 version" "") + find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR + PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING + PYTHON3_VERSION_MAJOR PYTHON3_VERSION_MINOR PYTHON3LIBS_FOUND diff --git a/ports/opencv3/0012-fix-zlib.patch b/ports/opencv3/0012-fix-zlib.patch new file mode 100644 index 00000000000000..7f01dabf3ca385 --- /dev/null +++ b/ports/opencv3/0012-fix-zlib.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake +index 6dbeca9..08e2f4a 100644 +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -5,6 +5,9 @@ + # --- zlib (required) --- + if(BUILD_ZLIB) + ocv_clear_vars(ZLIB_FOUND) ++elseif(1) ++ ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) ++ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) + else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) + if(ANDROID) diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 04d6e53da52eb6..8db4a0ef29a4f5 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -25,6 +25,8 @@ vcpkg_from_github( 0008-devendor-quirc.patch 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch + 0011-remove-python2.patch + 0012-fix-zlib.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -68,8 +70,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "world" BUILD_opencv_world ) -# Cannot use vcpkg_check_features() for "dnn", "gtk", "ipp", ovis", "qt", "tbb" -# As the respective value of their variables can be unset conditionally. +# Cannot use vcpkg_check_features() for "dnn", "gtk", "ipp", ovis", "python", "qt", "tbb" set(BUILD_opencv_dnn OFF) if("dnn" IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_ANDROID) @@ -108,6 +109,57 @@ if("tbb" IN_LIST FEATURES) set(WITH_TBB ON) endif() +set(WITH_PYTHON OFF) +if("python" IN_LIST FEATURES) + set(WITH_PYTHON ON) + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path("${PYTHON3_DIR}") + vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") + set(ENV{PYTHON} "${PYTHON3}") + + function(vcpkg_get_python_package PYTHON_DIR ) + cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") + + if(NOT _vgpp_PYTHON_EXECUTABLE) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") + endif() + if(NOT _vgpp_PACKAGES) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") + endif() + if(NOT _vgpp_PYTHON_DIR) + get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) + endif() + + if (WIN32) + set(PYTHON_OPTION "") + else() + set(PYTHON_OPTION "--user") + endif() + + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_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 "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) + endif() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) + endforeach() + else() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) + endforeach() + endif() + endfunction() + vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy) +endif() + if("dnn" IN_LIST FEATURES) vcpkg_download_distfile(TINYDNN_ARCHIVE URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz" @@ -349,9 +401,11 @@ vcpkg_cmake_configure( -DWITH_MSMF=${WITH_MSMF} -DWITH_OPENMP=OFF -DWITH_PROTOBUF=${BUILD_opencv_flann} + -DWITH_PYTHON=${WITH_PYTHON} -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF + -DWITH_CPUFEATURES=OFF ###### BUILD_options (mainly modules which require additional libraries) -DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_dnn=${BUILD_opencv_dnn} @@ -474,4 +528,6 @@ if(VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android") endif() +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 201b0d968a5a99..abc32bdfb84ea7 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,8 +1,10 @@ { "name": "opencv3", "version": "3.4.16", + "port-version": 4, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", @@ -202,6 +204,9 @@ "libpng" ] }, + "python": { + "description": "Python wrapper support for opencv" + }, "qt": { "description": "Qt GUI support for opencv", "dependencies": [ diff --git a/ports/opencv4/0002-install-options.patch b/ports/opencv4/0002-install-options.patch index a551023c3bf85b..6592723851da88 100644 --- a/ports/opencv4/0002-install-options.patch +++ b/ports/opencv4/0002-install-options.patch @@ -5,7 +5,7 @@ # --- Python Support --- -if(NOT IOS) -+if(0) ++if(WITH_PYTHON) include(cmake/OpenCVDetectPython.cmake) endif() diff --git a/ports/opencv4/0011-remove-python2.patch b/ports/opencv4/0011-remove-python2.patch new file mode 100644 index 00000000000000..bee0faa87c593e --- /dev/null +++ b/ports/opencv4/0011-remove-python2.patch @@ -0,0 +1,18 @@ +--- a/cmake/OpenCVDetectPython.cmake ++++ b/cmake/OpenCVDetectPython.cmake +@@ -268,15 +268,6 @@ if(OPENCV_PYTHON_SKIP_DETECTION) + return() + endif() + +-find_python("" "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR +- PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING +- PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND +- PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY +- PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH +- PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH +- PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION) +- +-option(OPENCV_PYTHON3_VERSION "Python3 version" "") + find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR + PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING + PYTHON3_VERSION_MAJOR PYTHON3_VERSION_MINOR PYTHON3LIBS_FOUND diff --git a/ports/opencv4/0012-fix-zlib.patch b/ports/opencv4/0012-fix-zlib.patch new file mode 100644 index 00000000000000..9c38fd89251c86 --- /dev/null +++ b/ports/opencv4/0012-fix-zlib.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake +index 8ea5497..7ed3f6b 100644 +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -5,6 +5,9 @@ + # --- zlib (required) --- + if(BUILD_ZLIB) + ocv_clear_vars(ZLIB_FOUND) ++elseif(1) ++ ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) ++ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) + else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) + if(ANDROID) diff --git a/ports/opencv4/0013-fix-opengl.patch b/ports/opencv4/0013-fix-opengl.patch new file mode 100644 index 00000000000000..8cd38c9bb66306 --- /dev/null +++ b/ports/opencv4/0013-fix-opengl.patch @@ -0,0 +1,11 @@ +--- a/modules/highgui/CMakeLists.txt ++++ b/modules/highgui/CMakeLists.txt +@@ -271,7 +271,7 @@ if(APPLE) + add_apple_compiler_options(${the_module}) + endif() + +-if(OPENCV_HIGHGUI_BUILTIN_BACKEND STREQUAL "WIN32UI" AND HAVE_OPENGL AND OPENGL_LIBRARIES) ++if(HAVE_OPENGL AND OPENGL_LIBRARIES) + ocv_target_link_libraries(${the_module} PRIVATE "${OPENGL_LIBRARIES}") + endif() + diff --git a/ports/opencv4/0014-fix-gstreamer.patch b/ports/opencv4/0014-fix-gstreamer.patch new file mode 100644 index 00000000000000..d75c5ec2ec1bdd --- /dev/null +++ b/ports/opencv4/0014-fix-gstreamer.patch @@ -0,0 +1,29 @@ +--- a/modules/videoio/cmake/detect_gstreamer.cmake ++++ b/modules/videoio/cmake/detect_gstreamer.cmake +@@ -44,6 +44,10 @@ if(NOT HAVE_GSTREAMER AND WIN32) + NAMES gstvideo gstvideo-1.0 + PATHS ${env_paths} + PATH_SUFFIXES "lib") ++ find_library(GSTREAMER_audio_LIBRARY ++ NAMES gstvideo gstaudio-1.0 ++ PATHS ${env_paths} ++ PATH_SUFFIXES "lib") + + find_library(GSTREAMER_glib_LIBRARY + NAMES glib-2.0 +@@ -63,6 +67,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) + AND GSTREAMER_pbutils_LIBRARY + AND GSTREAMER_riff_LIBRARY + AND GSTREAMER_video_LIBRARY ++ AND GSTREAMER_audio_LIBRARY + AND GSTREAMER_glib_LIBRARY + AND GSTREAMER_gobject_LIBRARY) + file(STRINGS "${GSTREAMER_gst_INCLUDE_DIR}/gst/gstversion.h" ver_strings REGEX "#define +GST_VERSION_(MAJOR|MINOR|MICRO|NANO).*") +@@ -77,6 +82,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) + ${GSTREAMER_app_LIBRARY} + ${GSTREAMER_riff_LIBRARY} + ${GSTREAMER_video_LIBRARY} ++ ${GSTREAMER_audio_LIBRARY} + ${GSTREAMER_pbutils_LIBRARY} + ${GSTREAMER_glib_LIBRARY} + ${GSTREAMER_gobject_LIBRARY}) diff --git a/ports/opencv4/0015-fix-freetype.patch b/ports/opencv4/0015-fix-freetype.patch new file mode 100644 index 00000000000000..62c41f2f4f3bca --- /dev/null +++ b/ports/opencv4/0015-fix-freetype.patch @@ -0,0 +1,16 @@ +diff --git a/modules/gapi/cmake/init.cmake b/modules/gapi/cmake/init.cmake +index 1c46432..43fb8ad 100644 +--- a/modules/gapi/cmake/init.cmake ++++ b/modules/gapi/cmake/init.cmake +@@ -20,10 +20,8 @@ if(NOT TARGET ade) + endif() + + if(WITH_FREETYPE) +- ocv_check_modules(FREETYPE freetype2) +- if (FREETYPE_FOUND) ++ find_package(freetype CONFIG REQUIRED) + set(HAVE_FREETYPE TRUE) +- endif() + endif() + + if(WITH_PLAIDML) diff --git a/ports/opencv4/0016-fix-freetype-contrib.patch b/ports/opencv4/0016-fix-freetype-contrib.patch new file mode 100644 index 00000000000000..4d0637fd1be548 --- /dev/null +++ b/ports/opencv4/0016-fix-freetype-contrib.patch @@ -0,0 +1,17 @@ +diff --git a/modules/freetype/CMakeLists.txt b/modules/freetype/CMakeLists.txt +index 6dd4aaf..e734e97 100644 +--- a/modules/freetype/CMakeLists.txt ++++ b/modules/freetype/CMakeLists.txt +@@ -3,8 +5,10 @@ if(APPLE_FRAMEWORK) + ocv_module_disable(freetype) + endif() + +-ocv_check_modules(FREETYPE freetype2) +-ocv_check_modules(HARFBUZZ harfbuzz) ++if(WITH_FREETYPE) ++find_package(freetype CONFIG REQUIRED) ++find_package(harfbuzz CONFIG REQUIRED) ++endif() + + if(OPENCV_INITIAL_PASS) + if(NOT FREETYPE_FOUND) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index ccf980b5dd87cb..e01547d3c1259e 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,14 +6,14 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") endif() -set(OPENCV_VERSION "4.5.4") +set(OPENCV_VERSION "4.5.5") set(USE_QT_VERSION "5") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954 + SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02 HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -25,6 +25,11 @@ vcpkg_from_github( 0008-devendor-quirc.patch 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch + 0011-remove-python2.patch + 0012-fix-zlib.patch + 0013-fix-opengl.patch + 0014-fix-gstreamer.patch + 0015-fix-freetype.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -52,6 +57,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "cudnn" WITH_CUDNN "eigen" WITH_EIGEN "ffmpeg" WITH_FFMPEG + "freetype" WITH_FREETYPE "gdcm" WITH_GDCM "gstreamer" WITH_GSTREAMER "halide" WITH_HALIDE @@ -70,8 +76,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "world" BUILD_opencv_world ) -# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "qt, "tbb" -# As the respective value of their variables can be unset conditionally. +# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt, "tbb" set(BUILD_opencv_dnn OFF) if("dnn" IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_ANDROID) @@ -125,6 +130,63 @@ if("tbb" IN_LIST FEATURES) set(WITH_TBB ON) endif() +set(WITH_PYTHON OFF) +set(BUILD_opencv_python3 OFF) +if("python" IN_LIST FEATURES) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static AND VCPKG_TARGET_IS_WINDOWS) + message(WARNING "The python module is currently unsupported on Windows when building static OpenCV libraries") + else() + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path("${PYTHON3_DIR}") + vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") + set(ENV{PYTHON} "${PYTHON3}") + + function(vcpkg_get_python_package PYTHON_DIR ) + cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") + + if(NOT _vgpp_PYTHON_EXECUTABLE) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") + endif() + if(NOT _vgpp_PACKAGES) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") + endif() + if(NOT _vgpp_PYTHON_DIR) + get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) + endif() + + if (WIN32) + set(PYTHON_OPTION "") + else() + set(PYTHON_OPTION "--user") + endif() + + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_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 "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) + endif() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) + endforeach() + else() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) + endforeach() + endif() + endfunction() + vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy) + set(BUILD_opencv_python3 ON) + set(WITH_PYTHON ON) + endif() +endif() + if("dnn" IN_LIST FEATURES) vcpkg_download_distfile(TINYDNN_ARCHIVE URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz" @@ -157,10 +219,11 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 a48d4b5d764170814d9027fdf50f61bb4a24f0b5a547dded79d06b948f86443f14734efc7bbb708b3870781cafc6bc9e3092d35dac34a81da2bf1740d5f93ff9 + SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35 HEAD_REF master PATCHES 0007-fix-hdf5.patch + 0016-fix-freetype-contrib.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -322,6 +385,16 @@ if("ffmpeg" IN_LIST FEATURES) endif() endif() +if("halide" IN_LIST FEATURES) + list(APPEND ADDITIONAL_BUILD_FLAGS + # Halide 13 requires C++17 + "-DCMAKE_CXX_STANDARD=17" + "-DCMAKE_CXX_STANDARD_REQUIRED=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON" + "-DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR}" + ) +endif() + if("qt" IN_LIST FEATURES) list(APPEND ADDITIONAL_BUILD_FLAGS "-DCMAKE_AUTOMOC=ON") endif() @@ -397,21 +470,22 @@ vcpkg_cmake_configure( ###### customized properties ## Options from vcpkg_check_features() ${FEATURE_OPTIONS} - -DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON - -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DWITH_GTK=${WITH_GTK} -DWITH_QT=${WITH_QT} -DWITH_IPP=${WITH_IPP} -DWITH_MATLAB=OFF -DWITH_MSMF=${WITH_MSMF} + -DWITH_PYTHON=${WITH_PYTHON} -DWITH_OPENMP=${WITH_OPENMP} -DWITH_PROTOBUF=${BUILD_opencv_dnn} -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF + -DWITH_CPUFEATURES=OFF ###### BUILD_options (mainly modules which require additional libraries) -DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_dnn=${BUILD_opencv_dnn} + -DBUILD_opencv_python3=${BUILD_opencv_python3} ###### The following modules are disabled for UWP -DBUILD_opencv_quality=${BUILD_opencv_quality} -DBUILD_opencv_gapi=${BUILD_opencv_gapi} @@ -480,7 +554,7 @@ find_dependency(Tesseract)") string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)") endif() if(BUILD_opencv_ovis) - string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") + string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(freetype)") endif() if("quirc" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(quirc)") @@ -534,4 +608,6 @@ if(VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android") endif() +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 931f15171c4293..4d3ec55d05e08b 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,8 +1,9 @@ { "name": "opencv4", - "version": "4.5.4", + "version": "4.5.5", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", @@ -115,6 +116,13 @@ } ] }, + "freetype": { + "description": "Freetype support for opencv", + "dependencies": [ + "freetype", + "harfbuzz" + ] + }, "gdcm": { "description": "GDCM support for opencv", "dependencies": [ @@ -208,6 +216,12 @@ "libpng" ] }, + "python": { + "description": "Python wrapper support for opencv", + "dependencies": [ + "python3" + ] + }, "qt": { "description": "Qt GUI support for opencv", "dependencies": [ diff --git a/ports/opendnp3/deps/asio.cmake b/ports/opendnp3/deps/asio.cmake new file mode 100644 index 00000000000000..7645e466a3ab30 --- /dev/null +++ b/ports/opendnp3/deps/asio.cmake @@ -0,0 +1 @@ +find_package(asio CONFIG REQUIRED) diff --git a/ports/opendnp3/portfile.cmake b/ports/opendnp3/portfile.cmake index c1a5c81963ce1d..d0b5b976f6abd5 100644 --- a/ports/opendnp3/portfile.cmake +++ b/ports/opendnp3/portfile.cmake @@ -7,10 +7,34 @@ vcpkg_from_github( REPO dnp3/opendnp3 REF 3.1.1 SHA512 2d7b26753fa03596ab73944236e5f1d82656f38248cc23fd00f7a2cdac27f481e5fe51e68b5896b6740db1a6d9560f0262e473648e001601125f4af8b4a652c2 - HEAD_REF master ) -file(COPY "${CURRENT_PORT_DIR}/opendnp3-config.cmake.in" DESTINATION "${SOURCE_PATH}") +file(READ "${SOURCE_PATH}/deps/ser4cpp.cmake" ser4cpp_cmake) +if(ser4cpp_cmake MATCHES "https://github\\.com/automatak/ser4cpp/archive/([0-9a-f]*)\\.zip") + vcpkg_from_github( + OUT_SOURCE_PATH ser4cpp_src + REPO automatak/ser4cpp + REF "${CMAKE_MATCH_1}" + SHA512 cd8d634c0e9fadda357bdd832c382189461f4707ced4834604668df0aa4e396333cce8d676d4f98ba1b414664228518e9a24c6456204b9d96a5f2df078bada2c + ) +else() + message(FATAL_ERROR "Unable to determine version of ser4cpp") +endif() + +file(READ "${SOURCE_PATH}/deps/exe4cpp.cmake" exe4cpp_cmake) +if(exe4cpp_cmake MATCHES "https://github\\.com/automatak/exe4cpp/archive/([0-9a-f]*)\\.zip") + vcpkg_from_github( + OUT_SOURCE_PATH exe4cpp_src + REPO automatak/exe4cpp + REF "${CMAKE_MATCH_1}" + SHA512 c8946db752c0f8499d21c2da96b84676b8768954bcb1964f4c444c731d9871d8978cb96fe89b1125e91b861aef0984bdd943a4dccb91d17ba43f22c57673b7b2 + ) +else() + message(FATAL_ERROR "Unable to determine version of exe4cpp") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/opendnp3-config.cmake.in" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/deps/" DESTINATION "${SOURCE_PATH}/deps/") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATICLIBS) @@ -23,6 +47,9 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DDNP3_STATIC_LIBS=${STATICLIBS} + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + -DFETCHCONTENT_SOURCE_DIR_SER4CPP=${ser4cpp_src} + -DFETCHCONTENT_SOURCE_DIR_EXE4CPP=${exe4cpp_src} ${FEATURE_OPTIONS} ) diff --git a/ports/opendnp3/vcpkg.json b/ports/opendnp3/vcpkg.json index 7262378ff7a98a..98d7f33705729a 100644 --- a/ports/opendnp3/vcpkg.json +++ b/ports/opendnp3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opendnp3", "version": "3.1.1", + "port-version": 1, "description": "DNP3 (IEEE-1815) protocol stack. Modern C++ with bindings for .NET and Java.", "homepage": "https://github.com/dnp3/opendnp3/", "supports": "!uwp", diff --git a/ports/opengl/glu.pc.in b/ports/opengl/glu.pc.in new file mode 100644 index 00000000000000..1d086a91e1eaf7 --- /dev/null +++ b/ports/opengl/glu.pc.in @@ -0,0 +1,10 @@ +prefix=${pcfiledir}/../.. +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: glu +Description: OpenGL Utility Library +Version: @WINDOWS_SDK_SEMVER@ +Requires: opengl +Libs: -L${libdir} -lGlU32 +Cflags: -I${includedir} diff --git a/ports/opengl/opengl.pc.in b/ports/opengl/opengl.pc.in new file mode 100644 index 00000000000000..231bce08519ae5 --- /dev/null +++ b/ports/opengl/opengl.pc.in @@ -0,0 +1,9 @@ +prefix=${pcfiledir}/../.. +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: OpenGL +Description: OpenGL library and headers. +Version: @WINDOWS_SDK_SEMVER@ +Libs: -L${libdir} -lOpenGL32 +Cflags: -I${includedir} diff --git a/ports/opengl/portfile.cmake b/ports/opengl/portfile.cmake index 72625fa15feb30..5a20f8ea09affc 100644 --- a/ports/opengl/portfile.cmake +++ b/ports/opengl/portfile.cmake @@ -62,6 +62,18 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore elseif(WINDOWS_SDK MATCHES "8.") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license") endif() + + string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" WINDOWS_SDK_SEMVER "${WINDOWS_SDK}") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opengl.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glu.pc" @ONLY) + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/opengl.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glu.pc" @ONLY) + endif() + vcpkg_fixup_pkgconfig() + else() set(VCPKG_POLICY_EMPTY_PACKAGE enabled) endif() diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json index da77cb58b28bf2..e921d648fb659e 100644 --- a/ports/opengl/vcpkg.json +++ b/ports/opengl/vcpkg.json @@ -1,6 +1,5 @@ { "name": "opengl", - "version-string": "0.0", - "port-version": 9, + "version-date": "2022-03-14", "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics." } diff --git a/ports/openh264/vcpkg.json b/ports/openh264/vcpkg.json index f05ee097824339..23f7be6b01d8ad 100644 --- a/ports/openh264/vcpkg.json +++ b/ports/openh264/vcpkg.json @@ -1,11 +1,14 @@ { "name": "openh264", "version-date": "2021-03-16", - "port-version": 2, + "port-version": 3, "description": "OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.", "homepage": "https://www.openh264.org/", "supports": "!uwp", "dependencies": [ - "tool-meson" + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/openimageio/disable-test.patch b/ports/openimageio/disable-test.patch deleted file mode 100644 index fc46c40b47176a..00000000000000 --- a/ports/openimageio/disable-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 54fe7d9..65f47fd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -281,11 +281,12 @@ install (EXPORT OIIO_EXPORTED_TARGETS - FILE ${OIIO_TARGETS_EXPORT_NAME} - NAMESPACE ${PROJECT_NAME}::) - -- -+if (0) - if (NOT ${PROJECT_NAME}_IS_SUBPROJECT) - oiio_setup_test_data() - oiio_add_all_tests() - endif () -+endif () - - if (NOT ${PROJECT_NAME}_IS_SUBPROJECT) - include (packaging) diff --git a/ports/openimageio/fix-config-cmake.patch b/ports/openimageio/fix-config-cmake.patch index e943d1c1eb19bb..b1ad7065020c83 100644 --- a/ports/openimageio/fix-config-cmake.patch +++ b/ports/openimageio/fix-config-cmake.patch @@ -1,8 +1,8 @@ diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in -index c578a1b..298362a 100644 +index b498ece..fb45388 100644 --- a/src/cmake/Config.cmake.in +++ b/src/cmake/Config.cmake.in -@@ -14,6 +14,6 @@ set (@PROJECT_NAME@_PLUGIN_SEARCH_PATH "@PLUGIN_SEARCH_PATH_NATIVE@") +@@ -30,7 +30,7 @@ endif () #...logic to determine installedPrefix from the own location... #set (@PROJECT_NAME@_CONFIG_DIR "${installedPrefix}/@CONFIG_INSTALL_DIR@") @@ -10,3 +10,4 @@ index c578a1b..298362a 100644 +include("${CMAKE_CURRENT_LIST_DIR}/OpenImageIOTargets.cmake") check_required_components ("@PROJECT_NAME@") + diff --git a/ports/openimageio/fix-dependencies.patch b/ports/openimageio/fix-dependencies.patch index 433d960e3ee300..fb630ad9a005ef 100644 --- a/ports/openimageio/fix-dependencies.patch +++ b/ports/openimageio/fix-dependencies.patch @@ -1,5 +1,5 @@ diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in -index 740da06..a34d4c9 100644 +index b690864..fb45388 100644 --- a/src/cmake/Config.cmake.in +++ b/src/cmake/Config.cmake.in @@ -11,6 +11,9 @@ elseif (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 2.4 AND @FOUND_OPENEXR_WITH_CONF @@ -13,7 +13,7 @@ index 740da06..a34d4c9 100644 find_dependency(Threads) # Because OpenEXR doesn't do it endif () diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 957abe3..2c093dd 100644 +index 631035a..9f4d096 100644 --- a/src/cmake/externalpackages.cmake +++ b/src/cmake/externalpackages.cmake @@ -148,7 +148,7 @@ find_python() @@ -25,26 +25,8 @@ index 957abe3..2c093dd 100644 checked_find_package (BZip2) # Used by ffmpeg and freetype if (NOT BZIP2_FOUND) -@@ -158,8 +158,6 @@ endif () - checked_find_package (Freetype - DEFINITIONS -DUSE_FREETYPE=1 ) - --checked_find_package (HDF5 -- ISDEPOF Field3D) - checked_find_package (OpenColorIO - DEFINITIONS -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1 - # PREFER_CONFIG -@@ -176,15 +174,15 @@ checked_find_package (TBB 2017 - checked_find_package (DCMTK VERSION_MIN 3.6.1) # For DICOM images - checked_find_package (FFmpeg VERSION_MIN 3.0) - checked_find_package (Field3D -- DEPS HDF5 -- DEFINITIONS -DUSE_FIELD3D=1) -+ DEFINITIONS -DUSE_FIELD3D=1) - checked_find_package (GIF - VERSION_MIN 4 - RECOMMEND_MIN 5.0 - RECOMMEND_MIN_REASON "for stability and thread safety") +@@ -200,7 +200,8 @@ if (ENABLE_FIELD3D) + endif () # For HEIF/HEIC/AVIF formats -checked_find_package (Libheif VERSION_MIN 1.3 @@ -53,65 +35,23 @@ index 957abe3..2c093dd 100644 RECOMMEND_MIN 1.7 RECOMMEND_MIN_REASON "for AVIF support") if (APPLE AND LIBHEIF_VERSION VERSION_GREATER_EQUAL 1.10 AND LIBHEIF_VERSION VERSION_LESS 1.11) -@@ -291,7 +289,8 @@ endmacro() +@@ -307,7 +308,8 @@ endmacro() option (USE_EMBEDDED_LIBSQUISH "Force use of embedded Libsquish, even if external is found" OFF) if (NOT USE_EMBEDDED_LIBSQUISH) - checked_find_package (Libsquish) + checked_find_package (unofficial-libsquish PREFER_CONFIG) -+ set(Libsquish_FOUND 1) ++ set(libsquish_FOUND 1) endif () -diff --git a/src/dds.imageio/CMakeLists.txt b/src/dds.imageio/CMakeLists.txt -index d693453..9bef055 100644 ---- a/src/dds.imageio/CMakeLists.txt -+++ b/src/dds.imageio/CMakeLists.txt -@@ -5,7 +5,7 @@ - if (Libsquish_FOUND) - # External libsquish was found -- use it - add_oiio_plugin (ddsinput.cpp -- LINK_LIBRARIES Libsquish::Libsquish -+ LINK_LIBRARIES unofficial::libsquish::squish - ) - else () - # No external libsquish was found -- use the embedded version. -diff --git a/src/field3d.imageio/CMakeLists.txt b/src/field3d.imageio/CMakeLists.txt -index a9e54e3..cc73ac4 100644 ---- a/src/field3d.imageio/CMakeLists.txt -+++ b/src/field3d.imageio/CMakeLists.txt -@@ -9,7 +9,7 @@ if (Field3D_FOUND) - endif () - add_oiio_plugin (field3dinput.cpp field3doutput.cpp - INCLUDE_DIRS ${FIELD3D_INCLUDES} -- LINK_LIBRARIES Field3D::Field3D -+ LINK_LIBRARIES ${FIELD3D_LIBRARIES} - # ${HDF5_LIBRARIES} - ${SZIP_LIBRARY}) - endif() -diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt -index fed8001..15e87ae 100644 ---- a/src/heif.imageio/CMakeLists.txt -+++ b/src/heif.imageio/CMakeLists.txt -@@ -2,9 +2,9 @@ - # SPDX-License-Identifier: BSD-3-Clause - # https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md - --if (Libheif_FOUND) -+if (libheif_FOUND) - add_oiio_plugin (heifinput.cpp heifoutput.cpp -- LINK_LIBRARIES Libheif::Libheif -+ LINK_LIBRARIES heif - DEFINITIONS "-DUSE_HEIF=1") - else () - message (WARNING "heif plugin will not be built") diff --git a/src/ico.imageio/CMakeLists.txt b/src/ico.imageio/CMakeLists.txt -index 9ba76ac..13db4ac 100644 +index d290625..cff954c 100644 --- a/src/ico.imageio/CMakeLists.txt +++ b/src/ico.imageio/CMakeLists.txt @@ -2,9 +2,15 @@ # SPDX-License-Identifier: BSD-3-Clause - # https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md + # https://github.com/OpenImageIO/oiio -if (TARGET PNG::PNG) +if (libpng_FOUND) @@ -127,30 +67,3 @@ index 9ba76ac..13db4ac 100644 else () message (WARNING "libpng not found, so ICO support will not work") set (format_plugin_definitions ${format_plugin_definitions} DISABLE_ICO=1 PARENT_SCOPE) -diff --git a/src/openvdb.imageio/CMakeLists.txt b/src/openvdb.imageio/CMakeLists.txt -index 57a0f62..3a07c31 100644 ---- a/src/openvdb.imageio/CMakeLists.txt -+++ b/src/openvdb.imageio/CMakeLists.txt -@@ -4,6 +4,6 @@ - - if (OpenVDB_FOUND) - add_oiio_plugin (openvdbinput.cpp -- INCLUDE_DIRS ${TBB_INCLUDE_DIRS} -- LINK_LIBRARIES OpenVDB::OpenVDB ${TBB_tbb_LIBRARY} ${BOOST_LIBRARIES}) -+ INCLUDE_DIRS ${OPENVDB_INCLUDES} ${TBB_INCLUDE_DIRS} -+ LINK_LIBRARIES ${OPENVDB_LIBRARIES} ${TBB_tbb_LIBRARY} ${BOOST_LIBRARIES}) - endif() -diff --git a/src/webp.imageio/CMakeLists.txt b/src/webp.imageio/CMakeLists.txt -index 44462c4..e1cb068 100644 ---- a/src/webp.imageio/CMakeLists.txt -+++ b/src/webp.imageio/CMakeLists.txt -@@ -4,7 +4,8 @@ - - if (WebP_FOUND) - add_oiio_plugin (webpinput.cpp webpoutput.cpp -- LINK_LIBRARIES WebP::WebP WebP::WebPDemux -+ INCLUDE_DIRS ${WEBP_INCLUDES} -+ LINK_LIBRARIES ${WEBP_LIBRARIES} - DEFINITIONS "-DUSE_WEBP=1") - else () - message (STATUS "WebP plugin will not be built") diff --git a/ports/openimageio/fix_static_build.patch b/ports/openimageio/fix_static_build.patch deleted file mode 100644 index a5ebb467a5d521..00000000000000 --- a/ports/openimageio/fix_static_build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cmake/compiler.cmake b/src/cmake/compiler.cmake -index 1468be3..ed4167a 100644 ---- a/src/cmake/compiler.cmake -+++ b/src/cmake/compiler.cmake -@@ -482,7 +482,7 @@ set (EXTRA_DSO_LINK_ARGS "" CACHE STRING "Extra command line definitions when bu - # - option (BUILD_SHARED_LIBS "Build shared libraries (set to OFF to build static libs)" ON) - if (NOT BUILD_SHARED_LIBS) -- add_definitions (-D${PROJ_NAME}_STATIC_DEFINE=1) -+ add_definitions (-DOIIO_STATIC_DEFINE=1) - endif () - - diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 9d49af03dc2e2d..a69fae17c95323 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -1,21 +1,12 @@ -if("field3d" IN_LIST FEATURES) - vcpkg_fail_port_install( - ON_TARGET WINDOWS UWP - MESSAGE "The field3d feature is not supported on Windows" - ) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF 9f74cf4d9813bfdcad5bca08b4ff75a25d056cb0 # 2.3.7.2 - SHA512 cebc388e842e983f010c5f3bf57bed3fe1ae9d2eac79019472f8431b194d6a8b156b27cc5688bd0998aa2d01959d47bcdc7e637417f755433ffe32c491cdc376 + REF ff71703961f7758409fb7e6e689258e2997f7c18 # 2.3.10.1 + SHA512 f56cb58329a496ca1fe3537fe87d469038ac0e74a555990a4510d2c019d2ad14b556240c0d5087a9a25ac01d9b371b5c77ce5a719e71a85fcd56e9cd099bc31e HEAD_REF master PATCHES - fix-config-cmake.patch - fix_static_build.patch - disable-test.patch fix-dependencies.patch + fix-config-cmake.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") @@ -33,7 +24,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libraw USE_LIBRAW opencolorio USE_OPENCOLORIO ffmpeg USE_FFMPEG - field3d USE_FIELD3D freetype USE_FREETYPE gif USE_GIF opencv USE_OPENCV @@ -48,7 +38,7 @@ get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DOIIO_BUILD_TESTS=OFF @@ -83,10 +73,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(COPY "${SOURCE_PATH}/src/cmake/modules/FindOpenImageIO.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_fixup_pkgconfig() -# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/ports/openimageio/vcpkg-cmake-wrapper.cmake b/ports/openimageio/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 5976305769ad2c..00000000000000 --- a/ports/openimageio/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(OPENIMAGEIO_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../OpenImageIO") - -_find_package(${ARGS}) - -set(CMAKE_MODULE_PATH ${OPENIMAGEIO_PREV_MODULE_PATH}) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index fd23968aa1d445..e5b6a47cd883a7 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", - "version": "2.3.7.2", - "port-version": 4, + "version": "2.3.10.1", + "port-version": 2, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ @@ -48,12 +48,6 @@ } ] }, - "field3d": { - "description": "Enable field3D support for openimageio", - "dependencies": [ - "field3d" - ] - }, "freetype": { "description": "Enable freetype support for openimageio", "dependencies": [ diff --git a/ports/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake index 09c74688362c97..82b139a2add940 100644 --- a/ports/openmpi/portfile.cmake +++ b/ports/openmpi/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows" "UWP") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) set(OpenMPI_FULL_VERSION "4.1.0") @@ -14,7 +12,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES + PATCHES keep_isystem.patch ) diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json index 1d371474b2d917..d880ce0f1c13a4 100644 --- a/ports/openmpi/vcpkg.json +++ b/ports/openmpi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmpi", "version": "4.1.0", - "port-version": 3, + "port-version": 4, "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", "homepage": "https://www.open-mpi.org/", "supports": "!(windows | uwp)" diff --git a/ports/openmvg/0001-eigen_3.4.0.patch b/ports/openmvg/0001-eigen_3.4.0.patch index be81355dd4e5c1..a4e759f52ebb36 100644 --- a/ports/openmvg/0001-eigen_3.4.0.patch +++ b/ports/openmvg/0001-eigen_3.4.0.patch @@ -1,25 +1,13 @@ -From 7be28dca0403660e721d66de954f27b92897163e Mon Sep 17 00:00:00 2001 -From: Alberto Luaces -Date: Wed, 8 Sep 2021 18:00:53 +0200 -Subject: [PATCH] eigen_3.4.0 - ---- - src/openMVG/multiview/solver_fundamental_kernel.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/src/openMVG/multiview/solver_fundamental_kernel.cpp b/src/openMVG/multiview/solver_fundamental_kernel.cpp -index 5e0c12eb..fa025198 100644 +index 2ffd45a..bbf74b4 100644 --- a/src/openMVG/multiview/solver_fundamental_kernel.cpp +++ b/src/openMVG/multiview/solver_fundamental_kernel.cpp -@@ -134,7 +134,7 @@ void EightPointSolver::Solve - MatX9 epipolar_constraint(x1.cols(), 9); - epipolar_constraint.fill(0.0); - EncodeEpipolarEquation(x1, x2, &epipolar_constraint); -- Eigen::SelfAdjointEigenSolver solver -+ Eigen::SelfAdjointEigenSolver> solver - (epipolar_constraint.transpose() * epipolar_constraint); - f = solver.eigenvectors().leftCols<1>(); - } --- -2.30.2 - +@@ -110,7 +110,7 @@ void EightPointSolver::Solve + x2.colwise().homogeneous(), + &epipolar_constraint); + // Find the F matrice in the nullspace of epipolar_constraint. +- Eigen::SelfAdjointEigenSolver solver ++ Eigen::SelfAdjointEigenSolver> solver + (epipolar_constraint.transpose() * epipolar_constraint); + f = solver.eigenvectors().leftCols<1>(); + diff --git a/ports/openmvg/0002-eigen-3.4.patch b/ports/openmvg/0002-eigen-3.4.patch new file mode 100644 index 00000000000000..19098d2ae246fc --- /dev/null +++ b/ports/openmvg/0002-eigen-3.4.patch @@ -0,0 +1,13 @@ +--- a/src/openMVG/multiview/CMakeLists.txt ++++ b/src/openMVG/multiview/CMakeLists.txt +@@ -38,6 +38,9 @@ target_include_directories(openMVG_multiview + $ + ) + set_target_properties(openMVG_multiview PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}") ++if (MSVC) ++ set_target_properties(openMVG_multiview PROPERTIES COMPILE_FLAGS "/bigobj") ++endif (MSVC) + + add_library(openMVG_multiview_test_data ${MULTIVIEWTESTDATA}) + target_link_libraries(openMVG_multiview_test_data PRIVATE openMVG_numeric openMVG_multiview) + \ No newline at end of file diff --git a/ports/openmvg/build_fixes.patch b/ports/openmvg/build_fixes.patch index 3b2b199b4b29ae..8f61668bec214d 100644 --- a/ports/openmvg/build_fixes.patch +++ b/ports/openmvg/build_fixes.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9cfd06c..8859469 100644 +index 5d909ec..ab7eb6f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -14,6 +14,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) +@@ -20,6 +20,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) message(FATAL_ERROR "In-source builds not allowed.") endif() @@ -10,16 +10,15 @@ index 9cfd06c..8859469 100644 # ============================================================================== # OpenMVG build options # ============================================================================== -@@ -31,7 +32,7 @@ option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON) +@@ -37,6 +38,7 @@ option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON) # and openMVG simultaneously # ============================================================================== option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF) -- +endif() + # ============================================================================== # Since OpenCV 3, SIFT is no longer in the default modules. See - # https://github.com/itseez/opencv_contrib for more informations. -@@ -85,6 +86,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +@@ -95,6 +97,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") register_definitions(-DOPENMVG_STD_UNORDERED_MAP) endif() @@ -27,7 +26,7 @@ index 9cfd06c..8859469 100644 # ============================================================================== # Check that submodule have been initialized and updated # ============================================================================== -@@ -93,6 +95,7 @@ if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include) +@@ -103,6 +106,7 @@ if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include) "\n submodule(s) are missing, please update your repository:\n" " > git submodule update -i\n") endif() @@ -35,7 +34,7 @@ index 9cfd06c..8859469 100644 # ============================================================================== # Additional cmake find modules -@@ -128,7 +131,6 @@ if (OpenMVG_USE_OPENMP) +@@ -138,7 +142,6 @@ if (OpenMVG_USE_OPENMP) find_package(OpenMP) if (OPENMP_FOUND) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") @@ -43,7 +42,7 @@ index 9cfd06c..8859469 100644 register_definitions(-DOPENMVG_USE_OPENMP) if (NOT MSVC) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -@@ -139,11 +141,6 @@ if (OpenMVG_USE_OPENMP) +@@ -149,11 +152,6 @@ if (OpenMVG_USE_OPENMP) endif() endif (NOT MSVC) endif (OPENMP_FOUND) @@ -55,22 +54,21 @@ index 9cfd06c..8859469 100644 endif (OpenMVG_USE_OPENMP) # ============================================================================== -@@ -160,10 +157,10 @@ endif() +@@ -170,9 +168,10 @@ endif() # ============================================================================== # IMAGE IO detection # ============================================================================== -find_package(JPEG QUIET) -find_package(PNG QUIET) -find_package(TIFF QUIET) -- +find_package(JPEG REQUIRED) +find_package(PNG REQUIRED) +find_package(TIFF REQUIRED) +find_package(vlfeat REQUIRED) + # Folders set_property(GLOBAL PROPERTY USE_FOLDERS ON) - -@@ -182,6 +179,7 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES) +@@ -192,6 +191,7 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES) set_property(TARGET glfw PROPERTY FOLDER OpenMVG/3rdParty/glfw) endif (OpenMVG_BUILD_OPENGL_EXAMPLES) @@ -78,16 +76,15 @@ index 9cfd06c..8859469 100644 # Dependencies install rules install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/ -@@ -189,7 +187,7 @@ install( +@@ -199,6 +199,7 @@ install( COMPONENT headers FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" ) -- +endif() + # ============================================================================== # --END-- SUBMODULE CONFIGURATION - # ============================================================================== -@@ -225,6 +223,7 @@ ENDMACRO(UNIT_TEST) +@@ -235,6 +236,7 @@ ENDMACRO(UNIT_TEST) # - external by default # - internal if cereal not found # ============================================================================== @@ -95,18 +92,19 @@ index 9cfd06c..8859469 100644 find_package(cereal QUIET CONFIG) if (NOT TARGET cereal) add_library(cereal INTERFACE) -@@ -237,6 +236,10 @@ if (NOT TARGET cereal) +@@ -247,7 +249,11 @@ if (NOT TARGET cereal) set(OpenMVG_USE_INTERNAL_CEREAL ON) endif() +endif() -+ -+find_package(cereal REQUIRED CONFIG) -+get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES) ++find_package(cereal REQUIRED CONFIG) ++get_target_property(CEREAL_INCLUDE_DIRS cereal::cereal INTERFACE_INCLUDE_DIRECTORIES) ++ # ============================================================================== # Eigen -@@ -245,6 +248,7 @@ endif() + # ============================================================================== +@@ -255,6 +261,7 @@ endif() # - external if EIGEN_INCLUDE_DIR_HINTS is defined # - internal if Eigen not found # ============================================================================== @@ -114,17 +112,18 @@ index 9cfd06c..8859469 100644 find_package(Eigen3 QUIET) if (NOT Eigen3_FOUND) set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen) -@@ -253,13 +257,17 @@ if (NOT Eigen3_FOUND) +@@ -263,6 +270,10 @@ if (NOT Eigen3_FOUND) else() set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) endif() +endif() - ++ +find_package(Eigen3 REQUIRED) +set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) + # ============================================================================== # Ceres - # ============================================================================== +@@ -270,6 +281,7 @@ endif() # - external by default if CERES_DIR_HINTS or find_package found a valid Ceres # - internal if ceres not found (ceres-solver+cxsparse+miniglog) # ============================================================================== @@ -132,16 +131,17 @@ index 9cfd06c..8859469 100644 find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS}) if (NOT Ceres_FOUND) set(OpenMVG_USE_INTERNAL_CERES ON) -@@ -271,13 +279,16 @@ if (NOT Ceres_FOUND) +@@ -281,6 +293,9 @@ if (NOT Ceres_FOUND) STRING(REGEX REPLACE "version ([0-9.]+).*" "\\1" CERES_VERSION ${CERES_CONFIG}) set(CERES_LIBRARIES openMVG_ceres) endif() +endif() - ++ +find_package(Ceres REQUIRED) + # ============================================================================== # Flann - # ============================================================================== +@@ -288,6 +303,7 @@ endif() # - internal by default (flann), # - external if FLANN_INCLUDE_DIR_HINTS and a valid Flann setup is found # ============================================================================== @@ -149,16 +149,17 @@ index 9cfd06c..8859469 100644 if (NOT DEFINED FLANN_INCLUDE_DIR_HINTS) set(FLANN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp) set(OpenMVG_USE_INTERNAL_FLANN ON) -@@ -286,13 +297,16 @@ find_package(Flann QUIET) +@@ -296,6 +312,9 @@ find_package(Flann QUIET) if (NOT FLANN_FOUND OR OpenMVG_USE_INTERNAL_FLANN) set(FLANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp) endif() +endif() - ++ +find_package(flann REQUIRED) + # ============================================================================== # CoinUtils - # ============================================================================== +@@ -303,6 +322,7 @@ endif() # - internal by default (CoinUtils), # - external if COINUTILS_INCLUDE_DIR_HINTS and a valid CoinUtils setup is found # ============================================================================== @@ -166,16 +167,17 @@ index 9cfd06c..8859469 100644 if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS) set(COINUTILS_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/) set(OpenMVG_USE_INTERNAL_COINUTILS ON) -@@ -302,13 +316,16 @@ if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS) +@@ -312,6 +332,9 @@ if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS) else() find_package(CoinUtils QUIET) endif() +endif() - ++ +find_package(CoinUtils REQUIRED) + ## ============================================================================== ## Clp - ## ============================================================================== +@@ -319,6 +342,7 @@ endif() ## - internal by default (Clp), ## - external if CLP_INCLUDE_DIR_HINTS and a valid Clp setup is found ## ============================================================================== @@ -183,17 +185,17 @@ index 9cfd06c..8859469 100644 if (NOT DEFINED CLP_INCLUDE_DIR_HINTS) set(CLP_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/) set(OpenMVG_USE_INTERNAL_CLP ON) -@@ -320,6 +337,9 @@ if (NOT DEFINED CLP_INCLUDE_DIR_HINTS) +@@ -330,13 +354,17 @@ if (NOT DEFINED CLP_INCLUDE_DIR_HINTS) else() find_package(Clp QUIET) endif() +endif() -+ -+find_package(Clp REQUIRED) ++find_package(Clp REQUIRED) ++ # ============================================================================== # Osi -@@ -327,6 +347,7 @@ endif() + # ============================================================================== # - internal by default (Osi), # - external if OSI_INCLUDE_DIR_HINTS and a valid Osi setup is found # ============================================================================== @@ -201,7 +203,7 @@ index 9cfd06c..8859469 100644 if (NOT DEFINED OSI_INCLUDE_DIR_HINTS) set(OSI_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/) set(OpenMVG_USE_INTERNAL_OSI ON) -@@ -336,6 +357,9 @@ if (NOT DEFINED OSI_INCLUDE_DIR_HINTS) +@@ -346,6 +374,9 @@ if (NOT DEFINED OSI_INCLUDE_DIR_HINTS) else() find_package(Osi QUIET) endif() @@ -211,7 +213,7 @@ index 9cfd06c..8859469 100644 # ============================================================================== # Internal CLP/OSI/COINUTILS libraries: -@@ -354,6 +378,7 @@ endif() +@@ -364,6 +395,7 @@ endif() # - internal by default (Lemon), # - external if LEMON_INCLUDE_DIR_HINTS and a valid Lemon setup is found # ============================================================================== @@ -219,9 +221,9 @@ index 9cfd06c..8859469 100644 if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS) set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon) set(OpenMVG_USE_INTERNAL_LEMON ON) -@@ -365,6 +390,9 @@ if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON) +@@ -374,6 +406,9 @@ if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON) + ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon ${PROJECT_BINARY_DIR}/third_party/lemon) - set(LEMON_LIBRARY openMVG_lemon) endif() +endif() + @@ -229,7 +231,7 @@ index 9cfd06c..8859469 100644 # ============================================================================== # OpenCV -@@ -372,20 +400,13 @@ endif() +@@ -381,12 +416,7 @@ endif() # - only external and enabled only if OpenMVG_USE_OPENCV is set to ON # ============================================================================== if (OpenMVG_USE_OPENCV) @@ -239,11 +241,11 @@ index 9cfd06c..8859469 100644 - UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENCV OFF) - UPDATE_CACHE_VARIABLE(OpenMVG_USE_OCVSIFT OFF) - endif() -+ find_package( OpenCV REQUIRED ) ++ find_package( OpenCV REQUIRED ) endif() -- - # ============================================================================== + +@@ -394,7 +424,6 @@ endif() # Third-party libraries: # ============================================================================== add_subdirectory(third_party) @@ -251,7 +253,7 @@ index 9cfd06c..8859469 100644 # ============================================================================== # openMVG modules -@@ -472,67 +493,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT}) +@@ -481,67 +510,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT}) message("\n") @@ -331,23 +333,22 @@ index 9cfd06c..8859469 100644 else() message(STATUS "LEMON: " ${LEMON_VERSION} " (external)") diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake -index 8a69c23..6a81580 100644 +index 8a69c23..6ebc661 100644 --- a/src/cmakeFindModules/FindClp.cmake +++ b/src/cmakeFindModules/FindClp.cmake -@@ -51,9 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "") +@@ -50,8 +50,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "") + ENDIF (NOT EXISTS ${CLP_VERSION_FILE}) SET(CLP_INCLUDE_DIR ${CLP_DIR}) - FIND_LIBRARY(CLP_LIBRARY NAMES Clp) +- FIND_LIBRARY(CLP_LIBRARY NAMES Clp) - FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver) -- FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp) -- + FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp) + FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp) + FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp) + # locate Clp libraries - IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY) - SET(CLP_LIBRARIES ${CLP_LIBRARY} ${CLPSOLVER_LIBRARY} ${OSICLP_LIBRARY}) diff --git a/src/cmakeFindModules/OpenMVGConfig.cmake.in b/src/cmakeFindModules/OpenMVGConfig.cmake.in -index e7dfbfd..c01910d 100644 +index e7dfbfd..65224c4 100644 --- a/src/cmakeFindModules/OpenMVGConfig.cmake.in +++ b/src/cmakeFindModules/OpenMVGConfig.cmake.in @@ -19,7 +19,7 @@ @@ -359,11 +360,12 @@ index e7dfbfd..c01910d 100644 # unsets all public (designed to be used externally) variables and reports # error message at priority depending upon [REQUIRED/QUIET/] argument. macro(OPENMVG_REPORT_NOT_FOUND REASON_MSG) -@@ -59,9 +59,19 @@ set(CALLERS_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) +@@ -58,10 +58,20 @@ set(CALLERS_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) + # Reset CMake module path to the installation directory of this # script. set(CMAKE_MODULE_PATH ${CURRENT_CONFIG_INSTALL_DIR}) - +include(CMakeFindDependencyMacro) ++ +find_dependency(CoinUtils) +find_dependency(Clp) +find_dependency(Osi) @@ -372,7 +374,7 @@ index e7dfbfd..c01910d 100644 +find_dependency(cereal) +find_dependency(Ceres) +find_dependency(vlfeat) -+ + # Build the absolute root install directory as a relative path get_filename_component(CURRENT_ROOT_INSTALL_DIR - ${CMAKE_MODULE_PATH}/../../../ ABSOLUTE) @@ -500,10 +502,10 @@ index cc5212f..acc57dd 100644 $ ) diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt -index 5fcd972..b21ea7b 100644 +index 2e0eafd7..d54d1e88 100644 --- a/src/openMVG/matching/CMakeLists.txt +++ b/src/openMVG/matching/CMakeLists.txt -@@ -18,6 +18,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST}) +@@ -16,6 +16,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST}) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) @@ -511,9 +513,12 @@ index 5fcd972..b21ea7b 100644 set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX) add_library(openMVG_matching -@@ -39,10 +40,10 @@ target_link_libraries(openMVG_matching +@@ -35,12 +36,12 @@ target_link_libraries(openMVG_matching + PUBLIC + openMVG_features Threads::Threads - cereal +- cereal ++ cereal::cereal ) -if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN) +if (NOT OpenMVG_USE_INTERNAL_FLANN) @@ -538,18 +543,19 @@ index 1f3fc30..4097320 100644 $) else() diff --git a/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt b/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt -index 862ffc7..326fc9a 100644 +index 862ffc7..62508af 100644 --- a/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt +++ b/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt -@@ -18,7 +18,7 @@ if (OpenMVG_BUILD_GUI_SOFTWARES) +@@ -18,8 +18,7 @@ if (OpenMVG_BUILD_GUI_SOFTWARES) add_executable( openMVG_sample_describe_and_match_GUI WIN32 ${FEATURES_PAIR_DEMO_SRCS} ${FEATURES_PAIR_DEMO_HDRS} ) endif( APPLE ) - target_link_libraries( openMVG_sample_describe_and_match_GUI Qt5::Widgets openMVG_features openMVG_image openMVG_matching vlsift ) +- + target_link_libraries( openMVG_sample_describe_and_match_GUI Qt5::Widgets openMVG_features openMVG_image openMVG_matching unofficial::vlfeat::vl ) - set_target_properties( openMVG_sample_describe_and_match_GUI PROPERTIES CXX_STANDARD 11) + set_property(TARGET openMVG_sample_describe_and_match_GUI PROPERTY FOLDER OpenMVG/Samples) diff --git a/src/openMVG_Samples/features_image_matching/CMakeLists.txt b/src/openMVG_Samples/features_image_matching/CMakeLists.txt index 18fb385..d44ffce 100644 --- a/src/openMVG_Samples/features_image_matching/CMakeLists.txt @@ -590,7 +596,7 @@ index 2f60393..0d57d0a 100644 # Installation rules diff --git a/src/software/SfM/CMakeLists.txt b/src/software/SfM/CMakeLists.txt -index 013a6c8..f38daa9 100644 +index 6db7e83..51e06f5 100644 --- a/src/software/SfM/CMakeLists.txt +++ b/src/software/SfM/CMakeLists.txt @@ -44,7 +44,7 @@ target_link_libraries(openMVG_main_ComputeFeatures @@ -602,7 +608,7 @@ index 013a6c8..f38daa9 100644 ) if (MSVC) set_target_properties(openMVG_main_ComputeFeatures PROPERTIES COMPILE_FLAGS "/bigobj") -@@ -235,7 +235,7 @@ if(OpenMVG_USE_OPENCV) +@@ -275,7 +275,7 @@ if(OpenMVG_USE_OPENCV) openMVG_multiview openMVG_sfm ${STLPLUS_LIBRARY} @@ -612,7 +618,7 @@ index 013a6c8..f38daa9 100644 target_include_directories(openMVG_main_ComputeFeatures_OpenCV PRIVATE ${OpenCV_INCLUDE_DIRS}) diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in -index 42405a4..28b0246 100644 +index 42b41cc..7fda0cd 100644 --- a/src/software/SfM/SfM_GlobalPipeline.py.in +++ b/src/software/SfM/SfM_GlobalPipeline.py.in @@ -21,7 +21,7 @@ @@ -624,14 +630,8 @@ index 42405a4..28b0246 100644 import os import subprocess -@@ -77,5 +77,3 @@ pRecons.wait() - - pRecons = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeSfM_DataColor"), "-i", reconstruction_dir+"/robust.bin", "-o", os.path.join(reconstruction_dir,"robust_colorized.ply")] ) - pRecons.wait() -- -- diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in -index 9a5a482..e804a19 100644 +index 423c85c..0ff2e77 100644 --- a/src/software/SfM/SfM_SequentialPipeline.py.in +++ b/src/software/SfM/SfM_SequentialPipeline.py.in @@ -21,7 +21,7 @@ @@ -643,27 +643,8 @@ index 9a5a482..e804a19 100644 import os import subprocess -@@ -77,5 +77,3 @@ pRecons.wait() - - pRecons = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeSfM_DataColor"), "-i", reconstruction_dir+"/robust.bin", "-o", os.path.join(reconstruction_dir,"robust_colorized.ply")] ) - pRecons.wait() -- -- -diff --git a/src/software/SfM/main_ComputeFeatures_OpenCV.cpp b/src/software/SfM/main_ComputeFeatures_OpenCV.cpp -index 9cc46af..f8bd892 100644 ---- a/src/software/SfM/main_ComputeFeatures_OpenCV.cpp -+++ b/src/software/SfM/main_ComputeFeatures_OpenCV.cpp -@@ -208,7 +208,7 @@ public: - // Create a SIFT detector - std::vector< cv::KeyPoint > v_keypoints; - cv::Mat m_desc; -- cv::Ptr siftdetector = cv::xfeatures2d::SIFT::create(); -+ cv::Ptr siftdetector = cv::SIFT::create(); - - // Process SIFT computation - siftdetector->detectAndCompute(img, m_mask, v_keypoints, m_desc); diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in -index 259e24e..1097062 100644 +index c7361f3..1c56aab 100644 --- a/src/software/SfM/tutorial_demo.py.in +++ b/src/software/SfM/tutorial_demo.py.in @@ -12,7 +12,7 @@ @@ -675,12 +656,6 @@ index 259e24e..1097062 100644 import os import subprocess -@@ -89,5 +89,3 @@ pRecons.wait() - print ("4. Structure from Known Poses (robust triangulation)") - pRecons = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeStructureFromKnownPoses"), "-i", reconstruction_dir+"/sfm_data.bin", "-m", matches_dir, "-o", os.path.join(reconstruction_dir,"robust.ply")] ) - pRecons.wait() -- -- diff --git a/src/software/VO/Tracker_opencv_klt.hpp b/src/software/VO/Tracker_opencv_klt.hpp index aa7dffe..2c4d237 100644 --- a/src/software/VO/Tracker_opencv_klt.hpp @@ -695,7 +670,7 @@ index aa7dffe..2c4d237 100644 m_detector->detect(current_img, m_nextKeypoints); diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt -index b71dfab..ad98e51 100644 +index 0d61c9f..05c8b29 100644 --- a/src/third_party/CMakeLists.txt +++ b/src/third_party/CMakeLists.txt @@ -18,7 +18,7 @@ add_subdirectory(stlplus3) @@ -705,9 +680,9 @@ index b71dfab..ad98e51 100644 -if(DEFINED OpenMVG_USE_INTERNAL_LEMON) +if(OpenMVG_USE_INTERNAL_LEMON) add_subdirectory(lemon) - set_property(TARGET openMVG_lemon PROPERTY FOLDER OpenMVG/3rdParty/lemon) - set_property(TARGET check PROPERTY FOLDER OpenMVG/3rdParty/lemon) -@@ -68,7 +68,7 @@ endif (NOT TIFF_FOUND) + set(LEMON_LIBRARY openMVG_lemon PARENT_SCOPE) + endif() +@@ -67,7 +67,7 @@ endif (NOT TIFF_FOUND) add_subdirectory(vectorGraphics) # Add ceres-solver (A Nonlinear Least Squares Minimizer) @@ -716,7 +691,7 @@ index b71dfab..ad98e51 100644 add_subdirectory(cxsparse) add_subdirectory(ceres-solver) set_property(TARGET openMVG_cxsparse PROPERTY FOLDER OpenMVG/3rdParty/ceres) -@@ -76,7 +76,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES) +@@ -75,7 +75,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES) endif() # Add an Approximate Nearest Neighbor library @@ -725,12 +700,64 @@ index b71dfab..ad98e51 100644 set(FLANN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/flann/src/cpp) add_subdirectory(flann) endif() -@@ -90,7 +90,7 @@ add_subdirectory(fast) +@@ -89,7 +89,7 @@ add_subdirectory(fast) ## # Install Header only libraries if necessary ## -if (DEFINED OpenMVG_USE_INTERNAL_EIGEN) +if (OpenMVG_USE_INTERNAL_EIGEN) #Configure Eigen install - set(EIGEN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen) + set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen) add_subdirectory(eigen) +diff --git a/src/openMVG/cameras/CMakeLists.txt b/src/openMVG/cameras/CMakeLists.txt +index 333ab729..50c8f572 100644 +--- a/src/openMVG/cameras/CMakeLists.txt ++++ b/src/openMVG/cameras/CMakeLists.txt +@@ -4,7 +4,7 @@ set_property(TARGET openMVG_camera APPEND PROPERTY + INTERFACE_INCLUDE_DIRECTORIES "$") + + target_compile_features(openMVG_camera INTERFACE ${CXX11_FEATURES}) +-target_link_libraries(openMVG_camera INTERFACE openMVG_numeric cereal ${OPENMVG_LIBRARY_DEPENDENCIES}) ++target_link_libraries(openMVG_camera INTERFACE openMVG_numeric cereal::cereal ${OPENMVG_LIBRARY_DEPENDENCIES}) + install(TARGETS openMVG_camera DESTINATION lib EXPORT openMVG-targets) + + UNIT_TEST(openMVG Camera_Pinhole openMVG_camera) +diff --git a/src/openMVG/features/CMakeLists.txt b/src/openMVG/features/CMakeLists.txt +index 2e49701d..0b5e1c3d 100644 +--- a/src/openMVG/features/CMakeLists.txt ++++ b/src/openMVG/features/CMakeLists.txt +@@ -31,7 +31,7 @@ target_include_directories(openMVG_features + ) + target_link_libraries(openMVG_features + PRIVATE openMVG_fast ${STLPLUS_LIBRARY} +- PUBLIC ${OPENMVG_LIBRARY_DEPENDENCIES} cereal) ++ PUBLIC ${OPENMVG_LIBRARY_DEPENDENCIES} cereal::cereal) + if (MSVC) + set_target_properties(openMVG_features PROPERTIES COMPILE_FLAGS "/bigobj") + target_compile_options(openMVG_features PUBLIC "-D_USE_MATH_DEFINES") +diff --git a/src/openMVG/geometry/CMakeLists.txt b/src/openMVG/geometry/CMakeLists.txt +index 0a6a016a..e509a4d5 100644 +--- a/src/openMVG/geometry/CMakeLists.txt ++++ b/src/openMVG/geometry/CMakeLists.txt +@@ -21,7 +21,7 @@ set_property(TARGET openMVG_geometry PROPERTY FOLDER OpenMVG/OpenMVG) + target_link_libraries(openMVG_geometry + PUBLIC + openMVG_numeric +- cereal ++ cereal::cereal + PRIVATE + openMVG_linearProgramming + ) +diff --git a/src/openMVG/sfm/CMakeLists.txt b/src/openMVG/sfm/CMakeLists.txt +index b8928083..1d10f939 100644 +--- a/src/openMVG/sfm/CMakeLists.txt ++++ b/src/openMVG/sfm/CMakeLists.txt +@@ -25,7 +25,7 @@ target_link_libraries(openMVG_sfm + openMVG_graph + openMVG_matching + openMVG_multiview +- cereal ++ cereal::cereal + ${OPENMVG_LIBRARY_DEPENDENCIES} + ) + diff --git a/ports/openmvg/portfile.cmake b/ports/openmvg/portfile.cmake index bb8d115ee8f553..a5de94bff5921e 100644 --- a/ports/openmvg/portfile.cmake +++ b/ports/openmvg/portfile.cmake @@ -10,20 +10,17 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openMVG/openMVG - REF 74deb33d12bf275a3b3a9afc833f4760be90f031 # v1.6 - SHA512 6e74effbc66f5d5e7c2d5edd7dacf3c0fa7eec1cb666244db8e4147c08d2e6faca98c1164ca1305a5013d247d479184742e5156232d4d8430615af31811e216e + REF d0fe73dd426ae4001631a51272cff71047522df9 # v2.0 + SHA512 1d5c68971ad63ced46d8b9070bdacc1065b4ba950fe919e11f952a004def87d4d83a474d48aee714c21b12106d7d81187d3670d8a2e6daf2d3c5fceb008a5de3 PATCHES build_fixes.patch 0001-eigen_3.4.0.patch + 0002-eigen-3.4.patch ) set(OpenMVG_USE_OPENMP OFF) if("openmp" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) - message(WARNING "OpenMP feature is broken on Windows, disabled until fixed https://github.com/openMVG/openMVG/issues/1765") - else() set(OpenMVG_USE_OPENMP ON) - endif() endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -53,9 +50,8 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindEigen.cmake ${SOURCE_PATH}/src/cmakeFindModules/FindClp.cmake ${SOURCE_PATH}/src/cmakeFindModules/FindOsi.cmake) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" OPTIONS ${FEATURE_OPTIONS} -DOpenMVG_USE_OPENMP=${OpenMVG_USE_OPENMP} -DOpenMVG_BUILD_SHARED=OFF @@ -74,29 +70,31 @@ vcpkg_configure_cmake( -DOpenMVG_USE_INTERNAL_LEMON=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/openMVG/cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/openMVG/cmake) if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG-targets.cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG-targets-debug.cmake") endif() +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/openMVG-targets.cmake" "${CURRENT_PACKAGES_DIR}/lib/openMVG-targets-release.cmake") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test - ${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data - ${CURRENT_PACKAGES_DIR}/include/openMVG_dependencies/nonFree/sift/vl) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test" + "${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data" + "${CURRENT_PACKAGES_DIR}/include/openMVG_dependencies/nonFree/sift/vl") if(OpenMVG_BUILD_SHARED) if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") # release - file(GLOB DLL_FILES ${CURRENT_PACKAGES_DIR}/lib/*.dll) - file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${DLL_FILES}) + file(GLOB DLL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.dll") + file(COPY "${DLL_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${DLL_FILES}") endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") # debug - file(GLOB DLL_FILES ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) - file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${DLL_FILES}) + file(GLOB DLL_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") + file(COPY "${DLL_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${DLL_FILES}") endif() endif() vcpkg_copy_pdbs() @@ -107,10 +105,10 @@ if("software" IN_LIST FEATURES) openMVG_main_AlternativeVO.app ui_openMVG_MatchesViewer.app ) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/openMVG_main_AlternativeVO.app) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ui_openMVG_MatchesViewer.app) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/openMVG_main_AlternativeVO.app) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ui_openMVG_MatchesViewer.app) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/openMVG_main_AlternativeVO.app") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ui_openMVG_MatchesViewer.app") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/openMVG_main_AlternativeVO.app") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ui_openMVG_MatchesViewer.app") else() vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES openMVG_main_AlternativeVO @@ -135,9 +133,6 @@ if("software" IN_LIST FEATURES) openMVG_main_ExportUndistortedImages openMVG_main_FrustumFiltering openMVG_main_geodesy_registration_to_gps_position - openMVG_main_GlobalSfM - openMVG_main_IncrementalSfM - openMVG_main_IncrementalSfM2 openMVG_main_ListMatchingPairs openMVG_main_MatchesToTracks openMVG_main_openMVG2Agisoft @@ -157,21 +152,22 @@ if("software" IN_LIST FEATURES) openMVG_main_SfM_Localization openMVG_main_SplitMatchFileIntoMatchFiles ui_openMVG_control_points_registration + openMVG_main_GeometricFilter + openMVG_main_PairGenerator + openMVG_main_SfM ) if("opencv" IN_LIST FEATURES) vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES - openMVG_main_ComputeFeatures_OpenCV - ) + openMVG_main_ComputeFeatures_OpenCV) endif() - file(COPY ${SOURCE_PATH}/src/openMVG/exif/sensor_width_database/sensor_width_camera_database.txt DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - set(OPENMVG_SOFTWARE_SFM_BUILD_DIR ${CURRENT_INSTALLED_DIR}/tools/${PORT}) - set(OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY ${CURRENT_INSTALLED_DIR}/tools/${PORT}) + file(COPY "${SOURCE_PATH}/src/openMVG/exif/sensor_width_database/sensor_width_camera_database.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + set(OPENMVG_SOFTWARE_SFM_BUILD_DIR "${CURRENT_INSTALLED_DIR}/tools/${PORT}") + set(OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY "${CURRENT_INSTALLED_DIR}/tools/${PORT}") configure_file("${SOURCE_PATH}/src/software/SfM/tutorial_demo.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/tutorial_demo.py" @ONLY) configure_file("${SOURCE_PATH}/src/software/SfM/SfM_GlobalPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/SfM_GlobalPipeline.py" @ONLY) configure_file("${SOURCE_PATH}/src/software/SfM/SfM_SequentialPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/SfM_SequentialPipeline.py" @ONLY) - message(STATUS "To use tools, you need graphviz installed and manually added to path (to have neato executable)") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json index 42686e60a0b712..80a83a7d3c7ace 100644 --- a/ports/openmvg/vcpkg.json +++ b/ports/openmvg/vcpkg.json @@ -1,8 +1,9 @@ { "name": "openmvg", - "version": "1.6", + "version": "2.0", "port-version": 3, "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", + "license": "MPL-2.0-no-copyleft-exception", "dependencies": [ "cereal", { @@ -21,6 +22,14 @@ "libpng", "osi", "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "vlfeat", "zlib" ], diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 85e5a544b3b008..e94e7a83f02d38 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -1,12 +1,13 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") - message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") + message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") endif() -set(OPENSSL_VERSION 1.1.1l) -vcpkg_download_distfile(ARCHIVE +set(OPENSSL_VERSION 1.1.1n) +vcpkg_download_distfile( + ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.1.1/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0 + SHA512 1937796736613dcf4105a54e42ecb61f95a1cea74677156f9459aea0f2c95159359e766089632bf364ee6b0d28d661eb9957bce8fecc9d2436378d8d79e8d0a4 ) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake index 14a7e6b4a5b8bb..7a04ae7c9dc3d1 100644 --- a/ports/openssl/unix/portfile.cmake +++ b/ports/openssl/unix/portfile.cmake @@ -1,7 +1,3 @@ -if (NOT VCPKG_TARGET_IS_MINGW) - vcpkg_fail_port_install(MESSAGE "${PORT} is only for openssl on Unix-like systems" ON_TARGET "UWP" "Windows") -endif() - vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH MASTER_COPY_SOURCE_PATH ARCHIVE "${ARCHIVE}" diff --git a/ports/openssl/uwp/portfile.cmake b/ports/openssl/uwp/portfile.cmake index d474abe0373813..9414634fe2057d 100644 --- a/ports/openssl/uwp/portfile.cmake +++ b/ports/openssl/uwp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} is only for Windows Universal Platform" ON_TARGET "Linux" "OSX") - vcpkg_find_acquire_program(JOM) get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY) vcpkg_add_to_path("${PERL_EXE_PATH}") diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake.in b/ports/openssl/vcpkg-cmake-wrapper.cmake.in index 4d9957c861c1b7..4a5ee893a2fe28 100644 --- a/ports/openssl/vcpkg-cmake-wrapper.cmake.in +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake.in @@ -1,40 +1,47 @@ -set(OPENSSL_ROOT_DIR_BAK ${OPENSSL_ROOT_DIR}) -get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) -get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) +cmake_policy(SET CMP0057 NEW) -if(CMAKE_HOST_WIN32) - file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" Z_VCPKG_PROGRAMFILES) - set(Z_VCPKG_PROGRAMFILESX86_NAME "PROGRAMFILES(x86)") - file(TO_CMAKE_PATH "$ENV{${Z_VCPKG_PROGRAMFILESX86_NAME}}" Z_VCPKG_PROGRAMFILESX86) - set(CMAKE_SYSTEM_IGNORE_PATH - "${Z_VCPKG_PROGRAMFILES}/OpenSSL" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC/static" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC/static" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC/static" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC/static" - "C:/OpenSSL/" - "C:/OpenSSL-Win32/" - "C:/OpenSSL-Win64/" - "C:/OpenSSL-Win32/lib/VC" - "C:/OpenSSL-Win64/lib/VC" - "C:/OpenSSL-Win32/lib/VC/static" - "C:/OpenSSL-Win64/lib/VC/static" - ) +if(OPENSSL_USE_STATIC_LIBS) + if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic") + message(WARNING "OPENSSL_USE_STATIC_LIBS is set, but vcpkg port openssl was built with dynamic linkage") + endif() + set(OPENSSL_USE_STATIC_LIBS_BAK "${OPENSSL_USE_STATIC_LIBS}") + set(OPENSSL_USE_STATIC_LIBS FALSE) +endif() + +if(DEFINED OPENSSL_ROOT_DIR) + set(OPENSSL_ROOT_DIR_BAK "${OPENSSL_ROOT_DIR}") +endif() +get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" DIRECTORY) +find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATH "${OPENSSL_ROOT_DIR}/include" NO_DEFAULT_PATH) +if(MSVC) + find_library(LIB_EAY_DEBUG NAMES libcrypto PATHS "${OPENSSL_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(LIB_EAY_RELEASE NAMES libcrypto PATHS "${OPENSSL_ROOT_DIR}/lib" NO_DEFAULT_PATH) + find_library(SSL_EAY_DEBUG NAMES libssl PATHS "${OPENSSL_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(SSL_EAY_RELEASE NAMES libssl PATHS "${OPENSSL_ROOT_DIR}/lib" NO_DEFAULT_PATH) +elseif(WIN32) + find_library(LIB_EAY NAMES libcrypto crypto NAMES_PER_DIR) + find_library(SSL_EAY NAMES libssl ssl NAMES_PER_DIR) +else() + find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto) + find_library(OPENSSL_SSL_LIBRARY NAMES ssl) endif() _find_package(${ARGS}) -set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK}) +unset(OPENSSL_ROOT_DIR) +if(DEFINED OPENSSL_ROOT_DIR_BAK) + set(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR_BAK}") + unset(OPENSSL_ROOT_DIR_BAK) +endif() + +if(DEFINED OPENSSL_USE_STATIC_LIBS_BAK) + set(OPENSSL_USE_STATIC_LIBS "${OPENSSL_USE_STATIC_LIBS_BAK}") + unset(OPENSSL_USE_STATIC_LIBS_BAK) +endif() if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(WIN32) @@ -46,8 +53,6 @@ if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "crypt32;ws2_32") endif() else() - cmake_policy(PUSH) - cmake_policy(SET CMP0057 NEW) find_library(OPENSSL_DL_LIBRARY NAMES dl) if(OPENSSL_DL_LIBRARY) list(APPEND OPENSSL_LIBRARIES "dl") @@ -68,6 +73,6 @@ if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(TARGET OpenSSL::SSL) set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads") endif() - cmake_policy(POP) endif() endif() +cmake_policy(POP) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 2d890c51a30c98..22c64c1d9cff38 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,9 +1,9 @@ { "name": "openssl", - "version-string": "1.1.1l", - "port-version": 4, + "version-string": "1.1.1n", "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": "OpenSSL", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index 4987e810760761..e4469ef3269984 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} is only for Windows Desktop" ON_TARGET "UWP" "Linux" "OSX") - vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} @@ -16,7 +14,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(OPENSSL_SHARED shared) endif() -set(CONFIGURE_OPTIONS +set(CONFIGURE_OPTIONS enable-static-engine enable-capieng no-ssl2 diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake index faa42c30907a1a..cb218ab17389d8 100644 --- a/ports/opensubdiv/portfile.cmake +++ b/ports/opensubdiv/portfile.cmake @@ -2,8 +2,6 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_IOS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PixarAnimationStudios/OpenSubdiv @@ -122,7 +120,7 @@ endif() # The header files are read only and can't remove when remove this port file(GLOB_RECURSE OSD_HDRS "${CURRENT_PACKAGES_DIR}/include/*.h") -file(CHMOD_RECURSE ${OSD_HDRS} +file(CHMOD_RECURSE ${OSD_HDRS} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json index f535d51b79b789..a94a9ea3465dcd 100644 --- a/ports/opensubdiv/vcpkg.json +++ b/ports/opensubdiv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opensubdiv", "version-semver": "3.4.3", - "port-version": 3, + "port-version": 4, "description": "An Open-Source subdivision surface library.", "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", "supports": "!arm & !uwp", diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index ff17db6aec0f48..aead2761e630e2 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp - REF v1.0.1 - SHA512 ddaf5f52f5c100f385e09a6eb69f08fced2e890145939d35f969b05743733409e43f4747713259b68641511401c2c1e01a498b9b7a20fab0f52ee6f4b5d3c77c + REF v1.2.0 + SHA512 5491fc21074f86d3b4ad5e8f7b16168b736491952942b7821984c4564fcb26f73630d83fe74ee7878848240a1b511f893e079154f42013bfe3bf1fd03c114c6d HEAD_REF main ) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index bbf828464d9b5d..1eb422a229ac46 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,13 +1,13 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.0.1", - "port-version": 1, + "version-semver": "1.2.0", "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." ], "homepage": "https://github.com/open-telemetry/opentelemetry-cpp", + "license": "Apache-2.0", "supports": "!(windows & !static)", "dependencies": [ "curl", diff --git a/ports/opentracing/portfile.cmake b/ports/opentracing/portfile.cmake index 61c1516cb3f201..9a6312e8f61621 100644 --- a/ports/opentracing/portfile.cmake +++ b/ports/opentracing/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET uwp) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(LOCAL_OPTIONS -DBUILD_STATIC_LIBS=OFF diff --git a/ports/opentracing/vcpkg.json b/ports/opentracing/vcpkg.json index d61870038912f7..8061bc3d9c2749 100644 --- a/ports/opentracing/vcpkg.json +++ b/ports/opentracing/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opentracing", - "version-string": "1.6.0", - "port-version": 1, + "version": "1.6.0", + "port-version": 2, "description": "C++ implementation of the OpenTracing API", "homepage": "https://opentracing.io", "supports": "!uwp" diff --git a/ports/openvdb/0003-fix-cmake.patch b/ports/openvdb/0003-fix-cmake.patch index 5db8cdde9ede53..4bd86e5cfd4ead 100644 --- a/ports/openvdb/0003-fix-cmake.patch +++ b/ports/openvdb/0003-fix-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3456346..f7e5796 100644 +index 2a879f2..e0d9ab5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -354,13 +354,9 @@ endif() +@@ -356,13 +356,9 @@ endif() if(OPENVDB_INSTALL_CMAKE_MODULES) set(OPENVDB_CMAKE_MODULES @@ -17,10 +17,10 @@ index 3456346..f7e5796 100644 cmake/OpenVDBHoudiniSetup.cmake cmake/OpenVDBMayaSetup.cmake diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake -index 1dc5bc0..d84d8f1 100644 +index 86eaf84..15fe31a 100644 --- a/cmake/FindOpenVDB.cmake +++ b/cmake/FindOpenVDB.cmake -@@ -457,7 +457,7 @@ endif() +@@ -462,7 +462,7 @@ endif() # Add standard dependencies @@ -29,7 +29,7 @@ index 1dc5bc0..d84d8f1 100644 if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS) # @note Both of these must be set for Boost 1.70 (VFX2020) to link against -@@ -607,7 +607,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS) +@@ -612,7 +612,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS) endif() if(OpenVDB_USES_BLOSC) @@ -38,16 +38,16 @@ index 1dc5bc0..d84d8f1 100644 endif() if(OpenVDB_USES_ZLIB) -@@ -619,7 +619,7 @@ if(OpenVDB_USES_LOG4CPLUS) - endif() - +@@ -626,7 +626,7 @@ endif() if(OpenVDB_USES_IMATH_HALF) -- find_package(IlmBase REQUIRED COMPONENTS Half) -+ find_package(IlmBase CONFIG REQUIRED) + find_package(Imath CONFIG) + if (NOT TARGET Imath::Imath) +- find_package(IlmBase REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + endif() + if(WIN32) - # @note OPENVDB_OPENEXR_STATICLIB is old functionality and should be removed - if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY)) -@@ -664,7 +664,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) +@@ -675,7 +675,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) if(NOT OPENVDB_USE_STATIC_LIBS) if(OpenVDB_USES_BLOSC) @@ -57,28 +57,31 @@ index 1dc5bc0..d84d8f1 100644 if(OpenVDB_USES_ZLIB) list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt -index 88543df..92efaee 100644 +index 9b6ba83..08b6bb3 100644 --- a/openvdb/openvdb/CMakeLists.txt +++ b/openvdb/openvdb/CMakeLists.txt -@@ -120,7 +120,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION) +@@ -127,9 +127,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION) endif() endif() -find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb) +find_package(TBB CONFIG REQUIRED) if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) - if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) +- if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) ++ if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} " -@@ -129,7 +129,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) - endif() - + "is deprecated and will be removed.") + endif() +@@ -138,7 +138,7 @@ endif() if(USE_IMATH_HALF) -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) -+ find_package(IlmBase CONFIG REQUIRED) - if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) - if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION) - message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} " -@@ -145,14 +145,7 @@ endif() + find_package(Imath CONFIG) + if (NOT TARGET Imath::Imath) +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) + if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION) + message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} " +@@ -157,14 +157,7 @@ endif() if(USE_BLOSC) # Find Blosc libraries @@ -94,8 +97,8 @@ index 88543df..92efaee 100644 else() message(WARNING "Blosc support is disabled. It is strongly recommended to " "enable blosc for optimal builds of OpenVDB and to support compatible " -@@ -215,7 +208,7 @@ endif() - # See FindOpenVDB.cmake +@@ -222,7 +215,7 @@ endif() + # /usr/local if(USE_BLOSC) - list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc) @@ -104,7 +107,7 @@ index 88543df..92efaee 100644 if(USE_BLOSC OR USE_ZLIB) diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt -index 8d9c375..14e1296 100644 +index 4d96425..d2037e8 100644 --- a/openvdb/openvdb/cmd/CMakeLists.txt +++ b/openvdb/openvdb/cmd/CMakeLists.txt @@ -46,7 +46,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") @@ -116,14 +119,14 @@ index 8d9c375..14e1296 100644 list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc) endif() -@@ -116,8 +116,8 @@ endif() - #### vdb_render - +@@ -83,8 +83,8 @@ endif() if(OPENVDB_BUILD_VDB_RENDER) -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) -- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) -+ find_package(IlmBase CONFIG REQUIRED) -+ find_package(OpenEXR CONFIG REQUIRED) - - set(VDB_RENDER_SOURCE_FILES openvdb_render.cc) - add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES}) + find_package(Imath CONFIG) + if (NOT TARGET Imath::Imath) +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) +- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) ++ find_package(IlmBase CONFIG REQUIRED) ++ find_package(OpenEXR CONFIG REQUIRED) + else() + find_package(OpenEXR CONFIG) + endif() diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index 116cbb34b50913..b5a3e77790cb2a 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -1,17 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openvdb - REF ea786c46b7a1b5158789293d9b148b379fc9914c # v8.1.0 - SHA512 3c4ab3db35b3eb019149ac455f0c7a262081e9866b7e49eaba05424bf837debccf0c987c2555d3c91a2cff2d1ba4b41862f544fd4684558f3a319616ef3c9eb3 - HEAD_REF master + REF 89873d2bd29870cc9f176ed12b3f3a930ca38d1a # v8.2.0 + SHA512 d72a0eec6b7ce8e25fbe3100d4a291c35d7c2448f23131aaa9f247210f26e965198ef2991d9cf789afc754cbcddaace7a27ab62a2609a19a896034859c518699 PATCHES 0003-fix-cmake.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/FindTBB.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/FindIlmBase.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/FindBlosc.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/FindOpenEXR.cmake) +file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindIlmBase.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindBlosc.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindOpenEXR.cmake") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OPENVDB_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPENVDB_SHARED) @@ -34,7 +33,7 @@ if ("ax" IN_LIST FEATURES) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DOPENVDB_BUILD_UNITTESTS=OFF -DOPENVDB_BUILD_PYTHON_MODULE=OFF diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json index 242f3f46ea5d98..669107898efb72 100644 --- a/ports/openvdb/vcpkg.json +++ b/ports/openvdb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openvdb", - "version": "8.1.0", + "version": "8.2.0", "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", "dependencies": [ diff --git a/ports/openvr/portfile.cmake b/ports/openvr/portfile.cmake index 9b4b3d6505276c..1aef03e9cb73e1 100644 --- a/ports/openvr/portfile.cmake +++ b/ports/openvr/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( diff --git a/ports/openvr/vcpkg.json b/ports/openvr/vcpkg.json index 3a3b00bab4d153..3662ad5a011406 100644 --- a/ports/openvr/vcpkg.json +++ b/ports/openvr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openvr", - "version-string": "1.16.8", - "port-version": 1, + "version": "1.16.8", + "port-version": 2, "description": "an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.", "homepage": "https://github.com/ValveSoftware/openvr", "supports": "!(arm | uwp | osx | android)" diff --git a/ports/openxr-loader/fix-jinja2.patch b/ports/openxr-loader/fix-jinja2.patch new file mode 100644 index 00000000000000..5d77cb4e461a0f --- /dev/null +++ b/ports/openxr-loader/fix-jinja2.patch @@ -0,0 +1,23 @@ +From d80c7dc3f4810fc49e4444590d39ef71e8a9b01c Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Sat, 19 Feb 2022 19:42:31 -0500 +Subject: [PATCH] Fix bad import in jinja2 + +--- + external/python/jinja2/utils.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/external/python/jinja2/utils.py b/external/python/jinja2/utils.py +index db9c5d06..f198e3ef 100644 +--- a/external/python/jinja2/utils.py ++++ b/external/python/jinja2/utils.py +@@ -639,4 +639,8 @@ def __repr__(self): + + + # Imported here because that's where it was in the past +-from markupsafe import Markup, escape, soft_unicode ++from markupsafe import Markup, escape ++try: ++ from markupsafe import soft_unicode ++except ImportError: ++ from markupsafe import soft_str as soft_unicode diff --git a/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch b/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch index 24e6b5149be0ee..bf915949a1a71b 100644 --- a/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch +++ b/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch @@ -2,7 +2,7 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c75b145..386494c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -66,7 +66,7 @@ if(NOT VULKAN_INCOMPATIBLE) +@@ -89,7 +89,7 @@ if(NOT VULKAN_INCOMPATIBLE) endif() find_package(Threads REQUIRED) @@ -15,7 +15,7 @@ diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt index 6a88cf4..0821a3d 100644 --- a/src/loader/CMakeLists.txt +++ b/src/loader/CMakeLists.txt -@@ -67,7 +67,11 @@ add_library(openxr_loader ${LIBRARY_TYPE} +@@ -68,7 +68,11 @@ add_library(openxr_loader ${LIBRARY_TYPE} ${openxr_loader_RESOURCE_FILE} ) if(BUILD_WITH_SYSTEM_JSONCPP) diff --git a/ports/openxr-loader/portfile.cmake b/ports/openxr-loader/portfile.cmake index c3046fdf9c7083..275d15b4081f64 100644 --- a/ports/openxr-loader/portfile.cmake +++ b/ports/openxr-loader/portfile.cmake @@ -1,10 +1,9 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/OpenXR-SDK - REF 960c4a6aa8cc9f47e357c696b5377d817550bf88 - SHA512 515494520a31491587418ab6cb1b28333481e0a20cb25d3f9bc875ac211faf1636641afdfee2ecdf816ea1222305ea52565992953b3bab68fffe40fa25e23145 + REF release-1.0.22 + SHA512 fe3c393c2d11981b42355acd8dbc337727120bcd0ff595abac1975c4ce5f68bb74a9a1b4c959e64e9a847ae5d504100d31979ffd7d9702c55b2dbd889de17d3e HEAD_REF master PATCHES fix-openxr-sdk-jsoncpp.patch @@ -13,25 +12,26 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH SDK_SOURCE_PATH REPO KhronosGroup/OpenXR-SDK-Source - REF 09cbbc9d3bc540a53d5f2d76b8074ddc0b96e933 - SHA512 1fc777d7aaea585dd8e9f9ac60a71a7eb55017183f33e51f987b94af6bba8d7808771abf9fc377c6e2b613f282db08a095595b4bc6899d4eaa6eabb45405dc1b + REF release-1.0.22 + SHA512 92802d57a45ca1d697d3cea1b3f5619af4ba36156cb28c2c39b2295a74ebc45907caf371c916c54ec3be44a2f3ae447ffc1cd62f54b7b24f7a081408328c7651 HEAD_REF master PATCHES fix-openxr-sdk-jsoncpp.patch + fix-jinja2.patch ) vcpkg_from_github( OUT_SOURCE_PATH HPP_SOURCE_PATH REPO KhronosGroup/OpenXR-hpp - REF 6fcea9e472622c9c7f4df0b5f0bfe7ff5d8553f7 - SHA512 04d1f9db6fd0a01cdf3274089ab17bf17974ff799b4690561c16067e83710e1422a2aefd070b26023ff832eb58e6a3365297a818c9546ea4c531328bd1fb2de4 + REF release-1.0.21 + SHA512 cda111f20392a64d5f4de6bd71f1fe7fe39d688bb2376c6b1841763459e32fd6d03b9552804b5ee464ba84cd4c05cfdaa1a6e8a8e5da3eae6b94c7797c65cb36 HEAD_REF master PATCHES 002-fix-hpp-gen.patch ) # Weird behavior inside the OpenXR loader. On Windows they force shared libraries to use static crt, and -# vice-versa. Might be better in future iterations to patch the CMakeLists.txt for OpenXR +# vice-versa. Might be better in future iterations to patch the CMakeLists.txt for OpenXR if (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_WINDOWS) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) set(DYNAMIC_LOADER OFF) @@ -44,39 +44,39 @@ endif() vcpkg_find_acquire_program(PYTHON3) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_API_LAYERS=OFF -DBUILD_TESTS=OFF -DBUILD_CONFORMANCE_TESTS=OFF -DDYNAMIC_LOADER=${DYNAMIC_LOADER} - -DPYTHON_EXECUTABLE=${PYTHON3} + -DPYTHON_EXECUTABLE="${PYTHON3}" -DBUILD_WITH_SYSTEM_JSONCPP=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Generate the OpenXR C++ bindings -set(ENV{OPENXR_REPO} ${SDK_SOURCE_PATH}) -file(STRINGS ${HPP_SOURCE_PATH}/headers.txt HEADER_LIST REGEX "^openxr.*") +set(ENV{OPENXR_REPO} "${SDK_SOURCE_PATH}") +file(STRINGS "${HPP_SOURCE_PATH}/headers.txt" HEADER_LIST REGEX "^openxr.*") foreach(HEADER ${HEADER_LIST}) vcpkg_execute_required_process( - COMMAND ${PYTHON3} ${HPP_SOURCE_PATH}/scripts/hpp_genxr.py -registry ${SDK_SOURCE_PATH}/specification/registry/xr.xml -o ${CURRENT_PACKAGES_DIR}/include/openxr ${HEADER} - WORKING_DIRECTORY ${HPP_SOURCE_PATH} + COMMAND ${PYTHON3} "${HPP_SOURCE_PATH}/scripts/hpp_genxr.py" -registry "${SDK_SOURCE_PATH}/specification/registry/xr.xml" -o "${CURRENT_PACKAGES_DIR}/include/openxr" ${HEADER} + WORKING_DIRECTORY "${HPP_SOURCE_PATH}" LOGNAME openxrhpp ) endforeach() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/OpenXR) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/openxr TARGET_PATH share/OpenXR) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/openxr) 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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openxr-loader/vcpkg.json b/ports/openxr-loader/vcpkg.json index 43ca0e1907caf9..ab539eacb2be37 100644 --- a/ports/openxr-loader/vcpkg.json +++ b/ports/openxr-loader/vcpkg.json @@ -1,11 +1,20 @@ { "name": "openxr-loader", - "version-string": "1.0.18", - "port-version": 2, - "description": "Khronos API for abstracting VR/MR/AR hardware", + "version": "1.0.22", + "port-version": 1, + "description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices", + "homepage": "https://github.com/KhronosGroup/OpenXR-SDK", "supports": "!(arm | uwp)", "dependencies": [ - "jsoncpp" + "jsoncpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "vulkan": { diff --git a/ports/optimus-cpp/portfile.cmake b/ports/optimus-cpp/portfile.cmake new file mode 100644 index 00000000000000..4692f4f56ae92f --- /dev/null +++ b/ports/optimus-cpp/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kafeg/optimus-cpp + REF 0.3.0 + SHA512 93abd13d4552a896f61e32dfebcc9037e7255f3fa86b230c03905df3148b9cc91cec772ec733e83fbcad574fd93fa4dadca9ec88b5836c5a4137d01e16580d6f + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/optimus-cpp/vcpkg.json b/ports/optimus-cpp/vcpkg.json new file mode 100644 index 00000000000000..2b8ee879d5077a --- /dev/null +++ b/ports/optimus-cpp/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "optimus-cpp", + "version": "0.3.0", + "description": "ID hashing and Obfuscation using Knuth's Algorithm for C++", + "homepage": "https://github.com/kafeg/optimus-cpp", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/osgearth/fix-dependency-osg.patch b/ports/osgearth/fix-dependency-osg.patch index 9d8b0d43df78be..6aae9a560c28ec 100644 --- a/ports/osgearth/fix-dependency-osg.patch +++ b/ports/osgearth/fix-dependency-osg.patch @@ -2,7 +2,7 @@ diff --git a/CMakeModules/FindOSG.cmake b/CMakeModules/FindOSG.cmake index b7dff11..d1ec2ff 100644 --- a/CMakeModules/FindOSG.cmake +++ b/CMakeModules/FindOSG.cmake -@@ -121,5 +121,36 @@ IF( OSG_LIBRARY AND OSG_INCLUDE_DIR ) +@@ -121,5 +121,40 @@ IF( OSG_LIBRARY AND OSG_INCLUDE_DIR ) SET( OSG_FOUND "YES" ) SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR} ${OSG_GEN_INCLUDE_DIR} ) GET_FILENAME_COMPONENT( OSG_LIBRARIES_DIR ${OSG_LIBRARY} PATH ) @@ -21,6 +21,10 @@ index b7dff11..d1ec2ff 100644 + find_package(TIFF REQUIRED) + find_package(zstd REQUIRED) + find_package(GIF REQUIRED) ++ if (WIN32) ++ find_package(pthreads CONFIG REQUIRED) ++ list(APPEND OSG_DEPENDS_LIBRARY PThreads4W::PThreads4W) ++ endif() + + if (UNIX) + list(APPEND OSG_DEPENDS_LIBRARY ${OSG_DEPENDS_LIBRARY} -pthread) diff --git a/ports/osgearth/fix-gcc11-compilation.patch b/ports/osgearth/fix-gcc11-compilation.patch new file mode 100644 index 00000000000000..582389068fa1dc --- /dev/null +++ b/ports/osgearth/fix-gcc11-compilation.patch @@ -0,0 +1,38 @@ +From 8c16194c53d5bf70716dae2c6df67e77a1608dde Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Wed, 28 Jul 2021 06:40:45 -0700 +Subject: [PATCH] fix-gcc11-compilation + +--- + src/osgEarth/Units | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/osgEarth/Units b/src/osgEarth/Units +index dd19afe..bfe826a 100644 +--- a/src/osgEarth/Units ++++ b/src/osgEarth/Units +@@ -196,17 +196,17 @@ namespace osgEarth + class qualified_double + { + public: +- qualified_double( double value, const Units& units ) : _value(value), _units(units) { } ++ qualified_double( double value, const Units& units ) : _value(value), _units(units) { } + +- qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { } ++ qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { } + + // parses the qualified number from a parseable string (e.g., "123km") +- qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) { ++ qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) { + Units::parse( parseable, _value, _units, defaultUnits ); + } + + // loads the qualified number from an old-school config (e.g., { value="123" units="km" } ) +- qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) { ++ qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) { + if ( conf.hasValue("value") ) { + _value = conf.value("value", 0.0); + if ( !Units::parse( conf.value("units"), _units ) ) +-- +2.31.1 + diff --git a/ports/osgearth/fix-imgui.patch b/ports/osgearth/fix-imgui.patch new file mode 100644 index 00000000000000..495c3dff864041 --- /dev/null +++ b/ports/osgearth/fix-imgui.patch @@ -0,0 +1,21 @@ +From 2aa1535341c9aace4a5ca0115fa51dbf76f582ec Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Wed, 29 Sep 2021 23:12:52 -0700 +Subject: [PATCH] patch + +--- + src/applications/osgearth_imgui/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/applications/osgearth_imgui/CMakeLists.txt b/src/applications/osgearth_imgui/CMakeLists.txt +index 246fd89..5ea6f63 100644 +--- a/src/applications/osgearth_imgui/CMakeLists.txt ++++ b/src/applications/osgearth_imgui/CMakeLists.txt +@@ -1,3 +1,3 @@ +-set(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) ++set(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) + set(TARGET_SRC osgearth_imgui.cpp) + SETUP_IMGUI_APPLICATION(osgearth_imgui) +-- +2.31.1 + diff --git a/ports/osgearth/make-all-find-packages-required.patch b/ports/osgearth/make-all-find-packages-required.patch index a39abb47955a59..51bd86f408bdb6 100644 --- a/ports/osgearth/make-all-find-packages-required.patch +++ b/ports/osgearth/make-all-find-packages-required.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7541c8d..b4076fe 100644 +index 7541c8d07..cc14d2160 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,40 +122,54 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit @@ -48,7 +48,7 @@ index 7541c8d..b4076fe 100644 +find_package(WebP CONFIG REQUIRED) +set(WEBP_LIBRARY WebP::webp) +set(WEBP_FOUND 1) -+find_package(Blend2D REQUIRED) ++find_package(Blend2D CONFIG REQUIRED) if(OSGEARTH_ENABLE_PROFILING) - find_package(Tracy) @@ -93,3 +93,23 @@ index 7541c8d..b4076fe 100644 ENDIF (WITH_EXTERNAL_TINYXML) # postfix settings for various configs +diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt +index cd55c1164..4ecb61f0d 100644 +--- a/src/osgEarth/CMakeLists.txt ++++ b/src/osgEarth/CMakeLists.txt +@@ -909,11 +909,11 @@ IF(FILEGDB_FOUND) + LINK_WITH_VARIABLES(${LIB_NAME} FILEGDB_LIBRARY) + ENDIF() + +-IF(BLEND2D_FOUND) ++#IF(BLEND2D_FOUND) + add_definitions(-DOSGEARTH_HAVE_BLEND2D) +- include_directories(${BLEND2D_INCLUDES}) +- link_with_variables(${LIB_NAME} BLEND2D_LIBRARY) +-ENDIF() ++# include_directories(${BLEND2D_INCLUDES}) ++ target_link_libraries(${LIB_NAME} blend2d::blend2d) ++#ENDIF() + + IF (WIN32) + LINK_EXTERNAL(${LIB_NAME} ${TARGET_EXTERNAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ) diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 6b7725ccc6591b..7d49d9ac370d3e 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -1,6 +1,6 @@ # Only dynamic build need dlls if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB OSG_PLUGINS_SUBDIR ${CURRENT_INSTALLED_DIR}/tools/osg/osgPlugins-*) + file(GLOB OSG_PLUGINS_SUBDIR "${CURRENT_INSTALLED_DIR}/tools/osg/osgPlugins-*") list(LENGTH OSG_PLUGINS_SUBDIR OSG_PLUGINS_SUBDIR_LENGTH) if(NOT OSG_PLUGINS_SUBDIR_LENGTH EQUAL 1) message(FATAL_ERROR "Could not determine osg version") @@ -14,15 +14,17 @@ vcpkg_from_github( REF 15d5340f174212d6f93ae55c0d9af606c3d361c0 #version 3.2 SHA512 f922e8bbb041a498e948587f03e8dc8a07b92e641f38d50a8eafb8b3ce1e0c92bb1ee01360d57e794429912734b60cf05ba143445a442bc95af39e3dd9fc3670 HEAD_REF master - PATCHES + PATCHES StaticOSG.patch # Fix port compilation in static-md module make-all-find-packages-required.patch fix-dependency-osg.patch remove-tool-debug-suffix.patch + fix-imgui.patch + fix-gcc11-compilation.patch ) # Upstream bug, see https://github.com/gwaldron/osgearth/issues/1002 -file(REMOVE ${SOURCE_PATH}/src/osgEarth/tinyxml.h) +file(REMOVE "${SOURCE_PATH}/src/osgEarth/tinyxml.h") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) @@ -31,9 +33,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tools OSGEARTH_BUILD_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DOSGEARTH_BUILD_SHARED_LIBS=${BUILD_SHARED} -DNRL_STATIC_LIBRARIES=${BUILD_STATIC} @@ -49,30 +50,30 @@ vcpkg_configure_cmake( -DWITH_EXTERNAL_TINYXML=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if (WIN32 AND (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)) +if (WIN32 AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) #Release - set(OSGEARTH_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - set(OSGEARTH_TOOL_PLUGIN_PATH ${OSGEARTH_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}) + set(OSGEARTH_TOOL_PATH "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + set(OSGEARTH_TOOL_PLUGIN_PATH "${OSGEARTH_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}") - file(MAKE_DIRECTORY ${OSGEARTH_TOOL_PLUGIN_PATH}) - file(GLOB OSGDB_PLUGINS ${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll) + file(MAKE_DIRECTORY "${OSGEARTH_TOOL_PLUGIN_PATH}") + file(GLOB OSGDB_PLUGINS "${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll") - file(COPY ${OSGDB_PLUGINS} DESTINATION ${OSGEARTH_TOOL_PLUGIN_PATH}) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}) + file(COPY ${OSGDB_PLUGINS} DESTINATION "${OSGEARTH_TOOL_PLUGIN_PATH}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}") #Debug - set(OSGEARTH_DEBUG_TOOL_PATH ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}) - set(OSGEARTH_DEBUG_TOOL_PLUGIN_PATH ${OSGEARTH_DEBUG_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}) + set(OSGEARTH_DEBUG_TOOL_PATH "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}") + set(OSGEARTH_DEBUG_TOOL_PLUGIN_PATH "${OSGEARTH_DEBUG_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}") - file(MAKE_DIRECTORY ${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}) + file(MAKE_DIRECTORY "${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}") - file(GLOB OSGDB_DEBUG_PLUGINS ${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll) + file(GLOB OSGDB_DEBUG_PLUGINS "${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll") - file(COPY ${OSGDB_DEBUG_PLUGINS} DESTINATION ${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}) + file(COPY ${OSGDB_DEBUG_PLUGINS} DESTINATION "${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}") endif() if ("tools" IN_LIST FEATURES) @@ -82,7 +83,7 @@ if ("tools" IN_LIST FEATURES) ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 57cc6af2682dd2..3d0ca822204074 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,12 +1,14 @@ { "name": "osgearth", "version": "3.2", - "port-version": 1, + "port-version": 3, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "supports": "!(x86 | wasm32)", "dependencies": [ "basisu", + "blend2d", + "cfitsio", "draco", "geos", "glew", @@ -20,8 +22,13 @@ ] }, "protobuf", + "pthreads", "sqlite3", - "tinyxml" + "tinyxml", + { + "name": "vcpkg-cmake", + "host": true + } ], "default-features": [ "tools" diff --git a/ports/otl/portfile.cmake b/ports/otl/portfile.cmake index 54896c2899c374..6809aa18217c9d 100644 --- a/ports/otl/portfile.cmake +++ b/ports/otl/portfile.cmake @@ -2,8 +2,8 @@ set(OTL_VERSION 40463) vcpkg_download_distfile(ARCHIVE URLS "http://otl.sourceforge.net/otlv4_${OTL_VERSION}.zip" - FILENAME "otlv4_${OTL_VERSION}-9485a0fe15a7.zip" - SHA512 9485a0fe15a737d55b0746a7e289b1a20e9435ed5c69bda7010705f8cde0a456163d83221d0103236a723837596613b578edc6d3d0007ce80a6cc76b4ed83888 + FILENAME "otlv4_${OTL_VERSION}-9485a0fe15a7-1.zip" + SHA512 46a50234009ca8e8dba3b0b781f4b496759f4c5697f045d816c7e4eddda61da63d03acf29b4d1f71ee035aba4c6daa72c9a546085a6d7b3c192353b854526392 ) vcpkg_extract_source_archive_ex( @@ -16,6 +16,16 @@ file(INSTALL "${SOURCE_PATH}/otlv${OTL_VERSION}.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}" RENAME otlv4.h) -file(INSTALL "${SOURCE_PATH}/otlv${OTL_VERSION}.h" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) +file(READ "${SOURCE_PATH}/otlv${OTL_VERSION}.h" copyright_contents) +string(FIND "${copyright_contents}" "#ifndef OTL_H" start_of_source) +if(start_of_source EQUAL "-1") + message(FATAL_ERROR "Could not find start of source; the header file has changed in a way that we cannot get the license text.") +endif() +string(SUBSTRING "${copyright_contents}" 0 "${start_of_source}" copyright_contents) +string(REGEX REPLACE "// ?" "" copyright_contents "${copyright_contents}") +string(REGEX REPLACE "=+\n" "" copyright_contents "${copyright_contents}") + +file(WRITE + "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" + "${copyright_contents}" +) diff --git a/ports/otl/vcpkg.json b/ports/otl/vcpkg.json index e2a6b46978ee5f..0c0a12814f18a6 100644 --- a/ports/otl/vcpkg.json +++ b/ports/otl/vcpkg.json @@ -1,6 +1,8 @@ { "name": "otl", "version": "4.0.463", + "port-version": 1, "description": "Oracle, Odbc and DB2-CLI Template Library", - "homepage": "http://otl.sourceforge.net/" + "homepage": "http://otl.sourceforge.net/", + "license": "ISC" } diff --git a/ports/outcome/portfile.cmake b/ports/outcome/portfile.cmake index 38cf26bf10cc40..a031a77b03a162 100644 --- a/ports/outcome/portfile.cmake +++ b/ports/outcome/portfile.cmake @@ -22,8 +22,8 @@ Outcome depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byt vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/outcome - REF a86c6b053b86e4fc5d920907b0afb3234bec9336 - SHA512 c282afd7b335fef37ec4c2011bf591d3ffd56872515e8fcbd95714020ab99d141a87a064ecda44bf9308cb4bd1f39977b62303f2cc297918be2f257a36ff5832 + REF 9c6ad6e8e6a48ddde65c0617e3df306bc901b41d + SHA512 b53807fdf9ac3647882f2029a7c5311e7f313abaec703142d2c6d4e73651898d868bfdd600e5f2fa3344e91ebb576324b4624ccf4aa8e09314b7a7ede4cb0fbc HEAD_REF develop PATCHES outcome-prune-sources.patch diff --git a/ports/outcome/vcpkg.json b/ports/outcome/vcpkg.json index 0735c5d090d689..eb8b45aa372a94 100644 --- a/ports/outcome/vcpkg.json +++ b/ports/outcome/vcpkg.json @@ -1,6 +1,6 @@ { "name": "outcome", - "version-string": "2.2.2-20210922", + "version-string": "2.2.2-20211208", "description": "Provides very lightweight outcome and result (non-Boost edition)", "homepage": "https://github.com/ned14/outcome", "supports": "!uwp", diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index eb12a9b6087304..6345bfdfc4f77f 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/pango - REF dc5bde2a20cbb025c9d0ed29ed687740a4d027da #v1.48.10 - SHA512 8454b2cb81fd57e140372b5c1e5786542e92bcad85d4718b7976dccbf694cfe0fec62938edc32e5de50991e2cda2b00e8d4e976921881069ca29976fe973f4ac + REF 26aadb2508f9022cbfc72e73b558c6791f5d46d9 #v1.50.3 + SHA512 09c2578300d391b406c14dfbf7f28968d326c6861f7eb1a3a8d1d8c4700d6e9f74c8621a3f2d181abe1f695324c6e5fc3a55eb038ebbe53a53be086983e3a186 HEAD_REF master # branch name ) diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index 07b7c83113f8b6..498ca48fd4a5a7 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pango", - "version": "1.48.10", + "version": "1.50.3", "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "dependencies": [ @@ -26,6 +26,10 @@ "coretext" ], "platform": "osx" + }, + { + "name": "vcpkg-tool-meson", + "host": true } ] } diff --git a/ports/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake index b7a59711964e43..3c2a0c32f0723d 100644 --- a/ports/pangomm/portfile.cmake +++ b/ports/pangomm/portfile.cmake @@ -1,9 +1,7 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64") - vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.48/pangomm-2.48.1.tar.xz" - FILENAME "pangomm-2.48.1.tar.xz" - SHA512 c204a1cb7a404f055d62880a760716c5567a835ca495cc5e01589ed59fabb332490e529de716c3438cefbc4428c025d6d01c71e4412b2843e3ab3a3175ccc2f4 + URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.50/pangomm-2.50.0.tar.xz" + FILENAME "pangomm-2.50.0.tar.xz" + SHA512 844850db93b8c4dab19dd364e674ee3d61b2fcb8e020ab3d314f240065ee17aeceea21e9ddc438a7d09d56410e3f82147a57425f76bb01e26d82872934269477 ) vcpkg_extract_source_archive_ex( diff --git a/ports/pangomm/vcpkg.json b/ports/pangomm/vcpkg.json index f0e36aa4eb7bcf..b2a91c87137cb8 100644 --- a/ports/pangomm/vcpkg.json +++ b/ports/pangomm/vcpkg.json @@ -1,8 +1,10 @@ { "name": "pangomm", - "version": "2.48.1", + "version": "2.50.0", + "port-version": 1, "description": "pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pangomm", + "supports": "!arm", "dependencies": [ "cairo", "cairomm", @@ -16,6 +18,10 @@ }, "glibmm", "harfbuzz", - "pango" + "pango", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index e8b81b15d18176..044226d8bf2f6c 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -3,17 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/parallel-hashmap - REF 1.33 - SHA512 287f098229153d925632e68e3cdbabfae0ea0ab8864089e4c0553a166c6079ca82ed5246ba53afd2a2917abcf06f37bc18f098e721f5f3b8def4d2d8c1c8c745 + REF 1.34 + SHA512 3747422e80406aa77b009adee3c16325640dd1044560882fb881dac5ef4109f7d165d26ed7e64002c9285275f95962725ce20c918da12c0c113999c8ca3c7429 HEAD_REF master ) # Use greg7mdp/parallel-hashmap's own build process, skipping examples and tests -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Delete redundant directories file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/doc) diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index b1d7230cf1d651..8393345a885e6b 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -1,6 +1,12 @@ { "name": "parallel-hashmap", - "version-string": "1.33", - "port-version": 1, - "description": "A header-only, very fast and memory-friendly family of C++ hash maps." + "version": "1.34", + "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/pbc/portfile.cmake b/ports/pbc/portfile.cmake index 93b06c5dbe090f..235cb9f51440f7 100644 --- a/ports/pbc/portfile.cmake +++ b/ports/pbc/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - set(PBC_VERSION 0.5.14) if(NOT VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/pbc/vcpkg.json b/ports/pbc/vcpkg.json index 3f9c2fc8082728..b7a040aa838fdd 100644 --- a/ports/pbc/vcpkg.json +++ b/ports/pbc/vcpkg.json @@ -1,10 +1,10 @@ { "name": "pbc", - "version-string": "0.5.14", - "port-version": 5, + "version": "0.5.14", + "port-version": 6, "description": "Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.", "homepage": "https://crypto.stanford.edu/pbc", - "supports": "!uwp", + "supports": "!uwp & !arm", "dependencies": [ { "name": "gmp", diff --git a/ports/pcapplusplus/CMakeLists.txt b/ports/pcapplusplus/CMakeLists.txt new file mode 100644 index 00000000000000..89ac75005c0c02 --- /dev/null +++ b/ports/pcapplusplus/CMakeLists.txt @@ -0,0 +1,106 @@ +cmake_minimum_required(VERSION 3.12) + +project(pcapplusplus CXX) + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +if (WIN32) + set(BUILD_SHARED_LIBS OFF) +endif() + +# dependencies +include(FindPackageHandleStandardArgs) +include(SelectLibraryConfigurations) +if (WIN32) + find_path(PCAP_INCLUDES NAMES pcap.h) + find_library(PCAP_LIBRARY_RELEASE NAMES wpcap PATH_SUFFIXES lib REQUIRED) + find_library(PCAP_LIBRARY_DEBUG NAMES wpcap PATH_SUFFIXES lib REQUIRED) + find_library(PACKET_LIBRARY_RELEASE NAMES Packet PATH_SUFFIXES lib REQUIRED) + find_library(PACKET_LIBRARY_DEBUG NAMES Packet PATH_SUFFIXES lib REQUIRED) + select_library_configurations(PCAP) + select_library_configurations(PACKET) + list(APPEND PCAP_LIBRARIES ${PACKET_LIBRARIES}) +else() + find_path(PCAP_INCLUDES NAMES pcap.h) + find_library(PCAP_LIBRARY_RELEASE NAMES pcap PATH_SUFFIXES lib REQUIRED) + find_library(PCAP_LIBRARY_DEBUG NAMES pcap PATH_SUFFIXES lib REQUIRED) + select_library_configurations(PCAP) +endif() + +find_package(Threads REQUIRED) + +# common++ +file(GLOB COMMONPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Common++/header/*.h") +file(GLOB COMMONPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Common++/src/*.cpp") + +add_library(commonpp ${COMMONPP_SOURCES}) + +target_include_directories(commonpp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Common++/header" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/EndianPortable/include") +set_target_properties(commonpp PROPERTIES OUTPUT_NAME Common++) +if (WIN32) + target_compile_definitions(commonpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(commonpp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(commonpp PRIVATE MAC_OS_X) +endif() + +# packet++ +file(GLOB PACKETPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Packet++/header/*.h") +file(GLOB PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Packet++/src/*.cpp") +list(APPEND PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/hash-library/md5.cpp") + +add_library(packetpp ${PACKETPP_SOURCES}) + +target_include_directories(packetpp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Packet++/header" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/hash-library") +target_link_libraries(packetpp PRIVATE commonpp) +set_target_properties(packetpp PROPERTIES OUTPUT_NAME Packet++) +if (WIN32) + target_compile_definitions(packetpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(packetpp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(packetpp PRIVATE MAC_OS_X) +endif() + +# pcap++ +file(GLOB PCAPPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header/*.h") +file(GLOB PCAPPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Pcap++/src/*.cpp") +file(GLOB LIGHTPCAPNG_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/src/*.cpp") + +add_library(pcappp ${PCAPPP_SOURCES}) + +target_include_directories(pcappp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header" "${PCAP_INCLUDES}" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/include") +target_link_libraries(pcappp PUBLIC commonpp packetpp ${PCAP_LIBRARIES} Threads::Threads) + +if (WIN32) + target_link_libraries(pcappp PUBLIC ws2_32 iphlpapi) +elseif (APPLE) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) + find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) + target_link_libraries(pcappp PUBLIC ${COREFOUNDATION_LIBRARY} ${SYSTEMCONFIGURATION_LIBRARY}) +endif() + +if (WIN32) + target_compile_definitions(pcappp PRIVATE WPCAP HAVE_REMOTE HAVE_STRUCT_TIMESPEC _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(pcappp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(pcappp PRIVATE MAC_OS_X) +endif() + +set_target_properties(pcappp PROPERTIES OUTPUT_NAME Pcap++) + +# Install +install(FILES ${PCAPPP_HEADERS} ${COMMONPP_HEADERS} ${PACKETPP_HEADERS} DESTINATION include) +install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION share/pcapplusplus) + +install( + TARGETS pcappp commonpp packetpp + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/ports/pcapplusplus/portfile.cmake b/ports/pcapplusplus/portfile.cmake index e280af3c3ffc64..1da5a37ab43987 100644 --- a/ports/pcapplusplus/portfile.cmake +++ b/ports/pcapplusplus/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -7,97 +9,15 @@ vcpkg_from_github( SHA512 ad10034950c0c3e6a4638e8b314c8983ce42609948d7d8d40ad0ff678820a2469807bd29aff77e657a150008602475b50cea84a0766ad87ea203985519cb38ac HEAD_REF master ) +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - set(VS_VERSION "vs2015") - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - set(VS_VERSION "vs2017") - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(VS_VERSION "vs2019") - else() - message(FATAL_ERROR "Unsupported visual studio version") - endif() - - vcpkg_execute_required_process( - COMMAND configure-windows-visual-studio.bat -v ${VS_VERSION} -w . -p . - WORKING_DIRECTORY ${SOURCE_PATH} - ) - - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "mk/${VS_VERSION}/Common++.vcxproj" - PLATFORM ${TRIPLET_SYSTEM_ARCH} - INCLUDES_SUBPATH Dist/header - ALLOW_ROOT_INCLUDES - USE_VCPKG_INTEGRATION - ) - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "mk/${VS_VERSION}/Packet++.vcxproj" - PLATFORM ${TRIPLET_SYSTEM_ARCH} - INCLUDES_SUBPATH Dist/header - ALLOW_ROOT_INCLUDES - USE_VCPKG_INTEGRATION - ) - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "mk/${VS_VERSION}/Pcap++.vcxproj" - PLATFORM ${TRIPLET_SYSTEM_ARCH} - USE_VCPKG_INTEGRATION - INCLUDES_SUBPATH Dist/header - ALLOW_ROOT_INCLUDES - LICENSE_SUBPATH LICENSE - ) - - # Lib - file(GLOB LIB_FILES_RELEASE "${SOURCE_PATH}/Dist/**/Release/*") - file( - INSTALL ${LIB_FILES_RELEASE} - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) - file(GLOB LIB_FILES_RELEASE "${SOURCE_PATH}/Dist/**/Debug/*") - file( - INSTALL ${LIB_FILES_RELEASE} - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) - - file( - REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/tools" "${CURRENT_PACKAGES_DIR}/lib/LightPcapNg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/LightPcapNg.lib" - ) -else() - if(VCPKG_TARGET_IS_LINUX) - set(CONFIG_CMD "./configure-linux.sh") - elseif(VCPKG_TARGET_IS_OSX) - set(CONFIG_CMD "./configure-mac_os_x.sh") - else() - message(FATAL_ERROR "Unsupported platform") - endif() - - vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/${CONFIG_CMD} --libpcap-include-dir ${CURRENT_INSTALLED_DIR}/include - WORKING_DIRECTORY ${SOURCE_PATH} - ) - - vcpkg_execute_build_process( - COMMAND make libs - WORKING_DIRECTORY ${SOURCE_PATH} - ) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) - # Lib - file(GLOB LIB_FILES "${SOURCE_PATH}/Dist/*.a") - file( - INSTALL ${LIB_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) +vcpkg_cmake_install() +vcpkg_copy_pdbs() - # Include - file(GLOB HEADER_FILES "${SOURCE_PATH}/Dist/header/*.h") - file( - INSTALL ${HEADER_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/include - ) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") - # Copyright - file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -endif() +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/pcapplusplus/vcpkg.json b/ports/pcapplusplus/vcpkg.json index 0d37fff7eb6f33..b1df5ae7af61d7 100644 --- a/ports/pcapplusplus/vcpkg.json +++ b/ports/pcapplusplus/vcpkg.json @@ -1,8 +1,10 @@ { "name": "pcapplusplus", - "version-string": "21.11", + "version": "21.11", + "port-version": 1, "description": "PcapPlusPlus is a multi-platform C++ library for capturing, parsing and crafting of network packets", "homepage": "https://github.com/seladb/PcapPlusPlus", + "license": null, "dependencies": [ { "name": "libpcap", @@ -12,6 +14,10 @@ "name": "pthreads", "platform": "windows" }, + { + "name": "vcpkg-cmake", + "host": true + }, { "name": "winpcap", "platform": "windows" diff --git a/ports/pcl/Workaround-ICE-in-release.patch b/ports/pcl/Workaround-ICE-in-release.patch new file mode 100644 index 00000000000000..36f66c8d655baa --- /dev/null +++ b/ports/pcl/Workaround-ICE-in-release.patch @@ -0,0 +1,20 @@ +diff --git a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp +index 49e52b4..a9578bd 100644 +--- a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp ++++ b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp +@@ -666,6 +666,7 @@ std::size_t ON_SerialNumberMap::ActiveIdCount() const + return m_active_id_count; + } + ++#pragma optimize("", off) + struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const + { + struct SN_ELEMENT* e=0; +@@ -717,6 +718,7 @@ struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const + } + return e; + } ++#pragma optimize("", on) + + struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::LastElement() const + { diff --git a/ports/pcl/fix-error-C3052.patch b/ports/pcl/fix-error-C3052.patch new file mode 100644 index 00000000000000..fce4fe6d7fe67d --- /dev/null +++ b/ports/pcl/fix-error-C3052.patch @@ -0,0 +1,20 @@ +diff --git a/common/src/fft/kiss_fft.c b/common/src/fft/kiss_fft.c +index a996887..37232bd 100644 +--- a/common/src/fft/kiss_fft.c ++++ b/common/src/fft/kiss_fft.c +@@ -260,11 +260,13 @@ void kf_work( + #if (defined _OPENMP && (_OPENMP <= 201307)) || (defined __GNUC__ && (__GNUC__ >= 6 && __GNUC__ < 9)) + #pragma omp parallel for \ + default(none) \ +- shared(f, factors, Fout, in_stride) ++ shared(f, factors, Fout, in_stride) \ ++ private(k) + #else + #pragma omp parallel for \ + default(none) \ +- shared(f, factors, Fout, fstride, in_stride, m, p, st) ++ shared(f, factors, Fout, fstride, in_stride, m, p, st) \ ++ private(k) + #endif + for (k=0;k -Date: Wed, 7 Jul 2021 16:11:12 -0400 -Subject: [PATCH] fix find qhull - ---- - CMakeLists.txt | 5 +---- - surface/CMakeLists.txt | 9 +++++++-- - 2 files changed, 8 insertions(+), 6 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1d9bb58f..7cf86f74b 100644 +index a1d9bb5..73b1465 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -359,10 +359,7 @@ if(WITH_QHULL) +@@ -359,10 +359,8 @@ if(WITH_QHULL) if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32)) set(QHULL_USE_STATIC ON) endif() @@ -21,11 +11,12 @@ index a1d9bb58f..7cf86f74b 100644 - include_directories(SYSTEM ${QHULL_INCLUDE_DIRS}) - endif() + find_package(Qhull CONFIG REQUIRED) ++ set(HAVE_QHULL ON) endif() # Cuda diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt -index d8a8566ea..1953c5566 100644 +index d8a8566..1953c55 100644 --- a/surface/CMakeLists.txt +++ b/surface/CMakeLists.txt @@ -12,7 +12,7 @@ if(NOT build) @@ -51,6 +42,3 @@ index d8a8566ea..1953c5566 100644 target_link_libraries("${LIB_NAME}" ${QHULL_LIBRARIES}) endif() --- -2.32.0.windows.1 - diff --git a/ports/pcl/fix-namespace-cub.patch b/ports/pcl/fix-namespace-cub.patch new file mode 100644 index 00000000000000..eb45eedec1c7b9 --- /dev/null +++ b/ports/pcl/fix-namespace-cub.patch @@ -0,0 +1,130 @@ +diff --git a/gpu/features/src/centroid.cu b/gpu/features/src/centroid.cu +index 045fe6f..3e9ef8b 100644 +--- a/gpu/features/src/centroid.cu ++++ b/gpu/features/src/centroid.cu +@@ -44,7 +44,6 @@ + + #include "pcl/gpu/utils/device/vector_math.hpp" + +-using namespace thrust; + + namespace pcl + { +@@ -124,9 +123,10 @@ float3 pcl::device::getMaxDistance(const DeviceArray& cloud, const float + thrust::counting_iterator ce = cf + cloud.size(); + + thrust::tuple init(0.f, 0); +- thrust::maximum< tuple > op; ++ thrust::maximum> op; + +- tuple res = transform_reduce( ++ thrust::tuple res = ++ transform_reduce( + make_zip_iterator(make_tuple( src_beg, cf )), + make_zip_iterator(make_tuple( src_beg, ce )), + TupleDistCvt(pivot), init, op); +@@ -151,9 +151,9 @@ float3 pcl::device::getMaxDistance(const DeviceArray& cloud, const Indic + thrust::counting_iterator ce = cf + indices.size(); + + thrust::tuple init(0.f, 0); +- thrust::maximum< tuple > op; ++ thrust::maximum> op; + +- tuple res = transform_reduce( ++ thrust::tuple res = transform_reduce( + make_zip_iterator(make_tuple( make_permutation_iterator(src_beg, map_beg), cf )), + make_zip_iterator(make_tuple( make_permutation_iterator(src_beg, map_end), ce )), + TupleDistCvt(pivot), init, op); +diff --git a/gpu/octree/src/cuda/bfrs.cu b/gpu/octree/src/cuda/bfrs.cu +index d392f67..0635e1e 100644 +--- a/gpu/octree/src/cuda/bfrs.cu ++++ b/gpu/octree/src/cuda/bfrs.cu +@@ -43,7 +43,6 @@ + + #include "cuda.h" + +-using namespace thrust; + + namespace pcl + { +@@ -80,11 +79,11 @@ void pcl::device::bruteForceRadiusSearch(const OctreeImpl::PointCloud& cloud, co + + InSphere cond(query.x, query.y, query.z, radius); + +- device_ptr cloud_ptr((const PointType*)cloud.ptr()); +- device_ptr res_ptr(buffer.ptr()); ++ thrust::device_ptr cloud_ptr((const PointType*)cloud.ptr()); ++ thrust::device_ptr res_ptr(buffer.ptr()); + +- counting_iterator first(0); +- counting_iterator last = first + cloud.size(); ++ thrust::counting_iterator first(0); ++ thrust::counting_iterator last = first + cloud.size(); + + //main bottle neck is a kernel call overhead/allocs + //work time for 871k points ~0.8ms +diff --git a/gpu/octree/src/cuda/octree_builder.cu b/gpu/octree/src/cuda/octree_builder.cu +index dfd2093..faad764 100644 +--- a/gpu/octree/src/cuda/octree_builder.cu ++++ b/gpu/octree/src/cuda/octree_builder.cu +@@ -51,7 +51,6 @@ + #include + + using namespace pcl::gpu; +-using namespace thrust; + + namespace pcl + { +@@ -316,7 +315,7 @@ void pcl::device::OctreeImpl::build() + // 3 * sizeof(int) => +1 row + + const int transaction_size = 128 / sizeof(int); +- int cols = max(points_num, transaction_size * 4); ++ int cols = std::max(points_num, transaction_size * 4); + int rows = 10 + 1; // = 13 + + storage.create(rows, cols); +@@ -338,8 +337,8 @@ void pcl::device::OctreeImpl::build() + { + //ScopeTimer timer("reduce-morton-sort-permutations"); + +- device_ptr beg(points.ptr()); +- device_ptr end = beg + points.size(); ++ thrust::device_ptr beg(points.ptr()); ++ thrust::device_ptr end = beg + points.size(); + + { + PointType atmax, atmin; +@@ -355,15 +354,15 @@ void pcl::device::OctreeImpl::build() + octreeGlobal.maxp = make_float3(maxp.x, maxp.y, maxp.z); + } + +- device_ptr codes_beg(codes.ptr()); +- device_ptr codes_end = codes_beg + codes.size(); ++ thrust::device_ptr codes_beg(codes.ptr()); ++ thrust::device_ptr codes_end = codes_beg + codes.size(); + { + //ScopeTimer timer("morton"); + thrust::transform(beg, end, codes_beg, CalcMorton(octreeGlobal.minp, octreeGlobal.maxp)); + } + +- device_ptr indices_beg(indices.ptr()); +- device_ptr indices_end = indices_beg + indices.size(); ++ thrust::device_ptr indices_beg(indices.ptr()); ++ thrust::device_ptr indices_end = indices_beg + indices.size(); + { + //ScopeTimer timer("sort"); + thrust::sequence(indices_beg, indices_end); +@@ -378,9 +377,9 @@ void pcl::device::OctreeImpl::build() + } + + { +- device_ptr xs(points_sorted.ptr(0)); +- device_ptr ys(points_sorted.ptr(1)); +- device_ptr zs(points_sorted.ptr(2)); ++ thrust::device_ptr xs(points_sorted.ptr(0)); ++ thrust::device_ptr ys(points_sorted.ptr(1)); ++ thrust::device_ptr zs(points_sorted.ptr(2)); + //ScopeTimer timer("perm2"); + thrust::transform(make_permutation_iterator(beg, indices_beg), + make_permutation_iterator(end, indices_end), diff --git a/ports/pcl/install-examples.patch b/ports/pcl/install-examples.patch new file mode 100644 index 00000000000000..136a4ce3675c1e --- /dev/null +++ b/ports/pcl/install-examples.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake +index 91f2404..18f5a24 100644 +--- a/cmake/pcl_targets.cmake ++++ b/cmake/pcl_targets.cmake +@@ -473,6 +473,8 @@ macro(PCL_ADD_EXAMPLE _name) + # add target to list of example targets created at the parent scope + list(APPEND PCL_EXAMPLES_ALL_TARGETS ${_name}) + set(PCL_EXAMPLES_ALL_TARGETS "${PCL_EXAMPLES_ALL_TARGETS}" PARENT_SCOPE) ++ ++ install(TARGETS ${_name} RUNTIME DESTINATION ${BIN_INSTALL_DIR}) + endmacro() + + ############################################################################### diff --git a/ports/pcl/no-absolute.patch b/ports/pcl/no-absolute.patch new file mode 100644 index 00000000000000..7c930e71959cde --- /dev/null +++ b/ports/pcl/no-absolute.patch @@ -0,0 +1,21 @@ +diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in +index 4137ed1..167fde2 100644 +--- a/PCLConfig.cmake.in ++++ b/PCLConfig.cmake.in +@@ -230,7 +230,7 @@ macro(find_flann) + if(PCL_ALL_IN_ONE_INSTALLER) + set(FLANN_ROOT "${PCL_ROOT}/3rdParty/Flann") + elseif(NOT FLANN_ROOT) +- set(FLANN_ROOT "@FLANN_ROOT@") ++ set(FLANN_ROOT "${VCPKG_IMPORT_PREFIX}") + endif() + + set(FLANN_USE_STATIC @FLANN_USE_STATIC@) +@@ -402,7 +402,6 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h") + # pcl_message("PCL found into a build tree.") + set(PCL_CONF_INCLUDE_DIR "${PCL_DIR}/include") # for pcl_config.h + set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@") +- set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@") + else() + pcl_report_not_found("PCL can not be found on this machine") + endif() diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 5780a8b10870a2..cee90574d05af3 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -14,7 +14,12 @@ vcpkg_from_github( remove-broken-targets.patch fix-cmake_find_library_suffixes.patch fix-pkgconfig.patch # Remove this patch in the next update + fix-namespace-cub.patch # Remove this patch in the next update + fix-error-C3052.patch # Remove this patch in the next update fix-find-libusb.patch + install-examples.patch + no-absolute.patch + Workaround-ICE-in-release.patch ) file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindQhull.cmake" @@ -32,16 +37,23 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - openni2 WITH_OPENNI2 - qt WITH_QT - pcap WITH_PCAP - cuda WITH_CUDA - cuda BUILD_CUDA - cuda BUILD_GPU - tools BUILD_tools - opengl WITH_OPENGL - vtk WITH_VTK - libusb WITH_LIBUSB + openni2 WITH_OPENNI2 + qt WITH_QT + pcap WITH_PCAP + cuda WITH_CUDA + cuda BUILD_CUDA + cuda BUILD_GPU + tools BUILD_tools + opengl WITH_OPENGL + libusb WITH_LIBUSB + visualization WITH_VTK + visualization BUILD_visualization + examples BUILD_examples + apps BUILD_apps + # These 2 apps need openni1 + #apps BUILD_apps_in_hand_scanner + #apps BUILD_apps_3d_rec_framework + simulation BUILD_simulation ) vcpkg_cmake_configure( @@ -103,7 +115,7 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if("tools" IN_LIST FEATURES) +if(BUILD_tools OR BUILD_apps OR BUILD_examples) file(GLOB EXEFILES_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}") file(GLOB EXEFILES_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}") file(COPY ${EXEFILES_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/pcl") @@ -111,4 +123,5 @@ if("tools" IN_LIST FEATURES) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/pcl") endif() +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) diff --git a/ports/pcl/usage b/ports/pcl/usage new file mode 100644 index 00000000000000..60aecd4943902f --- /dev/null +++ b/ports/pcl/usage @@ -0,0 +1,4 @@ +The package pcl provides CMake targets: + + find_package(PCL CONFIG REQUIRED) + target_link_libraries(main PRIVATE ${PCL_LIBRARIES}) diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json index f5db2beb7ffd12..edb982fc813b50 100644 --- a/ports/pcl/vcpkg.json +++ b/ports/pcl/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pcl", "version": "1.12.0", - "port-version": 1, + "port-version": 6, "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", "supports": "!(arm64 & windows)", "dependencies": [ "boost-asio", @@ -37,12 +38,33 @@ } ], "features": { + "apps": { + "description": "Build application examples/samples that show how PCL works", + "dependencies": [ + { + "name": "pcl", + "default-features": false, + "features": [ + "opengl", + "openni2", + "qt", + "vtk" + ] + } + ] + }, "cuda": { "description": "CUDA support for PCL", "dependencies": [ "cuda" ] }, + "examples": { + "description": "Build PCL examples", + "dependencies": [ + "vtk" + ] + }, "libusb": { "description": "Build USB RGBD-Camera drivers", "dependencies": [ @@ -90,17 +112,42 @@ } ] }, + "simulation": { + "description": "Build Point Cloud Library Simulation", + "dependencies": [ + "glew", + { + "name": "pcl", + "default-features": false, + "features": [ + "opengl" + ] + } + ] + }, "tools": { "description": "Build PCL utilities", "dependencies": [ "boost-accumulators" ] }, - "vtk": { - "description": "VTK-Visualizations support for PCL", + "visualization": { + "description": "Build visualization", "dependencies": [ "vtk" ] + }, + "vtk": { + "description": "An alias for visualization", + "dependencies": [ + { + "name": "pcl", + "default-features": false, + "features": [ + "visualization" + ] + } + ] } } } diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index a1db80085ad084..0568f07a35b999 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -56,7 +56,9 @@ if(BUILD_STATIC) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") elseif(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + endif() endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json index 16fe74caccc894..b6a59e074e28a1 100644 --- a/ports/pcre2/vcpkg.json +++ b/ports/pcre2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcre2", "version": "10.39", - "port-version": 1, + "port-version": 2, "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", "homepage": "https://github.com/PhilipHazel/pcre2", "dependencies": [ diff --git a/ports/pdal-c/cmake-project-include.cmake b/ports/pdal-c/cmake-project-include.cmake new file mode 100644 index 00000000000000..39f3cca6d23982 --- /dev/null +++ b/ports/pdal-c/cmake-project-include.cmake @@ -0,0 +1,3 @@ +if(WIN32) + add_compile_definitions(NOMINMAX) +endif() diff --git a/ports/pdal-c/fix-docs-version.patch b/ports/pdal-c/fix-docs-version.patch deleted file mode 100644 index d44b50b6141b8b..00000000000000 --- a/ports/pdal-c/fix-docs-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fbc4a4..c8a325a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,7 +23,8 @@ set(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "CMake RelWithDebInfo suffix") - set(PDALC_ENABLE_CODE_COVERAGE ON CACHE BOOL "Enable code coverage calculation") - set(PDALC_GCC_PARAM_GGC_MIN_HEAPSIZE "131072" CACHE STRING "GCC garbage collection minimum heap size") - --include(ObtainProjectVersion) -+set(${PROJECT_NAME}_VERSION "1.8") -+set(BUILD_ID "vcpkg build") - include_directories("${CMAKE_SOURCE_DIR}/source") - - if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake index 3e1b8c1a93b405..bb06b4d04cfeca 100644 --- a/ports/pdal-c/portfile.cmake +++ b/ports/pdal-c/portfile.cmake @@ -1,32 +1,28 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO PDAL/CAPI - REF 1.8 - SHA512 6a5f4cb3d36b419f3cd195028c3e6dc17abf3cdb7495aa3df638bc1f842ba98243c73e051e9cfcd3afe22787309cb871374b152ded92e6e06f404cd7b1ae50bf - HEAD_REF master - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-docs-version.patch - ${CMAKE_CURRENT_LIST_DIR}/preserve-install-dir.patch - ${CMAKE_CURRENT_LIST_DIR}/remove-tests.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO PDAL/CAPI + REF v2.1.0 + SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF + -DPDALC_ENABLE_DOCS:BOOL=OFF + -DPDALC_ENABLE_TESTS:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Remove headers from debug -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Install copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdal-c - RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pdal-c/preserve-install-dir.patch b/ports/pdal-c/preserve-install-dir.patch deleted file mode 100644 index 87377ab2f5500d..00000000000000 --- a/ports/pdal-c/preserve-install-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fbc4a4..075c86c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,8 +13,6 @@ set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - --# Install to the build directory --set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE STRING "CMake install prefix" FORCE) - - # Use "d" suffix for debug builds - # Do not use a suffix for RelWithDebInfo diff --git a/ports/pdal-c/remove-tests.patch b/ports/pdal-c/remove-tests.patch deleted file mode 100644 index c50914e576e2cd..00000000000000 --- a/ports/pdal-c/remove-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fbc4a4..e31e552 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -44,7 +44,3 @@ endif() - - add_subdirectory("source/pdal") - add_subdirectory("doc") -- --include(CTest) --add_subdirectory("tests/data") --add_subdirectory("tests/pdal") diff --git a/ports/pdal-c/vcpkg.json b/ports/pdal-c/vcpkg.json index c0629c9909de99..f02d1afdfc5177 100644 --- a/ports/pdal-c/vcpkg.json +++ b/ports/pdal-c/vcpkg.json @@ -1,9 +1,17 @@ { "name": "pdal-c", - "version-string": "1.8", - "port-version": 3, + "version-string": "2.1", "description": "C API for the Point Data Abstraction Library (PDAL)", + "homepage": "https://github.com/PDAL/CAPI#readme", + "supports": "!(windows & staticcrt)", "dependencies": [ - "pdal" + { + "name": "pdal", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/pdal/0001-win32_compiler_options.cmake.patch b/ports/pdal/0001-win32_compiler_options.cmake.patch deleted file mode 100644 index 8486cc1cd97c20..00000000000000 --- a/ports/pdal/0001-win32_compiler_options.cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar a/cmake/win32_compiler_options.cmake b/cmake/win32_compiler_options.cmake ---- a/cmake/win32_compiler_options.cmake 2018-04-06 20:24:17.000000000 +0200 -+++ b/cmake/win32_compiler_options.cmake 2018-04-28 19:40:54.534593200 +0200 -@@ -67,10 +67,6 @@ - endif() - endif() - --set(CMAKE_INCLUDE_PATH "c:/OSGeo4W64/include;$ENV{CMAKE_INCLUDE_PATH}") --set(CMAKE_LIBRARY_PATH "c:/OSGeo4W64/lib;$ENV{CMAKE_LIBRARY_PATH}") --set(CMAKE_PREFIX_PATH "c:/OSGeo4W64/cmake;$ENV{CMAKE_LIBRARY_PATH}") -- - #ABELL (& gadomski) - WHY? - set(PDAL_PLATFORM_WIN32 1) - set(WINSOCK_LIBRARY ws2_32) diff --git a/ports/pdal/0002-no-source-dir-writes.patch b/ports/pdal/0002-no-source-dir-writes.patch index f7ec12f6bfba81..f739cdf7dc794f 100644 --- a/ports/pdal/0002-no-source-dir-writes.patch +++ b/ports/pdal/0002-no-source-dir-writes.patch @@ -19,31 +19,3 @@ index dc146d1..9b82544 100644 ${PDAL_SRC_DIR}/compression/*.cpp) file(GLOB_RECURSE PRIVATE_SRCS ${PDAL_FILTERS_DIR}/private/*.cpp -diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt -index b02aa4a..d60b041 100644 ---- a/apps/CMakeLists.txt -+++ b/apps/CMakeLists.txt -@@ -66,9 +66,9 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc - if(UNIX OR APPLE) - # Autoconf compatibility variables to use the same script source. - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.in" -- "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config" @ONLY) -+ "${CMAKE_CURRENT_BINARY_DIR}/pdal-config" @ONLY) - -- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config" -+ file(COPY "${CMAKE_CURRENT_BINARY_DIR}/pdal-config" - DESTINATION - "${PDAL_OUTPUT_BIN_DIR}/" - FILE_PERMISSIONS -@@ -85,9 +85,9 @@ if(UNIX OR APPLE) - elseif(WIN32) - # Autoconf compatibility variables to use the same script source. - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pdal-config-bat.in" -- "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.bat" @ONLY) -+ "${CMAKE_CURRENT_BINARY_DIR}/pdal-config.bat" @ONLY) - -- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.bat" -+ file(COPY "${CMAKE_CURRENT_BINARY_DIR}/pdal-config.bat" - DESTINATION - "${PDAL_OUTPUT_BIN_DIR}/" - FILE_PERMISSIONS diff --git a/ports/pdal/0003-fix-copy-vendor.patch b/ports/pdal/0003-fix-copy-vendor.patch index 3aad7af320a9e9..092c4651fcf7e6 100644 --- a/ports/pdal/0003-fix-copy-vendor.patch +++ b/ports/pdal/0003-fix-copy-vendor.patch @@ -1,59 +1,20 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43e446a..c4c7d6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -339,6 +339,30 @@ install(DIRECTORY ${PDAL_FILTERS_DIR} - install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp} - DESTINATION include/pdal - ) -+# Install vendor headers -+install(DIRECTORY ${PDAL_VENDOR_ARBITER_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.hpp" -+ PATTERN "private" EXCLUDE -+) -+ -+install(DIRECTORY ${PDAL_VENDOR_JSONCPP_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.h" -+ PATTERN "private" EXCLUDE -+) -+ -+install(DIRECTORY ${PDAL_VENDOR_KAZHDAN_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.h" -+ PATTERN "private" EXCLUDE -+) -+ -+install(DIRECTORY ${PDAL_VENDOR_NANOFLANN_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.hpp" -+ PATTERN "private" EXCLUDE -+) - - # - # CPACK -@@ -348,7 +373,7 @@ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) - - export( - TARGETS -- ${PDAL_BASE_LIB_NAME} ${PDAL_UTIL_LIB_NAME} -+ ${PDAL_BASE_LIB_NAME} ${PDAL_ARBITER_LIB_NAME} ${PDAL_KAZHDAN_LIB_NAME} ${PDAL_UTIL_LIB_NAME} - FILE - "${PDAL_BINARY_DIR}/PDALTargets.cmake") - -diff --git a/cmake/directories.cmake b/cmake/directories.cmake -index f079ec7..8e366e8 100644 ---- a/cmake/directories.cmake -+++ b/cmake/directories.cmake -@@ -11,4 +11,7 @@ set(PDAL_KERNELS_DIR ${ROOT_DIR}/kernels) - set(PDAL_FILTERS_DIR ${ROOT_DIR}/filters) - set(PDAL_IO_DIR ${ROOT_DIR}/io) - set(PDAL_VENDOR_DIR ${ROOT_DIR}/vendor) -- -+set(PDAL_VENDOR_ARBITER_DIR ${PDAL_VENDOR_DIR}/arbiter) -+set(PDAL_VENDOR_JSONCPP_DIR ${PDAL_VENDOR_DIR}/jsoncpp) -+set(PDAL_VENDOR_KAZHDAN_DIR ${PDAL_VENDOR_DIR}/kazhdan) -+set(PDAL_VENDOR_NANOFLANN_DIR ${PDAL_VENDOR_DIR}/nanoflann) - -\ No newline at end of file +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e918a3e..a3f9a03 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -375,6 +375,15 @@ install(DIRECTORY ${PDAL_FILTERS_DIR} + install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp} + DESTINATION include/pdal + ) ++# Instaqll vendor headers ++install(DIRECTORY ++ ${PDAL_VENDOR_DIR}/arbiter ++ ${PDAL_VENDOR_DIR}/kazhdan ++ ${PDAL_VENDOR_DIR}/nanoflann ++ DESTINATION include/pdal/vendor ++ FILES_MATCHING PATTERN "*.hpp" PATTERN PATTERN "*.h" ++ PATTERN "private" EXCLUDE ++) + + # + # CPACK diff --git a/ports/pdal/0004-fix-const-overloaded.patch b/ports/pdal/0004-fix-const-overloaded.patch deleted file mode 100644 index 1f820aef340053..00000000000000 --- a/ports/pdal/0004-fix-const-overloaded.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pdal/PointViewIter.hpp b/pdal/PointViewIter.hpp -index 0c387be..ccb0721 100644 ---- a/pdal/PointViewIter.hpp -+++ b/pdal/PointViewIter.hpp -@@ -139,7 +139,7 @@ public: - - bool operator==(const PointViewIter& i) - { return m_id == i.m_id; } -- bool operator!=(const PointViewIter& i) -+ bool operator!=(const PointViewIter& i) const - { return m_id != i.m_id; } - bool operator<=(const PointViewIter& i) - { return m_id <= i.m_id; } diff --git a/ports/pdal/FindGEOS.cmake b/ports/pdal/FindGEOS.cmake deleted file mode 100644 index 88d17b0733d0d1..00000000000000 --- a/ports/pdal/FindGEOS.cmake +++ /dev/null @@ -1,13 +0,0 @@ -find_path(GEOS_INCLUDE_DIR geos_c.h) - -find_library(GEOS_LIBRARY_DEBUG NAMES geos_cd) -find_library(GEOS_LIBRARY_RELEASE NAMES geos_c) - -include(SelectLibraryConfigurations) -select_library_configurations(GEOS) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - GEOS DEFAULT_MSG - GEOS_LIBRARY GEOS_INCLUDE_DIR -) diff --git a/ports/pdal/fix-CPL_DLL.patch b/ports/pdal/fix-CPL_DLL.patch deleted file mode 100644 index ef7c2647273194..00000000000000 --- a/ports/pdal/fix-CPL_DLL.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/io/GeotiffSupport.cpp b/io/GeotiffSupport.cpp -index 7b75818..909992d 100644 ---- a/io/GeotiffSupport.cpp -+++ b/io/GeotiffSupport.cpp -@@ -43,8 +43,8 @@ PDAL_C_START - - // These functions are available from GDAL, but they - // aren't exported. --char CPL_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*); --int CPL_DLL GTIFSetFromOGISDefn(GTIF*, const char*); -+char GTIF_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*); -+int GTIF_DLL GTIFSetFromOGISDefn(GTIF*, const char*); - - PDAL_C_END - diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index 352eb1d43f1b17..8e794946436c81 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -1,231 +1,34 @@ -diff --git a/cmake/geos.cmake b/cmake/geos.cmake -index 90b79d9..5942ee5 100644 ---- a/cmake/geos.cmake -+++ b/cmake/geos.cmake -@@ -1,8 +1,5 @@ - # - # GEOS (required) - # --find_package(GEOS QUIET 3.3) --set_package_properties(GEOS PROPERTIES TYPE REQUIRED -- PURPOSE "Provides general purpose geometry support") -- --include_directories("${GEOS_INCLUDE_DIR}") -+find_package(geos CONFIG REQUIRED) -+set(GEOS_LIBRARY GEOS::geos GEOS::geos_c GEOS::geos_cxx_flags) -\ No newline at end of file -diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake -index 8178418..31b54d6 100644 ---- a/cmake/modules/FindPostgreSQL.cmake -+++ b/cmake/modules/FindPostgreSQL.cmake -@@ -80,4 +80,11 @@ find_package_handle_standard_args(PostgreSQL - POSTGRESQL_LIBRARIES - POSTGRESQL_VERSION) - --mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) -+include (CMakeFindDependencyMacro) -+find_package(OpenSSL REQUIRED) -+set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto) -+if (WIN32) -+ set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARIES} Secur32) -+endif() -+ -+mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) -\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 42cca1e..43b0ced 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -174,7 +174,6 @@ if (WITH_TESTS) - add_subdirectory(test) - endif() - add_subdirectory(dimbuilder) --add_subdirectory(vendor/pdalboost) - add_subdirectory(vendor/arbiter) - add_subdirectory(vendor/kazhdan) - if (NOT PDAL_HAVE_JSONCPP) -diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in -index a03ef14..9d073e6 100644 ---- a/PDALConfig.cmake.in -+++ b/PDALConfig.cmake.in -@@ -15,6 +15,11 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) - list(APPEND PDAL_LIBRARY_DIRS ${_foo}) - endforeach(_dir) - -+include(CMakeFindDependencyMacro) -+find_dependency(GeoTIFF) -+find_dependency(CURL) -+find_dependency(Boost COMPONENTS system filesystem) -+find_dependency(geos CONFIG) - include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") - - if (WIN32) -diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt -index 19a2dd1..d498080 100644 ---- a/pdal/util/CMakeLists.txt -+++ b/pdal/util/CMakeLists.txt -@@ -8,6 +8,8 @@ endif() - - include(${PDAL_CMAKE_DIR}/execinfo.cmake) - -+find_package(Boost COMPONENTS system filesystem REQUIRED) -+ - set(PDAL_UTIL_SOURCES - "${PDAL_UTIL_DIR}/Bounds.cpp" - "${PDAL_UTIL_DIR}/Charbuf.cpp" -@@ -16,14 +18,14 @@ set(PDAL_UTIL_SOURCES - "${PDAL_UTIL_DIR}/Utils.cpp" - ) - --PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES}) -+PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} ${PDAL_UTIL_SOURCES}) - target_link_libraries(${PDAL_UTIL_LIB_NAME} +@@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME} + target_link_libraries(${PDAL_BASE_LIB_NAME} PRIVATE - ${EXECINFO_LIBRARY} -- ${PDAL_BOOST_LIB_NAME} -+ PUBLIC -+ Boost::system -+ Boost::filesystem - ) --target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE -- ${PDAL_VENDOR_DIR}/pdalboost) - - if (UNIX AND NOT APPLE) - target_link_libraries(${PDAL_UTIL_LIB_NAME} -diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp -index 7679f22..b18b674 100644 ---- a/pdal/util/FileUtils.cpp -+++ b/pdal/util/FileUtils.cpp -@@ -124,19 +124,19 @@ std::ostream *createFile(std::string const& name, bool asBinary) - bool directoryExists(const std::string& dirname) - { - //ABELL - Seems we should be calling is_directory -- return pdalboost::filesystem::exists(dirname); -+ return boost::filesystem::exists(dirname); - } - - - bool createDirectory(const std::string& dirname) - { -- return pdalboost::filesystem::create_directory(dirname); -+ return boost::filesystem::create_directory(dirname); - } - - - void deleteDirectory(const std::string& dirname) - { -- pdalboost::filesystem::remove_all(dirname); -+ boost::filesystem::remove_all(dirname); - } - - -@@ -146,15 +146,15 @@ std::vector directoryList(const std::string& dir) - - try - { -- pdalboost::filesystem::directory_iterator it(dir); -- pdalboost::filesystem::directory_iterator end; -+ boost::filesystem::directory_iterator it(dir); -+ boost::filesystem::directory_iterator end; - while (it != end) - { - files.push_back(it->path().string()); - it++; - } - } -- catch (pdalboost::filesystem::filesystem_error) -+ catch (boost::filesystem::filesystem_error) - { - files.clear(); - } -@@ -194,13 +194,13 @@ void closeFile(std::istream* in) - - bool deleteFile(const std::string& file) - { -- return pdalboost::filesystem::remove(file); -+ return boost::filesystem::remove(file); - } - - - void renameFile(const std::string& dest, const std::string& src) - { -- pdalboost::filesystem::rename(src, dest); -+ boost::filesystem::rename(src, dest); - } - - -@@ -211,9 +211,9 @@ bool fileExists(const std::string& name) - - try - { -- return pdalboost::filesystem::exists(name); -+ return boost::filesystem::exists(name); - } -- catch (pdalboost::filesystem::filesystem_error) -+ catch (boost::filesystem::filesystem_error) - { - } - return false; -@@ -222,7 +222,7 @@ bool fileExists(const std::string& name) - - uintmax_t fileSize(const std::string& file) - { -- return pdalboost::filesystem::file_size(file); -+ return boost::filesystem::file_size(file); - } - - -@@ -243,7 +243,7 @@ std::string readFileIntoString(const std::string& filename) - - std::string getcwd() - { -- const pdalboost::filesystem::path p = pdalboost::filesystem::current_path(); -+ const boost::filesystem::path p = boost::filesystem::current_path(); - return addTrailingSlash(p.string()); - } - -@@ -271,7 +271,7 @@ std::string toAbsolutePath(const std::string& filename) - // otherwise, make it absolute (relative to current working dir) and return that - std::string toAbsolutePath(const std::string& filename) - { -- return pdalboost::filesystem::absolute(filename).string(); -+ return boost::filesystem::absolute(filename).string(); - } - - -@@ -283,7 +283,7 @@ std::string toAbsolutePath(const std::string& filename) - std::string toAbsolutePath(const std::string& filename, const std::string base) - { - const std::string newbase = toAbsolutePath(base); -- return pdalboost::filesystem::absolute(filename, newbase).string(); -+ return boost::filesystem::absolute(filename, newbase).string(); - } - - std::string getFilename(const std::string& path) -@@ -304,8 +304,8 @@ std::string getFilename(const std::string& path) - // Get the directory part of a filename. - std::string getDirectory(const std::string& path) - { -- const pdalboost::filesystem::path dir = -- pdalboost::filesystem::path(path).parent_path(); -+ const boost::filesystem::path dir = -+ boost::filesystem::path(path).parent_path(); - return addTrailingSlash(dir.string()); - } - -@@ -326,13 +326,13 @@ std::string stem(const std::string& path) - // Determine if the path represents a directory. - bool isDirectory(const std::string& path) - { -- return pdalboost::filesystem::is_directory(path); -+ return boost::filesystem::is_directory(path); - } - - // Determine if the path is an absolute path - bool isAbsolutePath(const std::string& path) - { -- return pdalboost::filesystem::path(path).is_absolute(); -+ return boost::filesystem::path(path).is_absolute(); - } - - + ${CMAKE_THREAD_LIBS_INIT} +- ${GDAL_LIBRARY} ++ ${GDAL_LIBRARIES} + ${GEOTIFF_LIBRARY} + ${LASZIP_LIBRARY} + ${LIBXML2_LIBRARIES} +diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake +index bfaa5b2..e73ec9e 100644 +--- a/cmake/zstd.cmake ++++ b/cmake/zstd.cmake +@@ -4,7 +4,15 @@ + option(WITH_ZSTD + "Build support for compression/decompression with Zstd." TRUE) + if (WITH_ZSTD) +- find_package(ZSTD QUIET) ++ find_package(zstd CONFIG REQUIRED) ++ set(ZSTD_FOUND TRUE) ++ set(ZSTD_INCLUDE_DIRS "") ++ if(TARGET zstd::libzstd_static) ++ set(ZSTD_LIBRARIES zstd::libzstd_static) ++ set(ZSTD_STATIC_LIB zstd::libzstd_static) ++ else() ++ set(ZSTD_LIBRARIES zstd::libzstd_shared) ++ endif() + set_package_properties(ZSTD PROPERTIES TYPE + PURPOSE "General compression support") + if (ZSTD_FOUND) diff --git a/ports/pdal/fix-find-library-suffix.patch b/ports/pdal/fix-find-library-suffix.patch new file mode 100644 index 00000000000000..53eefb68d12f6e --- /dev/null +++ b/ports/pdal/fix-find-library-suffix.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake +index dae98ea..edab055 100644 +--- a/cmake/libraries.cmake ++++ b/cmake/libraries.cmake +@@ -3,11 +3,7 @@ + option(PDAL_BUILD_STATIC "Build PDAL as a static library" OFF) + if (PDAL_BUILD_STATIC) + set(PDAL_LIB_TYPE "STATIC") +- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX}) + else () + set(PDAL_LIB_TYPE "SHARED") +- if (WIN32) +- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX}) +- endif() + endif() + mark_as_advanced(PDAL_BUILD_STATIC) diff --git a/ports/pdal/fix-unix-compiler-options.patch b/ports/pdal/fix-unix-compiler-options.patch new file mode 100644 index 00000000000000..79a379cb9cea96 --- /dev/null +++ b/ports/pdal/fix-unix-compiler-options.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 679b4e7..08965d9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,7 +187,7 @@ add_subdirectory(apps) + # so that users only need link libpdalcpp. + # + if (APPLE) +- set(PDAL_REEXPORT "-Wl,-reexport_library,$") ++ set(PDAL_REEXPORT "-Wl$-reexport_library$$") + # + # This allows the rpath reference for the reexported library (above) to + # be found. diff --git a/ports/pdal/libpq.patch b/ports/pdal/libpq.patch deleted file mode 100644 index 3aac2188cd0f90..00000000000000 --- a/ports/pdal/libpq.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/cmake/postgres.cmake b/cmake/postgres.cmake -index 0dad71069..32fdae2f8 100644 ---- a/cmake/postgres.cmake -+++ b/cmake/postgres.cmake -@@ -7,3 +7,27 @@ find_package(PostgreSQL REQUIRED) - mark_as_advanced(CLEAR POSTGRESQL_INCLUDE_DIR) - mark_as_advanced(CLEAR POSTGRESQL_LIBRARIES) - include_directories(${POSTGRESQL_INCLUDE_DIR}) -+ -+include(SelectLibraryConfigurations) -+ -+find_library(PostgreSQLCommon_LIBRARY_DEBUG -+NAMES libpgcommond pgcommond pgcommon libpgcommon -+NAMES_PER_DIR -+) -+find_library(PostgreSQLCommon_LIBRARY_RELEASE -+NAMES pgcommon libpgcommon -+NAMES_PER_DIR -+) -+select_library_configurations(PostgreSQLCommon) -+ -+find_library(PostgreSQLPort_LIBRARY_DEBUG -+NAMES pgportd libpgportd pgport libpgport -+NAMES_PER_DIR -+) -+find_library(PostgreSQLPort_LIBRARY_RELEASE -+NAMES pgport libpgport -+NAMES_PER_DIR -+) -+select_library_configurations(PostgreSQLPort) -+ -+list(APPEND POSTGRESQL_LIBRARIES ${PostgreSQLPort_LIBRARIES} ${PostgreSQLCommon_LIBRARIES}) -\ No newline at end of file diff --git a/ports/pdal/no-pkgconfig-requires.patch b/ports/pdal/no-pkgconfig-requires.patch new file mode 100644 index 00000000000000..1f0841e2c73a52 --- /dev/null +++ b/ports/pdal/no-pkgconfig-requires.patch @@ -0,0 +1,12 @@ +diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in +index 6885221..cd2136c 100644 +--- a/apps/pdal.pc.in ++++ b/apps/pdal.pc.in +@@ -5,7 +5,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include + + Name: PDAL + Description: Point Data Abstraction Library +-Requires: @PKGCONFIG_LIBRARY_DEFINITIONS@ + Version: @PDAL_VERSION@ + Libs: -L${libdir} -l@PDAL_LIB_NAME@ + Cflags: -I${includedir}/pdal @PDAL_CONFIG_DEFINITIONS@ diff --git a/ports/pdal/no-rpath.patch b/ports/pdal/no-rpath.patch new file mode 100644 index 00000000000000..ab2c555c9bf319 --- /dev/null +++ b/ports/pdal/no-rpath.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/rpath.cmake b/cmake/rpath.cmake +index ba486b7..4323a77 100644 +--- a/cmake/rpath.cmake ++++ b/cmake/rpath.cmake +@@ -1,6 +1,7 @@ + # + # Set options and variable related to OSX rpath. + # ++return() + + # per http://www.cmake.org/Wiki/CMake_RPATH_handling + SET(CMAKE_SKIP_BUILD_RPATH FALSE) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 4fbabc1f0f7bae..dda2aead16c1bb 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -1,75 +1,86 @@ -set(PDAL_VERSION_STR "1.7.1") +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -vcpkg_download_distfile(ARCHIVE - URLS "http://download.osgeo.org/pdal/PDAL-${PDAL_VERSION_STR}-src.tar.gz" - FILENAME "PDAL-${PDAL_VERSION_STR}-src.tar.gz" - SHA512 e3e63bb05930c1a28c4f46c7edfaa8e9ea20484f1888d845b660a29a76f1dd1daea3db30a98607be0c2eeb86930ec8bfd0965d5d7d84b07a4fe4cb4512da9b09 -) - -vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH + REPO PDAL/PDAL + REF 2.3.0 + SHA512 898ea54c8c8e0a9bb8aed8d7f542da5a44b02c8656273783366d711b5b3f50b547438aa1cb4d41b490d187dae7bef20fe3b6c64dcb87c06e6f4cb91a8f79ac59 + HEAD_REF master PATCHES - 0001-win32_compiler_options.cmake.patch 0002-no-source-dir-writes.patch 0003-fix-copy-vendor.patch fix-dependency.patch - libpq.patch - fix-CPL_DLL.patch - 0004-fix-const-overloaded.patch + use-vcpkg-boost.patch + fix-unix-compiler-options.patch + fix-find-library-suffix.patch + no-pkgconfig-requires.patch + no-rpath.patch ) file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") +file(REMOVE_RECURSE "${SOURCE_PATH}/vendor/pdalboost/boost" "${SOURCE_PATH}/vendor/pdalboost/libs") -# Deploy custom CMake modules to enforce expected dependencies look-up -foreach(_module IN ITEMS FindGDAL FindGEOS FindGeoTIFF FindCurl) # Outdated; Supplied by CMake - file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake") -endforeach() -foreach(_module IN ITEMS FindGEOS) # Overwritten Modules. - file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/${_module}.cmake - DESTINATION ${SOURCE_PATH}/cmake/modules/ - ) +# Prefer pristine CMake find modules + wrappers and config files from vcpkg. +foreach(package IN ITEMS Curl GeoTIFF ICONV PostgreSQL ZSTD) + file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake") endforeach() -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" VCPKG_BUILD_STATIC_LIBS) +unset(ENV{OSGEO4W_HOME}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + draco BUILD_PLUGIN_DRACO + e57 BUILD_PLUGIN_E57 + hdf5 BUILD_PLUGIN_HDF + i3s BUILD_PLUGIN_I3S + laszip WITH_LASZIP + lzma WITH_LZMA + pgpointcloud BUILD_PLUGIN_PGPOINTCLOUD + zstd WITH_ZSTD +) +if(BUILD_PLUGIN_DRACO) + vcpkg_find_acquire_program(PKGCONFIG) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPDAL_BUILD_STATIC:BOOL=${VCPKG_BUILD_STATIC_LIBS} + -DPDAL_PLUGIN_INSTALL_PATH=. + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + -DPOSTGRESQL_LIBRARIES=PostgreSQL::PostgreSQL -DWITH_TESTS:BOOL=OFF -DWITH_COMPLETION:BOOL=OFF + -DWITH_LAZPERF:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Libexecinfo:BOOL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libunwind:BOOL=ON + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + POSTGRESQL_LIBRARIES ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/pdal/cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PDAL) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# Install PDAL executable -file(GLOB _pdal_apps ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(COPY ${_pdal_apps} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/pdal) -file(REMOVE ${_pdal_apps}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +# Install and cleanup executables +file(GLOB pdal_unsupported + "${CURRENT_PACKAGES_DIR}/bin/*.bat" + "${CURRENT_PACKAGES_DIR}/bin/pdal-config" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.bat" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/pdal-config" +) +file(REMOVE ${pdal_unsupported}) +vcpkg_copy_tools(TOOL_NAMES pdal AUTO_CLEAN) # Post-install clean-up file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib/pdal - ${CURRENT_PACKAGES_DIR}/debug/lib/pdal - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/include/pdal/filters/private/csf" + "${CURRENT_PACKAGES_DIR}/include/pdal/filters/private/miniball" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) -else() - file(GLOB _pdal_bats ${CURRENT_PACKAGES_DIR}/bin/*.bat) - file(REMOVE ${_pdal_bats}) - file(GLOB _pdal_bats ${CURRENT_PACKAGES_DIR}/debug/bin/*.bat) - file(REMOVE ${_pdal_bats}) - file(GLOB _pdal_apps ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(REMOVE ${_pdal_apps}) -endif() - -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +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) diff --git a/ports/pdal/usage b/ports/pdal/usage new file mode 100644 index 00000000000000..eaf37886430891 --- /dev/null +++ b/ports/pdal/usage @@ -0,0 +1,9 @@ +The package pdal provides CMake variables: + + find_package(PDAL CONFIG REQUIRED) + target_include_directories(${PDAL_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${PDAL_LIBRARIES}) + +If necessary, override the default plugin search path by setting the +environment variable PDAL_DRIVER_PATH to a list of directories that +pdal should search for plugins. diff --git a/ports/pdal/use-vcpkg-boost.patch b/ports/pdal/use-vcpkg-boost.patch new file mode 100644 index 00000000000000..d07bf6eea54ccc --- /dev/null +++ b/ports/pdal/use-vcpkg-boost.patch @@ -0,0 +1,66 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 83a396b..7ebcc3b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -67,7 +67,8 @@ else() + endif() + set(PDAL_LIB_NAME pdalcpp) + set(PDAL_UTIL_LIB_NAME pdal_util) +-set(PDAL_BOOST_LIB_NAME pdal_boost) ++find_package(Boost COMPONENTS filesystem system REQUIRED) ++set(PDAL_BOOST_LIB_NAME Boost::filesystem Boost::system) + set(PDAL_KAZHDAN_LIB_NAME pdal_kazhdan) + set(PDAL_TEST_SUPPORT_OBJS pdal_test_support) + +@@ -179,13 +180,11 @@ endif() + + add_subdirectory(plugins) + +-#include_directories(vendor/pdalboost) + if (WITH_TESTS) + include (${PDAL_CMAKE_DIR}/gtest.cmake) + add_subdirectory(test) + endif() + add_subdirectory(dimbuilder) +-add_subdirectory(vendor/pdalboost) + add_subdirectory(vendor/arbiter) + add_subdirectory(vendor/kazhdan) + add_subdirectory(pdal/util) +@@ -269,7 +268,6 @@ target_include_directories(${PDAL_BASE_LIB_NAME} + ${PROJECT_BINARY_DIR}/include + ${PDAL_VENDOR_DIR} + ${PDAL_VENDOR_DIR}/eigen +- ${PDAL_VENDOR_DIR}/pdalboost + ${LIBXML2_INCLUDE_DIR} + ${ZSTD_INCLUDE_DIRS} + ${NLOHMANN_INCLUDE_DIR} +diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt +index 6b3e889..8a42122 100644 +--- a/pdal/util/CMakeLists.txt ++++ b/pdal/util/CMakeLists.txt +@@ -40,8 +40,6 @@ target_link_libraries(${PDAL_UTIL_LIB_NAME} + ${CMAKE_DL_LIBS} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE +- ${PDAL_VENDOR_DIR}/pdalboost) + + set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES + VERSION "${PDAL_BUILD_VERSION}" +diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp +index ee47b55..4a57268 100644 +--- a/pdal/util/FileUtils.cpp ++++ b/pdal/util/FileUtils.cpp +@@ -98,6 +98,12 @@ inline std::string const& toNative(std::string const& in) { return in; } + + } // unnamed namespace + ++namespace pdalboost ++{ ++ namespace filesystem = boost::filesystem; ++ namespace system = boost::system; ++} ++ + namespace FileUtils + { + diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index 93d9cb70e9aae5..b4f2a01dde978d 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,15 +1,109 @@ { "name": "pdal", - "version": "1.7.1", - "port-version": 13, + "version": "2.3.0", "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", + "homepage": "https://pdal.io/", + "supports": "!(windows & staticcrt)", "dependencies": [ "boost-filesystem", "boost-system", - "gdal", - "geos", - "jsoncpp", + { + "name": "curl", + "default-features": false + }, + { + "name": "gdal", + "default-features": false + }, + "libgeotiff", + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ "laszip", - "libgeotiff" - ] + "supported-plugins" + ], + "features": { + "draco": { + "description": "Build the Draco plugin", + "dependencies": [ + "draco" + ] + }, + "e57": { + "description": "Build the E57 plugin", + "dependencies": [ + "xerces-c" + ] + }, + "hdf": { + "description": "Build the HDF plugin", + "dependencies": [ + { + "name": "hdf5", + "default-features": false + } + ] + }, + "i3s": { + "description": "Build the SLPK/I3S plugins", + "dependencies": [ + "zlib" + ] + }, + "laszip": { + "description": "LASzip support", + "dependencies": [ + "laszip" + ] + }, + "liblzma": { + "description": "Support for compression/decompression with LZMA", + "dependencies": [ + "liblzma" + ] + }, + "pgpointcloud": { + "description": "Build the PgPointCloud plugin", + "dependencies": [ + "libpq" + ] + }, + "supported-plugins": { + "description": "Default set of plugins, dependent on platform", + "dependencies": [ + { + "name": "pdal", + "default-features": false, + "features": [ + "draco", + "e57", + "i3s" + ] + }, + { + "name": "pdal", + "default-features": false, + "features": [ + "hdf", + "pgpointcloud" + ], + "platform": "!uwp" + } + ] + }, + "zstd": { + "description": "Support for ZSTD compression/decompression", + "dependencies": [ + "zstd" + ] + } + } } diff --git a/ports/pdcurses/nmake-install.patch b/ports/pdcurses/nmake-install.patch new file mode 100644 index 00000000000000..892550352f4e3d --- /dev/null +++ b/ports/pdcurses/nmake-install.patch @@ -0,0 +1,21 @@ +diff --git a/wincon/Makefile.vc b/wincon/Makefile.vc +index 80c4689..1bae388 100644 +--- a/wincon/Makefile.vc ++++ b/wincon/Makefile.vc +@@ -118,3 +118,16 @@ tui.obj: $(demodir)\tui.c $(demodir)\tui.h + + tuidemo.obj: $(demodir)\tuidemo.c + $(BUILD) -I$(demodir) $(demodir)\tuidemo.c ++ ++install: all ++ -mkdir $(INSTALLDIR)\lib ++ copy pdcurses.lib $(INSTALLDIR)\lib ++!ifdef DLL ++ -mkdir $(INSTALLDIR)\bin ++ copy pdcurses.dll $(INSTALLDIR)\bin ++!endif ++!ifndef SKIP_HEADERS ++ -mkdir $(INSTALLDIR)\include ++ copy $(PDCURSES_SRCDIR)\curses.h $(INSTALLDIR)\include ++ copy $(PDCURSES_SRCDIR)\panel.h $(INSTALLDIR)\include ++!endif diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index 81b201c1b61b17..7869f2185a6e18 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -1,73 +1,42 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_CRT) - -find_program(NMAKE nmake) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wmcbrine/PDCurses REF 6c1f95c4fa9f9f105879c2d99dd72a5bf335c046 # 3.9 SHA512 2d682a3516baaa58a97854aca64d985768b7af76d998240b54afc57ddf2a44894835a1748888f8dd7c1cc8045ede77488284f8adf1b73878879b4b4d3391218d HEAD_REF master + PATCHES + nmake-install.patch ) - -set(PDC_NMAKE_CMD ${NMAKE} /A -f ${SOURCE_PATH}/wincon/Makefile.vc WIDE=Y UTF8=Y) - -set(PDC_NMAKE_CWD ${SOURCE_PATH}/wincon) -set(PDC_PDCLIB ${SOURCE_PATH}/wincon/pdcurses) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(PDC_NMAKE_CMD ${PDC_NMAKE_CMD} DLL=Y) -endif() - -message(STATUS "Build ${TARGET_TRIPLET}-rel") -vcpkg_execute_required_process( - COMMAND ${PDC_NMAKE_CMD} - WORKING_DIRECTORY ${PDC_NMAKE_CWD} - LOGNAME build-${TARGET_TRIPLET}-rel -) -message(STATUS "Build ${TARGET_TRIPLET}-rel done") - -file ( - COPY ${PDC_PDCLIB}.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib -) -if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file ( - COPY ${PDC_PDCLIB}.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + cmake_path(NATIVE_PATH SOURCE_PATH PDCURSES_SRCDIR) + set(DLL_OPTION "") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(DLL_OPTION DLL=Y) + endif() + vcpkg_build_nmake( + SOURCE_PATH "${SOURCE_PATH}/wincon" + PROJECT_NAME Makefile.vc + ENABLE_INSTALL + OPTIONS + /A + "PDCURSES_SRCDIR=${PDCURSES_SRCDIR}" + WIDE=Y + UTF8=Y + ${DLL_OPTION} + OPTIONS_RELEASE + "CFLAGS=-D_CRT_SECURE_NO_WARNINGS" + "LDFLAGS=" + OPTIONS_DEBUG + "CFLAGS=-D_CRT_SECURE_NO_WARNINGS -DPDCDEBUG" + "LDFLAGS=-debug" + DEBUG=Y + SKIP_HEADERS=Y ) + vcpkg_copy_pdbs() + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/curses.h" "#ifdef PDC_DLL_BUILD" "#if 1") + endif() endif() -message(STATUS "Build ${TARGET_TRIPLET}-dbg") -vcpkg_execute_required_process( - COMMAND ${PDC_NMAKE_CMD} DEBUG=Y - WORKING_DIRECTORY ${PDC_NMAKE_CWD} - LOGNAME build-${TARGET_TRIPLET}-dbg -) -message(STATUS "Build ${TARGET_TRIPLET}-dbg done") - -file ( - INSTALL ${PDC_PDCLIB}.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib -) -if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file ( - INSTALL ${PDC_PDCLIB}.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - ) -endif() - -file( - INSTALL ${SOURCE_PATH}/curses.h ${SOURCE_PATH}/panel.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include -) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(READ ${CURRENT_PACKAGES_DIR}/include/curses.h _contents) - string(REPLACE "#ifdef PDC_DLL_BUILD" "#if 1" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/curses.h "${_contents}") -endif() - -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdcurses RENAME copyright) - -vcpkg_copy_pdbs() \ No newline at end of file +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pdcurses/vcpkg.json b/ports/pdcurses/vcpkg.json index 59398f2fe49937..fa26f9b12d3599 100644 --- a/ports/pdcurses/vcpkg.json +++ b/ports/pdcurses/vcpkg.json @@ -1,7 +1,8 @@ { "name": "pdcurses", "version-string": "3.9", - "port-version": 2, + "port-version": 3, "description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.", - "homepage": "https://pdcurses.org/" + "homepage": "https://pdcurses.org/", + "supports": "windows & !uwp & !mingw" } diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index c6c99ee784005f..4183a10107b017 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 3.2.2 - SHA512 7ad055e38b362d6b90a49d5deb400948febfbcc30898e05548424bc758f38ffb3f69ca0db41e4480697f8916c90bdb3e48927a4db0caa7a20c8012b1a6d1fe08 - HEAD_REF master + REF 3.2.5 + SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14 + HEAD_REF main ) vcpkg_cmake_configure( @@ -22,4 +22,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/pegtl/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/pegtl/vcpkg.json b/ports/pegtl/vcpkg.json index 95a4f011a5e893..b173e2ba83b201 100644 --- a/ports/pegtl/vcpkg.json +++ b/ports/pegtl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "pegtl", - "version-semver": "3.2.2", + "version-semver": "3.2.5", "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", "homepage": "https://github.com/taocpp/PEGTL", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/pfring/portfile.cmake b/ports/pfring/portfile.cmake index 967bdc5eebb5f8..9ef1667355f4fd 100644 --- a/ports/pfring/portfile.cmake +++ b/ports/pfring/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ntop/PF_RING @@ -10,7 +8,7 @@ vcpkg_from_github( use-vcpkg-libpcap.patch makefile.patch ) - + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -27,17 +25,17 @@ vcpkg_copy_pdbs() # Install manually because pfring cannot set prefix if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) set(PFRING_OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - + if (VCPKG_BUILD_TYPE STREQUAL debug) file(GLOB_RECURSE PFRING_KO_FILES "${PFRING_OBJ_DIR}/*.ko") file(INSTALL ${PFRING_KO_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/share/${PORT}) - + file(INSTALL ${SOURCE_PATH}/userland/lib/pfring.h DESTINATION ${CURRENT_PACKAGES_DIR}/debug/include) endif() - + file(GLOB_RECURSE PFRING_LIBS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") file(INSTALL ${PFRING_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(GLOB_RECURSE PFRING_DLLS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(INSTALL ${PFRING_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) @@ -46,18 +44,18 @@ endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) set(PFRING_OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - + file(GLOB_RECURSE PFRING_KO_FILES "${PFRING_OBJ_DIR}/*.ko") file(INSTALL ${PFRING_KO_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - + file(GLOB_RECURSE PFRING_LIBS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") file(INSTALL ${PFRING_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(GLOB_RECURSE PFRING_DLLS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(INSTALL ${PFRING_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) endif() - + file(INSTALL ${SOURCE_PATH}/userland/lib/pfring.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) endif() diff --git a/ports/pfring/vcpkg.json b/ports/pfring/vcpkg.json index 9e78c638bb5dd9..d0f6d91917f833 100644 --- a/ports/pfring/vcpkg.json +++ b/ports/pfring/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pfring", - "version-string": "2019-10-17", - "port-version": 3, + "version-date": "2019-10-17", + "port-version": 4, "description": "PF_RING™ is a Linux kernel module and user-space framework that allows you to process packets at high-rates while providing you a consistent API for packet processing applications.", "homepage": "https://github.com/ntop/PF_RING", + "supports": "!windows", "dependencies": [ "libpcap" ] diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake index 3b905cc010566a..7fe812dc27b1ee 100644 --- a/ports/physx/portfile.cmake +++ b/ports/physx/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET MINGW) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVIDIAGameWorks/PhysX diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index 1a93f3f5161822..fd3665a648d09c 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,8 +1,10 @@ { "name": "physx", "version-semver": "4.1.2", + "port-version": 1, "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", "homepage": "https://github.com/NVIDIAGameWorks/PhysX", + "supports": "!mingw", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/piex/CMakeLists.txt b/ports/piex/CMakeLists.txt index 35a881055c4eb2..7b782a66d7b0fd 100644 --- a/ports/piex/CMakeLists.txt +++ b/ports/piex/CMakeLists.txt @@ -17,6 +17,7 @@ add_library(image_type_recognition ) target_link_libraries(image_type_recognition binary_parse) +target_compile_features(image_type_recognition PUBLIC cxx_std_11) add_library(tiff_directory src/tiff_directory/tiff_directory.cc @@ -30,6 +31,7 @@ add_library(piex ) target_link_libraries(piex tiff_directory image_type_recognition binary_parse) +target_compile_features(piex PUBLIC cxx_std_11) install( TARGETS piex diff --git a/ports/piex/portfile.cmake b/ports/piex/portfile.cmake index 485210da0180f2..44ff3fc7de3df6 100644 --- a/ports/piex/portfile.cmake +++ b/ports/piex/portfile.cmake @@ -8,16 +8,15 @@ 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_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/piex RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/piex" RENAME copyright) diff --git a/ports/piex/vcpkg.json b/ports/piex/vcpkg.json index fdb727fb705db4..497b60aaa690b9 100644 --- a/ports/piex/vcpkg.json +++ b/ports/piex/vcpkg.json @@ -1,7 +1,13 @@ { "name": "piex", - "version-string": "2019-07-11", - "port-version": 1, + "version-date": "2019-07-11", + "port-version": 2, "description": "The Preview Image Extractor (PIEX) is designed to find and extract the largest", - "homepage": "https://github.com/google/piex" + "homepage": "https://github.com/google/piex", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/pistache/vcpkg.json b/ports/pistache/vcpkg.json index d627fc301cadaf..fb464a5a10b9d1 100644 --- a/ports/pistache/vcpkg.json +++ b/ports/pistache/vcpkg.json @@ -1,11 +1,15 @@ { "name": "pistache", "version-date": "2021-03-31", - "port-version": 2, + "port-version": 3, "description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API", "homepage": "https://github.com/oktal/pistache", "supports": "linux", "dependencies": [ - "rapidjson" + "rapidjson", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/pixel/001-prevent-examples.patch b/ports/pixel/001-prevent-examples.patch new file mode 100644 index 00000000000000..ec958f867c90d5 --- /dev/null +++ b/ports/pixel/001-prevent-examples.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b910231..71f7ddf 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,6 +34,8 @@ else() + target_link_libraries(pixel PUBLIC SDL2::SDL2) + endif() + ++option(BUILD_EXAMPLES "Build examples" OFF) ++if(BUILD_EXAMPLES) + add_executable(image_swap examples/image_swap/src/image_swap.cpp) + target_link_libraries(image_swap PRIVATE pixel) + add_executable(randomdots examples/randomdots/src/randomdots.cpp) +@@ -50,7 +52,11 @@ add_executable(simple examples/simple/src/simple.cpp) + target_link_libraries(simple PRIVATE pixel) + add_executable(starfield examples/starfield/src/starfield.cpp) + target_link_libraries(starfield PRIVATE pixel) ++endif() + ++if(MSVC) ++ add_compile_definitions(_CRT_SECURE_NO_WARNINGS) ++endif() + + # Install Section + include(GNUInstallDirs) +@@ -87,12 +93,6 @@ install( + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) + +-install( +- FILES +- ${PROJECT_SOURCE_DIR}/LICENSE +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pixel/copyright +- ) +- + install( + FILES + ${PROJECT_BINARY_DIR}/pixelConfig.cmake diff --git a/ports/pixel/portfile.cmake b/ports/pixel/portfile.cmake index 0b63c66f7ae867..1cac519bf86642 100644 --- a/ports/pixel/portfile.cmake +++ b/ports/pixel/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - if(VCPKG_TARGET_IS_LINUX) message(WARNING"${PORT} currently requires libglu1-mesa from the system package manager: This can be installed on Ubuntu systems via sudo apt install libglu1-mesa-dev") @@ -8,19 +6,24 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dascandy/pixel - REF v0.3 - SHA512 d7d622679195d0eb30c8ed411333711369b108e2171d1e4b0a93c7ae3bd1fb36a25fbe1f5771c858615c07ee139412e5353b8cb5489cb409dd94829253c18a7b + REF c4411f67746fdd811aa5f8c102ac340e9eaf4ec5 + SHA512 e4f704c076bb61220349524b0b1033a92c44128bb81e79dbd32ea2d1aa9d4abb0d6daab3617f69b59d1c1e50d750767153174fea015d8718804612f4d9f68ff6 HEAD_REF master + PATCHES + 001-prevent-examples.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pixel/vcpkg.json b/ports/pixel/vcpkg.json index df2963bc99ff8c..00d5b4c22d14b3 100644 --- a/ports/pixel/vcpkg.json +++ b/ports/pixel/vcpkg.json @@ -1,10 +1,9 @@ { "name": "pixel", - "version-string": "0.3", - "port-version": 3, + "version-date": "2022-03-15", "description": "Simple 2D Graphics based on standard and portable OpenGL.", "homepage": "https://github.com/dascandy/pixel", - "supports": "!windows", + "license": "Apache-2.0", "dependencies": [ "glew", "opengl", @@ -19,6 +18,10 @@ { "name": "sdl2", "platform": "!linux" + }, + { + "name": "vcpkg-cmake", + "host": true } ] } diff --git a/ports/pixman/no-host-cpu-checks.patch b/ports/pixman/no-host-cpu-checks.patch new file mode 100644 index 00000000000000..f70c54a01c2ac2 --- /dev/null +++ b/ports/pixman/no-host-cpu-checks.patch @@ -0,0 +1,108 @@ +diff --git a/meson.build b/meson.build +index 1cec227..1b07ca8 100644 +--- a/meson.build ++++ b/meson.build +@@ -95,44 +95,7 @@ else + mmx_flags = ['-mmmx', '-Winline'] + endif + if not use_mmx.disabled() +- if host_machine.cpu_family() == 'x86_64' or cc.get_id() == 'msvc' +- have_mmx = true +- elif host_machine.cpu_family() == 'x86' and cc.compiles(''' +- #include +- #include +- +- /* Check support for block expressions */ +- #define _mm_shuffle_pi16(A, N) \ +- ({ \ +- __m64 ret; \ +- \ +- /* Some versions of clang will choke on K */ \ +- asm ("pshufw %2, %1, %0\n\t" \ +- : "=y" (ret) \ +- : "y" (A), "K" ((const int8_t)N) \ +- ); \ +- \ +- ret; \ +- }) +- +- int main () { +- __m64 v = _mm_cvtsi32_si64 (1); +- __m64 w; +- +- w = _mm_shuffle_pi16(v, 5); +- +- /* Some versions of clang will choke on this */ +- asm ("pmulhuw %1, %0\n\t" +- : "+y" (w) +- : "y" (v) +- ); +- +- return _mm_cvtsi64_si32 (v); +- }''', +- args : mmx_flags, +- name : 'MMX Intrinsic Support') +- have_mmx = true +- endif ++ have_mmx = true + endif + + if have_mmx +@@ -154,29 +117,7 @@ elif cc.get_id() != 'msvc' + sse2_flags = ['-msse2', '-Winline'] + endif + if not use_sse2.disabled() +- if host_machine.cpu_family() == 'x86' +- if cc.compiles(''' +- #if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)) +- # if !defined(__amd64__) && !defined(__x86_64__) +- # error "Need GCC >= 4.2 for SSE2 intrinsics on x86" +- # endif +- #endif +- #include +- #include +- #include +- int param; +- int main () { +- __m128i a = _mm_set1_epi32 (param), b = _mm_set1_epi32 (param + 1), c; +- c = _mm_xor_si128 (a, b); +- return _mm_cvtsi128_si32(c); +- }''', +- args : sse2_flags, +- name : 'SSE2 Intrinsic Support') +- have_sse2 = true +- endif +- elif host_machine.cpu_family() == 'x86_64' +- have_sse2 = true +- endif ++ have_sse2 = true + endif + + if have_sse2 +@@ -192,24 +133,8 @@ if cc.get_id() != 'msvc' + ssse3_flags = ['-mssse3', '-Winline'] + endif + +-# x64 pre-2010 MSVC compilers crashes when building the ssse3 code +-if not use_ssse3.disabled() and not (cc.get_id() == 'msvc' and cc.version().version_compare('<16') and host_machine.cpu_family() == 'x86_64') +- if host_machine.cpu_family().startswith('x86') +- if cc.compiles(''' +- #include +- #include +- #include +- int param; +- int main () { +- __m128i a = _mm_set1_epi32 (param), b = _mm_set1_epi32 (param + 1), c; +- c = _mm_xor_si128 (a, b); +- return _mm_cvtsi128_si32(c); +- }''', +- args : ssse3_flags, +- name : 'SSSE3 Intrinsic Support') +- have_ssse3 = true +- endif +- endif ++if use_ssse3.enabled() ++ have_ssse3 = true + endif + + if have_ssse3 diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index 43f4f3ddbaf08b..fa6c8687a4e8c3 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -39,7 +39,9 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PIXMAN_VERSION} - PATCHES remove_test_demos.patch + PATCHES + remove_test_demos.patch + no-host-cpu-checks.patch ) # Meson install wrongly pkgconfig file! vcpkg_configure_meson( diff --git a/ports/pixman/vcpkg.json b/ports/pixman/vcpkg.json index 17284edad02e9f..b475c2fb78bcf4 100644 --- a/ports/pixman/vcpkg.json +++ b/ports/pixman/vcpkg.json @@ -1,10 +1,15 @@ { "name": "pixman", "version": "0.40.0", + "port-version": 2, "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.", "homepage": "https://www.cairographics.org/releases", + "license": "MIT", "dependencies": [ "libpng", - "tool-meson" + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/pkgconf/portfile.cmake b/ports/pkgconf/portfile.cmake index 1d8dda8dd16f0b..7c5ccb242b3bac 100644 --- a/ports/pkgconf/portfile.cmake +++ b/ports/pkgconf/portfile.cmake @@ -11,6 +11,59 @@ vcpkg_configure_meson( NO_PKG_CONFIG OPTIONS -Dtests=false ) + +set(systemsuffix "") +set(architectureprefix "") + +set(SYSTEM_LIBDIR "") +set(PKG_DEFAULT_PATH "") +set(SYSTEM_INCLUDEDIR "") +set(PERSONALITY_PATH "personality.d") + + +if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_CROSSCOMPILING AND VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + # These defaults are obtained from pkgconf/pkg-config on Ubuntu and OpenSuse + # vcpkg cannot do system introspection to obtain/set these values since it would break binary caching. + set(SYSTEM_INCLUDEDIR "/usr/include") + # System lib dirs will be stripped from -L from the pkg-config output + set(SYSTEM_LIBDIR "/lib:/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:/lib/x86_64-linux-gnux32:/lib64:/lib32:/libx32:/usr/lib:/usr/lib/i386-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnux32:/usr/lib64:/usr/lib32:/usr/libx32") + set(PKG_DEFAULT_PATH "/usr/local/lib/x86_64-linux-gnu/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig") + set(PERSONALITY_PATH "/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d") +endif() + +if(DEFINED VCPKG_pkgconf_SYSTEM_LIBDIR) + set(SYSTEM_LIBDIR "${VCPKG_pkgconf_SYSTEM_LIBDIR}") +endif() +if(DEFINED VCPKG_pkgconf_PKG_DEFAULT_PATH) + set(PKG_DEFAULT_PATH "${VCPKG_pkgconf_PKG_DEFAULT_PATH}") +endif() +if(DEFINED VCPKG_pkgconf_SYSTEM_INCLUDEDIR) + set(SYSTEM_INCLUDEDIR "${VCPKG_pkgconf_SYSTEM_INCLUDEDIR}") +endif() +if(DEFINED VCPKG_pkgconf_PERSONALITY_PATH) + set(PERSONALITY_PATH "${VCPKG_pkgconf_PERSONALITY_PATH}") +endif() + + +set(pkgconfig_file "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libpkgconf/config.h") +if(EXISTS "${pkgconfig_file}") + file(READ "${pkgconfig_file}" contents) + string(REGEX REPLACE "#define PKG_DEFAULT_PATH [^\n]+" "#define PKG_DEFAULT_PATH \"${PKG_DEFAULT_PATH}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_INCLUDEDIR [^\n]+" "#define SYSTEM_INCLUDEDIR \"${SYSTEM_INCLUDEDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_LIBDIR [^\n]+" "#define SYSTEM_LIBDIR \"${SYSTEM_LIBDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define PERSONALITY_PATH [^\n]+" "#define PERSONALITY_PATH \"${PERSONALITY_PATH}\"" contents "${contents}") + file(WRITE "${pkgconfig_file}" "${contents}") +endif() +set(pkgconfig_file "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libpkgconf/config.h") +if(EXISTS "${pkgconfig_file}") + file(READ "${pkgconfig_file}" contents) + string(REGEX REPLACE "#define PKG_DEFAULT_PATH [^\n]+" "#define PKG_DEFAULT_PATH \"${PKG_DEFAULT_PATH}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_INCLUDEDIR [^\n]+" "#define SYSTEM_INCLUDEDIR \"${SYSTEM_INCLUDEDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_LIBDIR [^\n]+" "#define SYSTEM_LIBDIR \"${SYSTEM_LIBDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define PERSONALITY_PATH [^\n]+" "#define PERSONALITY_PATH \"${PERSONALITY_PATH}\"" contents "${contents}") + file(WRITE "${pkgconfig_file}" "${contents}") +endif() + vcpkg_install_meson() vcpkg_fixup_pkgconfig(SKIP_CHECK) diff --git a/ports/pkgconf/vcpkg.json b/ports/pkgconf/vcpkg.json index 8d544f1023b6d3..8ea4e30e7598c8 100644 --- a/ports/pkgconf/vcpkg.json +++ b/ports/pkgconf/vcpkg.json @@ -1,7 +1,14 @@ { "name": "pkgconf", "version": "1.8.0", + "port-version": 2, "description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.", "homepage": "https://github.com/pkgconf/pkgconf", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] } diff --git a/ports/plf-colony/portfile.cmake b/ports/plf-colony/portfile.cmake index 97e64da711248f..e4ec7bd47358a7 100644 --- a/ports/plf-colony/portfile.cmake +++ b/ports/plf-colony/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mattreecebentley/plf_colony - REF e6e563b63dd9e64fc2fcc66a757e366641e62f01 - SHA512 61723a47387fb3ce9a342fbd6db11369774c1a5c5d28ba2db1fee3396a0588a0e9df50cbcaa4561f409d34ddadc17ae61dba29606aa6481647f3bcd003cfaafa + REF 7243b4601b5d7e989550c158a9918ea5a05feaf4 + SHA512 aaf898ac5a37720545a7b7226c8bd09be80dcdd03d9c77a2c64cfe0aedbb59ede4042001c616c4b5d29f13717ae5b637c0608d83819c2bceae5606c8555a64da HEAD_REF master ) -file(COPY ${SOURCE_PATH}/plf_colony.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/plf_colony.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/plf-colony/vcpkg.json b/ports/plf-colony/vcpkg.json index 5529658fae8dcf..01101a6a1d4c52 100644 --- a/ports/plf-colony/vcpkg.json +++ b/ports/plf-colony/vcpkg.json @@ -1,6 +1,6 @@ { "name": "plf-colony", - "version": "6.28", + "version": "6.33", "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/plf-hive/portfile.cmake b/ports/plf-hive/portfile.cmake new file mode 100644 index 00000000000000..8fcbfb5d3d0e41 --- /dev/null +++ b/ports/plf-hive/portfile.cmake @@ -0,0 +1,13 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mattreecebentley/plf_hive + REF 39dfcc5712125cc645df123c120006b7a6fd95d6 + SHA512 81a1f185ca8293b6fb83605c05ecf14d024194334cb64932daa29ecae064918241fa7f3e4a688dc2b19b4b5dd8a2605d60947bd513f7cd30299fd6ba25aa8b35 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/plf_hive.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/plf-hive/vcpkg.json b/ports/plf-hive/vcpkg.json new file mode 100644 index 00000000000000..4393fa9720e693 --- /dev/null +++ b/ports/plf-hive/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "plf-hive", + "version-date": "2021-12-11", + "description": "plf::hive is a fork of plf::colony to match the current C++ standards proposal.", + "homepage": "https://plflib.org/colony.htm" +} diff --git a/ports/plibsys/portfile.cmake b/ports/plibsys/portfile.cmake index c6ab653b60714c..777443c7be8912 100644 --- a/ports/plibsys/portfile.cmake +++ b/ports/plibsys/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO saprykin/plibsys @@ -31,5 +29,3 @@ vcpkg_copy_pdbs() configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - - diff --git a/ports/plibsys/vcpkg.json b/ports/plibsys/vcpkg.json index 4960c01a26cb2c..fa95157d389b4d 100644 --- a/ports/plibsys/vcpkg.json +++ b/ports/plibsys/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plibsys", - "version-string": "0.0.4", - "port-version": 5, + "version": "0.0.4", + "port-version": 6, "description": "Highly portable C system library: threads and synchronization, sockets, IPC, data structures and more.", "homepage": "https://github.com/saprykin/plibsys", "supports": "!uwp" diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index cfb8058513b02d..4f52c12e8f710e 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -25,10 +25,8 @@ vcpkg_check_features( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DENABLE_tcl=OFF - -DENABLE_d=OFF - -DENABLE_qt=OFF - -DENABLE_ocaml=OFF + -DDEFAULT_NO_BINDINGS=ON + -DENABLE_cxx=ON -DPL_HAVE_QHULL=OFF -DPLPLOT_USE_QT5=OFF -DPL_DOUBLE=ON diff --git a/ports/plplot/vcpkg.json b/ports/plplot/vcpkg.json index cd1d20313cc6f9..07f3f4326a1bd0 100644 --- a/ports/plplot/vcpkg.json +++ b/ports/plplot/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plplot", "version-semver": "5.13.0", - "port-version": 14, + "port-version": 15, "description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.", "dependencies": [ "bzip2", diff --git a/ports/pmdk/portfile.cmake b/ports/pmdk/portfile.cmake index 60d53e11a06c3f..dcda72d8cb0988 100644 --- a/ports/pmdk/portfile.cmake +++ b/ports/pmdk/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -vcpkg_fail_port_install(ON_ARCH "arm" "x86") - set(PMDK_VERSION "1.11.0") vcpkg_from_github( diff --git a/ports/pmdk/vcpkg.json b/ports/pmdk/vcpkg.json index b51a613f0ff579..75c6148dab219e 100644 --- a/ports/pmdk/vcpkg.json +++ b/ports/pmdk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pmdk", "version": "1.11.0", + "port-version": 1, "description": "Persistent Memory Development Kit", "homepage": "https://github.com/pmem/pmdk", "supports": "!(arm | x86)" diff --git a/ports/poco/fix-InstallDataMysql.patch b/ports/poco/fix-InstallDataMysql.patch new file mode 100644 index 00000000000000..90888df6a7b72e --- /dev/null +++ b/ports/poco/fix-InstallDataMysql.patch @@ -0,0 +1,13 @@ +diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt +index 9d0a85c..4f1ae21 100644 +--- a/Data/CMakeLists.txt ++++ b/Data/CMakeLists.txt +@@ -45,7 +45,7 @@ else(ENABLE_DATA_SQLITE) + message(STATUS "SQLite Support Disabled") + endif() + +-if((MYSQL_FOUND OR unofficial-libmariadb_FOUND) AND ENABLE_DATA_MYSQL) ++if((unofficial-libmysql_FOUND OR unofficial-libmariadb_FOUND) AND ENABLE_DATA_MYSQL) + message(STATUS "MySQL Support Enabled") + add_subdirectory(MySQL) + else() diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 4ac9a949df8436..e4ceb12b413188 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pocoproject/poco - REF f81a38057f1d240fe7b7a069612776f788bc88ea # poco-1.11.0-release - SHA512 c5f39aca8b5464959b9337b0cbd8ee86d81f195f5a5ba864692c71b2bdbffdecef0537b6e6a2d9f41829bcd58f78825b10565d0c4ee7b3c856a4886a9e328118 + REF de61f0049175a941cc83c2615c3bdc5e947b89f9 # poco-1.11.1-release + SHA512 0290eeeca8a85286efe8f583224062ea97668c2730f8f7db4e075ce75e997b0a0c969159d4034c27fbb2e8d4b9c6504888d8ffa001193f7eb0e450bca2d5d7a2 HEAD_REF master PATCHES # Fix embedded copy of pcre in static linking mode @@ -14,6 +12,7 @@ vcpkg_from_github( fix_dependency.patch fix-feature-sqlite3.patch fix-error-c3861.patch + fix-InstallDataMysql.patch ) file(REMOVE "${SOURCE_PATH}/Foundation/src/pcre.h") @@ -84,20 +83,20 @@ vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec arc AUTO_CLEAN) # Copy additional include files not part of any libraries if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL") - file(COPY ${SOURCE_PATH}/Data/include DESTINATION ${CURRENT_PACKAGES_DIR}) + file(COPY "${SOURCE_PATH}/Data/include" DESTINATION "${CURRENT_PACKAGES_DIR}") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/MySQL") - file(COPY ${SOURCE_PATH}/Data/MySQL/include DESTINATION ${CURRENT_PACKAGES_DIR}) + file(COPY "${SOURCE_PATH}/Data/MySQL/include" DESTINATION "${CURRENT_PACKAGES_DIR}") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/ODBC") - file(COPY ${SOURCE_PATH}/Data/ODBC/include DESTINATION ${CURRENT_PACKAGES_DIR}) + file(COPY "${SOURCE_PATH}/Data/ODBC/include" DESTINATION "${CURRENT_PACKAGES_DIR}") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/PostgreSQL") - file(COPY ${SOURCE_PATH}/Data/PostgreSQL/include DESTINATION ${CURRENT_PACKAGES_DIR}) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libpq) + file(COPY "${SOURCE_PATH}/Data/PostgreSQL/include" DESTINATION "${CURRENT_PACKAGES_DIR}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libpq") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/SQLite") - file(COPY ${SOURCE_PATH}/Data/SQLite/include DESTINATION ${CURRENT_PACKAGES_DIR}) + file(COPY "${SOURCE_PATH}/Data/SQLite/include" DESTINATION "${CURRENT_PACKAGES_DIR}") endif() if(VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json index 2090861431af97..98519295d98926 100644 --- a/ports/poco/vcpkg.json +++ b/ports/poco/vcpkg.json @@ -1,9 +1,9 @@ { "name": "poco", - "version-semver": "1.11.0", - "port-version": 1, + "version": "1.11.1", "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", "homepage": "https://github.com/pocoproject/poco", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "expat", diff --git a/ports/polyhook2/portfile.cmake b/ports/polyhook2/portfile.cmake index 5d638eb9a15d82..25ae5978621bc2 100644 --- a/ports/polyhook2/portfile.cmake +++ b/ports/polyhook2/portfile.cmake @@ -1,28 +1,23 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "Linux" "OSX" "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevemk14ebr/PolyHook_2_0 - REF 01ec7c7ddee1d0da9cc49c4adf930eb5d6a86ba1 - SHA512 9d482cd4ec9161b437ee976130b4e64b3acb5f1eb4c47291074110d86ca1ca7479b5c6d0af5be2c7628f702dc858e6a9ef10cd8dcf915b9f022f158e0e4ad0ba + REF 750e78f8d7ebfc291e1c0dce3a0763c3a4b86737 + SHA512 c542288cfde258bcb54960593f2b596b6a967cf128a691e4b8ad699127567c58dc55ce2bbf21f4d3ccbaa2d794bcacd3540503b039ee58c614a854f13d51d30e HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - capstone POLYHOOK_DISASM_CAPSTONE - zydis POLYHOOK_DISASM_ZYDIS - exception POLYHOOK_FEATURE_EXCEPTION - detours POLYHOOK_FEATURE_DETOURS - inlinentd POLYHOOK_FEATURE_INLINENTD - pe POLYHOOK_FEATURE_PE - virtuals POLYHOOK_FEATURE_VIRTUALS + FEATURES + capstone POLYHOOK_DISASM_CAPSTONE + zydis POLYHOOK_DISASM_ZYDIS + exception POLYHOOK_FEATURE_EXCEPTION + detours POLYHOOK_FEATURE_DETOURS + inlinentd POLYHOOK_FEATURE_INLINENTD + pe POLYHOOK_FEATURE_PE + virtuals POLYHOOK_FEATURE_VIRTUALS ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BUILD_SHARED_LIB OFF) -else() - set(BUILD_SHARED_LIB ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB) if (VCPKG_CRT_LINKAGE STREQUAL "static") set(BUILD_STATIC_RUNTIME ON) @@ -30,9 +25,8 @@ else() set(BUILD_STATIC_RUNTIME OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DPOLYHOOK_BUILD_SHARED_LIB=${BUILD_SHARED_LIB} -DPOLYHOOK_BUILD_STATIC_RUNTIME=${BUILD_STATIC_RUNTIME} @@ -41,12 +35,12 @@ vcpkg_configure_cmake( -DPOLYHOOK_USE_EXTERNAL_ZYDIS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/PolyHook_2 TARGET_PATH share/PolyHook_2) +vcpkg_cmake_config_fixup(PACKAGE_NAME PolyHook_2 CONFIG_PATH lib/PolyHook_2) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/polyhook2/vcpkg.json b/ports/polyhook2/vcpkg.json index 252fb1a87217a2..3e1c552d81338b 100644 --- a/ports/polyhook2/vcpkg.json +++ b/ports/polyhook2/vcpkg.json @@ -1,10 +1,20 @@ { "name": "polyhook2", - "version-string": "2021-05-09", - "port-version": 1, + "version-date": "2022-03-01", "description": "C++17, x86/x64 Hooking Library v2.0", "homepage": "https://github.com/stevemk14ebr/PolyHook_2_0", + "license": "MIT", "supports": "!(arm | uwp | linux | osx)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "capstone", "detours", diff --git a/ports/poppler/0002-remove-test-subdirectory.patch b/ports/poppler/0002-remove-test-subdirectory.patch deleted file mode 100644 index 80dd5b53fcbdcd..00000000000000 --- a/ports/poppler/0002-remove-test-subdirectory.patch +++ /dev/null @@ -1,24 +0,0 @@ -From aa0fa5f737b8ea3d2dfb396243be79af49274b6e Mon Sep 17 00:00:00 2001 -From: abc -Date: Fri, 18 Dec 2020 14:32:31 +0800 -Subject: [PATCH 2/2] remove test subdirectory - ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ec66b515..cce875a0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -749,7 +749,6 @@ endif() - if(ENABLE_GLIB) - add_subdirectory(glib) - endif() --add_subdirectory(test) - if(ENABLE_QT5) - add_subdirectory(qt5) - endif() --- -2.29.2.windows.2 - diff --git a/ports/poppler/0003-fix-gperf-not-recognized.patch b/ports/poppler/0003-fix-gperf-not-recognized.patch deleted file mode 100644 index e6edf39e79325b..00000000000000 --- a/ports/poppler/0003-fix-gperf-not-recognized.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cce875a..0b04be7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -530,8 +530,8 @@ endif() - if (GPERF AND RUN_GPERF_IF_PRESENT) - macro(ADD_GPERF_FILE input) - add_custom_command(OUTPUT poppler/${input}.c -- COMMAND gperf poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c -- COMMAND gperf poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c -+ COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c -+ COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c - COMMAND clang-format -i ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c || true - DEPENDS poppler/${input}.gperf - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/ports/poppler/0004-disable-clang-format.patch b/ports/poppler/0004-disable-clang-format.patch deleted file mode 100644 index 43a48da787bd5e..00000000000000 --- a/ports/poppler/0004-disable-clang-format.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b04be7..947d5be 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -532,7 +532,6 @@ if (GPERF AND RUN_GPERF_IF_PRESENT) - add_custom_command(OUTPUT poppler/${input}.c - COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c - COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c -- COMMAND clang-format -i ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c || true - DEPENDS poppler/${input}.gperf - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - diff --git a/ports/poppler/cmake-project-include.cmake b/ports/poppler/cmake-project-include.cmake new file mode 100644 index 00000000000000..8e9d1db25f769e --- /dev/null +++ b/ports/poppler/cmake-project-include.cmake @@ -0,0 +1,29 @@ +if("${FONT_CONFIGURATION}" STREQUAL "fontconfig") + # Poppler uses different variable names than CMake. + find_package(Fontconfig REQUIRED) + set(FONTCONFIG_DEFINITIONS "") + set(FONTCONFIG_INCLUDE_DIR "${Fontconfig_INCLUDE_DIRS}") + set(FONTCONFIG_LIBRARIES "Fontconfig::Fontconfig") +endif() + +# Poppler uses different variable names than CMake, +# plus ICONV_SECOND_ARGUMENT_IS_CONST +find_package(Iconv REQUIRED) +set(ICONV_INCLUDE_DIR "${Iconv_INCLUDE_DIR}") +set(ICONV_LIBRARIES "${Iconv_LIBRARIES}") + +# Create helper file for iconv usage requirement +set(poppler_iconv [[ +Name: poppler-vcpkg-iconv +Description: iconv linking requirements for poppler +Version: 0 +Libs:]]) +string(TOLOWER "${Iconv_LIBRARIES}" iconv_libraries) +if(iconv_libraries MATCHES "iconv") + string(APPEND poppler_iconv " -liconv") +endif() +if(iconv_libraries MATCHES "charset") + string(APPEND poppler_iconv " -lcharset") +endif() +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/poppler-vcpkg-iconv.pc" "${poppler_iconv}") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/poppler-vcpkg-iconv.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/ports/poppler/export-unofficial-poppler.patch b/ports/poppler/export-unofficial-poppler.patch new file mode 100644 index 00000000000000..ca02c12b1d4d26 --- /dev/null +++ b/ports/poppler/export-unofficial-poppler.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9a0dcb1..c1f2f02 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -600,7 +600,14 @@ target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS}) + if(CMAKE_USE_PTHREADS_INIT) + target_link_libraries(poppler LINK_PRIVATE Threads::Threads) + endif() +-install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++target_include_directories(poppler PUBLIC ++ $ ++ $ ++ $ ++) ++set_target_properties(poppler PROPERTIES EXPORT_NAME poppler-private) ++install(TARGETS poppler EXPORT unofficial-poppler-targets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(EXPORT unofficial-poppler-targets NAMESPACE unofficial::poppler:: DESTINATION share/unofficial-poppler) + + if(ENABLE_UNSTABLE_API_ABI_HEADERS) + install(FILES +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index c37936b..344933c 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -32,7 +32,8 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler-cpp PROPERTIES SUFFIX "-${POPPLER_CPP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler-cpp poppler ${ICONV_LIBRARIES}) +-install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS poppler-cpp EXPORT unofficial-poppler-cpp-targets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(EXPORT unofficial-poppler-cpp-targets NAMESPACE unofficial::poppler:: DESTINATION share/unofficial-poppler) + + install(FILES + poppler-destination.h diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake index fcb96f6c666e54..c75bad85932076 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -1,45 +1,76 @@ -vcpkg_from_github( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH - REPO freedesktop/poppler - REF poppler-20.12.1 - SHA512 f692682689c0b0fcc3953a1cc157b6e1d2ce3ccab185189d6dc0807f1dd3ea2d1a9773d0b805079a30b3c8a3b0cf3ee83239ed48d7b08dc7762eba29c2033674 + REPO poppler/poppler + REF poppler-22.02.0 + SHA512 693b813ef80656e7078f8830ec38e23520c6abd307befbb1721ba883233c92099704a7f02557807b28560f9c7ea1aa27192aea620b2ce4e9062a0b8790e93225 HEAD_REF master PATCHES - 0002-remove-test-subdirectory.patch - 0003-fix-gperf-not-recognized.patch - 0004-disable-clang-format.patch + export-unofficial-poppler.patch ) +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindFontconfig.cmake") -vcpkg_find_acquire_program(GPERF) -get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) -vcpkg_add_to_path(${GPERF_PATH}) +set(POPPLER_PC_REQUIRES "freetype2 libjpeg libopenjp2 libpng libtiff-4 poppler-vcpkg-iconv") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - curl ENABLE_CURL - zlib ENABLE_ZLIB - splash ENABLE_SPLASH + FEATURES + cairo WITH_Cairo + curl ENABLE_LIBCURL + private-api ENABLE_UNSTABLE_API_ABI_HEADERS + zlib ENABLE_ZLIB ) +if("fontconfig" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=fontconfig") + string(APPEND POPPLER_PC_REQUIRES " fontconfig") +elseif(VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=win32") +else() + list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=generic") +endif() +if("cairo" IN_LIST FEATURES) + string(APPEND POPPLER_PC_REQUIRES " cairo") +endif() +if("curl" IN_LIST FEATURES) + string(APPEND POPPLER_PC_REQUIRES " libcurl") +endif() +if("zlib" IN_LIST FEATURES) + string(APPEND POPPLER_PC_REQUIRES " zlib") +endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" -DBUILD_GTK_TESTS=OFF -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF -DBUILD_CPP_TESTS=OFF - -DENABLE_LIBCURL=${ENABLE_CURL} + -DBUILD_MANUAL_TESTS=OFF -DENABLE_UTILS=OFF -DENABLE_GLIB=OFF - -DENABLE_GLOBJECT_INTROSPECTION=OFF + -DENABLE_GOBJECT_INTROSPECTION=OFF -DENABLE_QT5=OFF -DENABLE_QT6=OFF + -DENABLE_CMS=none + -DRUN_GPERF_IF_PRESENT=OFF + -DENABLE_RELOCATABLE=OFF # https://gitlab.freedesktop.org/poppler/poppler/-/issues/1209 + -DWITH_NSS3=OFF ${FEATURE_OPTIONS} ) +vcpkg_cmake_install() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-poppler-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-poppler/unofficial-poppler-config.cmake" @ONLY) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-poppler) -vcpkg_install_cmake() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/poppler.pc" "Libs:" "Requires.private: ${POPPLER_PC_REQUIRES}\nLibs:") +if(NOT DEFINED VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/poppler.pc" "Libs:" "Requires.private: ${POPPLER_PC_REQUIRES}\nLibs:") +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_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/poppler/unofficial-poppler-config.cmake b/ports/poppler/unofficial-poppler-config.cmake new file mode 100644 index 00000000000000..ccbef6a08fd536 --- /dev/null +++ b/ports/poppler/unofficial-poppler-config.cmake @@ -0,0 +1,22 @@ +include(CMakeFindDependencyMacro) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(features "@FEATURES@") +find_dependency(Boost) +if("fontconfig" IN_LIST features) + find_dependency(Fontconfig) # CMake 3.14 +endif() +find_dependency(Freetype) +find_dependency(JPEG) +find_dependency(PNG) +find_dependency(TIFF) +find_dependency(OpenJPEG CONFIG) +if("curl" IN_LIST features) + find_dependency(CURL) +endif() +if("zlib" IN_LIST features) + find_dependency(ZLIB) +endif() +find_dependency(Iconv) # CMake 3.11 +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-poppler-targets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-poppler-cpp-targets.cmake") diff --git a/ports/poppler/usage b/ports/poppler/usage new file mode 100644 index 00000000000000..f5cbbd53704b0f --- /dev/null +++ b/ports/poppler/usage @@ -0,0 +1,6 @@ +The package poppler can be imported via CMake FindPkgConfig module: + + include(FindPkgConfig) + pkg_check_modules(POPPLER_CPP REQUIRED IMPORTED_TARGET poppler-cpp) + + target_link_libraries(main PRIVATE PkgConfig::poppler-cpp) diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index 2ae9cae7753454..4ef8d2ab7eeb4e 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,41 +1,77 @@ { "name": "poppler", - "version": "20.12.1", - "port-version": 6, - "description": "a PDF rendering library", + "version": "22.2.0", + "description": "A PDF rendering library", "homepage": "https://poppler.freedesktop.org/", + "license": "GPL-2.0-or-later", + "supports": "!uwp", "dependencies": [ + "boost-container", + "boost-move", + "freetype", + "libiconv", + "libjpeg-turbo", + "libpng", + "openjpeg", + "tiff", { - "name": "cairo", - "platform": "osx" + "name": "vcpkg-cmake", + "host": true }, { - "name": "devil", - "platform": "(windows | linux) & !arm" - }, - "fontconfig", - "freetype", - "libiconv", - "openjpeg" + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ - "splash", + "font-configuration", "zlib" ], "features": { + "cairo": { + "description": "Enable the Cairo graphics backend", + "dependencies": [ + { + "name": "cairo", + "default-features": false + } + ] + }, "curl": { "description": "curl for poppler", "dependencies": [ - "curl" + { + "name": "curl", + "default-features": false + } ] }, - "splash": { - "description": "Build the Splash graphics backend", + "font-configuration": { + "description": "Defaut font configuration backend", + "dependencies": [ + { + "name": "poppler", + "default-features": false, + "features": [ + "fontconfig" + ], + "platform": "!windows & !android" + } + ] + }, + "fontconfig": { + "description": "Use fontconfig", + "supports": "!windows, mingw", "dependencies": [ - "boost-container", - "boost-move" + "fontconfig" ] }, + "private-api": { + "description": "Install headers for private API (aka unstable API/ABI headers)" + }, + "splash": { + "description": "The splash backend is always enabled. This option is kept for compatibility." + }, "zlib": { "description": "zlib for poppler", "dependencies": [ diff --git a/ports/popsift/fix_missing_thrust_include.patch b/ports/popsift/fix_missing_thrust_include.patch new file mode 100644 index 00000000000000..69138afb56d26e --- /dev/null +++ b/ports/popsift/fix_missing_thrust_include.patch @@ -0,0 +1,21 @@ +From 273adb1c375b12f285694488280e04efd251a76a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Sch=C3=B6ps?= +Date: Sat, 28 Aug 2021 16:52:25 +0200 +Subject: [PATCH] Add missing thrust include + +--- + src/popsift/s_filtergrid.cu | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/popsift/s_filtergrid.cu b/src/popsift/s_filtergrid.cu +index 078eb114..301c6a96 100644 +--- a/src/popsift/s_filtergrid.cu ++++ b/src/popsift/s_filtergrid.cu +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/ports/popsift/portfile.cmake b/ports/popsift/portfile.cmake index a0269235f7fade..5bd1c9f459a7fa 100644 --- a/ports/popsift/portfile.cmake +++ b/ports/popsift/portfile.cmake @@ -1,16 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO alicevision/popsift + REPO alicevision/popsift REF v0.9 SHA512 56789520872203eea86e07e8210e00c0b67d85486af16df9d620b1aff10f8d9ef5d910cf1dda6c68af7ca2ed11658ab5414ac79117b543f91a7d8d6a96a17ce0 HEAD_REF develop + PATCHES + fix_missing_thrust_include.patch ) -include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) +include("${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake") vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) -message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES apps PopSift_BUILD_EXAMPLES @@ -29,11 +29,11 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/PopSift) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") - # copy the apps in tools directory - if ("apps" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES popsift-demo AUTO_CLEAN) - endif() +# copy the apps in tools directory +if ("apps" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES popsift-demo AUTO_CLEAN) +endif() -file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/popsift/vcpkg.json b/ports/popsift/vcpkg.json index aed5386b8f9e50..ddff7933960110 100644 --- a/ports/popsift/vcpkg.json +++ b/ports/popsift/vcpkg.json @@ -1,7 +1,7 @@ { "name": "popsift", - "version-string": "0.9", - "port-version": 2, + "version": "0.9", + "port-version": 3, "description": "PopSift is an implementation of the SIFT algorithm in CUDA.", "homepage": "https://github.com/alicevision/popsift", "supports": "!(uwp | arm | arm64 | android | x86)", diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake index 30e9adfa0509a8..f80cace7922101 100644 --- a/ports/portaudio/portfile.cmake +++ b/ports/portaudio/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PortAudio/portaudio diff --git a/ports/portaudio/vcpkg.json b/ports/portaudio/vcpkg.json index cbf20bfc6b01aa..581b35543097f9 100644 --- a/ports/portaudio/vcpkg.json +++ b/ports/portaudio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "portaudio", "version": "19.7", - "port-version": 2, + "port-version": 3, "description": "PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.", "homepage": "http://www.portaudio.com", "supports": "!uwp" diff --git a/ports/portmidi/add-feature-options.patch b/ports/portmidi/add-feature-options.patch deleted file mode 100644 index 605dfcd35bcccd..00000000000000 --- a/ports/portmidi/add-feature-options.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/portmidi/trunk/CMakeLists.txt b/portmidi/trunk/CMakeLists.txt -index e5e01b6..483b900 100644 ---- a/portmidi/trunk/CMakeLists.txt -+++ b/portmidi/trunk/CMakeLists.txt -@@ -72,10 +72,14 @@ endif(0) - include_directories(pm_common porttime) - add_subdirectory(pm_common) - -+if (0) - add_subdirectory(pm_test) -+endif() - - add_subdirectory(pm_dylib) - - # Cannot figure out how to make an xcode Java application with CMake -+if (JAVA_SUPPORT) - add_subdirectory(pm_java) -+endif() - -diff --git a/portmidi/trunk/pm_common/CMakeLists.txt b/portmidi/trunk/pm_common/CMakeLists.txt -index c829063..2597bea 100644 ---- a/portmidi/trunk/pm_common/CMakeLists.txt -+++ b/portmidi/trunk/pm_common/CMakeLists.txt -@@ -111,17 +111,25 @@ target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) - # define the jni library - include_directories(${JAVA_INCLUDE_PATHS}) - -+if (JAVA_SUPPORT) - set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) - add_library(pmjni SHARED ${JNISRC}) - target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) - set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") -+endif() - - # install the libraries (Linux and Mac OS X command line) - if(1) -- INSTALL(TARGETS portmidi-static pmjni -+ INSTALL(TARGETS portmidi-static - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) -+ if (JAVA_SUPPORT) -+ INSTALL(TARGETS pmjni -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ endif() - # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here - INSTALL(FILES portmidi.h ../porttime/porttime.h - DESTINATION include) diff --git a/ports/portmidi/fix-build-install.patch b/ports/portmidi/fix-build-install.patch deleted file mode 100644 index 76f0f92bf215b2..00000000000000 --- a/ports/portmidi/fix-build-install.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/portmidi/trunk/CMakeLists.txt b/portmidi/trunk/CMakeLists.txt -index 4919b78..e5e01b6 100644 ---- a/portmidi/trunk/CMakeLists.txt -+++ b/portmidi/trunk/CMakeLists.txt -@@ -4,6 +4,7 @@ - - cmake_minimum_required(VERSION 2.6) - -+if (0) - if(UNIX) - # allow user to set Release or Debug - set(CMAKE_BUILD_TYPE Release CACHE STRING -@@ -22,11 +23,13 @@ else(UNIX) - set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING - "Semicolon-separate list of supported configuration types") - endif(UNIX) -+endif() - - #set(CMAKE_RELATIVE_PATHS ON CACHE STRING "avoid absolute paths" FORCE) - - # Clear out the built-in C++ compiler and link flags for each of the - # unused configurations. -+if (0) - set(CMAKE_CXX_FLAGS_MINSIZEREL "" CACHE INTERNAL "Unused") - set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "" CACHE INTERNAL "Unused") - set(CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL "" CACHE INTERNAL "Unused") -@@ -37,10 +40,11 @@ set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") - - set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING "change to needed architecture for a smaller library" FORCE) -+endif() - - PROJECT(portmidi) - --if(UNIX) -+if(0) - # Problem: if there was an old Debug build and you change - # CMAKE_BUILD_TYPE to Release, then the OUTPUT_DIRECTORY's will - # still be Debug. Try to fix this by checking if the DIRECTORY's -@@ -63,7 +67,7 @@ if(UNIX) - ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} - CACHE STRING "libraries go here" FORCE) - endif(CMAKE_LIBRARY_OUTPUT_DIRECTORY MATCHES ${BAD_DIR}) --endif(UNIX) -+endif(0) - - include_directories(pm_common porttime) - add_subdirectory(pm_common) -diff --git a/portmidi/trunk/pm_common/CMakeLists.txt b/portmidi/trunk/pm_common/CMakeLists.txt -index cbeeade..c829063 100644 ---- a/portmidi/trunk/pm_common/CMakeLists.txt -+++ b/portmidi/trunk/pm_common/CMakeLists.txt -@@ -5,8 +5,6 @@ - if(APPLE OR WIN32) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) - # set the build directory for .dylib libraries -- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) -- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) - - # the first time CMake configures, save off CMake's built-in flags - if(NOT DEFAULT_DEBUG_FLAGS) -@@ -104,8 +102,9 @@ set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) - # this completes the list of library sources by adding shared code - list(APPEND LIBSRC pmutil portmidi) - -+if (NOT BUILD_SHARED_LIBS) - # now add the shared files to make the complete list of library sources --add_library(portmidi-static ${LIBSRC}) -+add_library(portmidi-static STATIC ${LIBSRC}) - set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s") - target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) - -@@ -118,11 +117,13 @@ target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) - set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") - - # install the libraries (Linux and Mac OS X command line) --if(UNIX) -+if(1) - INSTALL(TARGETS portmidi-static pmjni -- LIBRARY DESTINATION /usr/local/lib -- ARCHIVE DESTINATION /usr/local/lib) -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) - # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here --# INSTALL(FILES portmidi.h ../porttime/porttime.h --# DESTINATION /usr/local/include) --endif(UNIX) -+ INSTALL(FILES portmidi.h ../porttime/porttime.h -+ DESTINATION include) -+endif(1) -+endif() -diff --git a/portmidi/trunk/pm_common/portmidi.h b/portmidi/trunk/pm_common/portmidi.h -index e07991e..6f48927 100644 ---- a/portmidi/trunk/pm_common/portmidi.h -+++ b/portmidi/trunk/pm_common/portmidi.h -@@ -108,6 +108,8 @@ typedef unsigned int uint32_t; - - #ifdef _WINDLL - #define PMEXPORT __declspec(dllexport) -+#elif defined _PM_USEDLL -+#define PMEXPORT __declspec(dllimport) - #else - #define PMEXPORT - #endif -diff --git a/portmidi/trunk/pm_dylib/CMakeLists.txt b/portmidi/trunk/pm_dylib/CMakeLists.txt -index f693dd6..69d4d24 100644 ---- a/portmidi/trunk/pm_dylib/CMakeLists.txt -+++ b/portmidi/trunk/pm_dylib/CMakeLists.txt -@@ -4,11 +4,8 @@ - # portmidi/pm_dylib - if(APPLE OR WIN32) - # set the build directory for .dylib libraries -- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) -- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) - # the "archive" output directory says where to put portmidi.lib, the - # static part of the lib/dll pair: -- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) - - # the first time CMake configures, save off CMake's built-in flags - if(NOT DEFAULT_DEBUG_FLAGS) -@@ -113,15 +110,21 @@ set(SHARED_FILES pmutil portmidi) - prepend_path(SHARED_PATHS ../pm_common/ ${SHARED_FILES}) - list(APPEND LIBSRC ${SHARED_PATHS}) - -+if (BUILD_SHARED_LIBS) - add_library(portmidi-dynamic SHARED ${LIBSRC}) - set_target_properties(portmidi-dynamic PROPERTIES OUTPUT_NAME "portmidi") - target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS}) -+if (MSVC) -+ target_compile_definitions(portmidi-dynamic PRIVATE _WINDLL) -+endif() - - # install the libraries (Linux and Mac OS X command line) --if(UNIX) -+if(1) - INSTALL(TARGETS portmidi-dynamic -- LIBRARY DESTINATION /usr/local/lib -- ARCHIVE DESTINATION /usr/local/lib) -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) - INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h -- DESTINATION /usr/local/include) --endif(UNIX) -+ DESTINATION include) -+endif(1) -+endif() diff --git a/ports/portmidi/portfile.cmake b/ports/portmidi/portfile.cmake index 45e15ab0520f82..c6dd12b1cfd2dd 100644 --- a/ports/portmidi/portfile.cmake +++ b/ports/portmidi/portfile.cmake @@ -1,35 +1,16 @@ -vcpkg_fail_port_install(ON_TARGET "uwp" ON_ARCH "arm") - -vcpkg_from_sourceforge( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO portmedia - FILENAME "portmedia-code-r234.zip" - SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794 - PATCHES - fix-build-install.patch - add-feature-options.patch -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/portmidi/trunk" - OPTIONS - -DJAVA_SUPPORT=OFF - -DJAVA_INCLUDE_PATH= - -DJAVA_INCLUDE_PATH2= - -DJAVA_JVM_LIBRARY= - MAYBE_UNUSED_VARIABLES - JAVA_INCLUDE_PATH - JAVA_INCLUDE_PATH2 + REPO PortMidi/portmidi + REF v2.0.2 + SHA512 36c43dc1f8b304c36de1c4672b8d2abe67c72dd8ea46044ebd479896a0e346f00207d4483e08701a04cdf3f342790c874f8a1c07d71d5d55d763bf97a1276021 + HEAD_REF master ) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() -if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/portmidi.h" - "#elif defined _PM_USEDLL" "#elif 1" - ) -endif() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PortMidi) +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(INSTALL "${SOURCE_PATH}/portmidi/trunk/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/portmidi/vcpkg.json b/ports/portmidi/vcpkg.json index 91d162c4f11365..4b2da518b3efcc 100644 --- a/ports/portmidi/vcpkg.json +++ b/ports/portmidi/vcpkg.json @@ -1,14 +1,23 @@ { "name": "portmidi", - "version": "0.234", - "port-version": 3, - "description": "Free, cross-platform, open-source I/O library for MIDI", - "homepage": "https://sourceforge.net/projects/portmedia/", - "supports": "!uwp & !linux", + "version": "2.0.2", + "port-version": 1, + "description": "PortMidi is a cross platform (Windows, macOS, Linux, and BSDs which support alsalib) library for interfacing with operating systems' MIDI I/O APIs.", + "homepage": "https://github.com/PortMidi/portmidi", + "license": "MIT", + "supports": "!uwp", "dependencies": [ + { + "name": "alsa", + "platform": "!(windows | osx)" + }, { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/portsmf/portfile.cmake b/ports/portsmf/portfile.cmake index 158094ee76c020..01370f7c2c9787 100644 --- a/ports/portsmf/portfile.cmake +++ b/ports/portsmf/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tenacityteam/portsmf diff --git a/ports/portsmf/vcpkg.json b/ports/portsmf/vcpkg.json index c97b7711de8e7b..f3105391aa7917 100644 --- a/ports/portsmf/vcpkg.json +++ b/ports/portsmf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "portsmf", "version": "0.238", + "port-version": 1, "description": "Portsmf is 'Port Standard MIDI File', a cross-platform, C++ library for reading and writing Standard MIDI Files.", "homepage": "https://github.com/tenacityteam/portsmf", "license": "MIT", diff --git a/ports/presentmon/portfile.cmake b/ports/presentmon/portfile.cmake index b6a00824bde1fd..a2c5dc041ba8b9 100644 --- a/ports/presentmon/portfile.cmake +++ b/ports/presentmon/portfile.cmake @@ -1,8 +1,6 @@ # The upstream doesn't export any symbols vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "linux" "osx" "uwp" "ios" "android" "freebsd") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GameTechDev/PresentMon diff --git a/ports/presentmon/vcpkg.json b/ports/presentmon/vcpkg.json index b4e05670cba237..daa764fddec5ad 100644 --- a/ports/presentmon/vcpkg.json +++ b/ports/presentmon/vcpkg.json @@ -1,6 +1,7 @@ { "name": "presentmon", "version-semver": "1.7.0", + "port-version": 1, "description": "PresentMon is a tool to capture and analyze ETW events related to swap chain presentation on Windows.", "supports": "windows & !uwp", "features": { diff --git a/ports/proj4/fix-proj4-targets-cmake.patch b/ports/proj/fix-proj4-targets-cmake.patch similarity index 68% rename from ports/proj4/fix-proj4-targets-cmake.patch rename to ports/proj/fix-proj4-targets-cmake.patch index 73fa76e50948e8..62964308619a55 100644 --- a/ports/proj4/fix-proj4-targets-cmake.patch +++ b/ports/proj/fix-proj4-targets-cmake.patch @@ -26,7 +26,15 @@ index 7d736d129..2be8f8be9 100644 if(NOT SQLITE3_FOUND) message(SEND_ERROR "sqlite3 dependency not found!") endif() -@@ -171,6 +186,7 @@ if(ENABLE_CURL) +@@ -151,6 +165,7 @@ if(ENABLE_TIFF) + find_package(TIFF REQUIRED) + if(TIFF_FOUND) + set(TIFF_ENABLED TRUE) ++ set(TIFF_LIBRARY TIFF::TIFF) + else() + message(SEND_ERROR + "libtiff dependency not found! Use ENABLE_TIFF=OFF to force it off") +@@ -171,6 +188,7 @@ if(ENABLE_CURL) find_package(CURL REQUIRED) if(CURL_FOUND) set(CURL_ENABLED TRUE) @@ -34,35 +42,25 @@ index 7d736d129..2be8f8be9 100644 else() message(SEND_ERROR "curl dependency not found!") endif() - -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index c790fa4a8..6653a28b9 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -95,6 +95,10 @@ endif () - - foreach (PROJECT_VARIANT_NAME ${PROJECT_NAME} ${PROJECT_LEGACY_NAME}) - string (TOLOWER "${PROJECT_VARIANT_NAME}" PROJECT_VARIANT_LOWER) -+ set(FIND_DEPENDENCY_SQLITE3 "find_dependency(unofficial-sqlite3 CONFIG)") -+ if(CURL_ENABLED) -+ set(FIND_DEPENDENCY_CURL "find_dependency(CURL CONFIG)") -+ endif() - set (CMAKECONFIGSUBDIR "${CMAKECONFIGDIR}/${PROJECT_VARIANT_LOWER}") - # proj-config.cmake for the install tree. It's installed in - # ${CMAKECONFIGSUBDIR} and @PROJECT_ROOT_DIR@ is the relative - diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in index 23f997abd..8baef00f0 100644 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in -@@ -7,6 +7,10 @@ +@@ -7,6 +7,17 @@ # @PROJECT_VARIANT_NAME@_LIBRARY_DIRS = /usr/local/lib # @PROJECT_VARIANT_NAME@_BINARY_DIRS = /usr/local/bin # @PROJECT_VARIANT_NAME@_VERSION = 4.9.1 (for example) ++cmake_policy(PUSH) ++cmake_policy(SET CMP0012 NEW) +include(CMakeFindDependencyMacro) -+ -+@FIND_DEPENDENCY_SQLITE3@ -+@FIND_DEPENDENCY_CURL@ ++find_dependency(unofficial-sqlite3 CONFIG) ++if("@ENABLE_TIFF@") ++ find_dependency(TIFF) ++endif() ++if("@ENABLE_CURL@") ++ find_dependency(CURL CONFIG) ++endif() ++cmake_policy(POP) # Tell the user project where to find our headers and libraries get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) diff --git a/ports/proj4/fix-win-output-name.patch b/ports/proj/fix-win-output-name.patch similarity index 100% rename from ports/proj4/fix-win-output-name.patch rename to ports/proj/fix-win-output-name.patch diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake index cc6e26fcb0b69f..63a50506c3ea18 100644 --- a/ports/proj/portfile.cmake +++ b/ports/proj/portfile.cmake @@ -1 +1,69 @@ -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OSGeo/PROJ + REF 9.0.0 + SHA512 f11a20e9f9615c513755f54ac400cc2e144e40caa91f616c8f640aef9caf779487dc94927b3a4b57b15a595c17b70636b872d9a77d7baaf912b1a507004e6520 + HEAD_REF master + PATCHES + fix-win-output-name.patch + fix-proj4-targets-cmake.patch + tools-cmake.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + net ENABLE_CURL + tiff ENABLE_TIFF + tools BUILD_APPS +) + +vcpkg_list(SET TOOL_NAMES cct cs2cs geod gie invgeod invproj proj projinfo projsync) +if("tools" IN_LIST FEATURES AND NOT "net" IN_LIST FEATURES) + set(BUILD_PROJSYNC OFF) + vcpkg_list(APPEND FEATURE_OPTIONS -DBUILD_PROJSYNC=${BUILD_PROJSYNC}) + vcpkg_list(REMOVE_ITEM TOOL_NAMES projsync) +endif() + +find_program(EXE_SQLITE3 NAMES "sqlite3" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH REQUIRED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DNLOHMANN_JSON=external + -DPROJ_LIB_SUBDIR=lib + -DPROJ_INCLUDE_SUBDIR=include + -DPROJ_DATA_SUBDIR=share/${PORT}/data + -DBUILD_TESTING=OFF + "-DEXE_SQLITE3=${EXE_SQLITE3}" +) + +vcpkg_cmake_install() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Enforce consistency with src/lib_proj.cmake build time configuration. + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proj.h" + "#ifndef PROJ_DLL" + "#ifndef PROJ_DLL\n# define PROJ_DLL\n#elif 0" + ) +endif() + +vcpkg_cmake_config_fixup(PACKAGE_NAME proj4 CONFIG_PATH lib/cmake/proj4 DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/proj) + +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") + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +if(NOT DEFINED VCPKG_BUILD_TYPE AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/proj.pc" " -lproj" " -lproj_d") +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/proj4/tools-cmake.patch b/ports/proj/tools-cmake.patch similarity index 54% rename from ports/proj4/tools-cmake.patch rename to ports/proj/tools-cmake.patch index 514a15ad193805..cc76be215d2c99 100644 --- a/ports/proj4/tools-cmake.patch +++ b/ports/proj/tools-cmake.patch @@ -1,14 +1,14 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt index 534bc311b..f9fb0f1bb 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt +--- a/src/apps/CMakeLists.txt ++++ b/src/apps/CMakeLists.txt @@ -83,10 +83,3 @@ if(BUILD_PROJSYNC) - endif() + # global configurations for all apps -if(MSVC OR CMAKE_CONFIGURATION_TYPES) - if(BIN_TARGETS) -- # Add _d suffix for your debug versions of the tools +- # Add _d suffix for debug versions of the apps - set_target_properties(${BIN_TARGETS} PROPERTIES - DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) - endif() diff --git a/ports/proj4/usage b/ports/proj/usage similarity index 68% rename from ports/proj4/usage rename to ports/proj/usage index ebf9f6c8d5aae1..a1236dde61303a 100644 --- a/ports/proj4/usage +++ b/ports/proj/usage @@ -1,4 +1,4 @@ -The package proj4 provides CMake targets: +The package proj provides CMake targets: find_package(PROJ CONFIG REQUIRED) target_link_libraries(main PRIVATE PROJ::proj) diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json index 50beaca9bc8e84..a17d5a8aa352f1 100644 --- a/ports/proj/vcpkg.json +++ b/ports/proj/vcpkg.json @@ -1,9 +1,57 @@ { "name": "proj", - "version-string": "0", - "port-version": 1, - "description": "a stub package that pulls in proj4. Do not depend on this package.", + "version": "9.0.0", + "description": "PROJ library for cartographic projections", + "homepage": "https://proj.org/", + "license": "MIT", "dependencies": [ - "proj4" - ] + "nlohmann-json", + { + "name": "sqlite3", + "default-features": false + }, + { + "name": "sqlite3", + "host": true, + "features": [ + "tool" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "net", + "tiff" + ], + "features": { + "net": { + "description": "Enable network support", + "dependencies": [ + "curl" + ] + }, + "tiff": { + "description": "Enable TIFF support to read some grids", + "dependencies": [ + { + "name": "tiff", + "default-features": false, + "features": [ + "lzma", + "zip" + ] + } + ] + }, + "tools": { + "description": "Build tools" + } + } } diff --git a/ports/proj4/fix-filemanager-uwp.patch b/ports/proj4/fix-filemanager-uwp.patch deleted file mode 100644 index 14dba72c29c55b..00000000000000 --- a/ports/proj4/fix-filemanager-uwp.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/src/filemanager.cpp b/src/filemanager.cpp -index e6a9ed9..d85290b 100644 ---- a/src/filemanager.cpp -+++ b/src/filemanager.cpp -@@ -48,6 +48,12 @@ - - #include "proj_config.h" - -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) -+#define UWP 1 -+#else -+#define UWP 0 -+#endif -+ - #ifdef _WIN32 - #include - #include -@@ -692,10 +698,21 @@ std::unique_ptr FileWin32::open(PJ_CONTEXT *ctx, const char *filename, - ? FILE_ATTRIBUTE_READONLY - : FILE_ATTRIBUTE_NORMAL; - try { -+#if UWP -+ CREATEFILE2_EXTENDED_PARAMETERS extendedParameters; -+ ZeroMemory(&extendedParameters, sizeof(extendedParameters)); -+ extendedParameters.dwSize = sizeof(extendedParameters); -+ extendedParameters.dwFileAttributes = dwFlagsAndAttributes; -+ HANDLE hFile = CreateFile2( -+ UTF8ToWString(std::string(filename)).c_str(), dwDesiredAccess, -+ FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, -+ dwCreationDisposition, &extendedParameters); -+#else // UWP - HANDLE hFile = CreateFileW( - UTF8ToWString(std::string(filename)).c_str(), dwDesiredAccess, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, - dwCreationDisposition, dwFlagsAndAttributes, nullptr); -+#endif // UWP - return std::unique_ptr(hFile != INVALID_HANDLE_VALUE - ? new FileWin32(filename, ctx, hFile) - : nullptr); -@@ -1211,6 +1228,9 @@ const char *proj_context_get_user_writable_directory(PJ_CONTEXT *ctx, - wPath.resize(wcslen(wPath.data())); - path = NS_PROJ::WStringToUTF8(wPath); - #else -+#if UWP -+ if (false) { -+#else // UWP - wchar_t *wPath; - if (SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, nullptr, &wPath) == - S_OK) { -@@ -1218,6 +1238,7 @@ const char *proj_context_get_user_writable_directory(PJ_CONTEXT *ctx, - std::string str = NS_PROJ::WStringToUTF8(ws); - path = str; - CoTaskMemFree(wPath); -+#endif // UWP - #endif - } else { - const char *local_app_data = getenv("LOCALAPPDATA"); -@@ -1311,11 +1332,13 @@ static std::string pj_get_relative_share_proj_internal_no_check() { - #if defined(_WIN32) || defined(HAVE_LIBDL) - #ifdef _WIN32 - HMODULE hm = NULL; -+#if !UWP - if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | - GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, - (LPCSTR)&pj_get_relative_share_proj, &hm) == 0) { - return std::string(); - } -+#endif // UWP - - DWORD path_size = 1024; - diff --git a/ports/proj4/fix-sqlite3-bin.patch b/ports/proj4/fix-sqlite3-bin.patch deleted file mode 100644 index 20fea7141b421f..00000000000000 --- a/ports/proj4/fix-sqlite3-bin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 75c4696..2e8a957 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,7 +110,7 @@ include(policies) - ################################################################################ - # Check for sqlite3 - ################################################################################ --find_program(EXE_SQLITE3 sqlite3) -+# Use incoming parameter - if(NOT EXE_SQLITE3) - message(SEND_ERROR "sqlite3 binary not found!") - endif() diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 2a0a83e24bca53..cc6e26fcb0b69f 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -1,109 +1 @@ -set(VERSION 8.0.0) # Variable used for pc file -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO OSGeo/PROJ - REF "${VERSION}" - SHA512 353f0e14ba6c11bfcec8a30b3f322842e8a3103546e0fd40871e341c859ca7ae2b9411425be5b588eb45cc5716255d2ea81d6357407bcfb9506a0edb161376f5 - HEAD_REF master - PATCHES - fix-filemanager-uwp.patch - fix-sqlite3-bin.patch - fix-win-output-name.patch - fix-proj4-targets-cmake.patch - tools-cmake.patch -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(VCPKG_BUILD_SHARED_LIBS ON) - set(EXTRA_FEATURES tiff ENABLE_TIFF tools BUILD_PROJSYNC tools ENABLE_CURL) - set(TOOL_NAMES cct cs2cs geod gie proj projinfo projsync) -else() - set(VCPKG_BUILD_SHARED_LIBS OFF) - set(TOOL_NAMES cct cs2cs geod gie proj projinfo) -endif() - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tools BUILD_CCT - tools BUILD_CS2CS - tools BUILD_GEOD - tools BUILD_GIE - tools BUILD_PROJ - tools BUILD_PROJINFO - ${EXTRA_FEATURES} -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(WARNING "ENABLE_TIFF ENABLE_CURL and BUILD_PROJSYNC will be off when building static") - set(FEATURE_OPTIONS ${FEATURE_OPTIONS} -DENABLE_TIFF=OFF -DENABLE_CURL=OFF -DBUILD_PROJSYNC=OFF) -endif() - -set(EXE_SQLITE3 "${CURRENT_HOST_INSTALLED_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}") - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${FEATURE_OPTIONS} - -DPROJ_LIB_SUBDIR=lib - -DPROJ_INCLUDE_SUBDIR=include - -DPROJ_DATA_SUBDIR=share/${PORT} - -DBUILD_TESTING=OFF - -DEXE_SQLITE3=${EXE_SQLITE3} -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME PROJ CONFIG_PATH lib/cmake/proj DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(PACKAGE_NAME PROJ4 CONFIG_PATH lib/cmake/proj4) - -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") - -vcpkg_copy_pdbs() - -set(PACKAGE "${PORT}") -set(requires_private "sqlite3") -if(ENABLE_CURL) - string(APPEND requires_private " libcurl") -endif() -if(ENABLE_TIFF) - string(APPEND requires_private " libtiff-4") -endif() -set(libs_private "") -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - string(APPEND libs_private " -lole32 -lshell32") -elseif(VCPKG_TARGET_IS_OSX) - string(APPEND libs_private " -lc++ -lm") -else() - string(APPEND libs_private " -lstdc++ -lm") -endif() -set(libdir [[${prefix}/lib]]) -set(exec_prefix [[${prefix}]]) -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(includedir [[${prefix}/include]]) - set(datarootdir [[${prefix}/share]]) - set(datadir [[${prefix}/share]]) - set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/proj.pc") - configure_file("${SOURCE_PATH}/proj.pc.in" "${outfile}" @ONLY) - vcpkg_replace_string("${outfile}" "Requires:" "Requires.private: ${requires_private}") - vcpkg_replace_string("${outfile}" " -lstdc++" "${libs_private}") -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(includedir [[${prefix}/../include]]) - set(datarootdir [[${prefix}/../share]]) - set(datadir [[${prefix}/../share]]) - set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/proj.pc") - configure_file("${SOURCE_PATH}/proj.pc.in" "${outfile}" @ONLY) - vcpkg_replace_string("${outfile}" "Requires:" "Requires.private: ${requires_private}") - vcpkg_replace_string("${outfile}" " -lstdc++" "${libs_private}") - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string("${outfile}" " -lproj" " -lproj_d") - endif() -endif() -vcpkg_fixup_pkgconfig() - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index b1c9f2034c0407..a669741020d21e 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,43 +1,55 @@ { "name": "proj4", - "version-semver": "8.0.0", - "description": "PROJ.4 library for cartographic projections", - "homepage": "https://github.com/OSGeo/PROJ", + "version-semver": "8.9.9", + "port-version": 1, + "description": "A stub package that pulls in proj. Do not depend on this package.", + "license": "MIT", "dependencies": [ { - "name": "sqlite3", - "default-features": false - }, - { - "name": "sqlite3", - "host": true, - "features": [ - "tool" - ] - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true + "name": "proj", + "default-features": false, + "version>=": "9.0.0" } ], "default-features": [ + "net", "tiff" ], "features": { + "net": { + "description": "Enable network support", + "dependencies": [ + { + "name": "proj", + "default-features": false, + "features": [ + "net" + ] + } + ] + }, "tiff": { "description": "Enable TIFF support to read some grids", "dependencies": [ - "tiff" + { + "name": "proj", + "default-features": false, + "features": [ + "tiff" + ] + } ] }, "tools": { - "description": "generate tools", + "description": "Build tools", "dependencies": [ - "curl" + { + "name": "proj", + "default-features": false, + "features": [ + "tools" + ] + } ] } } diff --git a/ports/protobuf/fix-static-build.patch b/ports/protobuf/fix-static-build.patch index fec980a9319860..d0e3ae010daf18 100644 --- a/ports/protobuf/fix-static-build.patch +++ b/ports/protobuf/fix-static-build.patch @@ -1,13 +1,26 @@ -diff --git a/cmake/install.cmake b/cmake/install.cmake -index ef5bb13..e2d4acb 100644 ---- a/cmake/install.cmake -+++ b/cmake/install.cmake -@@ -33,7 +33,7 @@ if (protobuf_BUILD_PROTOC_BINARIES) - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT protoc) -- if (UNIX AND NOT APPLE) -+ if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME) - set_property(TARGET protoc - PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") - elseif (APPLE) +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 51e8478..64347c4 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -182,7 +182,7 @@ else (protobuf_BUILD_SHARED_LIBS) + # making programmatic control difficult. Prefer the functionality in newer + # CMake versions when available. + if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15) +- set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) ++ + else() + # In case we are building static libraries, link also the runtime library statically + # so that MSVCR*.DLL is not required at runtime. +diff --git a/cmake/install.cmake b/cmake/install.cmake +index 4e1c5de..d3aa865 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -32,7 +32,7 @@ if (protobuf_BUILD_PROTOC_BINARIES) + install(TARGETS protoc EXPORT protobuf-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) +- if (UNIX AND NOT APPLE) ++ if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME) + set_property(TARGET protoc + PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") + elseif (APPLE) diff --git a/ports/protobuf/fix-uwp-build.patch b/ports/protobuf/fix-uwp-build.patch deleted file mode 100644 index ca806ebd1540cc..00000000000000 --- a/ports/protobuf/fix-uwp-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc -index b6c31fd..8b77c3d 100644 ---- a/src/google/protobuf/descriptor.cc -+++ b/src/google/protobuf/descriptor.cc -@@ -794,7 +794,7 @@ class TableArena { - size = RoundUp(size); - - Block* to_relocate = nullptr; -- Block* to_use; -+ Block* to_use = nullptr; - - for (size_t i = 0; i < kSmallSizes.size(); ++i) { - if (small_size_blocks_[i] != nullptr && size <= kSmallSizes[i]) { diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 8395eeae5dd3c4..205cf7cd74353f 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf - REF v3.18.0 - SHA512 2c8ff451b54120e4670f7ea8c92c0c7d70f4bb781979f74f59ddcb7c9cc74fe3e8910fc579d2686fb0e1aafa35fb9548ccab667accf2358c71cfd17ba38d7826 + REF v3.19.4 + SHA512 2653b9852e5ac69f1de9b6ac02887c366aa0a9efd2b29e53135f61a9a10f5a1b5853a8c4cbb3658f519dfdbde9f32c547c39751ab417f123162b08be9e76c9e1 HEAD_REF master PATCHES fix-static-build.patch fix-default-proto-file-path.patch - fix-uwp-build.patch ) string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES) @@ -27,13 +26,12 @@ endif() if (VCPKG_DOWNLOAD_MODE) # download PKGCONFIG in download mode which is used in `vcpkg_fixup_pkgconfig()` at the end of this script. - # download it here because `vcpkg_configure_cmake()` halts execution in download mode when running configure process. + # download it here because `vcpkg_cmake_configure()` halts execution in download mode when running configure process. vcpkg_find_acquire_program(PKGCONFIG) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/cmake - PREFER_NINJA OPTIONS -Dprotobuf_BUILD_SHARED_LIBS=${protobuf_BUILD_SHARED_LIBS} -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME} @@ -44,7 +42,7 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # It appears that at this point the build hasn't actually finished. There is probably # a process spawned by the build, therefore we need to wait a bit. @@ -57,52 +55,52 @@ function(protobuf_try_remove_recurse_wait PATH_TO_REMOVE) endif() endfunction() -protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/include) +protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/include") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake" "\${_IMPORT_PREFIX}/bin/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" ) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(READ ${CURRENT_PACKAGES_DIR}/debug/share/protobuf/protobuf-targets-debug.cmake DEBUG_MODULE) + file(READ "${CURRENT_PACKAGES_DIR}/debug/share/protobuf/protobuf-targets-debug.cmake" DEBUG_MODULE) string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}") string(REPLACE "\${_IMPORT_PREFIX}/debug/bin/protoc${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}" DEBUG_MODULE "${DEBUG_MODULE}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-debug.cmake "${DEBUG_MODULE}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-debug.cmake" "${DEBUG_MODULE}") endif() -protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share) +protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/share") if(protobuf_BUILD_PROTOC_BINARIES) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN) else() - vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.18.0.0 AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.19.4.0 AUTO_CLEAN) endif() else() - file(COPY ${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + file(COPY "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") endif() -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake" "if(protobuf_MODULE_COMPATIBLE)" "if(ON)" ) if(NOT protobuf_BUILD_LIBPROTOC) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-module.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-module.cmake" "_protobuf_find_libraries(Protobuf_PROTOC protoc)" "" ) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin) - protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin) + protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/bin") + protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/bin") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h" "\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" "\#ifndef PROTOBUF_USE_DLLS\n\#define PROTOBUF_USE_DLLS\n\#endif // PROTOBUF_USE_DLLS\n\n\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" ) @@ -111,7 +109,7 @@ endif() vcpkg_copy_pdbs() set(packages protobuf protobuf-lite) foreach(_package IN LISTS packages) - set(_file ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_package}.pc) + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_package}.pc") if(EXISTS "${_file}") vcpkg_replace_string(${_file} "-l${_package}" "-l${_package}d") endif() @@ -120,8 +118,8 @@ endforeach() vcpkg_fixup_pkgconfig() if(NOT protobuf_BUILD_PROTOC_BINARIES) - configure_file(${CMAKE_CURRENT_LIST_DIR}/protobuf-targets-vcpkg-protoc.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-targets-vcpkg-protoc.cmake COPYONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/protobuf-targets-vcpkg-protoc.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-targets-vcpkg-protoc.cmake" COPYONLY) endif() -configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index c75206275c098f..3eaa26fc545522 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,12 +1,21 @@ { "name": "protobuf", - "version-semver": "3.18.0", + "version-semver": "3.19.4", "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", + "license": "BSD-3-Clause", "dependencies": [ { "name": "protobuf", "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { diff --git a/ports/protozero/fix-builderror.patch b/ports/protozero/fix-builderror.patch new file mode 100644 index 00000000000000..74ae3980048760 --- /dev/null +++ b/ports/protozero/fix-builderror.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f9702d6..bd41cbe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,7 +29,7 @@ if(MSVC) + add_definitions(/W3) + add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS) + else() +- add_definitions(-std=c++11 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default) ++ add_definitions(-std=c++17 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default) + if(WERROR) + add_definitions(-Werror) + endif() diff --git a/ports/protozero/portfile.cmake b/ports/protozero/portfile.cmake index fda45303cc87cb..abfe4956b43820 100644 --- a/ports/protozero/portfile.cmake +++ b/ports/protozero/portfile.cmake @@ -5,17 +5,17 @@ vcpkg_from_github( SHA512 d09a34865c535264c52f9c605ccb6f453c357f5e3a7b0dc72b097de288eabc6985a5b81ddbe79c47d0af2d8f74e33bd380fefce47acb15d8d51d5c151d71786b REF v1.7.0 HEAD_REF master + PATCHES fix-builderror.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/protozero/vcpkg.json b/ports/protozero/vcpkg.json index aae619a1e56c20..3d4ba85b9a7d50 100644 --- a/ports/protozero/vcpkg.json +++ b/ports/protozero/vcpkg.json @@ -1,9 +1,19 @@ { "name": "protozero", "version-semver": "1.7.0", + "port-version": 1, "description": "Minimalist protocol buffer decoder and encoder in C++", "homepage": "https://github.com/mapbox/protozero", + "license": "BSD-2-Clause", "dependencies": [ - "protobuf" + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/proxygen/fix-duplicated-target.patch b/ports/proxygen/fix-duplicated-target.patch deleted file mode 100644 index 89d32e53db647d..00000000000000 --- a/ports/proxygen/fix-duplicated-target.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake -index c664ccbe3..3c3f1245c 100644 ---- a/build/fbcode_builder/CMake/FindSodium.cmake -+++ b/build/fbcode_builder/CMake/FindSodium.cmake -@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS) - else() - set(_LIB_TYPE SHARED) - endif() --add_library(sodium ${_LIB_TYPE} IMPORTED) -+ -+if(NOT TARGET sodium) -+ add_library(sodium ${_LIB_TYPE} IMPORTED) -+endif() - - set_target_properties(sodium PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}" diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index d2789572d9d96d..445e6e25bf505e 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -1,18 +1,15 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen - REF v2021.06.14.00 - SHA512 f5ab54514575f86897438f40a481796c34031101775b61a01581338c91686159995e4f822909e42eed4c006b2c6a6351887d469cc9df1df80711dba10cc15a19 + REF v2022.01.31.00 + SHA512 f340466fb52e01bb71289f7cf1e8aee2ef8a0d5db21998ea85aaf07b128144de05747ececcac65e99d1d452bddc0d0dc60ba17087311c8337e31fbdda6f4ce3a HEAD_REF master PATCHES remove-register.patch - fix-duplicated-target.patch # fixed in master ) vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) +get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY) vcpkg_add_to_path(${PYTHON3_PATH}) if (VCPKG_TARGET_IS_WINDOWS) @@ -26,18 +23,17 @@ else() endif() endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_tools(TOOL_NAMES proxygen_curl proxygen_echo proxygen_proxy proxygen_push proxygen_static AUTO_CLEAN) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/proxygen) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/proxygen) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 2e8dd6606b95db..6221e52a37de54 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2021.06.14.00", + "version-string": "2022.01.31.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "supports": "!windows", @@ -16,6 +16,14 @@ "fizz", "folly", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "wangle", "zlib", "zstd" diff --git a/ports/ptex/portfile.cmake b/ports/ptex/portfile.cmake index 6fe24666be5fa9..057dfc089d0542 100644 --- a/ports/ptex/portfile.cmake +++ b/ports/ptex/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(PTEX_VER 2.3.2) vcpkg_from_github( @@ -8,7 +6,7 @@ vcpkg_from_github( REF 1b8bc985a71143317ae9e4969fa08e164da7c2e5 SHA512 37f2df9ec195f3d69d9526d0dea6a93ef49d69287bfae6ccd9671477491502ea760ed14e3b206b4f488831ab728dc749847b7d176c9b8439fb58b0a0466fe6c5 HEAD_REF master - PATCHES + PATCHES fix-build.patch fix-config.cmake.patch ) diff --git a/ports/ptex/vcpkg.json b/ports/ptex/vcpkg.json index 355a40596ce1f7..636cea5191348c 100644 --- a/ports/ptex/vcpkg.json +++ b/ports/ptex/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ptex", "version": "2.3.2", - "port-version": 3, + "port-version": 4, "description": "Per-Face Texture Mapping for Production Rendering.", "homepage": "https://github.com/wdas/ptex", "supports": "!uwp", diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 6277348ad84049..b0a329c91d4868 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF v2.8.1 - SHA512 6738b4551a1ca2fdf6676be78216b9056cecf8b4d125f0d1aaae9929614bcbf4a9b233fc3c52b8f9dfd19a9ca1496515e6748c1afd8968b9c52c9a1e8b28da10 + REF v2.9.1 + SHA512 1f268cc6df1f572658bfc3e60f7f010bec9b9444d6a6d6c95f7b26f7b4b7dd42846e65ae5a611c01c0341335fdfa84b01272b5c1b2cc11a418f64fecabfa0588 HEAD_REF master ) @@ -22,5 +22,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/pybind11") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pybind11/pybind11Tools.cmake" + [=[find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=] + [=[find_package(PythonLibs ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=]) # CMake's PythonLibs works better with vcpkg + # copy license file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json index 3c6faa3c719f77..4e51db6aaaf25c 100644 --- a/ports/pybind11/vcpkg.json +++ b/ports/pybind11/vcpkg.json @@ -1,8 +1,11 @@ { "name": "pybind11", - "version-semver": "2.8.1", + "version": "2.9.1", + "port-version": 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", + "supports": "!(arm & windows)", "dependencies": [ "python3", { diff --git a/ports/python2/008-bz2d.patch b/ports/python2/008-bz2d.patch new file mode 100644 index 00000000000000..88ec7405e01aa1 --- /dev/null +++ b/ports/python2/008-bz2d.patch @@ -0,0 +1,19 @@ +diff --git a/setup.py b/setup.py +index f764223..d6a58e4 100644 +--- a/setup.py ++++ b/setup.py +@@ -1506,6 +1506,14 @@ class PyBuildExt(build_ext): + exts.append( Extension('bz2', ['bz2module.c'], + libraries = ['bz2'], + extra_link_args = bz2_extra_link_args) ) ++ elif (self.compiler.find_library_file(lib_dirs, 'bz2d')): ++ if host_platform == "darwin": ++ bz2_extra_link_args = ('-Wl,-search_paths_first',) ++ else: ++ bz2_extra_link_args = () ++ exts.append( Extension('bz2', ['bz2module.c'], ++ libraries=['bz2d'], ++ extra_link_args = bz2_extra_link_args) ) + else: + missing.append('bz2') + diff --git a/ports/python2/portfile.cmake b/ports/python2/portfile.cmake index fdbf8f415b97a6..227ffed4115918 100644 --- a/ports/python2/portfile.cmake +++ b/ports/python2/portfile.cmake @@ -35,6 +35,10 @@ if (VCPKG_TARGET_IS_WINDOWS) list(APPEND _PYTHON_PATCHES ${CMAKE_CURRENT_LIST_DIR}/007-fix-build-path.patch ) +else() + list(APPEND _PYTHON_PATCHES + ${CMAKE_CURRENT_LIST_DIR}/008-bz2d.patch + ) endif() @@ -50,6 +54,8 @@ vcpkg_extract_source_archive_ex( PATCHES ${_PYTHON_PATCHES} ) +vcpkg_replace_string("${SOURCE_PATH}/Makefile.pre.in" "$(INSTALL) -d -m $(DIRMODE)" "$(MKDIR_P)") + if (VCPKG_TARGET_IS_WINDOWS) if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(BUILD_ARCH "Win32") @@ -85,10 +91,62 @@ else() ) vcpkg_install_make() + vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") endif() +if (NOT VCPKG_TARGET_IS_WINDOWS) + foreach(lib_suffix IN ITEMS "" "/debug") + set(python_config_file "${CURRENT_PACKAGES_DIR}${lib_suffix}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata.py") + if(NOT EXISTS "${python_config_file}") + continue() + endif() + + file(READ "${python_config_file}" contents) + + string(PREPEND contents "import os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))\n") + # make contents a list of lines + string(REPLACE ";" "\\;" old_contents "${contents}") + string(REGEX REPLACE "\r?\n" ";" old_contents "${contents}") + + set(new_contents "") + foreach(line IN LISTS old_contents) + if(line MATCHES "\"") + string(REGEX REPLACE + "${CURRENT_PACKAGES_DIR}|${CURRENT_INSTALLED_DIR}" + "\" + _base + \"" + line + "${line}" + ) + string(REGEX REPLACE + "\"[^\"]*${CURRENT_BUILDTREES_DIR}[^\"]*\"" + "''" + line + "${line}" + ) + else() + string(REGEX REPLACE + "${CURRENT_PACKAGES_DIR}|${CURRENT_INSTALLED_DIR}" + "' + _base + '" + line + "${line}" + ) + string(REGEX REPLACE + "'[^']*${CURRENT_BUILDTREES_DIR}[^']*'" + "''" + line + "${line}" + ) + endif() + list(APPEND new_contents "${line}") + endforeach() + + list(JOIN new_contents "\n" contents) + file(WRITE "${python_config_file}" "${contents}") + 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) diff --git a/ports/python2/vcpkg.json b/ports/python2/vcpkg.json index 9780104ac1d9d5..abe470eb5b662d 100644 --- a/ports/python2/vcpkg.json +++ b/ports/python2/vcpkg.json @@ -1,7 +1,8 @@ { "name": "python2", "version": "2.7.18", - "port-version": 1, + "port-version": 4, "description": "The Python programming language as an embeddable library", - "homepage": "https://www.python.org" + "homepage": "https://www.python.org", + "license": "Python-2.0" } diff --git a/ports/python3/0006-restore-support-for-windows-7.patch b/ports/python3/0006-restore-support-for-windows-7.patch index e240fefffc1f9e..a8f343e843ce1e 100644 --- a/ports/python3/0006-restore-support-for-windows-7.patch +++ b/ports/python3/0006-restore-support-for-windows-7.patch @@ -73,7 +73,16 @@ diff --git a/PC/getpathp.c b/PC/getpathp.c index 53da3a6..3d58bbf 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c -@@ -250,14 +250,43 @@ ismodule(wchar_t *filename, int update_filename) +@@ -90,7 +90,7 @@ + #endif + + #include +-#include ++#include + + #ifdef HAVE_SYS_TYPES_H + #include +@@ -249,14 +249,43 @@ ismodule(wchar_t *filename, int update_filename) stuff as fits will be appended. */ @@ -164,15 +173,15 @@ index d7d3cf0..6e9c090 100644 /* We only set these values when building Python - we don't want to force these values on extensions, as that will affect the prototypes and diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 2625d02..20e3d6e 100644 +index c39ba3e1a9..0ef3a05fb6 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -106,7 +106,7 @@ _Py_HAVE_ZLIB;%(PreprocessorDefinitions) -- version.lib;shlwapi.lib;ws2_32.lib;pathcch.lib;%(AdditionalDependencies) -+ version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies) +- version.lib;ws2_32.lib;pathcch.lib;%(AdditionalDependencies) ++ version.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies) diff --git a/ports/python3/0008-fix-parallel-install.patch b/ports/python3/0008-fix-parallel-install.patch deleted file mode 100644 index 26554644c46466..00000000000000 --- a/ports/python3/0008-fix-parallel-install.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 790d974..88fc444 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -2019,6 +2019,10 @@ Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h - .PHONY: build_all_generate_profile build_all_merge_profile - .PHONY: gdbhooks - -+# Serialize targets which may create /lib -+libinstall: altbininstall -+libainstall: altbininstall -+ - # IF YOU PUT ANYTHING HERE IT WILL GO AWAY - # Local Variables: - # mode: makefile diff --git a/ports/python3/0009-python.pc.patch b/ports/python3/0009-python.pc.patch new file mode 100644 index 00000000000000..173be389dae385 --- /dev/null +++ b/ports/python3/0009-python.pc.patch @@ -0,0 +1,16 @@ +--- a/Misc/python.pc.in 2022-01-14 05:23:10.299912709 +0000 ++++ b/Misc/python.pc.in 2022-01-14 05:23:15.908022446 +0000 +@@ -10,4 +10,4 @@ + Version: @VERSION@ + Libs.private: @LIBS@ + Libs: +-Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ ++Cflags: -I${includedir}/python@VERSION@ +--- a/Misc/python-embed.pc.in 2022-01-14 05:22:57.043653570 +0000 ++++ b/Misc/python-embed.pc.in 2022-01-14 05:23:04.603801315 +0000 +@@ -10,4 +10,4 @@ + Version: @VERSION@ + Libs.private: @LIBS@ + Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ +-Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ ++Cflags: -I${includedir}/python@VERSION@ diff --git a/ports/python3/0010-bz2d.patch b/ports/python3/0010-bz2d.patch new file mode 100644 index 00000000000000..162cc7cabab272 --- /dev/null +++ b/ports/python3/0010-bz2d.patch @@ -0,0 +1,19 @@ +diff --git a/setup.py b/setup.py +index 43e807f20..df4d43d3d 100644 +--- a/setup.py ++++ b/setup.py +@@ -1741,6 +1741,14 @@ def detect_compress_exts(self): + self.add(Extension('_bz2', ['_bz2module.c'], + libraries=['bz2'], + extra_link_args=bz2_extra_link_args)) ++ elif (self.compiler.find_library_file(self.lib_dirs, 'bz2d')): ++ if MACOS: ++ bz2_extra_link_args = ('-Wl,-search_paths_first',) ++ else: ++ bz2_extra_link_args = () ++ self.add(Extension('_bz2', ['_bz2module.c'], ++ libraries=['bz2d'], ++ extra_link_args=bz2_extra_link_args)) + else: + self.missing.append('_bz2') + diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 494703ff4b7d00..d99a0fd673bf55 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -5,7 +5,7 @@ endif() set(PYTHON_VERSION_MAJOR 3) set(PYTHON_VERSION_MINOR 10) -set(PYTHON_VERSION_PATCH 0) +set(PYTHON_VERSION_PATCH 2) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -13,7 +13,8 @@ set(PATCHES 0003-devendor-external-dependencies.patch 0004-dont-copy-vcruntime.patch 0005-only-build-required-projects.patch - 0008-fix-parallel-install.patch + 0009-python.pc.patch + 0010-bz2d.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(PREPEND PATCHES 0001-static-library.patch) @@ -40,11 +41,32 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 d83e0685c274be09da7833a3c24b7379ae0e43b43c131f11bfaccd5902f6a1c510a3ae67c42471a4281922ead3bd34856608ec47be7dd76ddd734e59906ba03b + SHA512 14f0d1847d4361fa075adbe4dbf7339fb62be91d5419cf506abdf46b36dc5273564792d35e5a5e0608a8fa877a870152a593743c3b70a98c739d5bd028be9e18 HEAD_REF master PATCHES ${PATCHES} ) +vcpkg_replace_string("${SOURCE_PATH}/Makefile.pre.in" "$(INSTALL) -d -m $(DIRMODE)" "$(MKDIR_P)") + +function(make_python_pkgconfig) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "FILE;INSTALL_ROOT;EXEC_PREFIX;INCLUDEDIR;ABIFLAGS" "") + + set(prefix "${CURRENT_PACKAGES_DIR}") + set(libdir [[${prefix}/lib]]) + set(exec_prefix ${arg_EXEC_PREFIX}) + set(includedir ${arg_INCLUDEDIR}) + set(VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") + set(ABIFLAGS ${arg_ABIFLAGS}) + + string(REPLACE "python" "python-${VERSION}" out_file ${arg_FILE}) + set(out_full_path "${arg_INSTALL_ROOT}/lib/pkgconfig/${out_file}") + configure_file("${SOURCE_PATH}/Misc/${arg_FILE}.in" ${out_full_path} @ONLY) + + file(READ ${out_full_path} pkgconfig_file) + string(REPLACE "-lpython${VERSION}" "-lpython${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}" pkgconfig_file "${pkgconfig_file}") + file(WRITE ${out_full_path} "${pkgconfig_file}") +endfunction() + if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) # Due to the way Python handles C extension modules on Windows, a static python core cannot # load extension modules. @@ -59,7 +81,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) 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(LZMA_RELEASE NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) - find_library(LZMA_DEBUG NAMES lzmad PATHS "${CURRENT_INSTALLED_DIR}/debug/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) find_library(SQLITE_DEBUG NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(SSL_RELEASE NAMES libssl PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) @@ -149,7 +171,8 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(GLOB PYTHON_INSTALLERS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wininst-*.exe") file(REMOVE ${PYTHON_LIBS} ${PYTHON_INSTALLERS}) - if(PYTHON_ALLOW_EXTENSIONS) + # The generated python executable must match the host arch + if(PYTHON_ALLOW_EXTENSIONS AND NOT VCPKG_CROSSCOMPILING) message(STATUS "Bootstrapping pip") vcpkg_execute_required_process(COMMAND python -m ensurepip WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}" @@ -157,13 +180,46 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) ) endif() + # pkg-config files + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + make_python_pkgconfig(FILE python.pc INSTALL_ROOT ${CURRENT_PACKAGES_DIR} + EXEC_PREFIX "\${prefix}/tools/${PORT}" INCLUDEDIR [[${prefix}/include]] ABIFLAGS "") + make_python_pkgconfig(FILE python-embed.pc INSTALL_ROOT ${CURRENT_PACKAGES_DIR} + EXEC_PREFIX "\${prefix}/tools/${PORT}" INCLUDEDIR [[${prefix}/include]] ABIFLAGS "") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + make_python_pkgconfig(FILE python.pc INSTALL_ROOT "${CURRENT_PACKAGES_DIR}/debug" + EXEC_PREFIX "\${prefix}/../tools/${PORT}" INCLUDEDIR [[${prefix}/../include]] ABIFLAGS "_d") + make_python_pkgconfig(FILE python-embed.pc INSTALL_ROOT "${CURRENT_PACKAGES_DIR}/debug" + EXEC_PREFIX "\${prefix}/../tools/${PORT}" INCLUDEDIR [[${prefix}/../include]] ABIFLAGS "_d") + endif() + + vcpkg_fixup_pkgconfig() + vcpkg_clean_msbuild() + + # Remove static library belonging to executable + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/python.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/python.lib" + "${CURRENT_PACKAGES_DIR}/lib/manual-link/python.lib") + endif() + if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/python_d.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/python_d.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/python_d.lib") + endif() + endif() else() set(OPTIONS "--with-openssl=${CURRENT_INSTALLED_DIR}" "--with-ensurepip" "--with-suffix=" "--with-system-expat" + "--without-readline" + "--disable-test-modules" ) if(VCPKG_TARGET_IS_OSX) list(APPEND OPTIONS "LIBS=-liconv -lintl") @@ -216,17 +272,23 @@ _generate_finder(DIRECTORY "python3" PREFIX "Python3") _generate_finder(DIRECTORY "pythoninterp" PREFIX "PYTHON" NO_OVERRIDE) if (NOT VCPKG_TARGET_IS_WINDOWS) - file(GLOB python_config_files "${CURRENT_PACKAGES_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata*") - list(POP_FRONT python_config_files python_config_file) - vcpkg_replace_string("${python_config_file}" "# system configuration generated and used by the sysconfig module" "# system configuration generated and used by the sysconfig module\nimport os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))\n") - vcpkg_replace_string("${python_config_file}" "${CURRENT_INSTALLED_DIR}" "' + _base + '") - vcpkg_replace_string("${python_config_file}" "${CURRENT_PACKAGES_DIR}" "' + _base + '") - vcpkg_replace_string("${python_config_file}" "${CURRENT_BUILDTREES_DIR}" "not/existing") - - file(GLOB python_config_files "${CURRENT_PACKAGES_DIR}/debug/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata*") - list(POP_FRONT python_config_files python_config_file) - vcpkg_replace_string("${python_config_file}" "# system configuration generated and used by the sysconfig module" "# system configuration generated and used by the sysconfig module\nimport os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))\n") - vcpkg_replace_string("${python_config_file}" "${CURRENT_INSTALLED_DIR}" "' + _base + '") - vcpkg_replace_string("${python_config_file}" "${CURRENT_PACKAGES_DIR}" "' + _base + '") - vcpkg_replace_string("${python_config_file}" "${CURRENT_BUILDTREES_DIR}" "not/existing") + function(replace_dirs_in_config_file python_config_file) + vcpkg_replace_string("${python_config_file}" "${CURRENT_INSTALLED_DIR}" "' + _base + '") + vcpkg_replace_string("${python_config_file}" "${CURRENT_PACKAGES_DIR}" "' + _base + '") + vcpkg_replace_string("${python_config_file}" "${CURRENT_BUILDTREES_DIR}" "not/existing") + endfunction() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB python_config_files "${CURRENT_PACKAGES_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata*") + list(POP_FRONT python_config_files python_config_file) + vcpkg_replace_string("${python_config_file}" "# system configuration generated and used by the sysconfig module" "# system configuration generated and used by the sysconfig module\nimport os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))\n") + replace_dirs_in_config_file("${python_config_file}") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB python_config_files "${CURRENT_PACKAGES_DIR}/debug/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata*") + list(POP_FRONT python_config_files python_config_file) + vcpkg_replace_string("${python_config_file}" "# system configuration generated and used by the sysconfig module" "# system configuration generated and used by the sysconfig module\nimport os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))\n") + replace_dirs_in_config_file("${python_config_file}") + endif() endif() diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 4c16b303273b95..1a2ec9110034a3 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,10 +1,11 @@ { "name": "python3", - "version-semver": "3.10.0", - "port-version": 3, + "version": "3.10.2", + "port-version": 1, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", - "supports": "!(arm | uwp)", + "license": "Python-2.0", + "supports": "!uwp", "dependencies": [ { "name": "bzip2", @@ -31,6 +32,10 @@ "name": "openssl", "platform": "!(windows & static)" }, + { + "name": "python3", + "host": true + }, { "name": "sqlite3", "platform": "!(windows & static)" diff --git a/ports/qca/0002-fix-build-error.patch b/ports/qca/0002-fix-build-error.patch index 31aede75cee41e..58c52af0a62ce4 100644 --- a/ports/qca/0002-fix-build-error.patch +++ b/ports/qca/0002-fix-build-error.patch @@ -1,8 +1,18 @@ -diff --git "a/cmake/modules/QcaMacro.cmake" "b/cmake/modules/QcaMacro.cmake" -index 5d86e4725..62568626b 100644 ---- "a/cmake/modules/QcaMacro.cmake" -+++ "b/cmake/modules/QcaMacro.cmake" -@@ -61,15 +61,6 @@ macro(add_qca_test TARGET DESCRIPTION) +From 8d67288a3dde7e535ff747715f96f98282a3bf67 Mon Sep 17 00:00:00 2001 +From: Matthias Kuhn +Date: Fri, 3 Dec 2021 15:17:25 +0100 +Subject: [PATCH] Ifdef codecs + +--- + cmake/modules/QcaMacro.cmake | 9 --------- + plugins/qca-ossl/qca-ossl.cpp | 6 ++++++ + 2 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/cmake/modules/QcaMacro.cmake b/cmake/modules/QcaMacro.cmake +index 80af6e84..ba86310d 100644 +--- a/cmake/modules/QcaMacro.cmake ++++ b/cmake/modules/QcaMacro.cmake +@@ -69,15 +69,6 @@ macro(add_qca_test TARGET DESCRIPTION) endmacro(add_qca_test) macro(install_pdb TARGET INSTALL_PATH) @@ -18,41 +28,44 @@ index 5d86e4725..62568626b 100644 endmacro(install_pdb) macro(normalize_path PATH) -diff --git "a/plugins/qca-ossl/qca-ossl.cpp" "b/plugins/qca-ossl/qca-ossl.cpp" -index ee872d721..fa3e2c414 100644 ---- "a/plugins/qca-ossl/qca-ossl.cpp" -+++ "b/plugins/qca-ossl/qca-ossl.cpp" -@@ -6910,6 +6910,7 @@ public: - else if ( type == QLatin1String("aes256-ccm") ) - return new opensslCipherContext( EVP_aes_256_ccm(), 0, this, type); +diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp +index b2c5d3d3..4250ec26 100644 +--- a/plugins/qca-ossl/qca-ossl.cpp ++++ b/plugins/qca-ossl/qca-ossl.cpp +@@ -6846,6 +6846,7 @@ public: + else if (type == QLatin1String("aes256-ccm")) + return new opensslCipherContext(EVP_aes_256_ccm(), 0, this, type); #endif +#ifndef OPENSSL_NO_BF - else if ( type == QLatin1String("blowfish-ecb") ) - return new opensslCipherContext( EVP_bf_ecb(), 0, this, type); - else if ( type == QLatin1String("blowfish-cfb") ) -@@ -6920,6 +6921,8 @@ public: - return new opensslCipherContext( EVP_bf_cbc(), 0, this, type); - else if ( type == QLatin1String("blowfish-cbc-pkcs7") ) - return new opensslCipherContext( EVP_bf_cbc(), 1, this, type); + else if (type == QLatin1String("blowfish-ecb")) + return new opensslCipherContext(EVP_bf_ecb(), 0, this, type); + else if (type == QLatin1String("blowfish-cfb")) +@@ -6856,6 +6857,8 @@ public: + return new opensslCipherContext(EVP_bf_cbc(), 0, this, type); + else if (type == QLatin1String("blowfish-cbc-pkcs7")) + return new opensslCipherContext(EVP_bf_cbc(), 1, this, type); +#endif +#ifndef OPENSSL_NO_DES - else if ( type == QLatin1String("tripledes-ecb") ) - return new opensslCipherContext( EVP_des_ede3(), 0, this, type); - else if ( type == QLatin1String("tripledes-cbc") ) -@@ -6936,6 +6939,8 @@ public: - return new opensslCipherContext( EVP_des_cfb(), 0, this, type); - else if ( type == QLatin1String("des-ofb") ) - return new opensslCipherContext( EVP_des_ofb(), 0, this, type); + else if (type == QLatin1String("tripledes-ecb")) + return new opensslCipherContext(EVP_des_ede3(), 0, this, type); + else if (type == QLatin1String("tripledes-cbc")) +@@ -6872,6 +6875,8 @@ public: + return new opensslCipherContext(EVP_des_cfb(), 0, this, type); + else if (type == QLatin1String("des-ofb")) + return new opensslCipherContext(EVP_des_ofb(), 0, this, type); +#endif +#ifndef OPENSSL_NO_CAST - else if ( type == QLatin1String("cast5-ecb") ) - return new opensslCipherContext( EVP_cast5_ecb(), 0, this, type); - else if ( type == QLatin1String("cast5-cbc") ) -@@ -6946,6 +6951,7 @@ public: - return new opensslCipherContext( EVP_cast5_cfb(), 0, this, type); - else if ( type == QLatin1String("cast5-ofb") ) - return new opensslCipherContext( EVP_cast5_ofb(), 0, this, type); + else if (type == QLatin1String("cast5-ecb")) + return new opensslCipherContext(EVP_cast5_ecb(), 0, this, type); + else if (type == QLatin1String("cast5-cbc")) +@@ -6882,6 +6887,7 @@ public: + return new opensslCipherContext(EVP_cast5_cfb(), 0, this, type); + else if (type == QLatin1String("cast5-ofb")) + return new opensslCipherContext(EVP_cast5_ofb(), 0, this, type); +#endif - else if ( type == QLatin1String("pkey") ) - return new MyPKeyContext( this ); - else if ( type == QLatin1String("dlgroup") ) + else if (type == QLatin1String("pkey")) + return new MyPKeyContext(this); + else if (type == QLatin1String("dlgroup")) +-- +2.31.1 + diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index b3acc2875742e3..54c137540ea5fd 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -11,8 +11,8 @@ vcpkg_add_to_path("${PERL_EXE_PATH}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/qca - REF v2.3.1 - SHA512 e04a44fb395e24fd009bb6b005282880bef84ca492b5e15903f9ce3e5e3f93beae3a386a1a381507ed5b0c6550e64c6bf434328f9d965fa7f7d638c3e5d5948b + REF v2.3.4 + SHA512 04583da17531538fc2a7ae18a1a4f89f1e8d303e2bb390520a8f55a20bab17f8407ab07aefef2a75587e2a0521f41b37a9fdd8430ec483daf5d02c05556b8ddb PATCHES 0001-fix-path-for-vcpkg.patch 0002-fix-build-error.patch @@ -44,6 +44,12 @@ vcpkg_execute_required_process( ) message(STATUS "Importing certstore done") +if("botan" IN_LIST FEATURES) + list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN="yes") +else() + list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN="no") +endif() + # Configure and build vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -54,6 +60,7 @@ vcpkg_cmake_configure( -DQCA_SUFFIX=OFF -DQCA_FEATURE_INSTALL_DIR=share/qca/mkspecs/features -DOSX_FRAMEWORK=OFF + ${QCA_OPTIONS} OPTIONS_DEBUG -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_DEBUG} OPTIONS_RELEASE @@ -78,5 +85,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) +vcpkg_fixup_pkgconfig() + # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json index f8dd9019b91536..723256ab982915 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,11 +1,10 @@ { "name": "qca", - "version": "2.3.1", - "port-version": 5, + "version": "2.3.4", + "port-version": 2, "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://cgit.kde.org/qca.git/", "dependencies": [ - "botan", { "name": "qt5-base", "default-features": false @@ -18,5 +17,16 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "botan" + ], + "features": { + "botan": { + "description": "Build with botan", + "dependencies": [ + "botan" + ] + } + } } diff --git a/ports/qhttpengine/portfile.cmake b/ports/qhttpengine/portfile.cmake new file mode 100644 index 00000000000000..5a59f0ce84d268 --- /dev/null +++ b/ports/qhttpengine/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nitroshare/qhttpengine + REF 43f55df51623621ed3efb4e42c7894586d988667 + SHA512 bf615016b9078ff1b3b47bb0d0329565d2d44caba67a3a207c430e7f03a7b5d8b326268fafa2b8ebff387aec9356014ec5510e18a422dd2dea7eb1e9bfc009f3 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_DOC=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/qhttpengine/vcpkg.json b/ports/qhttpengine/vcpkg.json new file mode 100644 index 00000000000000..9e554e1e50bc5e --- /dev/null +++ b/ports/qhttpengine/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "qhttpengine", + "version": "1.0.2", + "description": "HTTP server for Qt applications", + "supports": "!uwp", + "dependencies": [ + "qt5-base", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/qhull/portfile.cmake b/ports/qhull/portfile.cmake index 5584c7b1926e04..6aa76096c6ea59 100644 --- a/ports/qhull/portfile.cmake +++ b/ports/qhull/portfile.cmake @@ -11,38 +11,45 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/share/man - ${CURRENT_PACKAGES_DIR}/share/doc - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share/man - ${CURRENT_PACKAGES_DIR}/debug/share/doc + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/doc" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share/man" + "${CURRENT_PACKAGES_DIR}/debug/share/doc" ) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Qhull) -file(REMOVE - ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/qhullstatic.pc - ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic_d.pc -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Qhull) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE - ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/qhull_r.pc - ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhull_rd.pc - ) + file(WRITE "${CURRENT_PACKAGES_DIR}/share/qhull/QhullTargets-interface.cmake" [[ + add_library(Qhull::qhull_r IMPORTED INTERFACE) + set_target_properties(Qhull::qhull_r PROPERTIES INTERFACE_LINK_LIBRARIES Qhull::qhullstatic_r) +]]) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(active_basename "qhullstatic") + set(inactive_basename "qhull") else() - file(REMOVE - ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/qhullstatic_r.pc - ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic_rd.pc - ) + set(active_basename "qhull") + set(inactive_basename "qhullstatic") +endif() +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${inactive_basename}_r.pc") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${inactive_basename}.pc") # qhullstatic.pc in dynamic build +if(NOT DEFINED VCPKG_BUILD_TYPE) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${inactive_basename}_rd.pc") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${active_basename}_rd.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${active_basename}_r.pc") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic_d.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic.pc") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${inactive_basename}.pc") # qhullstatic.pc in dynamic build + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullcpp_d.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullcpp.pc") endif() vcpkg_fixup_pkgconfig() @@ -56,4 +63,5 @@ vcpkg_copy_tools(TOOL_NAMES AUTO_CLEAN ) -file(INSTALL ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage) +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/qhull/usage b/ports/qhull/usage new file mode 100644 index 00000000000000..94dbcafa689fcb --- /dev/null +++ b/ports/qhull/usage @@ -0,0 +1,9 @@ +The package qhull provides CMake targets: + + # Reentrant C API + find_package(Qhull CONFIG REQUIRED) + target_link_libraries(main PRIVATE Qhull::qhull_r) + + # C++ API + find_package(Qhull CONFIG REQUIRED) + target_link_libraries(main PRIVATE Qhull::qhullcpp) diff --git a/ports/qhull/vcpkg.json b/ports/qhull/vcpkg.json index b115f1331af5ef..7f6e7e32fcb21d 100644 --- a/ports/qhull/vcpkg.json +++ b/ports/qhull/vcpkg.json @@ -1,7 +1,18 @@ { "name": "qhull", - "version-string": "8.0.2", - "port-version": 2, + "version": "8.0.2", + "port-version": 3, "description": "computes the convex hull, Delaunay triangulation, Voronoi diagram", - "homepage": "https://github.com/qhull/qhull" + "homepage": "https://github.com/qhull/qhull", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/qnnpack/portfile.cmake b/ports/qnnpack/portfile.cmake index 271bd11ca3b21c..673307bc479ad3 100644 --- a/ports/qnnpack/portfile.cmake +++ b/ports/qnnpack/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/QNNPACK diff --git a/ports/qnnpack/vcpkg.json b/ports/qnnpack/vcpkg.json index 20b4aa0e3ab5eb..75ec67e2ac5a64 100644 --- a/ports/qnnpack/vcpkg.json +++ b/ports/qnnpack/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qnnpack", "version-date": "2021-02-26", + "port-version": 1, "description": "Quantized Neural Network PACKage - mobile-optimized implementation of quantized neural network operators", "homepage": "https://github.com/pytorch/QNNPACK", "supports": "linux | osx", diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 2d206def12219f..f82649d132ac94 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -16,8 +16,6 @@ vcpkg_cmake_configure( -DPYTHON_EXECUTABLE=${PYTHON3} -DLIB_SUFFIX= -DBUILD_GO=no - -DBUILD_RUBY=no - -DBUILD_PYTHON=no -DENABLE_JSONCPP=ON -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON ) @@ -26,8 +24,24 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +set(configFiles + "${CURRENT_PACKAGES_DIR}/share/${PORT}/Proton/ProtonConfig.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/ProtonCpp/ProtonCppConfig.cmake" +) +foreach(configFile IN LISTS configFiles) + vcpkg_replace_string("${configFile}" + "IMPORTED_LOCATION_DEBUG \"\${_IMPORT_PREFIX}/lib" + "IMPORTED_LOCATION_DEBUG \"\${_IMPORT_PREFIX}/debug/lib" + ) + vcpkg_replace_string("${configFile}" + "debug \${_IMPORT_PREFIX}/lib" + "debug \${_IMPORT_PREFIX}/debug/lib" + ) +endforeach() vcpkg_fixup_pkgconfig() +configure_file(${CMAKE_CURRENT_LIST_DIR}/qpid-protonConfig.cmake + ${CURRENT_PACKAGES_DIR}/share/${PORT}/qpid-protonConfig.cmake COPYONLY) file(RENAME "${CURRENT_PACKAGES_DIR}/share/proton/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/qpid-proton/qpid-protonConfig.cmake b/ports/qpid-proton/qpid-protonConfig.cmake new file mode 100644 index 00000000000000..3ad039bd6f9138 --- /dev/null +++ b/ports/qpid-proton/qpid-protonConfig.cmake @@ -0,0 +1,4 @@ +get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) +set(_IMPORT_PREFIX "${PACKAGE_PREFIX_DIR}") +include(${CMAKE_CURRENT_LIST_DIR}/Proton/ProtonConfig.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/ProtonCpp/ProtonCppConfig.cmake) diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index cbdd7e4ecd6d0a..30219802bdcea2 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qpid-proton", "version": "0.32.0", - "port-version": 2, + "port-version": 3, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "dependencies": [ diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index a464049ec76ab2..668661cdb40cdb 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -1,27 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System - REF 44dc76bd19853dcb18d37d5be231af526c8f709e #v3.6.3 - SHA512 ff50cd65f82736eae90f823d332d63c5c024ecb9e510f95fb8d776a0763bbd0143094b789516193c4037ca2a82eba33d73a68193bb6777e285c8a1e397b3958c + REF ab4869a0e1c97fec1dfca29eeb84be67af182864 #v3.8.0 + SHA512 220ec4604eda8a39cd7ba8839cee2ab420e8c5a0b247749afb85a7b4ec3286f6debd53c910637e84023af79319f0600eb48a6c037c3e4877708677fee3c62ce7 HEAD_REF master PATCHES hardcode_version.patch config_changes.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_EXAMPLES=OFF - -DVERSION_SHORT=3.6.3 + -DVERSION_SHORT=3.8.0 ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/gnu-lgpl-v2.1.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/license) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/qtadvanceddocking TARGET_PATH share/qtadvanceddocking) +vcpkg_cmake_config_fixup(PACKAGE_NAME qtadvanceddocking CONFIG_PATH lib/cmake/qtadvanceddocking) diff --git a/ports/qt-advanced-docking-system/vcpkg.json b/ports/qt-advanced-docking-system/vcpkg.json index ae8fe0ff68edb8..75500cea707f46 100644 --- a/ports/qt-advanced-docking-system/vcpkg.json +++ b/ports/qt-advanced-docking-system/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt-advanced-docking-system", - "version-string": "3.6.3", - "port-version": 2, + "version": "3.8.0", "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio", "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System", "dependencies": [ @@ -14,6 +13,14 @@ "name": "qt5-x11extras", "platform": "!windows" }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 67a6953fa2a407..411d572e3e2edd 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qt", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qt5compat", @@ -14,6 +15,7 @@ "textcodec" ] }, + "qtapplicationmanager", { "name": "qtbase", "default-features": false @@ -30,6 +32,11 @@ "qtconnectivity", "qtdatavis3d", "qtdeclarative", + { + "name": "qtdeviceutilities", + "default-features": false, + "platform": "linux" + }, "qtdoc", { "name": "qtimageformats", @@ -40,14 +47,7 @@ "webp" ] }, - { - "name": "qtlocation", - "default-features": false, - "features": [ - "nmea", - "qml" - ] - }, + "qtinterfaceframework", { "name": "qtlottie", "default-features": false, @@ -60,11 +60,18 @@ "name": "qtmultimedia", "default-features": false, "features": [ - "gstreamer", "qml", "widgets" ] }, + { + "name": "qtmultimedia", + "default-features": false, + "features": [ + "gstreamer" + ], + "platform": "!(static & windows)" + }, "qtnetworkauth", { "name": "qtopcua", @@ -72,6 +79,13 @@ "qml" ] }, + { + "name": "qtpositioning", + "default-features": false, + "features": [ + "qml" + ] + }, { "name": "qtquick3d", "default-features": false @@ -127,7 +141,8 @@ "geolocation", "spellchecker", "webchannel" - ] + ], + "platform": "!static" }, { "name": "qtwebsockets", @@ -140,9 +155,16 @@ "name": "qtwebview", "default-features": false, "features": [ - "qml", - "webengine" + "qml" ] + }, + { + "name": "qtwebview", + "default-features": false, + "features": [ + "webengine" + ], + "platform": "!static" } ], "default-features": [ diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index 62a01e4de459a9..5e37676c575113 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -3,7 +3,7 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) set(OPTIONS -system-assimp) if(VCPKG_TARGET_IS_WINDOWS) - set(VCVER vc140 vc141 vc142 ) + set(VCVER vc140 vc141 vc142 vc143 ) set(CRT mt md) set(DBG_NAMES) set(REL_NAMES) diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index ea4f27ee834f1f..282d07e0e613ea 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-3d", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", + "license": null, "dependencies": [ "assimp", { diff --git a/ports/qt5-activeqt/vcpkg.json b/ports/qt5-activeqt/vcpkg.json index 05dd52842bc86a..8935f1e5e7f4e4 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-activeqt", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 ActiveQt Module - ActiveX components", + "license": null, "supports": "windows", "dependencies": [ { diff --git a/ports/qt5-androidextras/vcpkg.json b/ports/qt5-androidextras/vcpkg.json index 12024cbd29872a..15e043cd59eae6 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-androidextras", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 androidextras Module;", + "license": null, "supports": "android", "dependencies": [ { diff --git a/ports/qt5-base/cmake/configure_qt.cmake b/ports/qt5-base/cmake/configure_qt.cmake index ea62b744a2874e..ff2c8bc320554a 100644 --- a/ports/qt5-base/cmake/configure_qt.cmake +++ b/ports/qt5-base/cmake/configure_qt.cmake @@ -142,7 +142,7 @@ function(configure_qt) string(REPLACE "${CMAKE_CURRENT_INSTALLED_DIR_PATH}" "\${CURRENT_INSTALLED_DIR}" _contents ${_contents}) #string(REPLACE "HostPrefix=\${CURRENT_PACKAGES_DIR}" "HostPrefix=\${CURRENT_INSTALLED_DIR}" _contents ${_contents}) string(REPLACE "[EffectivePaths]\nPrefix=..\n" "" _contents ${_contents}) - string(REPLACE "[EffectiveSourcePaths]\nPrefix=${_csc_SOURCE_PATH}\n" "" _contents ${_contents}) + string(REGEX REPLACE "\\[EffectiveSourcePaths\\]\r?\nPrefix=[^\r\n]+\r?\n" "" _contents ${_contents}) string(REPLACE "Sysroot=\n" "" _contents ${_contents}) string(REPLACE "SysrootifyPrefix=false\n" "" _contents ${_contents}) file(WRITE "${CURRENT_PACKAGES_DIR}/tools/qt5/qt_${_build_type_${_buildname}}.conf" "${_contents}") diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index 52f9c6c1ba3f7f..e2e390cec1cf43 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -3,9 +3,11 @@ function(qt_build_submodule SOURCE_PATH) # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings set(ENV{_CL_} "/utf-8") - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY) - vcpkg_add_to_path("${PYTHON2_EXE_PATH}") + if(NOT PORT STREQUAL "qt5-webengine") + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) + vcpkg_add_to_path("${PYTHON3_EXE_PATH}") + endif() vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH} ${ARGV}) diff --git a/ports/qt5-base/cmake/qt_download_submodule.cmake b/ports/qt5-base/cmake/qt_download_submodule.cmake index 63850a4ef2a831..5c8aff03326f1e 100644 --- a/ports/qt5-base/cmake/qt_download_submodule.cmake +++ b/ports/qt5-base/cmake/qt_download_submodule.cmake @@ -14,7 +14,7 @@ function(qt_download_submodule) qt_get_submodule_name(NAME) set(FULL_VERSION "${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}") - set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") + set(ARCHIVE_NAME "${NAME}-everywhere-opensource-src-${FULL_VERSION}.tar.xz") set(URLS "https://download.qt.io/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" "https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" ) diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index c52196078e19ed..c7d0cba8c57429 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,67 +1,68 @@ -#Every update requires an update of these hashes and the version within the control file of each of the 32 ports. +#Every update requires an update of these hashes and the version within the control file of each of the 32 ports. #So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 2) +set(QT_PATCH_VER 3) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-base a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9) -set(QT_HASH_qt5-3d 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b) -set(QT_HASH_qt5-activeqt a2286a6736d14cf9b0dbf20af5ee8c23f94f57b6d4c0be41853e67109d87fd78dbf8f14eef2ce4b8d9ff2244af7ef139829ad7674d9ec9669434028961e65ec7) -set(QT_HASH_qt5-charts d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f) -set(QT_HASH_qt5-connectivity a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c) -set(QT_HASH_qt5-datavis3d 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3) -set(QT_HASH_qt5-declarative a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3) -set(QT_HASH_qt5-gamepad 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1) -set(QT_HASH_qt5-graphicaleffects 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d) -set(QT_HASH_qt5-imageformats 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e) -set(QT_HASH_qt5-location 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f) -set(QT_HASH_qt5-macextras 21e807a587da716615a447207abda2c3eb409111a0eb6f844c8f1281ccc842a7c2e8759c1d7ce62cc3bad3325b4570a0bae1fbe4e5592e905788dde8898c6cb0) -set(QT_HASH_qt5-mqtt 91efd3b1ebef3c95473c018bcacd0772e613b38c) # Git commit ID -set(QT_HASH_qt5-multimedia be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd) -set(QT_HASH_qt5-networkauth 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d) -set(QT_HASH_qt5-purchasing 1a40fd3ca149f9c8fc98a45562b37fc97c7addc513d40f50997576648d441d379179370c6491a003982feafe96736047a8faf09caf36eaeea5a97553f75d1255) -set(QT_HASH_qt5-quickcontrols 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2) # deprecated -set(QT_HASH_qt5-quickcontrols2 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f) -set(QT_HASH_qt5-remoteobjects 1cce1b6128f283fe8930e1e58b9620459c50b203a39607e9bcde8423930da08e5c70e7effaf64d2690f463cc7b37cfc67fb6c0ac89e27df3a57007aee1d5233d) -set(QT_HASH_qt5-script 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32) # deprecated -set(QT_HASH_qt5-scxml 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8) -set(QT_HASH_qt5-sensors d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b) -set(QT_HASH_qt5-serialport 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b) -set(QT_HASH_qt5-speech 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05) -set(QT_HASH_qt5-svg 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730) -set(QT_HASH_qt5-tools 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b) -set(QT_HASH_qt5-virtualkeyboard 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016) -set(QT_HASH_qt5-webchannel 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b) -set(QT_HASH_qt5-websockets 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4) -set(QT_HASH_qt5-webview 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85) -set(QT_HASH_qt5-winextras 6555a42d4bbeb46b394f573b6ed7926ec21cf6024de3c5f43000373bf0a2f4544f19866e2c9469da2d60b5dd99fb046765be5d3f8d5025169e319795bbf66d9e) -set(QT_HASH_qt5-xmlpatterns 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348) # deprecated -##TODO -set(QT_HASH_qt5-doc ce2c003b37829da102f243ca271548cff0597b4b667109ca9533971a490b8b20eb3183af6e0b209ad58964f2be2e757f83933a3f8c484dd0814750e24d1a244e) -set(QT_HASH_qt5-x11extras beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9) -set(QT_HASH_qt5-androidextras cacd9252f313595d21eb6a94ffabbd5fff476af82aa619b4edfc77a9f405f52bd1b89da97c8f7dadf8c403035a243205a25a2f85250ebc0590bf68f914cdbf3a) -#set(QT_HASH_qt5-canvas3d 0) deprecated -set(QT_HASH_qt5-translations 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe) -set(QT_HASH_qt5-serialbus c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b) -set(QT_HASH_qt5-webengine de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756) -set(QT_HASH_qt5-webglplugin 14b9a0c08472121165eba82f3c81518be7b19484b7bee7887df9751edc6e2e7e76d06f961b180427014beb71c725d343e9f196f37690e2d207511f7639bd2627) -set(QT_HASH_qt5-wayland e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c) +set(QT_HASH_qt5-base 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079) +set(QT_HASH_qt5-3d 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c) +set(QT_HASH_qt5-activeqt 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a) +set(QT_HASH_qt5-androidextras 45957b9afccf147dfe75c210e77e7b12cd3d1c34855052773a8ccce62020acd06e9e8f5b848f32f1fdbdb8fa614877909b9a1517530aad643b8954200ec030ca) +set(QT_HASH_qt5-charts 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48) +set(QT_HASH_qt5-connectivity 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534) +set(QT_HASH_qt5-datavis3d d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3) +set(QT_HASH_qt5-declarative c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597) +set(QT_HASH_qt5-doc bb23d6d65a7c39ed9119e0bf30810a94ad937cc3f9ab0004d0c3fda712a6fbe009fdef74f5fe1212bc68ad0851ada37592c11f6ef754b81eff2d9c453b3a995b) +set(QT_HASH_qt5-gamepad 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa) +set(QT_HASH_qt5-graphicaleffects 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98) +set(QT_HASH_qt5-imageformats f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e) +set(QT_HASH_qt5-location 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886) +set(QT_HASH_qt5-macextras 26ff64206d6b491271a2db8a6932b30fc8df6ff121ef272edca5e2ec61d98668e326102d529f9335eab98bb3e5e3261cb50db2b2f78f751226bb9d4aa84e499b) +set(QT_HASH_qt5-mqtt df91daf1accdf93d05bad33b9abb4a69f2b3fcd91f6dbcd71d6c74c21b0f0b2aeabc83f64aa5c149321b1a700cde3d81a4cbfc8fad7cdd8b0d8c0cc073299f82) +set(QT_HASH_qt5-multimedia 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668) +set(QT_HASH_qt5-networkauth 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654) +set(QT_HASH_qt5-purchasing 33ce166c6f4e626fef4cc17e902a5117225fa87799687e6c0956898bf80e04df4f3fa447b466e43c9fac58e879a7c9fd0e8c18006e8aa69f0e8762b258c81674) +set(QT_HASH_qt5-quickcontrols 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e) +set(QT_HASH_qt5-quickcontrols2 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb) +set(QT_HASH_qt5-remoteobjects a20699353269dd1d61ea9a45191aa6c438d597783c7461ee41c1bbde0d6043f2be138dd0f46744c1a3081c4098e66e78543f0397eb18b72aab99808de7855bd9) +set(QT_HASH_qt5-script ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9) +set(QT_HASH_qt5-scxml 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1) +set(QT_HASH_qt5-sensors c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2) +set(QT_HASH_qt5-serialbus af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87) +set(QT_HASH_qt5-serialport 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a) +set(QT_HASH_qt5-speech 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a) +set(QT_HASH_qt5-svg 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527) +set(QT_HASH_qt5-tools 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47) +set(QT_HASH_qt5-translations d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc) +set(QT_HASH_qt5-virtualkeyboard f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2) +set(QT_HASH_qt5-webchannel 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415) +set(QT_HASH_qt5-webengine d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c) +set(QT_HASH_qt5-webglplugin 01860ca3ce27630ca1a92eb6deb933959a3679fb579d4cb8a06884f51a672c355f6929355aa6d45f4c5d8ac026b4cecdc7a26d5b2e897ca75bb7a9331e2d3e0d) +set(QT_HASH_qt5-websockets a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea) +set(QT_HASH_qt5-webview 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030) +set(QT_HASH_qt5-x11extras eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133) +set(QT_HASH_qt5-xmlpatterns 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4) +set(QT_HASH_qt5-wayland 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89) +set(QT_HASH_qt5-winextras d0707f865552645e82a493265b142171f14c126bd99325471b5d94593c95763d606be89fcc72f74f3192446e024c9be904c7d95816b2dd8e8cc7cf9f34a02f77) + if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) if("${PORT}" MATCHES "qt5-base") foreach(_current_qt_port ${QT_PORT_LIST}) - set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/CONTROL") + set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/vcpkg.json") file(READ ${_current_control} _control_contents) #message(STATUS "Before: \n${_control_contents}") - string(REGEX REPLACE "Version:[^0-9]+[0-9]\.[0-9]+\.[0-9]+[^\n]*\n" "Version: ${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\n \"port-version\": [0-9]+," "" _control_contents "${_control_contents}") #message(STATUS "After: \n${_control_contents}") file(WRITE ${_current_control} "${_control_contents}") + configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) endforeach() endif() -endif() \ No newline at end of file +endif() diff --git a/ports/qt5-base/cmake/qt_port_hashes_latest.cmake b/ports/qt5-base/cmake/qt_port_hashes_latest.cmake index c52196078e19ed..61d8e0ac81a6f9 100644 --- a/ports/qt5-base/cmake/qt_port_hashes_latest.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes_latest.cmake @@ -1,67 +1,67 @@ #Every update requires an update of these hashes and the version within the control file of each of the 32 ports. #So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 2) +set(QT_PATCH_VER 3) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-base a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9) -set(QT_HASH_qt5-3d 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b) -set(QT_HASH_qt5-activeqt a2286a6736d14cf9b0dbf20af5ee8c23f94f57b6d4c0be41853e67109d87fd78dbf8f14eef2ce4b8d9ff2244af7ef139829ad7674d9ec9669434028961e65ec7) -set(QT_HASH_qt5-charts d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f) -set(QT_HASH_qt5-connectivity a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c) -set(QT_HASH_qt5-datavis3d 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3) -set(QT_HASH_qt5-declarative a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3) -set(QT_HASH_qt5-gamepad 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1) -set(QT_HASH_qt5-graphicaleffects 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d) -set(QT_HASH_qt5-imageformats 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e) -set(QT_HASH_qt5-location 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f) -set(QT_HASH_qt5-macextras 21e807a587da716615a447207abda2c3eb409111a0eb6f844c8f1281ccc842a7c2e8759c1d7ce62cc3bad3325b4570a0bae1fbe4e5592e905788dde8898c6cb0) -set(QT_HASH_qt5-mqtt 91efd3b1ebef3c95473c018bcacd0772e613b38c) # Git commit ID -set(QT_HASH_qt5-multimedia be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd) -set(QT_HASH_qt5-networkauth 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d) -set(QT_HASH_qt5-purchasing 1a40fd3ca149f9c8fc98a45562b37fc97c7addc513d40f50997576648d441d379179370c6491a003982feafe96736047a8faf09caf36eaeea5a97553f75d1255) -set(QT_HASH_qt5-quickcontrols 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2) # deprecated -set(QT_HASH_qt5-quickcontrols2 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f) -set(QT_HASH_qt5-remoteobjects 1cce1b6128f283fe8930e1e58b9620459c50b203a39607e9bcde8423930da08e5c70e7effaf64d2690f463cc7b37cfc67fb6c0ac89e27df3a57007aee1d5233d) -set(QT_HASH_qt5-script 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32) # deprecated -set(QT_HASH_qt5-scxml 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8) -set(QT_HASH_qt5-sensors d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b) -set(QT_HASH_qt5-serialport 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b) -set(QT_HASH_qt5-speech 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05) -set(QT_HASH_qt5-svg 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730) -set(QT_HASH_qt5-tools 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b) -set(QT_HASH_qt5-virtualkeyboard 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016) -set(QT_HASH_qt5-webchannel 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b) -set(QT_HASH_qt5-websockets 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4) -set(QT_HASH_qt5-webview 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85) -set(QT_HASH_qt5-winextras 6555a42d4bbeb46b394f573b6ed7926ec21cf6024de3c5f43000373bf0a2f4544f19866e2c9469da2d60b5dd99fb046765be5d3f8d5025169e319795bbf66d9e) -set(QT_HASH_qt5-xmlpatterns 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348) # deprecated -##TODO -set(QT_HASH_qt5-doc ce2c003b37829da102f243ca271548cff0597b4b667109ca9533971a490b8b20eb3183af6e0b209ad58964f2be2e757f83933a3f8c484dd0814750e24d1a244e) -set(QT_HASH_qt5-x11extras beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9) -set(QT_HASH_qt5-androidextras cacd9252f313595d21eb6a94ffabbd5fff476af82aa619b4edfc77a9f405f52bd1b89da97c8f7dadf8c403035a243205a25a2f85250ebc0590bf68f914cdbf3a) -#set(QT_HASH_qt5-canvas3d 0) deprecated -set(QT_HASH_qt5-translations 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe) -set(QT_HASH_qt5-serialbus c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b) -set(QT_HASH_qt5-webengine de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756) -set(QT_HASH_qt5-webglplugin 14b9a0c08472121165eba82f3c81518be7b19484b7bee7887df9751edc6e2e7e76d06f961b180427014beb71c725d343e9f196f37690e2d207511f7639bd2627) -set(QT_HASH_qt5-wayland e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c) +set(QT_HASH_qt5-base 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079) +set(QT_HASH_qt5-3d 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c) +set(QT_HASH_qt5-activeqt 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a) +set(QT_HASH_qt5-androidextras 45957b9afccf147dfe75c210e77e7b12cd3d1c34855052773a8ccce62020acd06e9e8f5b848f32f1fdbdb8fa614877909b9a1517530aad643b8954200ec030ca) +set(QT_HASH_qt5-charts 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48) +set(QT_HASH_qt5-connectivity 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534) +set(QT_HASH_qt5-datavis3d d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3) +set(QT_HASH_qt5-declarative c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597) +set(QT_HASH_qt5-doc bb23d6d65a7c39ed9119e0bf30810a94ad937cc3f9ab0004d0c3fda712a6fbe009fdef74f5fe1212bc68ad0851ada37592c11f6ef754b81eff2d9c453b3a995b) +set(QT_HASH_qt5-gamepad 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa) +set(QT_HASH_qt5-graphicaleffects 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98) +set(QT_HASH_qt5-imageformats f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e) +set(QT_HASH_qt5-location 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886) +set(QT_HASH_qt5-macextras 26ff64206d6b491271a2db8a6932b30fc8df6ff121ef272edca5e2ec61d98668e326102d529f9335eab98bb3e5e3261cb50db2b2f78f751226bb9d4aa84e499b) +set(QT_HASH_qt5-mqtt df91daf1accdf93d05bad33b9abb4a69f2b3fcd91f6dbcd71d6c74c21b0f0b2aeabc83f64aa5c149321b1a700cde3d81a4cbfc8fad7cdd8b0d8c0cc073299f82) +set(QT_HASH_qt5-multimedia 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668) +set(QT_HASH_qt5-networkauth 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654) +set(QT_HASH_qt5-purchasing 33ce166c6f4e626fef4cc17e902a5117225fa87799687e6c0956898bf80e04df4f3fa447b466e43c9fac58e879a7c9fd0e8c18006e8aa69f0e8762b258c81674) +set(QT_HASH_qt5-quickcontrols 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e) +set(QT_HASH_qt5-quickcontrols2 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb) +set(QT_HASH_qt5-remoteobjects a20699353269dd1d61ea9a45191aa6c438d597783c7461ee41c1bbde0d6043f2be138dd0f46744c1a3081c4098e66e78543f0397eb18b72aab99808de7855bd9) +set(QT_HASH_qt5-script ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9) +set(QT_HASH_qt5-scxml 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1) +set(QT_HASH_qt5-sensors c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2) +set(QT_HASH_qt5-serialbus af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87) +set(QT_HASH_qt5-serialport 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a) +set(QT_HASH_qt5-speech 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a) +set(QT_HASH_qt5-svg 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527) +set(QT_HASH_qt5-tools 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47) +set(QT_HASH_qt5-translations d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc) +set(QT_HASH_qt5-virtualkeyboard f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2) +set(QT_HASH_qt5-webchannel 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415) +set(QT_HASH_qt5-webengine d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c) +set(QT_HASH_qt5-webglplugin 01860ca3ce27630ca1a92eb6deb933959a3679fb579d4cb8a06884f51a672c355f6929355aa6d45f4c5d8ac026b4cecdc7a26d5b2e897ca75bb7a9331e2d3e0d) +set(QT_HASH_qt5-websockets a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea) +set(QT_HASH_qt5-webview 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030) +set(QT_HASH_qt5-x11extras eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133) +set(QT_HASH_qt5-xmlpatterns 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4) +set(QT_HASH_qt5-wayland 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89) +set(QT_HASH_qt5-winextras d0707f865552645e82a493265b142171f14c126bd99325471b5d94593c95763d606be89fcc72f74f3192446e024c9be904c7d95816b2dd8e8cc7cf9f34a02f77) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) if("${PORT}" MATCHES "qt5-base") foreach(_current_qt_port ${QT_PORT_LIST}) - set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/CONTROL") + set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/vcpkg.json") file(READ ${_current_control} _control_contents) #message(STATUS "Before: \n${_control_contents}") - string(REGEX REPLACE "Version:[^0-9]+[0-9]\.[0-9]+\.[0-9]+[^\n]*\n" "Version: ${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\n \"port-version\": [0-9]+," "" _control_contents "${_control_contents}") #message(STATUS "After: \n${_control_contents}") file(WRITE ${_current_control} "${_control_contents}") + configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) endforeach() endif() -endif() \ No newline at end of file +endif() diff --git a/ports/qt5-base/cmake/qt_submodule_installation.cmake b/ports/qt5-base/cmake/qt_submodule_installation.cmake index 197c0ace4829eb..19c0b4ef428e22 100644 --- a/ports/qt5-base/cmake/qt_submodule_installation.cmake +++ b/ports/qt5-base/cmake/qt_submodule_installation.cmake @@ -1,11 +1,15 @@ function(qt_submodule_installation) - qt_download_submodule(OUT_SOURCE_PATH TARGET_SOURCE_PATH ${ARGV}) + cmake_parse_arguments(_csc "" "OUT_SOURCE_PATH" "" ${ARGN}) + qt_download_submodule(OUT_SOURCE_PATH TARGET_SOURCE_PATH ${_csc_UNPARSED_ARGUMENTS}) if(QT_UPDATE_VERSION) SET(VCPKG_POLICY_EMPTY_PACKAGE enabled PARENT_SCOPE) else() - qt_build_submodule(${TARGET_SOURCE_PATH} ${ARGV}) + qt_build_submodule(${TARGET_SOURCE_PATH} ${_csc_UNPARSED_ARGUMENTS}) qt_install_copyright(${TARGET_SOURCE_PATH}) endif() + if(DEFINED _csc_OUT_SOURCE_PATH) + set(${_csc_OUT_SOURCE_PATH} ${TARGET_SOURCE_PATH} PARENT_SCOPE) + endif() endfunction() \ No newline at end of file diff --git a/ports/qt5-base/patches/limits_include.patch b/ports/qt5-base/patches/limits_include.patch index 0ed514b7633d2d..4fe4952817d548 100644 --- a/ports/qt5-base/patches/limits_include.patch +++ b/ports/qt5-base/patches/limits_include.patch @@ -1,38 +1,3 @@ -From 61325e4547225b8b2ecefda4ca328a38c075c909 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Wed, 11 Aug 2021 15:35:05 +0200 -Subject: [PATCH] Add missing limits include - ---- - src/corelib/global/qendian.h | 1 + - src/corelib/global/qfloat16.h | 1 + - src/corelib/text/qbytearraymatcher.h | 2 ++ - 3 files changed, 4 insertions(+) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 257efbbdbe..05f11d6f81 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -47,6 +47,7 @@ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -+#include - - #ifdef min // MSVC - #undef min -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index c7a9c87af3..3287d7cbf2 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) - // All processors that support AVX2 do support F16C too. That doesn't mean diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h index 0eedfc1d20..f5f9bef7b8 100644 --- a/src/corelib/text/qbytearraymatcher.h @@ -46,6 +11,3 @@ index 0eedfc1d20..f5f9bef7b8 100644 QT_BEGIN_NAMESPACE --- -2.32.0 - diff --git a/ports/qt5-base/patches/zstdd.patch b/ports/qt5-base/patches/zstdd.patch deleted file mode 100644 index 9d10890c0f752d..00000000000000 --- a/ports/qt5-base/patches/zstdd.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/configure.json b/configure.json -index 50d69b740..7149e6803 100644 ---- a/configure.json -+++ b/configure.json -@@ -182,7 +182,10 @@ - }, - "sources": [ - { "type": "pkgConfig", "args": "libzstd >= 1.3" }, -- "-lzstd" -+ "-lzstd", -+ "-lzstdd", -+ "-lzstd -pthread", -+ "-lzstdd -pthread" - ] - }, - "dbus": { diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 1dacc980faef83..5fa298b2a5de56 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -78,7 +78,6 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/icu.patch #Help configure find static icu builds in vcpkg on windows patches/xlib.patch #Patches Xlib check to actually use Pkgconfig instead of makeSpec only patches/egl.patch #Fix egl detection logic. - patches/zstdd.patch #Fix detection of zstd in debug builds patches/mysql_plugin_include.patch #Fix include path of mysql plugin patches/mysql-configure.patch #Fix mysql project patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547 @@ -216,8 +215,8 @@ find_library(EXPAT_RELEASE NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_D find_library(EXPAT_DEBUG NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) #Dependent libraries -find_library(ZSTD_RELEASE NAMES zstd zstd_static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ZSTD_DEBUG NAMES zstdd zstd_staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ZSTD_RELEASE NAMES zstd PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ZSTD_DEBUG NAMES zstd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(BZ2_RELEASE bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BZ2_DEBUG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(SSL_RELEASE ssl ssleay32 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) @@ -506,6 +505,16 @@ endif() vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_OSX) + file(GLOB _debug_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*_debug.pc") + foreach(_file ${_debug_files}) + string(REGEX REPLACE "_debug\\.pc$" ".pc" _new_filename "${_file}") + string(REGEX MATCH "(Qt5[a-zA-Z]+)_debug\\.pc$" _not_used "${_file}") + set(_name ${CMAKE_MATCH_1}) + file(STRINGS "${_file}" _version REGEX "^(Version):.+$") + file(WRITE "${_new_filename}" "Name: ${_name}\nDescription: Forwarding to the _debug version by vcpkg\n${_version}\nRequires: ${_name}_debug\n") + endforeach() +endif() # #Code to get generated CMake files from CI # file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfig.cmake" "${CURRENT_BUILDTREES_DIR}/Qt5CoreConfig.cmake.log") # file(GLOB_RECURSE CMAKE_GUI_FILES "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Gui/*.cmake" ) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index a8e22ebd1d7447..fc71f36968ad7f 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,9 +1,10 @@ { "name": "qt5-base", - "version-semver": "5.15.2", - "port-version": 16, + "version": "5.15.3", + "port-version": 1, "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, "dependencies": [ { "name": "angle", diff --git a/ports/qt5-charts/vcpkg.json b/ports/qt5-charts/vcpkg.json index 9d0a9b981e7684..adbd870105802e 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-charts", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-connectivity/vcpkg.json b/ports/qt5-connectivity/vcpkg.json index a887329794d839..79a85b47a81503 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-connectivity", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-datavis3d/vcpkg.json b/ports/qt5-datavis3d/vcpkg.json index ddb155c33834b0..1d551e375b8ada 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-datavis3d", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index 8b4ab0e9abca44..7432d0f28489df 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -1,2 +1,6 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES limits_include.patch) +qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH PATCHES limits_include.patch) + +if(NOT QT_UPDATE_VERSION) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/5.15.3/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") +endif() diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index 9ac0dead3cbb68..2b0b4abcd6e9a2 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-declarative", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-doc/vcpkg.json b/ports/qt5-doc/vcpkg.json index d311b5ada3a488..a4f655ca179be9 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-doc", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 doc Module;", + "license": null, "supports": "linux", "dependencies": [ { diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index 4bd3fb05f7507d..a1de0a3dda4e07 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-gamepad", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-graphicaleffects/vcpkg.json b/ports/qt5-graphicaleffects/vcpkg.json index 83055ba6e14dcf..8f6bc2d3fd330a 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-graphicaleffects", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 GraphicalEffects Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index abd88a60c27e1d..a3cd9f92ac5ebd 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -36,7 +36,7 @@ find_library(WEBPDECODER_DEBUG NAMES webpdecoder libwebpdecoder webpdecoderd lib #Dependent libraries find_library(LZMA_RELEASE lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(LZMA_DEBUG lzmad lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(LZMA_DEBUG lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) if(NOT VCPKG_TARGET_IS_WINDOWS) string(APPEND WEBP_RELEASE " -pthread") diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index 9c4d0e0f4e1370..da6422d1e77b50 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-imageformats", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", + "license": null, "dependencies": [ "jasper", "libwebp", diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index 8abfa73c8aff13..fd0b1e89160e7a 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-location", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-macextras/vcpkg.json b/ports/qt5-macextras/vcpkg.json index 3ac6b3fc7f73d6..fd4552617512ba 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-macextras", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", + "license": null, "supports": "osx", "dependencies": [ { diff --git a/ports/qt5-mqtt/portfile.cmake b/ports/qt5-mqtt/portfile.cmake index ca6e25d0d4d746..f0462af132e36e 100644 --- a/ports/qt5-mqtt/portfile.cmake +++ b/ports/qt5-mqtt/portfile.cmake @@ -1,28 +1,2 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -#qt_submodule_installation() No binary package for this port. -if(QT_UPDATE_VERSION) - set(VCPKG_USE_HEAD_VERSION ON) -endif() - -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL git://code.qt.io/qt/qtmqtt.git - REF ${QT_HASH_${PORT}} - HEAD_REF "v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}" - PATCHES ${_qis_PATCHES} -) - -if(QT_UPDATE_VERSION) - message(STATUS "New qtmqtt ref: ${VCPKG_HEAD_VERSION}") -endif() - -# qt module builds from a git repository require a .git entry to invoke syncqt -file(WRITE "${SOURCE_PATH}/.git" "repocontent") - -# syncqt is a perl script -vcpkg_find_acquire_program(PERL) -get_filename_component(perl_exe_path ${PERL} DIRECTORY) -vcpkg_add_to_path("${perl_exe_path}") - -qt_build_submodule(${SOURCE_PATH}) -qt_install_copyright(${SOURCE_PATH}) +qt_submodule_installation(PATCHES ${_qis_PATCHES}) diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json index c4dac430ad181d..438929f9b38323 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-mqtt", - "version": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 MQTT module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index bc35ddac76fd80..6b2e45a2cc23f5 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-multimedia", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-networkauth/vcpkg.json b/ports/qt5-networkauth/vcpkg.json index 5aa743b193dd37..4ecdeb1504cb80 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-networkauth", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Network Authorization Module", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index b1b52cd67b5a2c..f2e59ed2127914 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-purchasing", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-quickcontrols/vcpkg.json b/ports/qt5-quickcontrols/vcpkg.json index ca2bd64054dd23..711c177858633a 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-quickcontrols", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 QuickControls Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index bf9665c890991d..a87e806c97ec86 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-quickcontrols2", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 QuickControls2 Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index 38f4f5a8f39bd0..6b8738ff029b8f 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-remoteobjects", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-script/vcpkg.json b/ports/qt5-script/vcpkg.json index 874be0e27d5b96..260a2c1527aa05 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-script", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Script Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index b32ce788301eb6..5c7c5307267ee5 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-scxml", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-sensors/vcpkg.json b/ports/qt5-sensors/vcpkg.json index 2fe0948eda3baa..1c7ef5d77a74b9 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-sensors", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-serialbus/vcpkg.json b/ports/qt5-serialbus/vcpkg.json index 3e34dd716e8e12..9d0d3f38879f0c 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-serialbus", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Serialbus Module;", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json index 8d9e79ccf8d2ef..5d91085737bd73 100644 --- a/ports/qt5-serialport/vcpkg.json +++ b/ports/qt5-serialport/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-serialport", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-speech/vcpkg.json b/ports/qt5-speech/vcpkg.json index 387b650a306bc4..f9898c0f64d82a 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-speech", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Speech Module", + "license": null, "dependencies": [ { "name": "atlmfc", diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 125ae9503bb110..f32761483611ab 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-svg", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index 5c81111397b2f5..df212fc048cd0f 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-tools", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", + "license": null, "dependencies": [ { "name": "qt5-activeqt", diff --git a/ports/qt5-translations/vcpkg.json b/ports/qt5-translations/vcpkg.json index c85cd0149e59d5..cfc49dc2cb5c4d 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-translations", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 translations module", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index c53720d04842f3..07cd620afa6b26 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-virtualkeyboard", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", + "license": null, "dependencies": [ "qt5-multimedia", "qt5-quickcontrols", diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index 7ccb51624c5972..76eb173096fefe 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-wayland", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 wayland Module;", + "license": null, "supports": "linux", "dependencies": [ { diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index a50e4f1a4f7201..1ba42163984175 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-webchannel", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-webengine/build_1.patch b/ports/qt5-webengine/build_1.patch index dfa3ea721f2718..4bef9ebd43b444 100644 --- a/ports/qt5-webengine/build_1.patch +++ b/ports/qt5-webengine/build_1.patch @@ -1,12 +1,12 @@ diff --git a/src/3rdparty/chromium/third_party/angle/BUILD.gn b/src/3rdparty/chromium/third_party/angle/BUILD.gn -index ad7675f4e..4a43479d9 100644 +index fb57176..fa84cc5 100644 --- a/src/3rdparty/chromium/third_party/angle/BUILD.gn +++ b/src/3rdparty/chromium/third_party/angle/BUILD.gn -@@ -126,7 +126,6 @@ config("extra_warnings") { +@@ -131,7 +131,6 @@ config("extra_warnings") { # Enable more default warnings on Windows. if (is_win) { cflags += [ - "/we4244", # Conversion: possible loss of data. + "/we4312", # Conversion: greater size. "/we4456", # Variable shadowing. "/we4458", # declaration hides class member. - "/we4715", # not all control paths return a value diff --git a/ports/qt5-webengine/build_2.patch b/ports/qt5-webengine/build_2.patch index 7a4622516d846f..77d7cbe0dc3f20 100644 --- a/ports/qt5-webengine/build_2.patch +++ b/ports/qt5-webengine/build_2.patch @@ -1,29 +1,24 @@ diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h -index 59dbfad04..134357395 100644 +index 18ca770..5585a67 100644 --- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h -@@ -74,7 +74,7 @@ class CircularQueue { +@@ -74,16 +74,16 @@ class CircularQueue { return queue_->Get(pos_); } - const T* operator->() const { + T* operator->() const { - #if PERFETTO_DCHECK_IS_ON() - PERFETTO_DCHECK(generation_ == queue_->generation()); - #endif -@@ -82,13 +82,13 @@ class CircularQueue { + return const_cast::Iterator*>(this)->operator->(); } T& operator*() { return *(operator->()); } - const T& operator*() const { return *(operator->()); } + T& operator*() const { return *(operator->()); } - value_type& operator[](difference_type i) { - return *(*this + i); - } + value_type& operator[](difference_type i) { return *(*this + i); } - const value_type& operator[](difference_type i) const { + value_type& operator[](difference_type i) const { - return *(*this + i); + return const_cast::Iterator&>(*this)[i]; } diff --git a/ports/qt5-webengine/build_3.patch b/ports/qt5-webengine/build_3.patch deleted file mode 100644 index a86c5dec4641b4..00000000000000 --- a/ports/qt5-webengine/build_3.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h -index 78c316e04..fdb0312e0 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h -@@ -138,9 +138,9 @@ class LABColorSpace { - clamp(lab.Z(), -128.0f, 128.0f)}; - - return { -- invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X(), -- invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y(), -- invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z()}; -+ (float)(invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X()), -+ (float)(invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y()), -+ (float)(invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z())}; - } - - private: diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 60020c83f8a139..080b21b3ce3e45 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -44,8 +44,7 @@ vcpkg_add_to_path(PREPEND "${NINJA_DIR}") set(PATCHES common.pri.patch gl.patch build_1.patch - build_2.patch - build_3.patch) + build_2.patch) set(OPTIONS) if("proprietary-codecs" IN_LIST FEATURES) diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 83a599f65bf8b5..f6349b28bf7832 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qt5-webengine", - "version-string": "5.15.2", - "port-version": 3, + "version": "5.15.3", + "port-version": 1, "description": "Qt5 webengine Module;", + "license": null, "supports": "!static", "dependencies": [ { diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index 596fb42c8b4fe6..518136852df14c 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-webglplugin", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 webglplugin Module;", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index 173b65271dba34..69e6af408a36a7 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-websockets", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-webview/vcpkg.json b/ports/qt5-webview/vcpkg.json index c033a0465328ff..8b8c4dbd4fd74d 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-webview", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", + "license": null, "dependencies": [ "qt5-declarative" ] diff --git a/ports/qt5-winextras/patches/require_quick.patch b/ports/qt5-winextras/patches/require_quick.patch new file mode 100644 index 00000000000000..471fa5a1737291 --- /dev/null +++ b/ports/qt5-winextras/patches/require_quick.patch @@ -0,0 +1,12 @@ +diff --git a/src/src.pro b/src/src.pro +index fceeb21..8a242d0 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -2,6 +2,7 @@ win32 { + TEMPLATE = subdirs + CONFIG += ordered + SUBDIRS += winextras ++ SUBDIRS += imports + } else { + # fake project for creating the documentation + TEMPLATE = aux diff --git a/ports/qt5-winextras/patches/unrequire_quick.patch b/ports/qt5-winextras/patches/unrequire_quick.patch new file mode 100644 index 00000000000000..98f652da182b74 --- /dev/null +++ b/ports/qt5-winextras/patches/unrequire_quick.patch @@ -0,0 +1,12 @@ +diff --git a/src/src.pro b/src/src.pro +index fceeb21..7e4835b 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -2,7 +2,6 @@ win32 { + TEMPLATE = subdirs + CONFIG += ordered + SUBDIRS += winextras +- qtHaveModule(quick): SUBDIRS += imports + } else { + # fake project for creating the documentation + TEMPLATE = aux diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake index 69c3adbb2e99ef..3f9ff8cc7e3a3a 100644 --- a/ports/qt5-winextras/portfile.cmake +++ b/ports/qt5-winextras/portfile.cmake @@ -1,5 +1,12 @@ -if (NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "qt5-winextras only support Windows.") +include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake") + +vcpkg_list(SET _patches + "patches/unrequire_quick.patch" +) +if("declarative" IN_LIST FEATURES) + list(APPEND _patches + "patches/require_quick.patch" + ) endif() -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() + +qt_submodule_installation(PATCHES ${_patches}) diff --git a/ports/qt5-winextras/vcpkg.json b/ports/qt5-winextras/vcpkg.json index 64434f24eb83fb..3ed0e5fdf26a4b 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,19 +1,23 @@ { "name": "qt5-winextras", - "version-string": "5.15.2", + "version": "5.15.3", "port-version": 1, "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", + "license": null, "supports": "windows", "dependencies": [ - { - "name": "atlmfc", - "platform": "windows" - }, + "atlmfc", { "name": "qt5-base", "default-features": false - }, - "qt5-declarative", - "qt5-multimedia" - ] + } + ], + "features": { + "declarative": { + "description": "Build Qt.Quick imports", + "dependencies": [ + "qt5-declarative" + ] + } + } } diff --git a/ports/qt5-x11extras/vcpkg.json b/ports/qt5-x11extras/vcpkg.json index 032093137ff979..7660c0c15a3076 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-x11extras", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 x11extras Module;", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index efe86ebc5f0245..2ceb26459e0f31 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-xmlpatterns", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5/vcpkg.json b/ports/qt5/vcpkg.json index bbf4197fdf3f6e..fdffcde2e97d4a 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,9 +1,10 @@ { "name": "qt5", - "version-string": "5.15.2", + "version": "5.15.3", "port-version": 1, "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qt5-base", @@ -75,7 +76,6 @@ "name": "qt5", "default-features": false, "features": [ - "mysqlplugin", "webengine" ], "platform": "!static" @@ -87,6 +87,14 @@ "wayland" ], "platform": "!windows" + }, + { + "name": "qt5-base", + "default-features": false, + "features": [ + "mysqlplugin", + "postgresqlplugin" + ] } ] }, @@ -117,7 +125,10 @@ "doc": { "description": [], "dependencies": [ - "qt5-doc" + { + "name": "qt5-doc", + "platform": "!windows" + } ] }, "essentials": { @@ -152,6 +163,9 @@ }, { "name": "qt5-winextras", + "features": [ + "declarative" + ], "platform": "windows" }, { diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 2bad0cc3babb76..272fb321fd8fe0 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qt5compat", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index d173af83d39e45..a535f025298639 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtactiveqt", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "ActiveQt", "homepage": "https://www.qt.io/", + "license": null, "supports": "windows", "dependencies": [ { diff --git a/ports/qtapplicationmanager/bump-cmake-version.patch b/ports/qtapplicationmanager/bump-cmake-version.patch new file mode 100644 index 00000000000000..31b99c71d204ff --- /dev/null +++ b/ports/qtapplicationmanager/bump-cmake-version.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2236c0..904c5b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + +-cmake_minimum_required(VERSION 3.16) ++cmake_minimum_required(VERSION 3.19) + + include(.cmake.conf) + project(QtApplicationManager # special case diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake new file mode 100644 index 00000000000000..8e190a55eeb3b2 --- /dev/null +++ b/ports/qtapplicationmanager/portfile.cmake @@ -0,0 +1,62 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES + bump-cmake-version.patch + wrapper-fixes.patch + ) + +set(TOOL_NAMES appman + appman-controller + appman-dumpqmltypes + appman-packager + appman-qmltestrunner + appman-launcher-qml + package-uploader + ) + +qt_download_submodule(PATCHES ${${PORT}_PATCHES}) +if(QT_UPDATE_VERSION) + return() +endif() + +set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) +set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) +qt_cmake_configure(${_opt} + OPTIONS + -DINPUT_libarchive=system + -DINPUT_libyaml=system + -DFEATURE_am_system_libyaml=ON + -DFEATURE_am_system_libarchive=ON + OPTIONS_DEBUG + OPTIONS_RELEASE) + +### Need to fix one post-build.bat; Couldn't find the place where it gets generated! +if(VCPKG_TARGET_IS_WINDOWS) + set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE) + if(EXISTS "${scriptfile}") + vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin") + endif() +endif() +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) + +qt_install_copyright("${SOURCE_PATH}") + +# Switch to a more complicated script due to the one post-build script which needed fixing after configure. +# If somebody finds out how/where post-build.bat gets generated please fix it there instead. +#qt_install_submodule(PATCHES ${${PORT}_PATCHES} +# TOOL_NAMES ${TOOL_NAMES} +# CONFIGURE_OPTIONS +# --trace-expand +# -DINPUT_libarchive=system +# -DINPUT_libyaml=system +# -DFEATURE_am_system_libyaml=ON +# -DFEATURE_am_system_libarchive=ON +# CONFIGURE_OPTIONS_RELEASE +# CONFIGURE_OPTIONS_DEBUG +# ) + +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) #Debug tracing libraries are only build if CMAKE_BUILD_TYPE is equal to Debug diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json new file mode 100644 index 00000000000000..901b72cde9214d --- /dev/null +++ b/ports/qtapplicationmanager/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "qtapplicationmanager", + "version": "6.2.3", + "description": "Qt component for application lifecycle management", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "!(windows & arm)", + "dependencies": [ + "libarchive", + "libyaml", + { + "name": "qtapplicationmanager", + "host": true, + "default-features": false + }, + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtwayland", + "default-features": false, + "platform": "!windows" + } + ] +} diff --git a/ports/qtapplicationmanager/wrapper-fixes.patch b/ports/qtapplicationmanager/wrapper-fixes.patch new file mode 100644 index 00000000000000..194e35f816a0e9 --- /dev/null +++ b/ports/qtapplicationmanager/wrapper-fixes.patch @@ -0,0 +1,56 @@ +diff --git a/cmake/FindWrapLibArchive.cmake b/cmake/FindWrapLibArchive.cmake +index 67e4ce0..887b766 100644 +--- a/cmake/FindWrapLibArchive.cmake ++++ b/cmake/FindWrapLibArchive.cmake +@@ -16,3 +16,24 @@ add_library(WrapLibArchive::WrapLibArchive INTERFACE IMPORTED) + target_link_libraries(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_LIBRARIES}) + target_include_directories(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_INCLUDE_DIRS}) + set(WrapLibArchive_FOUND TRUE) ++if(TARGET BZip2::BZip2) ++ set_property(TARGET BZip2::BZip2 PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET Threads::Threads) ++ set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET OpenSSL::Crypto) ++ set_property(TARGET OpenSSL::Crypto PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET zstd::libzstd) ++ set_property(TARGET zstd::libzstd PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET zstd::libzstd_shared) ++ set_property(TARGET zstd::libzstd_shared PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET zstd::libzstd_static) ++ set_property(TARGET zstd::libzstd_static PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET ZLIB::ZLIB) ++ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) ++endif() +diff --git a/cmake/FindWrapLibYaml.cmake b/cmake/FindWrapLibYaml.cmake +index 1dab912..c09e97f 100644 +--- a/cmake/FindWrapLibYaml.cmake ++++ b/cmake/FindWrapLibYaml.cmake +@@ -10,10 +10,17 @@ pkg_check_modules(pc_libyaml yaml-0.1 IMPORTED_TARGET) + + + if (NOT pc_libyaml_FOUND) +- set(WrapLibYaml_FOUND FALSE) +- return() ++ find_package(yaml) ++ if(yaml_FOUND) ++ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) ++ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${yaml_LIBRARIES}) ++ else() ++ set(WrapLibYaml_FOUND FALSE) ++ return() ++ endif() ++else() ++ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) ++ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE PkgConfig::pc_libyaml) + endif() +- +-add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) +-target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES}) + set(WrapLibYaml_FOUND TRUE) ++ diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index 587d6192cf3e0e..7026b300f1635c 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -1,3 +1,5 @@ +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg-port-config.cmake") +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake-config/vcpkg-port-config.cmake") include("${CMAKE_CURRENT_LIST_DIR}/qt_install_copyright.cmake") if(QT_IS_LATEST AND PORT STREQUAL "qtbase") @@ -34,6 +36,7 @@ function(qt_download_submodule) URL "https://code.qt.io/qt/${PORT}.git" REF "${${PORT}_REF}" ${UPDATE_PORT_GIT_OPTIONS} + ${QT_FETCH_REF} PATCHES ${_qarg_PATCHES} ) @@ -47,9 +50,9 @@ endfunction() function(qt_cmake_configure) - cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "DISABLE_NINJA" + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "DISABLE_NINJA;DISABLE_PARALLEL_CONFIGURE" "" - "TOOL_NAMES;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE") + "TOOL_NAMES;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;OPTIONS_MAYBE_UNUSED") vcpkg_find_acquire_program(PERL) # Perl is probably required by all qt ports for syncqt get_filename_component(PERL_PATH ${PERL} DIRECTORY) @@ -60,40 +63,50 @@ function(qt_cmake_configure) vcpkg_add_to_path(${PYTHON3_PATH}) endif() - if(CMAKE_HOST_WIN32) - if(NOT ${PORT} MATCHES "qtbase") - list(APPEND _qarg_OPTIONS -DQT_SYNCQT:PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl") - endif() - set(PERL_OPTION -DHOST_PERL:PATH="${PERL}") - else() - if(NOT ${PORT} MATCHES "qtbase") - list(APPEND _qarg_OPTIONS -DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl) - endif() - set(PERL_OPTION -DHOST_PERL:PATH=${PERL}) + if(NOT PORT MATCHES "^qtbase") + list(APPEND _qarg_OPTIONS "-DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl") endif() + set(PERL_OPTION "-DHOST_PERL:PATH=${PERL}") - if(NOT _qarg_DISABLE_NINJA) - set(NINJA_OPTION PREFER_NINJA) + set(ninja_option "") + if(_qarg_DISABLE_NINJA) + set(ninja_option WINDOWS_USE_MSBUILD) + endif() + + set(disable_parallel "") + if(_qarg_DISABLE_PARALLEL_CONFIGURE) + set(disable_parallel DISABLE_PARALLEL_CONFIGURE) endif() if(VCPKG_CROSSCOMPILING) - list(APPEND _qarg_OPTIONS -DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}) - list(APPEND _qarg_OPTIONS -DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share) + list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}") + list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share") if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged list(APPEND _qarg_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) endif() endif() - vcpkg_configure_cmake( + # Disable warning for CMAKE_DISABLE_FIND_PACKAGE_ + string(REGEX MATCHALL "CMAKE_DISABLE_FIND_PACKAGE_[^:=]+" disabled_find_package "${_qarg_OPTIONS}") + list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_find_package}) + # Disable unused warnings for disabled features. Qt might decide to not emit the feature variables if other features are deactivated. + string(REGEX MATCHALL "(QT_)?FEATURE_[^:=]+(:BOOL)?=OFF" disabled_features "${_qarg_OPTIONS}") + list(TRANSFORM disabled_features REPLACE "(:BOOL)?=OFF" "") + list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_features}) + + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - ${NINJA_OPTION} + ${ninja_option} + ${disable_parallel} OPTIONS + -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS:BOOL=ON # We don't want Qt to screw with users toolchain settings. #-DQT_HOST_PATH= # For crosscompiling #-DQT_PLATFORM_DEFINITION_DIR=mkspecs/win32-msvc #-DQT_QMAKE_TARGET_MKSPEC=win32-msvc #-DQT_USE_CCACHE - -DQT_NO_MAKE_EXAMPLES:BOOL=TRUE - -DQT_NO_MAKE_TESTS:BOOL=TRUE + -DQT_BUILD_EXAMPLES:BOOL=OFF + -DQT_BUILD_TESTS:BOOL=OFF + -DQT_BUILD_BENCHMARKS:BOOL=OFF ${PERL_OPTION} -DINSTALL_BINDIR:STRING=bin -DINSTALL_LIBEXECDIR:STRING=bin @@ -108,13 +121,25 @@ function(qt_cmake_configure) -DINSTALL_MKSPECSDIR:STRING=share/Qt6/mkspecs -DINSTALL_TRANSLATIONSDIR:STRING=translations/${QT6_DIRECTORY_PREFIX} OPTIONS_DEBUG - -DINPUT_debug:BOOL=ON + # -DFEATURE_debug:BOOL=ON only needed by qtbase and auto detected? -DINSTALL_DOCDIR:STRING=../doc/${QT6_DIRECTORY_PREFIX} -DINSTALL_INCLUDEDIR:STRING=../include/${QT6_DIRECTORY_PREFIX} -DINSTALL_TRANSLATIONSDIR:STRING=../translations/${QT6_DIRECTORY_PREFIX} -DINSTALL_DESCRIPTIONSDIR:STRING=../share/Qt6/modules -DINSTALL_MKSPECSDIR:STRING=../share/Qt6/mkspecs - ${_qis_CONFIGURE_OPTIONS_DEBUG} + ${_qarg_OPTIONS_DEBUG} + MAYBE_UNUSED_VARIABLES + INSTALL_BINDIR + INSTALL_DOCDIR + INSTALL_LIBEXECDIR + INSTALL_QMLDIR # No qml files + INSTALL_TRANSLATIONSDIR # No translations + INSTALL_PLUGINSDIR # No plugins + INSTALL_DESCRIPTIONSDIR + INSTALL_INCLUDEDIR + HOST_PERL + QT_SYNCQT + ${_qarg_OPTIONS_MAYBE_UNUSED} ) set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE) endfunction() @@ -131,6 +156,7 @@ function(qt_fix_prl_files) string(REPLACE "${include_path}" "\$\$[QT_INSTALL_HEADERS]" _contents "${_contents}") string(REPLACE "${install_prefix}" "\$\$[QT_INSTALL_PREFIX]" _contents "${_contents}") string(REPLACE "[QT_INSTALL_PREFIX]/lib/objects-Debug" "[QT_INSTALL_LIBS]/objects-Debug" _contents "${_contents}") + string(REPLACE "[QT_INSTALL_PREFIX]/Qt6/qml" "[QT_INSTALL_QML]" _contents "${_contents}") #Note: This only works without an extra if case since QT_INSTALL_PREFIX is the same for debug and release file(WRITE "${prl_file}" "${_contents}") endforeach() @@ -159,13 +185,13 @@ function(qt_fixup_and_cleanup) foreach(_comp IN LISTS COMPONENTS) if(EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6${_comp}") - vcpkg_fixup_cmake_targets(CONFIG_PATH share/Qt6${_comp} TARGET_PATH share/Qt6${_comp} TOOLS_PATH "tools/Qt6/bin") - # Would rather put it into share/cmake as before but the import_prefix correction in vcpkg_fixup_cmake_targets is working against that. + vcpkg_cmake_config_fixup(PACKAGE_NAME "Qt6${_comp}" CONFIG_PATH "share/Qt6${_comp}" TOOLS_PATH "tools/Qt6/bin") + # Would rather put it into share/cmake as before but the import_prefix correction in vcpkg_cmake_config_fixup is working against that. else() message(STATUS "WARNING: Qt component ${_comp} not found/built!") endif() endforeach() - #fix debug plugin paths (should probably be fixed in vcpkg_fixup_pkgconfig) + #fix debug plugin paths (should probably be fixed in vcpkg_cmake_config_fixup) file(GLOB_RECURSE DEBUG_CMAKE_TARGETS "${CURRENT_PACKAGES_DIR}/share/**/*Targets-debug.cmake") debug_message("DEBUG_CMAKE_TARGETS:${DEBUG_CMAKE_TARGETS}") foreach(_debug_target IN LISTS DEBUG_CMAKE_TARGETS) @@ -176,7 +202,7 @@ function(qt_fixup_and_cleanup) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(GLOB_RECURSE STATIC_CMAKE_TARGETS "${CURRENT_PACKAGES_DIR}/share/Qt6Qml/QmlPlugins/*.cmake") foreach(_plugin_target IN LISTS STATIC_CMAKE_TARGETS) - # restore a single get_filename_component which was remove by vcpkg_fixup_pkgconfig + # restore a single get_filename_component which was remove by vcpkg_cmake_config_fixup vcpkg_replace_string("${_plugin_target}" [[get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)]] "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)") @@ -240,7 +266,7 @@ endfunction() function(qt_install_submodule) cmake_parse_arguments(PARSE_ARGV 0 "_qis" "DISABLE_NINJA" "" - "PATCHES;TOOL_NAMES;CONFIGURE_OPTIONS;CONFIGURE_OPTIONS_DEBUG;CONFIGURE_OPTIONS_RELEASE") + "PATCHES;TOOL_NAMES;CONFIGURE_OPTIONS;CONFIGURE_OPTIONS_DEBUG;CONFIGURE_OPTIONS_RELEASE;CONFIGURE_OPTIONS_MAYBE_UNUSED") set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) @@ -256,9 +282,11 @@ function(qt_install_submodule) qt_cmake_configure(${_opt} OPTIONS ${_qis_CONFIGURE_OPTIONS} OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} - OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE} + OPTIONS_MAYBE_UNUSED ${_qis_CONFIGURE_OPTIONS_MAYBE_UNUSED} + ) - vcpkg_install_cmake(ADD_BIN_TO_PATH) + vcpkg_cmake_install(ADD_BIN_TO_PATH) qt_fixup_and_cleanup(TOOL_NAMES ${_qis_TOOL_NAMES}) diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index ba6695374657e9..697d3681160d27 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -1,11 +1,19 @@ -set(QT_VERSION 6.2.1) +set(QT_VERSION 6.2.3) if(PORT MATCHES "qtquickcontrols2") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") return() endif() -set(QT_GIT_TAG v${QT_VERSION}) + +### Setting up the git tag. +set(QT_FETCH_REF "") +set(QT_GIT_TAG "v${QT_VERSION}") +if(PORT MATCHES "qtdeviceutilities|qtlocation|qtinterfaceframework|qtapplicationmanager") + # So much for consistency .... + set(QT_FETCH_REF FETCH_REF "${QT_VERSION}") + set(QT_GIT_TAG "${QT_VERSION}") +endif() #set(QT_UPDATE_VERSION TRUE) if(QT_UPDATE_VERSION) @@ -34,13 +42,14 @@ set(QT_PORTS qt ## New in 6.1 qtactiveqt qtdatavis3d - #qtdeviceutils + qtdeviceutilities qtlottie qtscxml qtvirtualkeyboard qtcharts ## New in 6.2 qtconnectivity + qtpositioning qtlocation qtmultimedia qtremoteobjects @@ -51,48 +60,60 @@ set(QT_PORTS qt qtwebengine qtwebsockets qtwebview + ## New in 6.2.2 + qtinterfaceframework + qtapplicationmanager ) foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() -set(qtbase_REF fbdf50b6c6f69ab88d7a53dfb3ab35e2b49a9664) -set(qtshadertools_REF 73deb667b27451340cafc20ead3aeb4ea84a5246) -set(qtdeclarative_REF 3419dd06c5928e292e0c25692427632e124eefea) -set(qt5compat_REF 3f69f4b1e7d07756b9de7629ec22e1c68265c88a) -set(qttools_REF 8e1f1f6e906095a8f2d5ebbf85443e2407d4e07c) # Additional refs in portfile due to submodule -set(qtcoap_REF 1c0bb10d86b43c4b3860cd4526087e644d3f4b07) -set(qtdoc_REF 040ef9a76b5f79d3cf5e42849d5f49a51522dc0f) -set(qtimageformats_REF bd8b167280addfb9b2ee0d493d6cf7b31c03e574) -set(qtmqtt_REF 610543f328127c68ab39960ded51649ad41d3bd4) -set(qtnetworkauth_REF 1987896634a2c4ac23842b366b4704f0b1396de7) -set(qtopcua_REF ae441a8fff3603e7d21957a09a0b3014669bbb0b) -set(qtquicktimeline_REF 6ba89379c0859622d71f75486b8d872cc4a709ca) -set(qtquick3d_REF 7e30ae5f8b6f3c28a2ee2df3788846fc67ec3c1c) -set(qtsvg_REF 30ad9d119079f486817e60025eceffdc0745ffcf) -set(qttranslations_REF 6d297398a2f9b0f7cf67de63369ca7b75ed60034) -set(qtwayland_REF bea7e0ee35211873c90987c905e3fd68d41df4da) -# set(qtquickcontrols2_REF 0) # Moved into qtdeclarative since Qt 6.2 +set(qtbase_REF 0145fe008894c3b280649b02725e6ec5a5605006) +set(qtshadertools_REF a82d73829028a31640e317a2c8ce365ef74281a1) +set(qtdeclarative_REF 809f24b274ebfeb537c44f38445a4327d43da5e0) +set(qt5compat_REF ca0c27fb51622058e50150ab906260fb7ed11ae3) +set(qttools_REF fb3a3731946c70d573daaab232e13ed8f283fcef) # Additional refs ibelow +set(qtcoap_REF 7b4a337efc71426c84abab3b1d4bdad659ae1c63) +set(qtdoc_REF 1d8092320fedfa368e486eeeea43efec45460672) +set(qtimageformats_REF 1a8e25eb8a63968e09b944cebee5882c137b0c32) +set(qtmqtt_REF b1cfdd8b121c3d0554814c271096e3448da032bb) +set(qtnetworkauth_REF 8451dff3c65712b037ef0606c1f25d70152623f0) +set(qtopcua_REF 42a61efa01a255ab94eddd06321f1afd88653d26) +set(qtquicktimeline_REF 964efe364a37ef20da42d0a207022fe4b9414fe1) +set(qtquick3d_REF 8f4a5d3bedb548def24f2192d23a724dd05ed5a6) +set(qtsvg_REF 6c682d8f996ef5d6c8241f8550cab03cac49f440) +set(qttranslations_REF 4a1ae5b85d64411217438705da21462c5c7f9034) +set(qtwayland_REF 2bc79b7e60af737ceb3329cae076804ab84ea4d4) ### New in 6.1 -set(qtactiveqt_REF 1b710fa0b5e054189b62e2e7fe32fcf1bec0b081) -set(qtcharts_REF 78a74a1fcdc4329c054691021a65ff00dcd09ebb) -set(qtdatavis3d_REF bec62cdb6f800087fd92085984fde389e9091e13) -#set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF 9c72963a986d921e5c1cbdca6638fa17c9f8fa45) -set(qtscxml_REF 069fb385a21e2f844adeb74fbb06849ef5422c7d) -set(qtvirtualkeyboard_REF b6fe68874ed8ff86202320435a743521a245c515) +set(qtactiveqt_REF 8900aaf9bd44c265544b6346ab951ac8b4fa2cb3) +set(qtcharts_REF 690c97c1c0628985014c49ed69f5e9b05da3d775) +set(qtdatavis3d_REF 6e8983a92203194f5047002340ecf522e83187d1) +set(qtdeviceutilities_REF 643e82571dad2c96616d851508393a27b7ca788b) +set(qtlottie_REF 1509364fe51f432a5367d19a1a3f13566fa5e70f) +set(qtscxml_REF 98f98f87437369f6a3ed4f9f8668d0a29964372a) +set(qtvirtualkeyboard_REF 06ea4e113221c26ee5ed2edad6cffa63cde30978) ### New in 6.2 -set(qtconnectivity_REF e910b93cc161930748260626b414b7f4241e6d58) -set(qtlocation_REF 70c3948264d5e6e3bc9be4f0e5d8fdae8b821a08) -set(qtmultimedia_REF 64bc1b00b2979866d577eb57fd118ae497cf6391) -set(qtremoteobjects_REF 8876b4e07174b7fe3124de74002730684b1d0d82) -set(qtsensors_REF 8a949e9314682e6940f1b38f30f5d5f3fd1d6260) -set(qtserialbus_REF 709110461a843a9a0236f3cde27414157a088235) -set(qtserialport_REF d8b40852053623d44e8a07f4c208ace27dcde925) -set(qtwebchannel_REF c93ddec0eb35707fafd209bee8472fd6ee4a3cb6) -set(qtwebengine_REF b879b3ed6b4bb7d6951cf430d5e9b49898fe6c9a) # Additional refs in portfile due to submodule -set(qtwebsockets_REF 68a4c96964935ada5ae1ca323713b4e3862f010f) -set(qtwebview_REF 7ef6e31dd2ead012f941ddcaf30e5d4c2abf693b) +set(qtconnectivity_REF ddfa5de7af5d674ac1d0e9d18e37f70ae1ccd453) +set(qtmultimedia_REF 03c6a61266543c7634915de65cdb7752a25df6f4) +set(qtremoteobjects_REF 715bc1f6bc551aedbaddca3f44f3a5cee8710936) +set(qtserialport_REF b7f42ccd13cf0e736b65eebb7537e31584af6930) +set(qtsensors_REF e53e83d9beffc6a3ef465e91033f2b62fc8102fa) +set(qtserialbus_REF edefe743658051c6c406d3d7645031f2ac281fc0) +set(qtlocation_REF 0) # Currently empty port +set(qtwebchannel_REF adbb4c38c5af970f46000f61501ceee714364a46) +set(qtwebengine_REF 855304132f321f285986c7f1710a45bae72aec12) # Additional refs below +set(qtwebsockets_REF 84e8557281b242d3023b2cff86366343ac440fee) +set(qtwebview_REF 4c27976cd3817914a927f66153b123fd593a9fcf) +set(qtpositioning_REF 2702073aec1d87bb150bf27e8b28f0351710aaa6) +### New in Qt 6.2.2 +set(qtapplicationmanager_REF bcdd87312d8f959a8b928d9e1bc5f614fea9e4b3) +set(qtinterfaceframework_REF e0ebb6fd68e5c585ad55da8c4ca768ade6b82617) + +#Submodule stuff: +set(qttools_qlitehtml_REF 4931b7aa30f256c20573d283561aa432fecf8f38) +set(qttools_litehtml_REF 6236113734bb0a28467e5999e86fdd2834be8e01) +set(qttools_litehtml_HASH 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc) +set(qtwebengine_chromium_REF 30c22c6ed9833c7e6e14a345752c6f13cfbaec51) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qtbase/cocoa.patch b/ports/qtbase/cocoa.patch deleted file mode 100644 index 7242ff9ee38540..00000000000000 --- a/ports/qtbase/cocoa.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h -index 5d4b6d6a71..cc7193d8b7 100644 ---- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h -+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h -@@ -43,6 +43,7 @@ - #include - #include - -+#include - #include - - QT_BEGIN_NAMESPACE --- -cgit v1.2.1 - diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 12233c0e5e1f23..1ae2c92537c43b 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -1,7 +1,7 @@ # Reminder for myself and everybody else: -# Qt cross module dependency information within the Qt respository is wrong and/or incomplete. +# Qt cross module dependency information within the Qt respository is wrong and/or incomplete. # Always check the toplevel CMakeLists.txt for the find_package call and search for linkage against the Qt:: targets -# Often enough certain (bigger) dependencies are only used to build examples and/or tests. +# Often enough certain (bigger) dependencies are only used to build examples and/or tests. # As such getting the correct dependency information relevant for vcpkg requires a manual search/check #set(QT_IS_LATEST ON) @@ -9,15 +9,14 @@ ## All above goes into the qt_port_hashes in the future include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") -set(${PORT}_PATCHES - allow_outside_prefix.patch +set(${PORT}_PATCHES + allow_outside_prefix.patch clang-cl_source_location.patch config_install.patch dont_force_cmakecache.patch fix_cmake_build.patch harfbuzz.patch fix_egl.patch - cocoa.patch ) if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) @@ -29,9 +28,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES) message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" ) endif() -# Features can be found via searching for qt_feature in all configure.cmake files in the source: +# Features can be found via searching for qt_feature in all configure.cmake files in the source: # The files also contain information about the Platform for which it is searched -# Always use FEATURE_ in vcpkg_configure_cmake +# Always use FEATURE_ in vcpkg_cmake_configure # (using QT_FEATURE_X overrides Qts condition check for the feature.) # Theoretically there is a feature for every widget to enable/disable it but that is way to much for vcpkg @@ -40,8 +39,7 @@ set(INPUT_OPTIONS) foreach(_input IN LISTS input_vars) if(_input MATCHES "(png|jpeg)" ) list(APPEND INPUT_OPTIONS -DINPUT_lib${_input}:STRING=) - elseif(_input MATCHES "(sql-sqlite)") - list(APPEND INPUT_OPTIONS -DINPUT_sqlite:STRING=) # Not yet used be the cmake build + elseif(_input MATCHES "(sql-sqlite)") # Not yet used by the cmake build else() list(APPEND INPUT_OPTIONS -DINPUT_${_input}:STRING=) endif() @@ -59,7 +57,7 @@ endforeach() # General features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "appstore-compliant" FEATURE_appstore-compliant + "appstore-compliant" FEATURE_appstore_compliant "zstd" FEATURE_zstd "framework" FEATURE_framework "concurrent" FEATURE_concurrent @@ -80,6 +78,10 @@ INVERTED_FEATURES list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libudev:BOOL=ON) list(APPEND FEATURE_OPTIONS -DFEATURE_xml:BOOL=ON) +if(VCPKG_QT_NAMESPACE) + list(APPEND FEATURE_OPTIONS "-DQT_NAMESPACE:STRING=${VCPKG_QT_NAMESPACE}") +endif() + # Corelib features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_CORE_OPTIONS FEATURES @@ -127,6 +129,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS "jpeg" FEATURE_jpeg "png" FEATURE_png #"opengl" INPUT_opengl=something + "xlib" FEATURE_xlib + "xkb" FEATURE_xkbcommon + "xcb" FEATURE_xcb + "xcb-xlib" FEATURE_xcb_xlib + "xkbcommon-x11" FEATURE_xkbcommon_x11 + "xrender" FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled. + "xrender" FEATURE_xcb_native_painting # experimental INVERTED_FEATURES "vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan "egl" CMAKE_DISABLE_FIND_PACKAGE_EGL @@ -192,23 +201,23 @@ list(APPEND FEATURE_PRINTSUPPORT_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_CUPS:BOOL= # widgets features: # vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_WIDGETS_OPTIONS # "gtk3" FEATURE_gtk3 - # There are a lot of additional features here to deactivate parts of widgets. + # There are a lot of additional features here to deactivate parts of widgets. # ) list(APPEND FEATURE_WIDGETS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GTK3:BOOL=ON) -set(TOOL_NAMES - androiddeployqt - androidtestrunner - cmake_automoc_parser - moc - qdbuscpp2xml - qdbusxml2cpp - qlalr - qmake - qmake6 - qvkgen - rcc - tracegen +set(TOOL_NAMES + androiddeployqt + androidtestrunner + cmake_automoc_parser + moc + qdbuscpp2xml + qdbusxml2cpp + qlalr + qmake + qmake6 + qvkgen + rcc + tracegen uic qtpaths qtpaths6 @@ -235,15 +244,16 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} -DFEATURE_relocatable:BOOL=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG - -DQT_NO_MAKE_TOOLS:BOOL=ON -DFEATURE_debug:BOOL=ON + CONFIGURE_OPTIONS_MAYBE_UNUSED + FEATURE_appstore_compliant # only used for android/ios ) # Install CMake helper scripts if(QT_IS_LATEST) - set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details-latest.cmake") + set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details-latest.cmake") else() - set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details.cmake") + set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details.cmake") endif() file(INSTALL "${port_details}" @@ -267,9 +277,9 @@ if(CMAKE_HOST_WIN32) else() set(script_suffix) endif() -set(other_files +set(other_files target_qt.conf - qt-cmake-private-install.cmake + qt-cmake-private-install.cmake syncqt.pl android_cmakelist_patcher.sh android_emulator_launcher.sh @@ -310,7 +320,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/qmake" "${CURRENT_PACKAGES_DIR}/debug/bin/qmake") # qmake has been moved so this is the qmake helper script endif() file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*") - if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error. + if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") endif() endif() @@ -322,21 +332,33 @@ if(NOT VCPKG_TARGET_IS_OSX) endif() if(NOT VCPKG_TARGET_IS_IOS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/ios") -endif() +endif() +file(RELATIVE_PATH installed_to_host "${CURRENT_INSTALLED_DIR}" "${CURRENT_HOST_INSTALLED_DIR}") +file(RELATIVE_PATH host_to_installed "${CURRENT_HOST_INSTALLED_DIR}" "${CURRENT_INSTALLED_DIR}") +if(installed_to_host) + string(APPEND installed_to_host "/") + string(APPEND host_to_installed "/") +endif() set(_file "${CMAKE_CURRENT_LIST_DIR}/qt.conf.in") -set(REL_PATH) -configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_release.conf" @ONLY) +set(REL_PATH "") +set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}/") +configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_release.conf" @ONLY) # For vcpkg-qmake set(BACKUP_CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") set(BACKUP_CURRENT_HOST_INSTALLED_DIR "${CURRENT_HOST_INSTALLED_DIR}") set(CURRENT_INSTALLED_DIR "./../../../") -set(CURRENT_HOST_INSTALLED_DIR "./../../../") +set(CURRENT_HOST_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${installed_to_host}") + +## Configure installed qt.conf +set(REL_HOST_TO_DATA "${host_to_installed}") configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.conf") set(REL_PATH debug/) configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.debug.conf") + set(CURRENT_INSTALLED_DIR "${BACKUP_CURRENT_INSTALLED_DIR}") set(CURRENT_HOST_INSTALLED_DIR "${BACKUP_CURRENT_HOST_INSTALLED_DIR}") -configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONLY) +set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}/") +configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONLY) # For vcpkg-qmake if(VCPKG_TARGET_IS_WINDOWS) set(_DLL_FILES brotlicommon brotlidec bz2 freetype harfbuzz libpng16) diff --git a/ports/qtbase/qt.conf.in b/ports/qtbase/qt.conf.in index a26802bc371aca..8e76b8f6d343c7 100644 --- a/ports/qtbase/qt.conf.in +++ b/ports/qtbase/qt.conf.in @@ -25,7 +25,7 @@ Data=share/Qt6 Translations=translations/@QT6_DIRECTORY_PREFIX@ Examples=share/examples/@QT6_DIRECTORY_PREFIX@ HostPrefix=${CURRENT_HOST_INSTALLED_DIR} -HostData=${CURRENT_INSTALLED_DIR}/share/Qt6 +HostData=@REL_HOST_TO_DATA@share/Qt6 HostBinaries=@REL_PATH@bin HostLibraries=@REL_PATH@lib HostLibraryExecutables=tools/Qt6/bin diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index a89e7b5bad1f25..c43f2ac357d7ef 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,9 +1,9 @@ { "name": "qtbase", - "version-semver": "6.2.1", - "port-version": 1, + "version": "6.2.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, "dependencies": [ "freetype", { @@ -16,6 +16,30 @@ "host": true, "default-features": false }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "doubleconversion" + ], + "platform": "windows" + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "pcre2" + ], + "platform": "windows & static" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ @@ -274,6 +298,7 @@ "name": "qtbase", "default-features": false, "features": [ + "concurrent", "xkbcommon-x11", "xlib" ] diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index ba4875fa046163..a9022752b58bec 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtcharts", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "QtCharts module", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 0c2763ae3834cb..3eb3a025eb40a4 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtcoap", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index 0c5bc2fd0d50e8..0268353a94529e 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtconnectivity", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index b6acb274fd3bf6..6beebf4ee09a56 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtdatavis3d", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtdeclarative/portfile.cmake b/ports/qtdeclarative/portfile.cmake index 3928c3af39d69d..bf1d42cf3449de 100644 --- a/ports/qtdeclarative/portfile.cmake +++ b/ports/qtdeclarative/portfile.cmake @@ -24,3 +24,8 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) + +# remove `${SOURCE_PATH}` from the front of `#line` directives +if(NOT QT_UPDATE_VERSION) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtQml/${QT_VERSION}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") +endif() diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index c8fe1ff3014690..f71ce3a6c4988f 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtdeclarative", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtdeviceutilities/portfile.cmake b/ports/qtdeviceutilities/portfile.cmake new file mode 100644 index 00000000000000..f83d1fd6f0d8be --- /dev/null +++ b/ports/qtdeviceutilities/portfile.cmake @@ -0,0 +1,13 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +set(TOOL_NAMES settingsui) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json new file mode 100644 index 00000000000000..cf146e4e524e32 --- /dev/null +++ b/ports/qtdeviceutilities/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "qtdeviceutilities", + "version": "6.2.3", + "description": "Utils for Boot2Qt", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "linux", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qttools", + "default-features": false + } + ] +} diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 2832c14acd269d..9536a0b2a327b3 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtdoc", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Documentation", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index d50ef714aadae1..4de7422d30f5cd 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtimageformats", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtinterfaceframework/fix-taglib-search.patch b/ports/qtinterfaceframework/fix-taglib-search.patch new file mode 100644 index 00000000000000..b8027bdf6ab6c0 --- /dev/null +++ b/ports/qtinterfaceframework/fix-taglib-search.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindWrapSystemTagLib.cmake b/cmake/FindWrapSystemTagLib.cmake +index e82d2c1a9..14463c791 100644 +--- a/cmake/FindWrapSystemTagLib.cmake ++++ b/cmake/FindWrapSystemTagLib.cmake +@@ -4,7 +4,7 @@ if(TARGET WrapSystemTagLib::WrapSystemTagLib) + set(WrapSystemTagLib_FOUND ON) + return() + endif() +- ++unset(PKG_CONFIG_EXECUTABLE CACHE) + find_package(PkgConfig) + + pkg_check_modules(TagLib taglib IMPORTED_TARGET) diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake new file mode 100644 index 00000000000000..ff9ca6ccbbf032 --- /dev/null +++ b/ports/qtinterfaceframework/portfile.cmake @@ -0,0 +1,99 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +function(vcpkg_get_python_package PYTHON_DIR ) # From mesa + cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") + + if(NOT _vgpp_PYTHON_EXECUTABLE) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") + endif() + if(NOT _vgpp_PACKAGES) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") + endif() + if(NOT _vgpp_PYTHON_DIR) + get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) + endif() + + if (WIN32) + set(PYTHON_OPTION "") + else() + set(PYTHON_OPTION "--user") + endif() + + if("${_vgpp_PYTHON_DIR}" MATCHES "${DOWNLOADS}") # inside vcpkg + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_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 "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) + endif() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) + endforeach() + else() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) + endforeach() + endif() + if(NOT VCPKG_TARGET_IS_WINDOWS) + execute_process(COMMAND pip3 install ${_vgpp_PACKAGES}) + endif() + else() # outside vcpkg + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND ${_vgpp_PYTHON_EXECUTABLE} -c "import ${_package}" RESULT_VARIABLE HAS_ERROR) + if(HAS_ERROR) + message(FATAL_ERROR "Python package '${_package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${_vgpp_PACKAGES}") + endif() + endforeach() + endif() +endfunction() + +set(${PORT}_PATCHES fix-taglib-search.patch) # Strictly this is only required if qt does not use pkg-config since it forces it to off. +set(TOOL_NAMES + ifmedia-simulation-server + ifvehiclefunctions-simulation-server + ) + +qt_download_submodule(PATCHES ${${PORT}_PATCHES}) +if(QT_UPDATE_VERSION) + return() +endif() + +if(_qis_DISABLE_NINJA) + set(_opt DISABLE_NINJA) +endif() + +vcpkg_find_acquire_program(PKGCONFIG) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") +vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}/Scripts") +vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES virtualenv qface) + +if(VCPKG_CROSSCOMPILING) + list(APPEND FEATURE_OPTIONS "-DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET}") +endif() + +set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) +set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) +qt_cmake_configure(${_opt} + OPTIONS ${FEATURE_OPTIONS} + "-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found. + OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) + +qt_install_copyright("${SOURCE_PATH}") + +if(NOT VCPKG_CROSSCOMPILING) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ifcodegen") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ifcodegen" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/ifcodegen") +endif() diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json new file mode 100644 index 00000000000000..263b26a63b157e --- /dev/null +++ b/ports/qtinterfaceframework/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "qtinterfaceframework", + "version": "6.2.3", + "port-version": 2, + "description": "Qt Interface Framework", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "pkgconf", + "host": true + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtinterfaceframework", + "host": true, + "default-features": false + }, + { + "name": "qtmultimedia", + "default-features": false + }, + { + "name": "qtremoteobjects", + "default-features": false + }, + { + "name": "qttools", + "default-features": false + }, + "taglib" + ] +} diff --git a/ports/qtkeychain/portfile.cmake b/ports/qtkeychain/portfile.cmake index 794694648ef523..f631232282adda 100644 --- a/ports/qtkeychain/portfile.cmake +++ b/ports/qtkeychain/portfile.cmake @@ -8,12 +8,19 @@ vcpkg_from_github( HEAD_REF master ) +# Opportunity to build without dependency on qt5-tools/qt5-declarative +set(BUILD_TRANSLATIONS OFF) +if("translations" IN_LIST FEATURES) + set(BUILD_TRANSLATIONS ON) +endif() + vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_WITH_QT6=OFF -DBUILD_TEST_APPLICATION=OFF + -DBUILD_TRANSLATIONS=${BUILD_TRANSLATIONS} ) vcpkg_cmake_install() diff --git a/ports/qtkeychain/vcpkg.json b/ports/qtkeychain/vcpkg.json index ca581e822b6b4f..af15c267924974 100644 --- a/ports/qtkeychain/vcpkg.json +++ b/ports/qtkeychain/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtkeychain", "version": "0.13.2", + "port-version": 1, "description": "(Unaffiliated with Qt) Platform-independent Qt5 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", "license": "BSD-3-Clause", @@ -9,7 +10,6 @@ "name": "libsecret", "platform": "!(windows | uwp | osx)" }, - "qt5-tools", { "name": "vcpkg-cmake", "host": true @@ -18,5 +18,16 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "translations" + ], + "features": { + "translations": { + "description": "Build qtkeychain translations", + "dependencies": [ + "qt5-tools" + ] + } + } } diff --git a/ports/qtlocation/portfile.cmake b/ports/qtlocation/portfile.cmake index 6bb133bb07bdee..15fa294cde72d4 100644 --- a/ports/qtlocation/portfile.cmake +++ b/ports/qtlocation/portfile.cmake @@ -1,23 +1,24 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +message(STATUS "Upstream decided to split this into qtpositioning and qtlocation. qtlocation however is currently empty!") +# set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +# include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES) +# set(${PORT}_PATCHES) +# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +# FEATURES +# INVERTED_FEATURES + # "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + # "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort + # "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6Network +# ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort - "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6Network -) +# list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" + # "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" +# ) -list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" - "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) +# qt_install_submodule(PATCHES ${${PORT}_PATCHES} + # CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + # CONFIGURE_OPTIONS_RELEASE + # CONFIGURE_OPTIONS_DEBUG + # ) diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index c375ccb84bda7e..8d985e8ad4bf67 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtlocation", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Location", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", @@ -15,30 +16,7 @@ "dbus" ], "platform": "linux" - } - ], - "features": { - "nmea": { - "description": "Build with nmea", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - }, - "qtserialport" - ] }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } + "qtpositioning" + ] } diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 1488f0144868c6..873e46f433298c 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtlottie", - "version-semver": "6.2.1", + "version": "6.2.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, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 24a9ec196d648c..caeb4603574e15 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtmqtt", - "version-semver": "6.2.1", + "version": "6.2.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, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index fe4f81bd71a138..9af8430a3cda7f 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtmultimedia", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "alsa", diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index f2e57c09338ee4..e43545e4b086fe 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtnetworkauth", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtopcua/portfile.cmake b/ports/qtopcua/portfile.cmake index 024052484586e9..6cfe3cdbae8689 100644 --- a/ports/qtopcua/portfile.cmake +++ b/ports/qtopcua/portfile.cmake @@ -5,7 +5,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "open62541" FEATURE_open62541 - "open62541" FEATURE_open62541-security +# "open62541" FEATURE_open62541_security # requires vendored open62541 "uacpp" FEATURE_uacpp "ns0idnames" FEATURE_ns0idnames "ns0idgenerator" FEATURE_ns0idgenerator diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 90bb9f9c1dda71..9fd6237200c4c3 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtopcua", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtpositioning/portfile.cmake b/ports/qtpositioning/portfile.cmake new file mode 100644 index 00000000000000..01c76c93571456 --- /dev/null +++ b/ports/qtpositioning/portfile.cmake @@ -0,0 +1,18 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json new file mode 100644 index 00000000000000..afef3f03f38f1f --- /dev/null +++ b/ports/qtpositioning/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "qtpositioning", + "version": "6.2.3", + "description": "Qt Positioning", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtserialport", + "default-features": false + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 6b9e50596e9fdb..7041023f96c9bc 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtquick3d", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 5a996169561127..1703c5279e7f1c 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtquicktimeline", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 8f3a1798728fba..6e2929f034d201 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtremoteobjects", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index 6eb9b452d85886..e6865d1f165724 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtscxml", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index 041a2e15f4ecb9..fa33b290a959e0 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtsensors", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Sensors", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index d1752c40145f1c..f01ac65a03ca1c 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtserialbus", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index f72e900c345642..55d5ab5055ebd2 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtserialport", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 759742b7009714..8d640afff4374a 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtshadertools", - "version-semver": "6.2.1", + "version": "6.2.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, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 6bded3bf4a1f91..4f45b6b1ab4be7 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtsvg", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt SVG", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qttools/no_src_changes.patch b/ports/qttools/no_src_changes.patch new file mode 100644 index 00000000000000..8b948c26a8a371 --- /dev/null +++ b/ports/qttools/no_src_changes.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 20bd474..7b69743 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,13 +187,13 @@ endif() + if(WIN32) + file(TO_NATIVE_PATH ${XXD_COMMAND} XXD_COMMAND) + file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css MASTER_FILE) +- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc +- COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc ++ COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) + else() +- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc +- COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc ++ COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) + endif() +-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE) ++set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE) + + # Tests + +@@ -218,7 +218,7 @@ if (BUILD_TESTING) + add_executable( + ${TEST_NAME} + ${TEST_LITEHTML} +- ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc ++ ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc + ) + + set_target_properties(${TEST_NAME} PROPERTIES +@@ -243,7 +243,7 @@ if (BUILD_TESTING) + endif() + + # set(TEST_NAME ${PROJECT_NAME}_tests) +-# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) ++# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) + # set_target_properties(${TEST_NAME} PROPERTIES + # CXX_STANDARD 11 + # C_STANDARD 99 diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index 835e7ffce63238..012d5bbd7012b5 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -77,7 +77,7 @@ endif() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git - REF 6af5648d1208ed5760d74bd060c74ffa2bcfef6b + REF "${${PORT}_qlitehtml_REF}" FETCH_REF master HEAD_REF master ) @@ -85,9 +85,10 @@ vcpkg_from_git( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH_LITEHTML REPO litehtml/litehtml - REF db7f59d5886fd50f84d48720c79dc2e6152efa83 - SHA512 6beed53f8b779359eb2d08495547f9b4e3d02b70d68e035e6c188f009a283e630b3961caa472ce045799a9ef82e1cd6b3c63d8534e6e8127441944f4837a0352 + REF "${${PORT}_litehtml_REF}" + SHA512 "${${PORT}_litehtml_HASH}" HEAD_REF master + PATCHES no_src_changes.patch ) ##### qt_install_submodule @@ -111,7 +112,7 @@ qt_cmake_configure(${_opt} OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index f59f733cea234e..9bbd137bfdcf33 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qttools", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Tools", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qttranslations/portfile.cmake b/ports/qttranslations/portfile.cmake index 30a09d5996876e..f151f0a5b7416e 100644 --- a/ports/qttranslations/portfile.cmake +++ b/ports/qttranslations/portfile.cmake @@ -6,10 +6,10 @@ set(TOOL_NAMES) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG + CONFIGURE_OPTIONS_MAYBE_UNUSED + QT_BUILD_EXAMPLES + QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS ) - + set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # only translation files. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 17aea5fee8062d..fb1bec68eee1f3 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qttranslations", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Translations", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index c712e0f673c214..1bf7f1f89aac59 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtvirtualkeyboard", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 149505b3d084f7..4e16f588e9bec2 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtwayland", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", + "license": null, "supports": "!windows", "dependencies": [ { diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index 2d5bb8722ba831..e67abf1616fddd 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtwebchannel", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index 0f3370cb1635ff..c826a51d85c628 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -5,26 +5,30 @@ set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "proprietary-codecs" FEATURE_webengine-proprietary-codecs - "spellchecker" FEATURE_webengine-spellchecker - "geolocation" FEATURE_webengine-geolocation - "webchannel" FEATURE_webengine-webchannel + "proprietary-codecs" FEATURE_webengine_proprietary_codecs + "spellchecker" FEATURE_webengine_spellchecker + "geolocation" FEATURE_webengine_geolocation + "webchannel" FEATURE_webengine_webchannel INVERTED_FEATURES "geolocation" CMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning "webchannel" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel ) if(VCPKG_TARGET_IS_OSX AND "spellchecker" IN_LIST FEATRUES) - list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine-native-spellchecker=ON") + list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine_native_spellchecker=ON") endif() # webengine-extensions # webengine-printing-and-pdf # webengine-pepper-plugins -set(deactivated_features webengine-webrtc webengine-webrtc-pipewire webengine-v8-snapshot-support) +set(deactivated_features webengine_webrtc_pipewire) foreach(_feat IN LISTS deactivated_features) list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=OFF") endforeach() +set(enabled_features webengine_webrtc webengine_v8_snapshot_support) +foreach(_feat IN LISTS enabled_features) + list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=ON") +endforeach() if(VCPKG_TARGET_IS_LINUX) # qt_configure_add_summary_entry(ARGS "webengine-system-lcms2") @@ -32,7 +36,7 @@ if(VCPKG_TARGET_IS_LINUX) # + ALSA and PULSEAUDIO set(system_libs re2 icu libwebp opus ffmpeg libvpx snappy glib zlib minizip libevent protobuf libxml libpng libjpeg harfbuzz freetype) foreach(_sys_lib IN LISTS system_libs) - list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine-system-${_sys_lib}=ON") + list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine_system_${_sys_lib}=ON") endforeach() endif() @@ -73,7 +77,7 @@ endif() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE URL git://code.qt.io/qt/qtwebengine-chromium.git - REF 6b7b3f1bf9f41c3ae7afc359c90c3cc80687f004 + REF "${${PORT}_chromium_REF}" ) ##### qt_install_submodule @@ -91,7 +95,8 @@ if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/gn") file(RENAME "${SOURCE_PATH_WEBENGINE}/gn" "${SOURCE_PATH}/src/3rdparty/gn") endif() -qt_cmake_configure(OPTIONS ${FEATURE_OPTIONS} +qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. + OPTIONS ${FEATURE_OPTIONS} -DGPerf_EXECUTABLE=${GPERF} -DBISON_EXECUTABLE=${BISON} -DFLEX_EXECUTABLE=${FLEX} @@ -101,7 +106,7 @@ qt_cmake_configure(OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 71faea0ffe1e64..41109712622a0a 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,9 +1,11 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version-semver": "6.2.1", + "version": "6.2.3", + "port-version": 1, "description": "Qt WebEngine", "homepage": "https://www.qt.io/", + "license": null, "supports": "!static & !((arm | x86) & windows)", "dependencies": [ { @@ -106,6 +108,10 @@ "name": "vcpkg-tool-nodejs", "host": true }, + { + "name": "vcpkg-tool-python2", + "host": true + }, { "name": "zlib", "platform": "!windows" diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index c2274ce1c13385..5d4b13ad2e2921 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtwebsockets", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index aebc8c27e76e86..8167e57dca634f 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtwebview", - "version-semver": "6.2.1", + "version": "6.2.3", "description": "Qt Web View", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", @@ -24,6 +25,7 @@ }, "webengine": { "description": "Build with Webengine", + "supports": "!static", "dependencies": [ { "name": "qtwebengine", diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index 5f110915cfa11d..158dd4813f9c25 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF QuantLib-v1.24 - SHA512 1a63d90363cda69e20e40a60a2d6357f632fac997df520b949e73feb256dac8a999395d0ebe94734ac630e9104e512b0a545f6a2111b287a41e9128127aa5bb0 + REF QuantLib-v1.25 + SHA512 9a08c3d825f85c93e7db74b31dc93d03d7ec487b7a09f86b6f3efb0404791e1b3e1ea19e06cea19fd04ab190d2e8eb7bad889660d47eb9988c36609967646aa3 HEAD_REF master ) @@ -11,20 +11,20 @@ if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF ) -vcpkg_install_cmake() - +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME QuantLib CONFIG_PATH lib/cmake/QuantLib) vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +# Install custom usage +configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.TXT" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/quantlib/usage b/ports/quantlib/usage new file mode 100644 index 00000000000000..e121873e2dffd2 --- /dev/null +++ b/ports/quantlib/usage @@ -0,0 +1,4 @@ +The package quantlib provides CMake targets: + + find_package(QuantLib CONFIG REQUIRED) + target_link_libraries(main PRIVATE QuantLib::QuantLib) diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index e4d37e94445a37..b3020874012e1b 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quantlib", - "version": "1.24", + "version": "1.25", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", "supports": "!(windows & !static)", @@ -31,12 +31,19 @@ "boost-serialization", "boost-signals2", "boost-smart-ptr", - "boost-test", "boost-thread", "boost-tuple", "boost-type-traits", "boost-ublas", "boost-unordered", - "boost-utility" + "boost-utility", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/quazip/portfile.cmake b/ports/quazip/portfile.cmake index d074c780c9b918..12a51a218d7cee 100644 --- a/ports/quazip/portfile.cmake +++ b/ports/quazip/portfile.cmake @@ -12,6 +12,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/QuaZip-Qt5-1.1) vcpkg_copy_pdbs() +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +else() + vcpkg_fixup_pkgconfig() +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright) \ No newline at end of file diff --git a/ports/quazip/vcpkg.json b/ports/quazip/vcpkg.json index deae1dcae42c6b..0815c748d690b5 100644 --- a/ports/quazip/vcpkg.json +++ b/ports/quazip/vcpkg.json @@ -1,6 +1,7 @@ { "name": "quazip", "version": "1.1", + "port-version": 1, "description": "Qt/C++ wrapper over minizip", "homepage": "https://stachenov.github.io/quazip/", "dependencies": [ diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 6bc0398c4240c5..3c5470d48aadd8 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -32,4 +30,4 @@ vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 9057a3ec89ebd9..350321f5c48ff6 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,7 +1,7 @@ { "name": "quill", "version-semver": "1.6.3", - "port-version": 3, + "port-version": 4, "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "supports": "!(uwp | android)", diff --git a/ports/qwt-qt6/disable-examples-playground-tests.patch b/ports/qwt-qt6/disable-examples-playground-tests.patch deleted file mode 100644 index a3db8ab453d9f6..00000000000000 --- a/ports/qwt-qt6/disable-examples-playground-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/qwtconfig.pri b/qwtconfig.pri -index 0b054e0..d922aff 100644 ---- a/qwtconfig.pri -+++ b/qwtconfig.pri -@@ -137,7 +137,7 @@ win32 { - # Otherwise you have to build them from the examples directory. - ###################################################################### - --QWT_CONFIG += QwtExamples -+#QWT_CONFIG += QwtExamples - - ###################################################################### - # The playground is primarily intended for the Qwt development -@@ -148,14 +148,14 @@ QWT_CONFIG += QwtExamples - # Otherwise you have to build them from the playground directory. - ###################################################################### - --QWT_CONFIG += QwtPlayground -+#QWT_CONFIG += QwtPlayground - - ###################################################################### - # If you want to auto build the tests, enable the line below - # Otherwise you have to build them from the tests directory. - ###################################################################### - --QWT_CONFIG += QwtTests -+#QWT_CONFIG += QwtTests - - ###################################################################### - # When Qt has been built as framework qmake wants diff --git a/ports/qwt-qt6/portfile.cmake b/ports/qwt-qt6/portfile.cmake deleted file mode 100644 index 8ff49afcecfabb..00000000000000 --- a/ports/qwt-qt6/portfile.cmake +++ /dev/null @@ -1,37 +0,0 @@ -vcpkg_from_sourceforge( - OUT_SOURCE_PATH SOURCE_PATH - REPO qwt/qwt - REF 6.2.0 - FILENAME "qwt-6.2.0.zip" - SHA512 a3946c6e23481b5a2193819a1c1298db5a069d514ca60de54accb3a249403f5acd778172ae6fae24fae252767b1e58deba524de6225462f1bafd7c947996aae9 - PATCHES disable-examples-playground-tests.patch -) - -vcpkg_qmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "CONFIG+=${VCPKG_LIBRARY_LINKAGE}" -) - -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_install_qmake( - RELEASE_TARGETS sub-src-release_ordered - DEBUG_TARGETS sub-src-debug_ordered - ) -else () - vcpkg_install_qmake( - RELEASE_TARGETS sub-src-all-ordered - DEBUG_TARGETS sub-src-all-ordered - ) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -#Install the header files -file(GLOB HEADER_FILES "${SOURCE_PATH}/src/*.h") -file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") - -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/qwt-qt6/vcpkg.json b/ports/qwt-qt6/vcpkg.json deleted file mode 100644 index 8251167aa5bed0..00000000000000 --- a/ports/qwt-qt6/vcpkg.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "qwt-qt6", - "version-semver": "6.2.0", - "description": "qt widgets library for technical applications", - "homepage": "https://sourceforge.net/projects/qwt", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent", - "gui", - "widgets" - ] - }, - "qtsvg", - { - "name": "qttools", - "default-features": false, - "features": [ - "designer" - ] - }, - { - "name": "vcpkg-qmake", - "host": true, - "default-features": false - } - ] -} diff --git a/ports/qwt/fix-dynamic-static.patch b/ports/qwt/fix-dynamic-static.patch new file mode 100644 index 00000000000000..d0bd646fcafb39 --- /dev/null +++ b/ports/qwt/fix-dynamic-static.patch @@ -0,0 +1,15 @@ +diff --git a/qwtconfig.pri b/qwtconfig.pri +index 0b054e0..f93fef6 100644 +--- a/qwtconfig.pri ++++ b/qwtconfig.pri +@@ -72,7 +72,10 @@ QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features + # it will be a static library. + ###################################################################### + ++CONFIG(dynamic, dynamic|static) { ++ + QWT_CONFIG += QwtDll ++} + + ###################################################################### + # QwtPlot enables all classes, that are needed to use the QwtPlot diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake index 0732b80f49f841..9bee7b211b2085 100644 --- a/ports/qwt/portfile.cmake +++ b/ports/qwt/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_sourceforge( REF 6.2.0 FILENAME "qwt-6.2.0.zip" SHA512 a3946c6e23481b5a2193819a1c1298db5a069d514ca60de54accb3a249403f5acd778172ae6fae24fae252767b1e58deba524de6225462f1bafd7c947996aae9 + PATCHES + fix-dynamic-static.patch ) vcpkg_configure_qmake( diff --git a/ports/qwt/vcpkg.json b/ports/qwt/vcpkg.json index fb5d67871ff24e..380c844549c614 100644 --- a/ports/qwt/vcpkg.json +++ b/ports/qwt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qwt", "version-semver": "6.2.0", - "port-version": 1, + "port-version": 2, "description": "qt widgets library for technical applications", "homepage": "https://sourceforge.net/projects/qwt", "dependencies": [ diff --git a/ports/qwtw/portfile.cmake b/ports/qwtw/portfile.cmake index 27dd91786110de..5799b3d6f2d2d6 100644 --- a/ports/qwtw/portfile.cmake +++ b/ports/qwtw/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm" "x86" ON_LIBRARY_LINKAGE "static") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ig-or/qwtw @@ -7,7 +5,7 @@ vcpkg_from_github( SHA512 de5abf26d0975b9f0ed88e10cd4d5b4d12e25cce8c87ab6a18d8e7064697de6fc8da83e118b5a4e2819c09e2dbbfd20daeecc6a42748c019c6699666276d075a HEAD_REF master ) - + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/qwtw/vcpkg.json b/ports/qwtw/vcpkg.json index 2fa18ec80dcf15..48653056420658 100644 --- a/ports/qwtw/vcpkg.json +++ b/ports/qwtw/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qwtw", - "version-string": "3.1.0", - "port-version": 1, + "version": "3.1.0", + "port-version": 2, "description": "qwt-based 2D plotting library", "homepage": "https://github.com/ig-or/qwtw", "supports": "windows & x64 & !static", diff --git a/ports/randomstr/portfile.cmake b/ports/randomstr/portfile.cmake new file mode 100644 index 00000000000000..20b7425fe1273c --- /dev/null +++ b/ports/randomstr/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offscale/c89randomstr + REF 9d577c4343913a330ef32b93ed12b8942808bbbc + SHA512 7adfac8000d9057b9ca230f794bff82e1628864140e08d393e3faff890848606fff72c3dd2b296a20bf3003ed035e9e4273a0599764f515b7a6ac7091e9d2949 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTING=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/randomstr/vcpkg.json b/ports/randomstr/vcpkg.json new file mode 100644 index 00000000000000..29ea9f92ae5afe --- /dev/null +++ b/ports/randomstr/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "randomstr", + "version-date": "2022-02-03", + "description": "Simple randomstr function in a header-only C89 library", + "license": "0BSD", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index 47129ff1782a7a..86b0340ab891f6 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ericniebler/range-v3 - REF 4989f3e9ff2efee1852942bb9328ef121369ba02 # 0.11.0 - SHA512 da571feff60d20a42e1e0593f132d4ab095f3ffbecaf0c020f295a2ec8b75c6934abb1974679e55ce8b7b16d105e0cbf3929210677c3b1b90cb349e583854fd4 + REF 83783f578e0e6666d68a3bf17b0038a80e62530e # 2021-11-2 + SHA512 f0953e3c4e25ddf2f94b583080b8966faf1973243e01f77d23f8c04c2e0352003e4bd12490a46176472ad46c80dec99a1a8880a9bde8006eb01e3c3d8eee2fb4 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRANGE_V3_TESTS=OFF -DRANGE_V3_EXAMPLES=OFF @@ -16,12 +15,12 @@ vcpkg_configure_cmake( -DRANGE_V3_HEADER_CHECKS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/range-v3) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/range-v3) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/range-v3/vcpkg.json b/ports/range-v3/vcpkg.json index 6a5d15958936c6..f29c5549777c89 100644 --- a/ports/range-v3/vcpkg.json +++ b/ports/range-v3/vcpkg.json @@ -1,7 +1,16 @@ { "name": "range-v3", - "version-string": "0.11.0", - "port-version": 1, - "description": "Range library for C++11/14/17.", - "homepage": "https://github.com/ericniebler/range-v3" + "version-date": "2021-11-02", + "description": "Range library for C++11/14/17/20.", + "homepage": "https://github.com/ericniebler/range-v3", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/rapidcheck/portfile.cmake b/ports/rapidcheck/portfile.cmake index 544319ce50f752..29f430a926e388 100644 --- a/ports/rapidcheck/portfile.cmake +++ b/ports/rapidcheck/portfile.cmake @@ -3,23 +3,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emil-e/rapidcheck - REF 7bc7d302191a4f3d0bf005692677126136e02f60 - SHA512 8631f1034a0a24293d61a91cbb8f8b69c70acde02d60377d0a68d045e4d57acb878aafbea76907574c0cc6cdac3a16d207d310b49d7c48ee7edbede3236ed15b + REF 08b505857e32d52a20b2240b5125d937d67a6d86 + SHA512 d71d17354d2597a168be935e03b1330fc96ff12d6551b6bd34ef8f6c2ba69f7f9bff865afd6a6a59c48496bcc9ddf997b07112d80c761d909f7cd9ef93a7464b HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DRC_INSTALL_ALL_EXTRAS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -# Handle copyright configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/rapidcheck/vcpkg.json b/ports/rapidcheck/vcpkg.json index 60570b545e09fe..981a45ebba1fcb 100644 --- a/ports/rapidcheck/vcpkg.json +++ b/ports/rapidcheck/vcpkg.json @@ -1,7 +1,16 @@ { "name": "rapidcheck", - "version-string": "2020-08-25", - "port-version": 1, + "version-date": "2021-12-20", "description": "A property-based testing library for C++ (a la QuickCheck) with the goal of being simple to use with as little boilerplate as possible.", - "homepage": "https://github.com/emil-e/rapidcheck" + "homepage": "https://github.com/emil-e/rapidcheck", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/raylib/fix-linkGlfw.patch b/ports/raylib/fix-linkGlfw.patch new file mode 100644 index 00000000000000..d495e281462229 --- /dev/null +++ b/ports/raylib/fix-linkGlfw.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake +index 1b94cdf..4cc8f8f 100644 +--- a/cmake/GlfwImport.cmake ++++ b/cmake/GlfwImport.cmake +@@ -5,7 +5,7 @@ elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE") + find_package(glfw3 3.3.3 QUIET) + endif() + if (glfw3_FOUND) +- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) ++ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3) + endif() + + # Explicitly check against "ON", because USE_EXTERNAL_GLFW is a tristate option +@@ -32,3 +32,4 @@ else() + MESSAGE(STATUS "Using external GLFW") + set(GLFW_PKG_DEPS glfw3) + endif() ++set(GLFW_PKG_DEPS glfw3) +diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake +index c156d6b..55c5bca 100644 +--- a/cmake/LibraryConfigurations.cmake ++++ b/cmake/LibraryConfigurations.cmake +@@ -104,5 +104,5 @@ endif () + set(LIBS_PRIVATE ${LIBS_PRIVATE} ${OPENAL_LIBRARY}) + + if (${PLATFORM} MATCHES "Desktop") +- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) ++ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3) + endif () diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index a1a3ab0d99a152..96a0298d42d527 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -1,6 +1,3 @@ -# https://github.com/raysan5/raylib/issues/388 -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) message( "raylib currently requires the following libraries from the system package manager: @@ -13,12 +10,17 @@ These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev li ) endif() +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) + set(patches fix-linkGlfw.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raylib REF 4.0.0 SHA512 e9ffab14ab902e3327202e68ca139209ff24100dab62eb03fef50adf363f81e2705d81e709c58cf1514e68e6061c8963555bd2d00744daacc3eb693825fc3417 HEAD_REF master + PATCHES ${patches} ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED) @@ -37,8 +39,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_GAMES=OFF @@ -61,12 +62,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) - -configure_file( - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake - @ONLY -) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include @@ -81,7 +77,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) ) endif() -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/raylib/usage b/ports/raylib/usage deleted file mode 100644 index 94ce10978f78d5..00000000000000 --- a/ports/raylib/usage +++ /dev/null @@ -1,5 +0,0 @@ -The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: - - find_package(@PORT@ CONFIG REQUIRED) - target_include_directories(main PRIVATE ${RAYLIB_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${RAYLIB_LIBRARIES}) diff --git a/ports/raylib/vcpkg-cmake-wrapper.cmake b/ports/raylib/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 2d7560eb0f3e46..00000000000000 --- a/ports/raylib/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,11 +0,0 @@ -include(SelectLibraryConfigurations) - -find_path(RAYLIB_INCLUDE_DIR raylib.h) - -find_library(RAYLIB_LIBRARY_DEBUG NAMES raylib libraylib raylib_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) -find_library(RAYLIB_LIBRARY_RELEASE NAMES raylib libraylib raylib_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) - -select_library_configurations(RAYLIB) - -set(RAYLIB_INCLUDE_DIRS ${RAYLIB_INCLUDE_DIR}) -set(RAYLIB_LIBRARIES ${RAYLIB_LIBRARY}) diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index 4a27c41bfd2b24..348eb943e668e7 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -1,10 +1,16 @@ { "name": "raylib", "version-semver": "4.0.0", + "port-version": 3, "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", + "license": "Zlib", "supports": "!(arm | uwp)", "dependencies": [ + { + "name": "glfw3", + "platform": "!windows" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/readline-osx/portfile.cmake b/ports/readline-osx/portfile.cmake new file mode 100644 index 00000000000000..9aefc82414d125 --- /dev/null +++ b/ports/readline-osx/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/readline-osx/vcpkg.json b/ports/readline-osx/vcpkg.json new file mode 100644 index 00000000000000..381e95164c4a17 --- /dev/null +++ b/ports/readline-osx/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "readline-osx", + "version-date": "2020-01-04", + "description": "empty package, linking to readline-unix", + "supports": "osx", + "dependencies": [ + "readline-unix" + ] +} diff --git a/ports/readline-unix/portfile.cmake b/ports/readline-unix/portfile.cmake new file mode 100644 index 00000000000000..b7422e53af09bd --- /dev/null +++ b/ports/readline-unix/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_download_distfile( + ARCHIVE + URLS https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz + FILENAME readline-8.1.tar.gz + SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00 +) + +vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --with-curses=yes +) + +vcpkg_install_make() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/readline-unix/vcpkg.json b/ports/readline-unix/vcpkg.json new file mode 100644 index 00000000000000..6d3b9382b636a9 --- /dev/null +++ b/ports/readline-unix/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "readline-unix", + "version": "8.1", + "port-version": 1, + "description": "Implementation of readline for unix", + "supports": "!windows", + "dependencies": [ + "ncurses" + ] +} diff --git a/ports/readline-win32/vcpkg.json b/ports/readline-win32/vcpkg.json index 86c8d73046ca32..79e3a7f7da34a6 100644 --- a/ports/readline-win32/vcpkg.json +++ b/ports/readline-win32/vcpkg.json @@ -1,7 +1,8 @@ { "name": "readline-win32", - "version-string": "5.0", - "port-version": 3, + "version": "5.0", + "port-version": 4, "description": "Implementation of readline for Windows Desktop", - "homepage": "https://github.com/lltcggie" + "homepage": "https://github.com/lltcggie", + "supports": "windows & !uwp" } diff --git a/ports/readline/vcpkg.json b/ports/readline/vcpkg.json index 7dba01a74c9b3a..cc79a73bf237d8 100644 --- a/ports/readline/vcpkg.json +++ b/ports/readline/vcpkg.json @@ -1,10 +1,14 @@ { "name": "readline", "version-string": "0", - "port-version": 1, + "port-version": 3, "description": "GNU readline and history libraries", "supports": "!uwp", "dependencies": [ + { + "name": "readline-unix", + "platform": "!windows" + }, { "name": "readline-win32", "platform": "windows" diff --git a/ports/readosm/fix-makefiles.patch b/ports/readosm/fix-makefiles.patch index ea78af8572c730..a955938b788d74 100644 --- a/ports/readosm/fix-makefiles.patch +++ b/ports/readosm/fix-makefiles.patch @@ -37,10 +37,8 @@ diff --git a/nmake.opt b/nmake.opt index 5e45c0e..61c44f9 100644 --- a/nmake.opt +++ b/nmake.opt -@@ -1,8 +1,8 @@ - # Directory tree where ReadOSM will be installed. --INSTDIR=C:\OSGeo4W -+INSTDIR=$(INST_DIR) +@@ -2,7 +2,7 @@ + INSTDIR=C:\OSGeo4W # Uncomment the first for an optimized build, or the second for debug. -OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \ diff --git a/ports/readosm/pc-file.patch b/ports/readosm/pc-file.patch new file mode 100644 index 00000000000000..34ea86806881c1 --- /dev/null +++ b/ports/readosm/pc-file.patch @@ -0,0 +1,12 @@ +diff --git a/readosm.pc.in b/readosm.pc.in +index c1a0961..2417433 100644 +--- a/readosm.pc.in ++++ b/readosm.pc.in +@@ -8,5 +8,6 @@ includedir=@includedir@ + Name: readosm + Description: a simple library parsing Open Street Map files + Version: @VERSION@ +-Libs: -L${libdir} -lreadosm -lz -lexpat ++Requires.private: expat zlib ++Libs: -L${libdir} -lreadosm + Cflags: -I${includedir} diff --git a/ports/readosm/portfile.cmake b/ports/readosm/portfile.cmake index 9316b7d853c153..fabd6c4bf5ae09 100644 --- a/ports/readosm/portfile.cmake +++ b/ports/readosm/portfile.cmake @@ -1,89 +1,94 @@ set(READOSM_VERSION_STR "1.1.0a") vcpkg_download_distfile(ARCHIVE - URLS "http://www.gaia-gis.it/gaia-sins/readosm-sources/readosm-${READOSM_VERSION_STR}.tar.gz" + URLS "https://www.gaia-gis.it/gaia-sins/readosm-sources/readosm-${READOSM_VERSION_STR}.tar.gz" FILENAME "readosm-${READOSM_VERSION_STR}.tar.gz" SHA512 ec8516cdd0b02027cef8674926653f8bc76e2082c778b02fb2ebcfa6d01e21757aaa4fd5d5104059e2f5ba97190183e60184f381bfd592a635805aa35cd7a682 ) -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES fix-makefiles.patch - ) + pc-file.patch +) + +set(PKGCONFIG_MODULES expat zlib) - if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(CL_FLAGS_DBG "/MDd /Zi") - set(CL_FLAGS_REL "/MD /Ox") - set(EXPAT_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib") - set(EXPAT_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib") - else() - set(CL_FLAGS_DBG "/MTd /Zi") - set(CL_FLAGS_REL "/MT /Ox") - set(EXPAT_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib") - set(EXPAT_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib") - endif() +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + x_vcpkg_pkgconfig_get_modules( + PREFIX PKGCONFIG + MODULES --msvc-syntax ${PKGCONFIG_MODULES} + LIBS + ) - if(VCPKG_TARGET_IS_UWP) - set(UWP_LIBS windowsapp.lib) - set(UWP_LINK_FLAGS /APPCONTAINER) - endif() + if(VCPKG_TARGET_IS_UWP) + set(UWP_LIBS windowsapp.lib) + set(UWP_LINK_FLAGS /APPCONTAINER) + endif() - set(LIBS_ALL_DBG - "${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \ - ${UWP_LIBS} \ - ${EXPAT_LIBS_DBG}" - ) - set(LIBS_ALL_REL - "${CURRENT_INSTALLED_DIR}/lib/zlib.lib \ - ${UWP_LIBS} \ - ${EXPAT_LIBS_REL}" - ) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR) - string(REPLACE "/" "\\\\" INST_DIR ${CURRENT_PACKAGES_DIR}) - list(APPEND OPTIONS_RELEASE - "LINK_FLAGS=${UWP_LINK_FLAGS}" "INST_DIR=${INST_DIR}" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}" - ) - list(APPEND OPTIONS_DEBUG - "LINK_FLAGS=${UWP_LINK_FLAGS} /debug" "INST_DIR=${INST_DIR}\\debug" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}" - ) + vcpkg_install_nmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_RELEASE + "INSTDIR=${INST_DIR}" + "LINK_FLAGS=${UWP_LINK_FLAGS}" + "LIBS_ALL=${PKGCONFIG_LIBS_RELEASE} ${UWP_LIBS}" + OPTIONS_DEBUG + "INSTDIR=${INST_DIR}\\debug" + "LINK_FLAGS=${UWP_LINK_FLAGS} /debug" + "LIBS_ALL=${PKGCONFIG_LIBS_DEBUG} ${UWP_LIBS}" + ) - vcpkg_install_nmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS_RELEASE - ${OPTIONS_RELEASE} - OPTIONS_DEBUG - ${OPTIONS_DEBUG} - ) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib") + if(NOT DEFINED VCPKG_BUILD_TYPE) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib") + endif() + else() + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/readosm.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib" "${CURRENT_PACKAGES_DIR}/lib/readosm.lib") + if(NOT DEFINED VCPKG_BUILD_TYPE) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib") + endif() + endif() + 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) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib) - else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/readosm.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib ${CURRENT_PACKAGES_DIR}/lib/readosm.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib) - endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX - vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} - OUT_SOURCE_PATH SOURCE_PATH - ) + set(infile "${SOURCE_PATH}/readosm.pc.in") + set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/readosm.pc") + set(VERSION "${READOSM_VERSION_STR}") + set(exec_prefix [[${prefix}]]) + set(libdir [[${prefix}/lib]]) + set(includedir [[${prefix}/include]]) + list(JOIN pkg_config_modules " " requires_private) + configure_file("${infile}" "${outfile}" @ONLY) + if(NOT DEFINED VCPKG_BUILD_TYPE) + set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/readosm.pc") + set(includedir [[${prefix}/../include]]) + configure_file("${infile}" "${outfile}" @ONLY) + endif() - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG - OPTIONS - "LIBS=-lpthread -ldl -lstdc++ -lm" - ) +else() + x_vcpkg_pkgconfig_get_modules( + PREFIX PKGCONFIG + MODULES ${PKGCONFIG_MODULES} + LIBS + ) + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS_RELEASE + "LIBS=${PKGCONFIG_LIBS_RELEASE} \$LIBS" + OPTIONS_DEBUG + "LIBS=${PKGCONFIG_LIBS_DEBUG} \$LIBS" + ) - vcpkg_install_make() - vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) + vcpkg_install_make() endif() +vcpkg_fixup_pkgconfig() + # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/readosm/vcpkg.json b/ports/readosm/vcpkg.json index f76990a8c98046..f93c643368c7c7 100644 --- a/ports/readosm/vcpkg.json +++ b/ports/readosm/vcpkg.json @@ -1,11 +1,15 @@ { "name": "readosm", "version-string": "1.1.0a", - "port-version": 1, + "port-version": 2, "description": "ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf)", "homepage": "https://www.gaia-gis.it/gaia-sins/readosm-sources", "dependencies": [ "expat", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + }, "zlib" ] } diff --git a/ports/realsense2/fix-dependency-glfw3.patch b/ports/realsense2/fix-dependency-glfw3.patch deleted file mode 100644 index c11a5cdd1ad091..00000000000000 --- a/ports/realsense2/fix-dependency-glfw3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 16ced1b..ef1b158 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,7 +69,7 @@ include(CMake/install_config.cmake) - add_subdirectory(wrappers) - - if (BUILD_EXAMPLES AND BUILD_GLSL_EXTENSIONS) -- find_package(glfw3 3.3 QUIET) -+ find_package(glfw3 CONFIG REQUIRED) - if(NOT TARGET glfw) - message(STATUS "GLFW 3.3 not found; using internal version") - set(GLFW_INSTALL ON CACHE BOOL "" FORCE) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index 6bc748fdda525c..e9fd00b552d1e2 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF e9f05c55f88f6876633bd59fd1cb3848da64b699 #v2.49.0 - SHA512 dfd7012eb96f7d4a8054c8cc1141cd2c743255b7783d16565e02b2c688ea9d81cd61f3824f999c2c9d4ed1f44b3866b5bd399fab376ba8f16369989bda4bda85 + REF v2.50.0 + SHA512 ede964a5d5d7c70ff69b9d19e72ed2572f6d28c922cccae6d805ce72115b9d09d3b57d83163192aacc45856fe145d745472df4ca0053a41c65c175434709e3f0 HEAD_REF master PATCHES fix_openni2.patch - fix-dependency-glfw3.patch fix_config_osx.patch ) @@ -57,8 +56,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(BUILD_TOOLS) - set(TOOL_NAMES) - list(APPEND TOOL_NAMES rs-convert rs-enumerate-devices rs-fw-logger rs-fw-update rs-record rs-terminal) + set(TOOL_NAMES rs-convert rs-embed rs-enumerate-devices rs-fw-logger rs-fw-update rs-record rs-terminal) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) endif() diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index 89a822b44ee336..df3a95a3146d9d 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "realsense2", - "version": "2.49.0", - "port-version": 3, + "version": "2.50.0", "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "dependencies": [ @@ -29,11 +28,7 @@ "description": "Build Intel® RealSense™ T265 device" }, "tools": { - "description": "Build Intel® RealSense™ tools", - "dependencies": [ - "glfw3", - "opengl" - ] + "description": "Build Intel® RealSense™ tools" } } } diff --git a/ports/refl-cpp/portfile.cmake b/ports/refl-cpp/portfile.cmake index de642ed180e039..ab90b3e5bf66cb 100644 --- a/ports/refl-cpp/portfile.cmake +++ b/ports/refl-cpp/portfile.cmake @@ -3,11 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO veselink1/refl-cpp - REF v0.12.1 - SHA512 7f1b9473512e305181f2c46940d34aa75a9cee65c69340ddb68b7e5bb2346206ff2c5b83c5d8460bac4a738258e4f6305b6fe8bc3044a1bcb69b30d79dcd5107 + REF v0.12.2 + SHA512 a124f12f2a491b3f2ea74bcf3b8cd3e14f1a4aa5ede105edbed90c3329af7d7fffa5c7a287f2e1e6079d9f0fad34190887700ae20a7d15f00299526317b41137 HEAD_REF master ) -file(COPY "${SOURCE_PATH}/refl.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/include/refl.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/refl-cpp/vcpkg.json b/ports/refl-cpp/vcpkg.json index b8cbc487e89173..591cab09b38463 100644 --- a/ports/refl-cpp/vcpkg.json +++ b/ports/refl-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "refl-cpp", - "version": "0.12.1", - "description": "A compile-time reflection library for modern C++ with support for overloads, templates, attributes and proxies", + "version": "0.12.2", + "description": "Static reflection for C++17 (compile-time enumeration, attributes, proxies, overloads, template functions, metaprogramming).", "homepage": "https://github.com/veselink1/refl-cpp" } diff --git a/ports/replxx/portfile.cmake b/ports/replxx/portfile.cmake index e9fc798467db64..140d7425ee8491 100644 --- a/ports/replxx/portfile.cmake +++ b/ports/replxx/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AmokHuginnsson/replxx diff --git a/ports/replxx/vcpkg.json b/ports/replxx/vcpkg.json index 58c74968d9961a..e82e01326802c8 100644 --- a/ports/replxx/vcpkg.json +++ b/ports/replxx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "replxx", "version": "0.0.4", + "port-version": 1, "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.", "homepage": "https://github.com/AmokHuginnsson/replxx", "supports": "!uwp", diff --git a/ports/reproc/portfile.cmake b/ports/reproc/portfile.cmake index ec99b5112ac80b..572cce5fbd8d81 100644 --- a/ports/reproc/portfile.cmake +++ b/ports/reproc/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DaanDeMeyer/reproc diff --git a/ports/reproc/vcpkg.json b/ports/reproc/vcpkg.json index a4f70dc794d782..7c499935597c2b 100644 --- a/ports/reproc/vcpkg.json +++ b/ports/reproc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "reproc", "version": "14.2.4", + "port-version": 1, "description": "Cross-platform (C99/C++11) process library", "homepage": "https://github.com/DaanDeMeyer/reproc", "supports": "!uwp", diff --git a/ports/restclient-cpp/portfile.cmake b/ports/restclient-cpp/portfile.cmake index c2ea8fa251c039..508a0ffc12deba 100644 --- a/ports/restclient-cpp/portfile.cmake +++ b/ports/restclient-cpp/portfile.cmake @@ -5,27 +5,26 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mrtazz/restclient-cpp - REF 0.5.2 - SHA512 f6acc6a3d5cb852d6e507463d94d2f6192a941f0c26fef7c674e9ff7753cf5474522052a2065774050d01af5c6d2a3b86398f43cd2e4f5d03abcaac9a21ef4b7 + REF b782bd26539a3d1a8edcb6d8a3493b111f8fac66 #v2022-02-009 + SHA512 992b2c067c7b672432a202fea6b5263ff51ca77facace5078077e77e57390d3ddcb99e0e20ad1a1595612efbb625d34f4d2cd8c4a2ac4bb33e3f9d5d28c2c579 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GTest=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_jsoncpp=TRUE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/restclient-cpp) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restclient-cpp) vcpkg_copy_pdbs() # Remove includes in debug -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/restclient-cpp/vcpkg.json b/ports/restclient-cpp/vcpkg.json index fcef3266a3895c..d7dad289662290 100644 --- a/ports/restclient-cpp/vcpkg.json +++ b/ports/restclient-cpp/vcpkg.json @@ -1,10 +1,18 @@ { "name": "restclient-cpp", - "version-string": "0.5.2", - "port-version": 1, + "version-date": "2022-02-09", "description": "Simple REST client for C++. It wraps libcurl for HTTP requests.", "homepage": "https://code.mrtazz.com/restclient-cpp/", + "license": "MIT", "dependencies": [ - "curl" + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/rhash/portfile.cmake b/ports/rhash/portfile.cmake index 76c03c58c05715..d80f7fce644365 100644 --- a/ports/rhash/portfile.cmake +++ b/ports/rhash/portfile.cmake @@ -1,6 +1,4 @@ set(RHASH_XVERSION 1.4.0) -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rhash/RHash diff --git a/ports/rhash/vcpkg.json b/ports/rhash/vcpkg.json index 1cdb5fef020e94..252e0b0cf77a1e 100644 --- a/ports/rhash/vcpkg.json +++ b/ports/rhash/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rhash", - "version-string": "1.4.0", - "port-version": 1, + "version": "1.4.0", + "port-version": 2, "description": "C library for computing a wide variety of hash sums", "homepage": "https://github.com/rhash/RHash", "supports": "!uwp" diff --git a/ports/rhasheq/portfile.cmake b/ports/rhasheq/portfile.cmake new file mode 100644 index 00000000000000..fed79c5cdaaee7 --- /dev/null +++ b/ports/rhasheq/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offscale/rhasheq + REF c42b672daf9bb1525cb94645244a09344c2a7363 + SHA512 55947069a67e7de8561b92bad753481402dd353aa40b06719346fa1247d8d0a5073a8a3e38419e7d9028684c091eb23b11b254fea836383a24ce8dcfe0cffefc + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTING=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/rhasheq" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/rhasheq/vcpkg.json b/ports/rhasheq/vcpkg.json new file mode 100644 index 00000000000000..2ada70aec8b0bd --- /dev/null +++ b/ports/rhasheq/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rhasheq", + "version": "0.0.1", + "description": "Simple header-only librhash wrapper for verifying hashes from a file to a given `const char *`.", + "license": "0BSD", + "supports": "!uwp", + "dependencies": [ + "c89stringutils", + "rhash", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index 059c6325d13950..e90a48cc9a2078 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mikke89/RmlUi - REF 4.2 - SHA512 848515d554d6a56bc5ba962c8a3db27801491236f17092ea6c658b35d6cb8b3330dff197d71fc65aaa061476a383a467fcc481571cdf3777f06024819bf9267c + REF 4.3 + SHA512 70ceefb8ff9a62ef2be2271a3625d0d3ea411c097776fdfd8f469d462eb3a04514cb320c1f1296e7f1e49e7a89562498255976d3bb7d2317c0ad080dbb8ce542 HEAD_REF master PATCHES add-robin-hood.patch diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json index 389bf88d45e88d..03cbc9960a24b6 100644 --- a/ports/rmlui/vcpkg.json +++ b/ports/rmlui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rmlui", - "version": "4.2", + "version": "4.3", "maintainers": "Michael R. P. Ragazzon ", "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", "homepage": "https://github.com/mikke89/RmlUi", diff --git a/ports/robin-hood-hashing/portfile.cmake b/ports/robin-hood-hashing/portfile.cmake index c6dbf8fde0f109..8cc9746ebc223d 100644 --- a/ports/robin-hood-hashing/portfile.cmake +++ b/ports/robin-hood-hashing/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/robin-hood-hashing - REF 3.11.3 - SHA512 0a4bc04a7b474b80dc156492a12d29046a566272c7b5f2fbcbd27c68ec62fa5db753afe5eac521cd4bd6d6e5ce1b1dfd590ae0b64003a70e102c83a89045b1e6 + REF 3.11.5 + SHA512 5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489 HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRH_STANDALONE_PROJECT=OFF ) @@ -19,8 +19,8 @@ vcpkg_cmake_config_fixup( ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/robin-hood-hashing/vcpkg.json b/ports/robin-hood-hashing/vcpkg.json index 145bd2ba4c9db7..6a8b86b976181b 100644 --- a/ports/robin-hood-hashing/vcpkg.json +++ b/ports/robin-hood-hashing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "robin-hood-hashing", - "version": "3.11.3", + "version": "3.11.5", "description": "Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20", "homepage": "https://github.com/martinus/robin-hood-hashing", "dependencies": [ diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 08c7d6884e9766..d87195643c18f1 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF 4d57a393a8f1563c0dff1ff468756c23d89e3601 # v6.26.1 - SHA512 0f3e13704bd990763f1176c07d329271e6a834ae0225db4f2c11c645447e77d2f369eb110f5c962c31e1b7704d870ed9d38144858343fb0e5439e8c935ee9a19 + REF fcf3d75f3f022a6a55ff1222d6b06f8518d38c7c # v6.27.3 + SHA512 da78886dbd21339fbc9081e3f3de3aeac5b1124a0e4a879c936fae5248177bfc58ec5397d200e15ceeaf9cda2fb3850145e007a18ac0ba632dba084cc4064bfb HEAD_REF master PATCHES 0002-only-build-one-flavor.patch @@ -29,8 +29,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITH_GFLAGS=OFF -DWITH_TESTS=OFF diff --git a/ports/rocksdb/vcpkg.json b/ports/rocksdb/vcpkg.json index 5dec40c79b76b9..a69ead1df941da 100644 --- a/ports/rocksdb/vcpkg.json +++ b/ports/rocksdb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rocksdb", - "version": "6.26.1", + "version": "6.27.3", "description": "A library that provides an embeddable, persistent key-value store for fast storage", "homepage": "https://github.com/facebook/rocksdb", "dependencies": [ diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake deleted file mode 100644 index 3c56fd94b57e6c..00000000000000 --- a/ports/rs-core-lib/portfile.cmake +++ /dev/null @@ -1,12 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO CaptainCrowbar/rs-core-lib - REF 9eac3469ac13b2f1e9e4608a0710a76af68d1983 # accessed on 2020-09-14 - SHA512 ef3cb291efefff0ef13b683d70b99777cb403f5211a6f0e3099a91806cf3d7dd33d6e2e793ccbd836dcb145dc19cde99c4f4eb0bd49be3482d87d4e1a04ee2aa - HEAD_REF master -) - -file(INSTALL ${SOURCE_PATH}/rs-core DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.hpp") - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rs-core-lib RENAME copyright) \ No newline at end of file diff --git a/ports/rs-core-lib/vcpkg.json b/ports/rs-core-lib/vcpkg.json deleted file mode 100644 index 8ee5959e020cba..00000000000000 --- a/ports/rs-core-lib/vcpkg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "rs-core-lib", - "version-string": "2020-09-14", - "port-version": 1, - "description": "Minimal common utilities by Ross Smith", - "homepage": "https://github.com/CaptainCrowbar/rs-core-lib" -} diff --git a/ports/rsasynccpp/portfile.cmake b/ports/rsasynccpp/portfile.cmake index 438f2cd8c49406..4fa5cbb8105bc6 100644 --- a/ports/rsasynccpp/portfile.cmake +++ b/ports/rsasynccpp/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "ANDROID" "FREEBSD" "OPENBSD") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -37,12 +36,12 @@ endif() vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH RStein.AsyncCppLib.sln - LICENSE_SUBPATH LICENSE + LICENSE_SUBPATH LICENSE PLATFORM ${MSBUILD_PLATFORM} DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION} - RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} + RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} ) file(COPY "${SOURCE_PATH}/RStein.AsyncCpp/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/asynccpp" - FILES_MATCHING PATTERN "*.h") \ No newline at end of file + FILES_MATCHING PATTERN "*.h") diff --git a/ports/rsasynccpp/vcpkg.json b/ports/rsasynccpp/vcpkg.json index f29d9388b49782..b74ead2502a87e 100644 --- a/ports/rsasynccpp/vcpkg.json +++ b/ports/rsasynccpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rsasynccpp", "version": "0.0.7", + "port-version": 1, "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", diff --git a/ports/rsm-binary-io/portfile.cmake b/ports/rsm-binary-io/portfile.cmake index 28c00b72e610db..bb14909cee9a9c 100644 --- a/ports/rsm-binary-io/portfile.cmake +++ b/ports/rsm-binary-io/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "UWP") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/rsm-binary-io/vcpkg.json b/ports/rsm-binary-io/vcpkg.json index c353ba650f4b13..0c5c77eb66dd54 100644 --- a/ports/rsm-binary-io/vcpkg.json +++ b/ports/rsm-binary-io/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rsm-binary-io", "version-semver": "2.0.4", + "port-version": 1, "description": "A binary i/o library for C++, without the agonizing pain", "homepage": "https://github.com/Ryan-rsm-McKenzie/binary_io", "documentation": "https://ryan-rsm-mckenzie.github.io/binary_io/", diff --git a/ports/rsm-bsa/portfile.cmake b/ports/rsm-bsa/portfile.cmake index 9b457b08309b67..afa0602e9730b8 100644 --- a/ports/rsm-bsa/portfile.cmake +++ b/ports/rsm-bsa/portfile.cmake @@ -1,10 +1,9 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "UWP" ON_ARCH "x86") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ryan-rsm-McKenzie/bsa - REF 4.0.0 - SHA512 9be077349cea3f4c6f2298c6286fd306f370c560d9e474516dfd7ab8dcd2313032581f86f9b4f5afb5ccd2dbb4e57663e16997253421033e00186167db15576a + REF 4.0.2 + SHA512 075a8c3ec9cdd74d9346defa0d9f96cd776f945816cdff2dd39d3964623d68899afe2d73664aa1990fc7f97d756f813cf7ef29aba568cdc235b8d76172df49ca HEAD_REF master ) @@ -18,13 +17,6 @@ vcpkg_check_features( xmem BSA_SUPPORT_XMEM ) -if (BSA_SUPPORT_XMEM) - vcpkg_fail_port_install( - ON_TARGET "LINUX" - MESSAGE "XMem support is only available for windows" - ) -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/rsm-bsa/vcpkg.json b/ports/rsm-bsa/vcpkg.json index fc331bb0bd77dc..1becec84805a9a 100644 --- a/ports/rsm-bsa/vcpkg.json +++ b/ports/rsm-bsa/vcpkg.json @@ -1,9 +1,10 @@ { "name": "rsm-bsa", - "version-semver": "4.0.0", + "version-semver": "4.0.2", "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": [ { @@ -26,6 +27,7 @@ "features": { "xmem": { "description": "Compression support for the xmem codec", + "supports": "windows", "dependencies": [ "reproc" ] diff --git a/ports/rsm-mmio/portfile.cmake b/ports/rsm-mmio/portfile.cmake index a55ed8760c8e81..cec066167175f0 100644 --- a/ports/rsm-mmio/portfile.cmake +++ b/ports/rsm-mmio/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "UWP") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/rsm-mmio/vcpkg.json b/ports/rsm-mmio/vcpkg.json index fa7d4f7da53b2d..b88664f9c89b99 100644 --- a/ports/rsm-mmio/vcpkg.json +++ b/ports/rsm-mmio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rsm-mmio", "version-semver": "1.1.0", - "port-version": 1, + "port-version": 2, "description": "A cross-platform memory-mapped io library for C++ ", "homepage": "https://github.com/Ryan-rsm-McKenzie/mmio", "supports": "!osx & !uwp", diff --git a/ports/rsocket/fix-folly.patch b/ports/rsocket/fix-folly.patch new file mode 100644 index 00000000000000..05d00312674660 --- /dev/null +++ b/ports/rsocket/fix-folly.patch @@ -0,0 +1,13 @@ +diff --git a/rsocket/transports/tcp/TcpConnectionAcceptor.cpp b/rsocket/transports/tcp/TcpConnectionAcceptor.cpp +index 12ac289f..c37f621a 100644 +--- a/rsocket/transports/tcp/TcpConnectionAcceptor.cpp ++++ b/rsocket/transports/tcp/TcpConnectionAcceptor.cpp +@@ -31,7 +31,7 @@ class TcpConnectionAcceptor::SocketCallback + + void connectionAccepted( + folly::NetworkSocket fdNetworkSocket, +- const folly::SocketAddress& address) noexcept override { ++ const folly::SocketAddress& address, AcceptInfo info) noexcept override { + int fd = fdNetworkSocket.toFd(); + + VLOG(2) << "Accepting TCP connection from " << address << " on FD " << fd; diff --git a/ports/rsocket/portfile.cmake b/ports/rsocket/portfile.cmake index 4ae31c106ef0fe..f6ec73c4aa721d 100644 --- a/ports/rsocket/portfile.cmake +++ b/ports/rsocket/portfile.cmake @@ -1,44 +1,44 @@ # yarpl only support static build in Windows if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_ARCH "x64") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO rsocket/rsocket-cpp #v2020.05.04.00 - REF 8038d05e741c3d3ecd6adb069b4a1b3daa230e14 - SHA512 d7bc93af7b6130d73fa0823f534ad57a531dfa7d7aa990a2a1a1b72b6761db7eeb60573d0d38f55daa991554e3ab4ac507047f8051a4390b3343cd708a48efbb + REPO rsocket/rsocket-cpp + REF 45ed594ebd6701f40795c31ec922d784ec7fc921 + SHA512 51871253524b93a9622fa0f562019605b6034e4089cd955810050b4d43ff020813d632ea1e91bcaca0a8659638908c51df6eb686ba4f6583d4c15c04d5dc35bd HEAD_REF master PATCHES fix-cmake-config.patch fix-find-dependencies.patch + use-cpp-17.patch + fix-folly.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_BENCHMARKS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME yarpl CONFIG_PATH lib/cmake/yarpl DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/rsocket) -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") file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/include/yarpl/perf - ${CURRENT_PACKAGES_DIR}/include/yarpl/cmake - ${CURRENT_PACKAGES_DIR}/include/yarpl/test - ${CURRENT_PACKAGES_DIR}/include/rsocket/examples - ${CURRENT_PACKAGES_DIR}/include/rsocket/test + "${CURRENT_PACKAGES_DIR}/include/yarpl/perf" + "${CURRENT_PACKAGES_DIR}/include/yarpl/cmake" + "${CURRENT_PACKAGES_DIR}/include/yarpl/test" + "${CURRENT_PACKAGES_DIR}/include/rsocket/examples" + "${CURRENT_PACKAGES_DIR}/include/rsocket/test" ) -vcpkg_copy_pdbs() - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rsocket/use-cpp-17.patch b/ports/rsocket/use-cpp-17.patch new file mode 100644 index 00000000000000..4ef2f8abd8808d --- /dev/null +++ b/ports/rsocket/use-cpp-17.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 22570b5..15a750b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,7 +154,7 @@ if(BUILD_TESTS) + + endif() + +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + + include(CheckCXXCompilerFlag) + diff --git a/ports/rsocket/vcpkg.json b/ports/rsocket/vcpkg.json index cbaa74eb8b0435..018579f0bffca1 100644 --- a/ports/rsocket/vcpkg.json +++ b/ports/rsocket/vcpkg.json @@ -1,10 +1,9 @@ { "name": "rsocket", - "version-string": "2020.05.04.00", - "port-version": 2, + "version-string": "2021.08.30.00", + "port-version": 1, "description": "C++ implementation of RSocket http://rsocket.io", "homepage": "https://github.com/rsocket/rsocket-cpp", - "supports": "!(windows & x64)", "dependencies": [ "boost-context", "boost-filesystem", @@ -18,6 +17,14 @@ "gflags", "glog", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/rtabmap/0001-add-bigobj-for-msvc.patch b/ports/rtabmap/0001-add-bigobj-for-msvc.patch new file mode 100644 index 00000000000000..ea6c73b844675e --- /dev/null +++ b/ports/rtabmap/0001-add-bigobj-for-msvc.patch @@ -0,0 +1,24 @@ +From 37a2b1fe682bcea48cb944762853bec404c9e937 Mon Sep 17 00:00:00 2001 +From: Amin Yahyaabadi +Date: Sun, 6 Feb 2022 12:29:02 -0800 +Subject: [PATCH] add bigobj for msvc + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5cdae617..ed829a46 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,6 +106,7 @@ if(MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP${N}") + endif() + endif() ++ add_compile_options("/bigobj") + endif() + + # [Eclipse] Automatic Discovery of Include directories (Optional, but handy) +-- +2.35.1.windows.2 + diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index 548f5e3bc72b95..1cd6d123fa82b0 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-qt.patch + 0001-add-bigobj-for-msvc.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -23,8 +24,11 @@ vcpkg_cmake_configure( -DBUILD_APP=OFF -DBUILD_EXAMPLES=OFF -DWITH_QT=OFF - -DWITH_SUPERPOINT_TORCH=OFF - -DWITH_PYMATCHER=OFF + -DWITH_ORB_OCTREE=OFF + -DWITH_TORCH=OFF + -DWITH_PYTHON=OFF + -DWITH_PYTHON_THREADING=OFF + -DWITH_PDAL=OFF -DWITH_FREENECT=OFF -DWITH_FREENECT2=OFF -DWITH_K4W2=OFF @@ -37,13 +41,16 @@ vcpkg_cmake_configure( -DWITH_VERTIGO=OFF -DWITH_CVSBA=OFF -DWITH_POINTMATCHER=OFF + -DWITH_CCCORELIB=OFF -DWITH_LOAM=OFF -DWITH_FLYCAPTURE2=OFF -DWITH_ZED=OFF + -DWITH_ZEDOC=OFF -DWITH_REALSENSE=OFF -DWITH_REALSENSE_SLAM=OFF -DWITH_REALSENSE2=OFF -DWITH_MYNTEYE=OFF + -DWITH_DEPTHAI=OFF -DWITH_OCTOMAP=OFF -DWITH_CPUTSDF=OFF -DWITH_OPENCHISEL=OFF @@ -51,10 +58,11 @@ vcpkg_cmake_configure( -DWITH_FOVIS=OFF -DWITH_VISO2=OFF -DWITH_DVO=OFF - -DWITH_ORB_SLAM2=OFF -DWITH_OKVIS=OFF -DWITH_MSCKF_VIO=OFF -DWITH_VINS=OFF + -DWITH_OPENVINS=OFF + -DWITH_MADGWICK=OFF -DWITH_FASTCV=OFF ) diff --git a/ports/rtabmap/vcpkg.json b/ports/rtabmap/vcpkg.json index d0e2fc7fca2160..f92769710b237c 100644 --- a/ports/rtabmap/vcpkg.json +++ b/ports/rtabmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rtabmap", - "version-string": "0.20.13", - "port-version": 1, + "version": "0.20.13", + "port-version": 3, "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", "supports": "windows & !static", diff --git a/ports/rtaudio/portfile.cmake b/ports/rtaudio/portfile.cmake index d1c04be9eaad16..3739afc3d52c6c 100644 --- a/ports/rtaudio/portfile.cmake +++ b/ports/rtaudio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thestk/rtaudio - REF bc7ad66581947f810ff4460396bbbd1846b1e7c8 - SHA512 ef5a41df15a8486550fb791ac21fcee4ecbf726fe9e91a56fcdd437cd554ea242f08c1061a9c6d5c261d721d86fbbcb32ce64db030976150862ed42a40137fc7 + REF 46b01b5b134f33d8ddc3dab76829d4b1350e0522 + SHA512 f26f64fe77aa18c9adf401a720fc3d929af8655827f2c149539a1b73736efb3757ac2eaf5a6535a3c801df13e5f49728a49b6ffe5c01c2f91ab23e145bad5355 HEAD_REF master PATCHES fix-alsa.patch ) @@ -31,4 +31,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/rtaudio/vcpkg.json b/ports/rtaudio/vcpkg.json index ba7113e5d3b6d6..529386ba1e634a 100644 --- a/ports/rtaudio/vcpkg.json +++ b/ports/rtaudio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rtaudio", - "version-date": "2021-08-15", - "port-version": 2, + "version-date": "2021-11-16", "description": "A set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.", "homepage": "https://github.com/thestk/rtaudio", "supports": "!uwp", diff --git a/ports/rtlsdr/portfile.cmake b/ports/rtlsdr/portfile.cmake index fdf48429032381..472dbe0989666d 100644 --- a/ports/rtlsdr/portfile.cmake +++ b/ports/rtlsdr/portfile.cmake @@ -1,8 +1,3 @@ -vcpkg_fail_port_install( - ON_TARGET "uwp" "linux" "osx" "android" "freebsd" - ON_ARCH "arm" "arm64" -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osmocom/rtl-sdr diff --git a/ports/rtlsdr/vcpkg.json b/ports/rtlsdr/vcpkg.json index 1dbd2b0da36b13..3680d31284b3cc 100644 --- a/ports/rtlsdr/vcpkg.json +++ b/ports/rtlsdr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rtlsdr", - "version-string": "2020-04-16", - "port-version": 2, + "version-date": "2020-04-16", + "port-version": 3, "description": "rtl-sdr is a library that turns your Realtek RTL2832 based DVB dongle into a SDR receiver", "homepage": "https://osmocom.org/projects/rtl-sdr", "supports": "windows & (x86 | x64)", diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake index 8d1316ff68cc12..9b57212c46f90f 100644 --- a/ports/rtmidi/portfile.cmake +++ b/ports/rtmidi/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - # Upstream uses CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, which causes issues # https://github.com/thestk/rtmidi/blob/4.0.0/CMakeLists.txt#L20 vcpkg_check_linkage(ONLY_STATIC_LIBRARY) diff --git a/ports/rtmidi/vcpkg.json b/ports/rtmidi/vcpkg.json index 82d6c482c962b6..73280aa86fec0a 100644 --- a/ports/rtmidi/vcpkg.json +++ b/ports/rtmidi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rtmidi", "version-semver": "4.0.0", - "port-version": 3, + "port-version": 4, "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", "supports": "!uwp" diff --git a/ports/rxspencer/portfile.cmake b/ports/rxspencer/portfile.cmake index 92e4fd31f06530..b4ce794d01af94 100644 --- a/ports/rxspencer/portfile.cmake +++ b/ports/rxspencer/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO garyhouston/rxspencer @@ -12,7 +10,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - OPTIONS + OPTIONS -DCMAKE_CONFIG_DEST=share/rxspencer -Drxshared=${BUILD_SHARED} ) diff --git a/ports/rxspencer/vcpkg.json b/ports/rxspencer/vcpkg.json index a4fef35bebbabf..41b863e25f4f35 100644 --- a/ports/rxspencer/vcpkg.json +++ b/ports/rxspencer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rxspencer", "version": "3.9.0", + "port-version": 1, "description": "Henry Spencer's BSD regular expression library.", "homepage": "https://garyhouston.github.io/regex/", "supports": "!uwp", diff --git a/ports/ryu/portfile.cmake b/ports/ryu/portfile.cmake index 332de8d31a5311..c37850966d7c22 100644 --- a/ports/ryu/portfile.cmake +++ b/ports/ryu/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ulfjack/ryu @@ -26,9 +24,9 @@ vcpkg_execute_build_process( if (CMAKE_HOST_WIN32) file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) else() file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) diff --git a/ports/ryu/vcpkg.json b/ports/ryu/vcpkg.json index 52d1ea6d76beb9..19096019b87eba 100644 --- a/ports/ryu/vcpkg.json +++ b/ports/ryu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ryu", - "version-string": "2.0", - "port-version": 5, + "version": "2.0", + "port-version": 6, "description": "Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.", "homepage": "https://github.com/ulfjack/ryu", "supports": "!(uwp | arm | x86)" diff --git a/ports/s2geometry/CMakeLists.txt.patch b/ports/s2geometry/CMakeLists.txt.patch new file mode 100644 index 00000000000000..262b0bcd0b5055 --- /dev/null +++ b/ports/s2geometry/CMakeLists.txt.patch @@ -0,0 +1,118 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ecd280..9859890 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,16 +20,8 @@ set(CMAKE_CXX_EXTENSIONS OFF) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/third_party/cmake") + +-option(WITH_GFLAGS "Use gflags to change command line flags." OFF) +-add_feature_info(GFLAGS WITH_GFLAGS +- "allows changing command line flags.") + +-# glog option can only be turned on if gflags is on. +-cmake_dependent_option(WITH_GLOG "Use glog for logging." ON +- "WITH_GFLAGS" OFF) +-add_feature_info(GLOG WITH_GLOG "provides logging configurability.") +- +-option(BUILD_SHARED_LIBS "Build shared libraries instead of static." ON) ++option(BUILD_SHARED_LIBS "Build shared libraries instead of static." OFF) + add_feature_info(SHARED_LIBS BUILD_SHARED_LIBS + "builds shared libraries instead of static.") + +@@ -37,26 +29,19 @@ option(BUILD_EXAMPLES "Build s2 documentation examples." ON) + + feature_summary(WHAT ALL) + +-if (WITH_GLOG) +- find_package(Glog REQUIRED) +- # FindGFlags.cmake and FindGlog.cmake do not seem to implement REQUIRED; +- # check manually. +- if (NOT ${GLOG_FOUND}) +- message(FATAL_ERROR "Glog requested but not found") +- endif() +- add_definitions(-DS2_USE_GLOG) +-else() +- # Don't output anything for LOG(INFO). +- add_definitions(-DABSL_MIN_LOG_LEVEL=1) ++find_package(glog CONFIG REQUIRED) ++# FindGFlags.cmake and FindGlog.cmake do not seem to implement REQUIRED; ++# check manually. ++if (NOT ${GLOG_FOUND}) ++ message(FATAL_ERROR "Glog requested but not found") + endif() ++add_definitions(-DS2_USE_GLOG) + +-if (WITH_GFLAGS) +- find_package(GFlags REQUIRED) +- if (NOT ${GFLAGS_FOUND}) +- message(FATAL_ERROR "GFlags requested but not found") +- endif() +- add_definitions(-DS2_USE_GFLAGS) ++find_package(gflags CONFIG REQUIRED) ++if (NOT ${GFLAGS_FOUND}) ++ message(FATAL_ERROR "GFlags requested but not found") + endif() ++add_definitions(-DS2_USE_GFLAGS) + + find_package(OpenSSL REQUIRED) + # pthreads isn't used directly, but this is still required for std::thread. +@@ -204,14 +189,18 @@ add_library(s2testing STATIC + src/s2/s2testing.cc) + target_link_libraries( + s2 +- ${GFLAGS_LIBRARIES} ${GLOG_LIBRARIES} ${OPENSSL_LIBRARIES} ++ gflags::gflags glog::glog OpenSSL::SSL OpenSSL::Crypto + ${CMAKE_THREAD_LIBS_INIT}) + + # Allow other CMake projects to use this one with: + # list(APPEND CMAKE_MODULE_PATH "/third_party/cmake") + # add_subdirectory( s2geometry) + # target_link_libraries( s2) +-target_include_directories(s2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) ++target_include_directories(s2 PUBLIC ++ $ ++ $ ++) ++ + + # We don't need to install all headers, only those + # transitively included by s2 headers we are exporting. +@@ -407,7 +396,18 @@ install(FILES src/s2/util/math/mathutil.h + install(FILES src/s2/util/units/length-units.h + src/s2/util/units/physical-units.h + DESTINATION include/s2/util/units) +-install(TARGETS s2 s2testing DESTINATION lib) ++ install(TARGETS s2 s2testing ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib) ++install(TARGETS s2 ++ EXPORT unofficial-s2Targets ++ ) ++install(EXPORT unofficial-s2Targets ++ NAMESPACE unofficial-s2 ++ FILE unofficial-s2Targets.cmake ++ DESTINATION share/unofficial-s2/ ++) + + message("GTEST_ROOT: ${GTEST_ROOT}") + if (GTEST_ROOT) +@@ -534,3 +534,17 @@ endif() + if (${SWIG_FOUND} AND ${PYTHONLIBS_FOUND}) + add_subdirectory("src/python" python) + endif() ++ ++ ++include(CMakePackageConfigHelpers) ++# generate the config file that is includes the exports ++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/unofficial-s2Config.cmake" ++ INSTALL_DESTINATION "share/unofficial-s2/" ++ NO_SET_AND_CHECK_MACRO ++ NO_CHECK_REQUIRED_COMPONENTS_MACRO ++ ) ++ install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/unofficial-s2Config.cmake ++ DESTINATION "share/unofficial-s2/" ++ ) diff --git a/ports/s2geometry/Config.cmake.in.patch b/ports/s2geometry/Config.cmake.in.patch new file mode 100644 index 00000000000000..30162e6b9f2e62 --- /dev/null +++ b/ports/s2geometry/Config.cmake.in.patch @@ -0,0 +1,9 @@ +diff --git a/Config.cmake.in b/Config.cmake.in +new file mode 100644 +index 0000000..42bcf00 +--- /dev/null ++++ b/Config.cmake.in +@@ -0,0 +1,3 @@ ++@PACKAGE_INIT@ ++ ++include ( "${CMAKE_CURRENT_LIST_DIR}/unofficial-s2Targets.cmake" ) diff --git a/ports/s2geometry/portfile.cmake b/ports/s2geometry/portfile.cmake new file mode 100644 index 00000000000000..8eeeccaf1be23e --- /dev/null +++ b/ports/s2geometry/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/s2geometry + REF v0.9.0 + SHA512 854ec84a54aff036b3092a6233be0f5fc0e4846ac5f882326bbb3f2b9ce88bd5c866a80ae352d8e7d5ae00b9c9a8ab1cff6a95412f990b7bc1fdc5ca3d632b9c + HEAD_REF main + PATCHES + CMakeLists.txt.patch + Config.cmake.in.patch +) + + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + MAYBE_UNUSED_VARIABLES BUILD_TESTING +) + +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/s2geometry/" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/s2geometry/") diff --git a/ports/s2geometry/usage b/ports/s2geometry/usage new file mode 100644 index 00000000000000..31438446053d27 --- /dev/null +++ b/ports/s2geometry/usage @@ -0,0 +1,4 @@ +The package s2geometry provides CMake targets: + + find_package(unofficial-s2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial-s2::s2) diff --git a/ports/s2geometry/vcpkg.json b/ports/s2geometry/vcpkg.json new file mode 100644 index 00000000000000..e6f274b11f3bd3 --- /dev/null +++ b/ports/s2geometry/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "s2geometry", + "version": "0.9.0", + "port-version": 1, + "description": "S2 is a library for spherical geometry that aims to have the same robustness, flexibility, and performance as the very best planar geometry libraries.", + "homepage": "https://s2geometry.io", + "supports": "!windows", + "dependencies": [ + "gflags", + "glog", + "gtest", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake index db40a08d733d22..4ad9e76ced9e20 100644 --- a/ports/s2n/portfile.cmake +++ b/ports/s2n/portfile.cmake @@ -1,28 +1,48 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/s2n-tls - REF 4513f8d707a68388990886d353e7cfe46cc6454b # v1.1.1 - SHA512 6586e330733982ed3b70fd320e63575639d5793d69ffa06b2a46ed487d55d8271b46df611d62cc48410654b394d599de65edd9cdc860dea13255161d843f1f48 - PATCHES fix-cmake-target-path.patch - remove-libcrypto-messages.patch + REF 36c3dc72ab1359cf721294e1258dfdc2962f3ffc # v1.3.5 + SHA512 2c9eed12e90e5fc987758635fec4a7418c20d25c724cfa391090b06bfcc4eb5925b4011d51a99e7c7ab80f535684ee3934ba4734b7966edd323bf88bc5953d7c + PATCHES + fix-cmake-target-path.patch + use-openssl-crypto.patch + remove-trycompile.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tests BUILD_TESTING +) + +set(EXTRA_ARGS) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + set(EXTRA_ARGS "-DS2N_NO_PQ=TRUE") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${EXTRA_ARGS} + ${FEATURE_OPTIONS} + -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF ) vcpkg_cmake_install() +vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/s2n/cmake) +if(BUILD_TESTING) + message(STATUS Testing) + vcpkg_cmake_build(TARGET test LOGFILE_BASE test) +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/lib/s2n" - "${CURRENT_PACKAGES_DIR}/lib/s2n" - ) - -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/s2n" + "${CURRENT_PACKAGES_DIR}/share/s2n/modules" +) # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/s2n/remove-libcrypto-messages.patch b/ports/s2n/remove-libcrypto-messages.patch deleted file mode 100644 index 58ceb575694dea..00000000000000 --- a/ports/s2n/remove-libcrypto-messages.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake/modules/FindLibCrypto.cmake b/cmake/modules/FindLibCrypto.cmake -index 1ba8473..b486a1a 100644 ---- a/cmake/modules/FindLibCrypto.cmake -+++ b/cmake/modules/FindLibCrypto.cmake -@@ -88,9 +88,6 @@ else() - set(LIBCRYPTO_FOUND true) - set(LibCrypto_FOUND true) - -- message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}") -- message(STATUS "LibCrypto Shared Lib: ${LibCrypto_SHARED_LIBRARY}") -- message(STATUS "LibCrypto Static Lib: ${LibCrypto_STATIC_LIBRARY}") - if (NOT TARGET crypto AND - (EXISTS "${LibCrypto_LIBRARY}") - ) diff --git a/ports/s2n/remove-trycompile.patch b/ports/s2n/remove-trycompile.patch new file mode 100644 index 00000000000000..bf5582e39393dd --- /dev/null +++ b/ports/s2n/remove-trycompile.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt (revision 86c857094a2d94fafce15a3d32abb4052e664c5c) ++++ b/CMakeLists.txt (date 1643340236796) +@@ -409,32 +409,6 @@ + endif() + endif() + +-# Determine if EVP_md5_sha1 is available in libcrypto +-try_compile( +- LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH +- ${CMAKE_BINARY_DIR} +- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md5_sha1.c" +- LINK_LIBRARIES crypto ${OS_LIBS} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES=$" +-) +-if (LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH) +- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH) +-endif() +- +-# Determine if EVP_MD_CTX_set_pkey_ctx is available in libcrypto +-try_compile( +- LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX +- ${CMAKE_BINARY_DIR} +- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md_ctx_set_pkey_ctx.c" +- LINK_LIBRARIES crypto ${OS_LIBS} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES=$" +-) +-if (LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX) +- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX) +-endif() +- + if (S2N_INTERN_LIBCRYPTO) + if (NOT LibCrypto_STATIC_LIBRARY) + message(FATAL_ERROR "libcrypto interning requires a static build of libcrypto.a to be available") diff --git a/ports/s2n/use-openssl-crypto.patch b/ports/s2n/use-openssl-crypto.patch new file mode 100644 index 00000000000000..75c6885bc09d7f --- /dev/null +++ b/ports/s2n/use-openssl-crypto.patch @@ -0,0 +1,70 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index edbf248..2992a05 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -400,7 +400,7 @@ endif() + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) + + if (SEARCH_LIBCRYPTO) +- find_package(LibCrypto REQUIRED) ++ find_package(OpenSSL COMPONENTS Crypto REQUIRED) + else() + if (TARGET crypto) + message(STATUS "S2N found target: crypto") +@@ -465,7 +465,7 @@ if (S2N_INTERN_LIBCRYPTO) + ) + endif() + else() +- target_link_libraries(${PROJECT_NAME} PUBLIC crypto) ++ target_link_libraries(${PROJECT_NAME} PUBLIC OpenSSL::Crypto) + endif() + + target_link_libraries(${PROJECT_NAME} PUBLIC ${OS_LIBS} m) +@@ -473,7 +473,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${OS_LIBS} m) + target_include_directories(${PROJECT_NAME} PUBLIC $) + target_include_directories(${PROJECT_NAME} PUBLIC $ $) + +-target_include_directories(${PROJECT_NAME} PRIVATE $) ++target_include_directories(${PROJECT_NAME} PRIVATE $) + + if (BUILD_TESTING) + enable_testing() +@@ -485,7 +485,7 @@ if (BUILD_TESTING) + target_include_directories(testss2n PUBLIC tests) + target_compile_options(testss2n PRIVATE -std=gnu99) + target_link_libraries(testss2n PUBLIC ${PROJECT_NAME}) +- target_include_directories(testss2n PUBLIC $) ++ target_include_directories(testss2n PUBLIC $) + + if (S2N_INTERN_LIBCRYPTO) + # if libcrypto was interned, rewrite libcrypto symbols so use of internal functions will link correctly +@@ -536,13 +536,13 @@ if (BUILD_TESTING) + + add_executable(s2nc "bin/s2nc.c" "bin/echo.c" "bin/https.c" "bin/common.c") + target_link_libraries(s2nc ${PROJECT_NAME}) +- target_include_directories(s2nc PRIVATE $) ++ target_include_directories(s2nc PRIVATE $) + target_include_directories(s2nc PRIVATE api) + target_compile_options(s2nc PRIVATE -std=gnu99 -D_POSIX_C_SOURCE=200112L) + + add_executable(s2nd "bin/s2nd.c" "bin/echo.c" "bin/https.c" "bin/common.c") + target_link_libraries(s2nd ${PROJECT_NAME}) +- target_include_directories(s2nd PRIVATE $) ++ target_include_directories(s2nd PRIVATE $) + target_include_directories(s2nd PRIVATE api) + target_compile_options(s2nd PRIVATE -std=gnu99 -D_POSIX_C_SOURCE=200112L) + +diff --git a/cmake/s2n-config.cmake b/cmake/s2n-config.cmake +index 4e76ed6..f714df0 100644 +--- a/cmake/s2n-config.cmake ++++ b/cmake/s2n-config.cmake +@@ -5,8 +5,7 @@ if (NOT MSVC) + find_package(Threads REQUIRED) + endif() + +-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules") +-find_dependency(LibCrypto) ++find_dependency(OpenSSL COMPONENTS Crypto) + + include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json index bae45af959c47b..8264204294123b 100644 --- a/ports/s2n/vcpkg.json +++ b/ports/s2n/vcpkg.json @@ -1,10 +1,11 @@ { "name": "s2n", - "version": "1.1.1", + "version": "1.3.5", "description": "C99 implementation of the TLS/SSL protocols.", "homepage": "https://github.com/aws/s2n-tls", "supports": "!uwp & !windows", "dependencies": [ + "openssl", { "name": "vcpkg-cmake", "host": true @@ -13,5 +14,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tests": { + "description": "Build and run the tests" + } + } } diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index cab461de563662..721dfdebed7ea3 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -1,20 +1,15 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HappySeaFox/sail - REF v0.9.0-pre18 - SHA512 711dd34617982427155eaa4cb39d0d0004ef6bb31ac29ee07899ac0b132ed868ea30d39f424dffd8dd0e1ad8bc1c733dd1ab9e3713b5772100ae1953b4ce6e08 + REF v0.9.0-pre20 + SHA512 e11e05a452b62d6ad3d4c464994f410aa4829660003299b2d75910f0e089bde52bac73cf46b1be00524b157e059607867765f90615a6f5090c6106f12589dbb8 HEAD_REF master ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SAIL_STATIC) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DSAIL_STATIC=${SAIL_STATIC} -DSAIL_COMBINE_CODECS=ON -DSAIL_BUILD_APPS=OFF -DSAIL_BUILD_EXAMPLES=OFF @@ -43,9 +38,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" # Fix pkg-config files vcpkg_fixup_pkgconfig() +# Unused because SAIL_COMBINE_CODECS is On +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sail/sail-common/config.h" "#define SAIL_CODECS_PATH \"${CURRENT_PACKAGES_DIR}/lib/sail/codecs\"" "") + # Handle usage file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index 668cc0b7bc14ec..1032649b9ba55f 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,8 +1,9 @@ { "name": "sail", - "version-semver": "0.9.0-pre18", + "version-semver": "0.9.0-pre20", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/HappySeaFox/sail", + "license": "MIT", "supports": "!uwp", "dependencies": [ "giflib", diff --git a/ports/sbp/portfile.cmake b/ports/sbp/portfile.cmake index 219a548793bbaf..d345735fc2e8f0 100644 --- a/ports/sbp/portfile.cmake +++ b/ports/sbp/portfile.cmake @@ -1,7 +1,5 @@ # Windows shared libraries are not supported yet # See https://github.com/swift-nav/libsbp/issues/1062 -vcpkg_fail_port_install(ON_TARGET "uwp") - if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() diff --git a/ports/sbp/vcpkg.json b/ports/sbp/vcpkg.json index 248dc3139e1ca0..ca94345d428677 100644 --- a/ports/sbp/vcpkg.json +++ b/ports/sbp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sbp", "version-semver": "3.4.10", + "port-version": 1, "description": "Swift Navigation Binary Protocol (SBP) is a binary protocol for communicating GNSS data used by Piksi devices.", "homepage": "https://github.com/swift-nav/libsbp", "documentation": "https://support.swiftnav.com/support/solutions/articles/44001850782-swift-binary-protocol", diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake index d1e1f1b77631c3..50d61e642baf6c 100644 --- a/ports/scintilla/portfile.cmake +++ b/ports/scintilla/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP") - vcpkg_download_distfile(ARCHIVE URLS "https://www.scintilla.org/scintilla446.zip" FILENAME "scintilla446.zip" diff --git a/ports/scintilla/vcpkg.json b/ports/scintilla/vcpkg.json index c223db6a0bc996..2a934dc634bcc6 100644 --- a/ports/scintilla/vcpkg.json +++ b/ports/scintilla/vcpkg.json @@ -1,6 +1,7 @@ { "name": "scintilla", "version": "4.4.6", + "port-version": 1, "description": "A free source code editing component for Win32, GTK+, and OS X", "homepage": "https://www.scintilla.org/", "supports": "!(uwp | linux | osx)" diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index b9f438d5b97211..82759029ea3264 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -6,8 +6,8 @@ endif() set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(SCITER_REVISION d5a13ff197fed3af46d4bc931c158828eb61e357) -set(SCITER_SHA 5be2db9d2e5caa19be158020a084a246acd6dad2047062f603b3af4f3cdbdd7f7750b263ad6dfaa6c3667de6c51084fc2df75cd3cb8cd60501550377dded1928) +set(SCITER_REVISION 52bfe183983118c884294c864ee7b3d0dd199de6) +set(SCITER_SHA d31ef2a07525bf1c91b9f36ee434db6227bead732f5779cb4ee28ab6d92957bfb3d4656a960d3c47e64f3efc207f78be64853a56b1e1a14f56fd3c829b022155) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(SCITER_ARCH x64) @@ -94,8 +94,8 @@ elseif(VCPKG_TARGET_IS_WINDOWS) file(INSTALL ${SCITER_BIN}/scapp.exe DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/usciter.exe DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/inspector.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/window-mixin.exe DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${SCITER_TOOLS}) if ("windowless" IN_LIST FEATURES) set(SCITER_BIN ${SOURCE_PATH}/bin.lite/windows/${SCITER_ARCH}) @@ -104,8 +104,6 @@ elseif(VCPKG_TARGET_IS_WINDOWS) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - message(WARNING "Sciter requires manual deployment of the correct DLL files.") + endif() diff --git a/ports/sciter-js/vcpkg.json b/ports/sciter-js/vcpkg.json index 46e0121088d952..6e5606aabf93f0 100644 --- a/ports/sciter-js/vcpkg.json +++ b/ports/sciter-js/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sciter-js", - "version-string": "4.4.8.16", + "version": "4.4.8.31", "description": "Sciter.JS - Sciter but with QuickJS on board instead of TIScript. Sciter is an embeddable HTML/CSS/scripting engine.", "homepage": "https://github.com/c-smile/sciter-js-sdk", "supports": "!uwp & !arm & !static", diff --git a/ports/scnlib/portfile.cmake b/ports/scnlib/portfile.cmake index 8f2bd29950b167..0595fa487771f9 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 v0.4 - SHA512 a7059e70326e7d5af463b4ae09308644f8035092776f44001c1a4abf78421f55084e2fc30c6a9778eda62014354dba7c31b3f2f2d333bad04a2ec48b1f812ca0 + REF v1.0 + SHA512 0d34b5a710a472618df5d8202bbd647f488aa0ac2ad593c4a212e42b8aee5c35882f6e0ab7a7241c766ed17c9273d5e6704b012ef7f23a1b329b2a2f28ec60c6 HEAD_REF master ) diff --git a/ports/scnlib/vcpkg.json b/ports/scnlib/vcpkg.json index 04f4bd5e059b67..7554420878a6b6 100644 --- a/ports/scnlib/vcpkg.json +++ b/ports/scnlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "scnlib", - "version-string": "0.4", - "port-version": 1, + "version": "1.0", "description": "scnlib is a modern C++ library for replacing scanf and std::istream", "homepage": "https://scnlib.dev/" } diff --git a/ports/scylla-wrapper/portfile.cmake b/ports/scylla-wrapper/portfile.cmake index 03dfbb6f921cbb..f883451b5f3016 100644 --- a/ports/scylla-wrapper/portfile.cmake +++ b/ports/scylla-wrapper/portfile.cmake @@ -9,21 +9,20 @@ vcpkg_from_bitbucket( 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}") file(REMOVE - ${SOURCE_PATH}/scylla_wrapper_dll/distorm.h - ${SOURCE_PATH}/scylla_wrapper_dll/distorm_x64.lib - ${SOURCE_PATH}/scylla_wrapper_dll/distorm_x86.lib + "${SOURCE_PATH}/scylla_wrapper_dll/distorm.h" + "${SOURCE_PATH}/scylla_wrapper_dll/distorm_x64.lib" + "${SOURCE_PATH}/scylla_wrapper_dll/distorm_x86.lib" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/scylla-wrapper RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/scylla-wrapper/vcpkg.json b/ports/scylla-wrapper/vcpkg.json index 6bceab9f7a8846..79d6d09a5fb8d5 100644 --- a/ports/scylla-wrapper/vcpkg.json +++ b/ports/scylla-wrapper/vcpkg.json @@ -1,9 +1,14 @@ { "name": "scylla-wrapper", "version-string": "2018-08-26-16e6f435", - "port-version": 1, + "port-version": 2, "description": "This is a wrapper around Scylla. It exports functions for IAT fixing, dumping and PE rebuilding. based on https://github.com/NtQuery/Scylla commit 0f6b7198be (v0.9.6b).", + "supports": "windows & !uwp & !arm & !static", "dependencies": [ - "distorm" + "distorm", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/sdformat10/fix-quote.patch b/ports/sdformat10/fix-quote.patch new file mode 100644 index 00000000000000..6a8495c179a840 --- /dev/null +++ b/ports/sdformat10/fix-quote.patch @@ -0,0 +1,85 @@ +diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake +index cdbcfcc..0339a17 100644 +--- a/cmake/FindSSE.cmake ++++ b/cmake/FindSSE.cmake +@@ -5,7 +5,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO) + +- STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -14,14 +14,14 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + ENDIF (SSE2_TRUE) + + # /proc/cpuinfo apparently omits sse3 :( +- STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE) + IF (NOT SSE3_TRUE) +- STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE) + ENDIF (NOT SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSE3_TRUE OR SSSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -34,7 +34,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") +@@ -42,7 +42,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") + ENDIF (SSE41_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE) + IF (SSE42_TRUE) + set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host") +@@ -54,7 +54,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE + CPUINFO) + +- STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -62,7 +62,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE2_FOUND false CACHE BOOL "SSE2 available on host") + ENDIF (SSE2_TRUE) + +- STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE) + IF (SSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -70,7 +70,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE3_FOUND false CACHE BOOL "SSE3 available on host") + ENDIF (SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSSE3_TRUE) + set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host") +@@ -78,7 +78,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") diff --git a/ports/sdformat10/no-absolute.patch b/ports/sdformat10/no-absolute.patch new file mode 100644 index 00000000000000..4b5315365c99b1 --- /dev/null +++ b/ports/sdformat10/no-absolute.patch @@ -0,0 +1,38 @@ +diff --git a/cmake/sdf_config.h.in b/cmake/sdf_config.h.in +index 52408866..bd541701 100644 +--- a/cmake/sdf_config.h.in ++++ b/cmake/sdf_config.h.in +@@ -32,6 +32,3 @@ + #cmakedefine HAVE_URDFDOM 1 + #cmakedefine USE_INTERNAL_URDF 1 + #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 +@@ -98,22 +98,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath, + filename = filename.substr(idx + sep.length()); + } + +- // Next check the install path. +- 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; + if (sdf::filesystem::exists(path)) diff --git a/ports/sdformat10/portfile.cmake b/ports/sdformat10/portfile.cmake index d4166962f450c3..0d4c0f623cbe76 100644 --- a/ports/sdformat10/portfile.cmake +++ b/ports/sdformat10/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -6,6 +5,9 @@ vcpkg_from_github( REF sdformat10_10.0.0 SHA512 1caf98427d25e7c17bfacaab20382c573fac0c965b40ad0c5e0efd32ddfdaa20250d8c79ecf574989ba10b1feb884a9df3927b18ec2cd88f7c66b4d8194bc731 HEAD_REF sdf10 + PATCHES + fix-quote.patch + no-absolute.patch ) # Ruby is required by the sdformat build process @@ -14,28 +16,27 @@ get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) set(_path $ENV{PATH}) vcpkg_add_to_path(${RUBY_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DUSE_EXTERNAL_URDF=ON -DUSE_EXTERNAL_TINYXML=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Restore original path set(ENV{PATH} ${_path}) # Fix cmake targets and pkg-config file location -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/sdformat10") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat10") vcpkg_fixup_pkgconfig() # Remove debug files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/sdformat10/vcpkg.json b/ports/sdformat10/vcpkg.json index d7d3d8f242c62e..13c81a93b4dffb 100644 --- a/ports/sdformat10/vcpkg.json +++ b/ports/sdformat10/vcpkg.json @@ -1,13 +1,21 @@ { "name": "sdformat10", - "version-string": "10.0.0", - "port-version": 1, + "version": "10.0.0", + "port-version": 2, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "supports": "!uwp", "dependencies": [ "ignition-math6", "tinyxml2", - "urdfdom" + "urdfdom", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/sdformat6/disable-test.patch b/ports/sdformat6/disable-test.patch new file mode 100644 index 00000000000000..6861e3448b684f --- /dev/null +++ b/ports/sdformat6/disable-test.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78e72e6..8f97304 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -252,7 +252,9 @@ else (buid_errors) + + link_directories(${PROJECT_BINARY_DIR}/src) + ++ if (BUILD_TESTING) + add_subdirectory(test) ++ endif() + add_subdirectory(src) + add_subdirectory(include/sdf) + add_subdirectory(sdf) +diff --git a/cmake/SDFUtils.cmake b/cmake/SDFUtils.cmake +index acd57f8..3626e68 100644 +--- a/cmake/SDFUtils.cmake ++++ b/cmake/SDFUtils.cmake +@@ -119,6 +119,7 @@ endmacro() + include_directories(${PROJECT_SOURCE_DIR}/test/gtest/include) + macro (sdf_build_tests) + # Build all the tests ++ if (BUILD_TESTING) + foreach(GTEST_SOURCE_file ${ARGN}) + string(REGEX REPLACE ".cc" "" BINARY_NAME ${GTEST_SOURCE_file}) + set(BINARY_NAME ${TEST_TYPE}_${BINARY_NAME}) +@@ -205,6 +206,7 @@ macro (sdf_build_tests) + --error-exitcode=1 --show-leak-kinds=all ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_NAME}) + endif() + endforeach() ++ endif() + endmacro() + + ################################################# diff --git a/ports/sdformat6/fix-dependency-urdfdom.patch b/ports/sdformat6/fix-dependency-urdfdom.patch new file mode 100644 index 00000000000000..dad6fc106dc28b --- /dev/null +++ b/ports/sdformat6/fix-dependency-urdfdom.patch @@ -0,0 +1,34 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 2735a07..6721de4 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -62,16 +62,16 @@ if (NOT PKG_CONFIG_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + BUILD_WARNING("Couldn't find pkg-config for urdfdom, using internal copy") + set(USE_INTERNAL_URDF true) +- elseif(NOT USE_INTERNAL_URDF) ++ elseif(0) + BUILD_ERROR("Couldn't find pkg-config for urdfdom") + endif() + endif() + + if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) + # check for urdfdom with pkg-config +- pkg_check_modules(URDF urdfdom>=1.0) ++ find_package(urdfdom CONFIG REQUIRED) + +- if (NOT URDF_FOUND) ++ if (NOT urdfdom_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + message(STATUS "Couldn't find urdfdom >= 1.0, using internal copy") + set(USE_INTERNAL_URDF true) +@@ -80,8 +80,7 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) + endif() + else() + # what am I doing here? pkg-config and cmake +- set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR}) +- set(URDF_LIBRARY_DIRS ${URDF_LIBDIR}) ++ set(URDF_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) + endif() + endif() + diff --git a/ports/sdformat6/portfile.cmake b/ports/sdformat6/portfile.cmake index 8818b2be88088e..ef7c774c59fe69 100644 --- a/ports/sdformat6/portfile.cmake +++ b/ports/sdformat6/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osrf/sdformat @@ -8,6 +6,8 @@ vcpkg_from_github( HEAD_REF sdf6 PATCHES disable-unneeded-include-findboost.patch + fix-dependency-urdfdom.patch + disable-test.patch ) # Ruby is required by the sdformat build process @@ -18,9 +18,10 @@ vcpkg_add_to_path(${RUBY_PATH}) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS -DBUILD_TESTING=OFF - -DUSE_EXTERNAL_URDF=ON - -DUSE_EXTERNAL_TINYXML=ON + OPTIONS + -DBUILD_TESTING=OFF + -DUSE_INTERNAL_URDF=OFF + -DUSE_EXTERNAL_TINYXML=ON ) vcpkg_cmake_install() diff --git a/ports/sdformat6/vcpkg.json b/ports/sdformat6/vcpkg.json index f1ee8fccbabffe..c66f66a3c4cf8a 100644 --- a/ports/sdformat6/vcpkg.json +++ b/ports/sdformat6/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sdformat6", "version": "6.2.0", - "port-version": 4, + "port-version": 6, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", + "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ "boost-any", diff --git a/ports/sdformat9/fix-dependency-urdfdom.patch b/ports/sdformat9/fix-dependency-urdfdom.patch index d9016c6de39f30..d16cc831b2e7fd 100644 --- a/ports/sdformat9/fix-dependency-urdfdom.patch +++ b/ports/sdformat9/fix-dependency-urdfdom.patch @@ -1,7 +1,16 @@ diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index 965f1ec..cf2acf4 100644 +index 427e5e7..af31df4 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake +@@ -43,7 +43,7 @@ endif() + # 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 PKG_CONFIG_FOUND) ++if (0) + if (NOT DEFINED USE_INTERNAL_URDF) + BUILD_WARNING("Couldn't find pkg-config for urdfdom, using internal copy") + set(USE_INTERNAL_URDF true) @@ -53,10 +53,9 @@ if (NOT PKG_CONFIG_FOUND) endif() @@ -12,6 +21,15 @@ index 965f1ec..cf2acf4 100644 - if (NOT URDF_FOUND) + if (NOT urdfdom_FOUND) - find_package(urdfdom) - if (urdfdom_FOUND) - set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS}) + find_package(urdfdom) + if (urdfdom_FOUND) + set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS}) +@@ -73,6 +72,7 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) + # what am I doing here? pkg-config and cmake +- set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR}) + set(URDF_LIBRARY_DIRS ${URDF_LIBDIR}) ++ set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS}) ++ set(URDF_LIBRARIES ${urdfdom_LIBRARIES}) + endif() + endif() + diff --git a/ports/sdformat9/fix-quote.patch b/ports/sdformat9/fix-quote.patch new file mode 100644 index 00000000000000..6a8495c179a840 --- /dev/null +++ b/ports/sdformat9/fix-quote.patch @@ -0,0 +1,85 @@ +diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake +index cdbcfcc..0339a17 100644 +--- a/cmake/FindSSE.cmake ++++ b/cmake/FindSSE.cmake +@@ -5,7 +5,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO) + +- STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -14,14 +14,14 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + ENDIF (SSE2_TRUE) + + # /proc/cpuinfo apparently omits sse3 :( +- STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE) + IF (NOT SSE3_TRUE) +- STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE) + ENDIF (NOT SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSE3_TRUE OR SSSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -34,7 +34,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") +@@ -42,7 +42,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") + ENDIF (SSE41_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE) + IF (SSE42_TRUE) + set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host") +@@ -54,7 +54,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE + CPUINFO) + +- STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -62,7 +62,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE2_FOUND false CACHE BOOL "SSE2 available on host") + ENDIF (SSE2_TRUE) + +- STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE) + IF (SSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -70,7 +70,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE3_FOUND false CACHE BOOL "SSE3 available on host") + ENDIF (SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSSE3_TRUE) + set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host") +@@ -78,7 +78,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") diff --git a/ports/sdformat9/no-absolute.patch b/ports/sdformat9/no-absolute.patch new file mode 100644 index 00000000000000..40c99f26edca18 --- /dev/null +++ b/ports/sdformat9/no-absolute.patch @@ -0,0 +1,38 @@ +diff --git a/cmake/sdf_config.h.in b/cmake/sdf_config.h.in +index c3ce2336..64ac9f5f 100644 +--- a/cmake/sdf_config.h.in ++++ b/cmake/sdf_config.h.in +@@ -31,6 +31,3 @@ + #cmakedefine BUILD_TYPE_RELEASE 1 + #cmakedefine HAVE_URDFDOM 1 + #cmakedefine USE_INTERNAL_URDF 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 48c1943b..bd2c5b31 100644 +--- a/src/SDF.cc ++++ b/src/SDF.cc +@@ -100,22 +100,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath, + filename = filename.substr(idx + sep.length()); + } + +- // Next check the install path. +- 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; + if (sdf::filesystem::exists(path)) diff --git a/ports/sdformat9/portfile.cmake b/ports/sdformat9/portfile.cmake index b8807e0fe0c4f3..058988450fdd93 100644 --- a/ports/sdformat9/portfile.cmake +++ b/ports/sdformat9/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "linux" "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osrf/sdformat @@ -8,36 +6,37 @@ vcpkg_from_github( HEAD_REF sdf9 PATCHES fix-dependency-urdfdom.patch + fix-quote.patch + no-absolute.patch + use-external-tinyxml-windows.patch ) # Ruby is required by the sdformat build process vcpkg_find_acquire_program(RUBY) get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) set(_path $ENV{PATH}) -vcpkg_add_to_path(${RUBY_PATH}) +vcpkg_add_to_path("${RUBY_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF - -DUSE_EXTERNAL_URDF=ON - -DUSE_EXTERNAL_TINYXML=ON + -DUSE_INTERNAL_URDF=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Restore original path set(ENV{PATH} ${_path}) # Fix cmake targets and pkg-config file location -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/sdformat9") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat9") vcpkg_fixup_pkgconfig() # Remove debug files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sdformat9/use-external-tinyxml-windows.patch b/ports/sdformat9/use-external-tinyxml-windows.patch new file mode 100644 index 00000000000000..1f48617bc04c36 --- /dev/null +++ b/ports/sdformat9/use-external-tinyxml-windows.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3dad12e5..e290a3be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,7 +113,7 @@ include (${sdf_cmake_dir}/SDFUtils.cmake) + + message (STATUS "\n\n====== Finding 3rd Party Packages ======") + # Use of tinyxml. System installation on UNIX. Internal copy on WIN +-if (UNIX) ++if (true) + message (STATUS "Using system tinyxml") + set (USE_EXTERNAL_TINYXML True) + elseif(WIN32) +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 427e5e7a..655fafc0 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -9,7 +9,7 @@ if (USE_EXTERNAL_TINYXML) + ################################################# + # Find tinyxml. Only debian distributions package tinyxml with a pkg-config + # Use pkg_check_modules and fallback to manual detection (needed, at least, for MacOS) +- pkg_check_modules(tinyxml tinyxml) ++ find_package(tinyxml CONFIG REQUIRED) + if (NOT tinyxml_FOUND) + find_path (tinyxml_INCLUDE_DIRS tinyxml.h ${tinyxml_INCLUDE_DIRS} ENV CPATH) + find_library(tinyxml_LIBRARIES NAMES tinyxml) diff --git a/ports/sdformat9/vcpkg.json b/ports/sdformat9/vcpkg.json index 40de724cad7ba9..c4f2a7dcc84531 100644 --- a/ports/sdformat9/vcpkg.json +++ b/ports/sdformat9/vcpkg.json @@ -1,13 +1,23 @@ { "name": "sdformat9", - "version-string": "9.4.0", - "port-version": 1, + "version": "9.4.0", + "port-version": 5, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", + "license": "Apache-2.0", "supports": "!(linux | uwp)", "dependencies": [ "ignition-math6", "tinyxml", - "urdfdom" + "urdfdom", + "urdfdom-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake index 47f1b0730ec715..d870cffe9213e4 100644 --- a/ports/sdl1/portfile.cmake +++ b/ports/sdl1/portfile.cmake @@ -16,7 +16,7 @@ if (VCPKG_TARGET_IS_WINDOWS) file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln DESTINATION ${SOURCE_PATH}/VisualC/ ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LIB_TYPE StaticLibrary) + set(LIB_TYPE StaticLibrary) else() set(LIB_TYPE DynamicLibrary) endif() @@ -80,4 +80,11 @@ else() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/sdl1/bin/sdl-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/sdl1/bin/sdl-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/sdl1/debug/bin/sdl-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/sdl1/debug/bin/sdl-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + endif() endif() \ No newline at end of file diff --git a/ports/sdl1/vcpkg.json b/ports/sdl1/vcpkg.json index e75f7a2179642d..299c16461f215e 100644 --- a/ports/sdl1/vcpkg.json +++ b/ports/sdl1/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl1", - "version-string": "1.2.15", - "port-version": 14, + "version": "1.2.15", + "port-version": 15, "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" } diff --git a/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch b/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch new file mode 100644 index 00000000000000..897c0aac7c8314 --- /dev/null +++ b/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch @@ -0,0 +1,12 @@ +--- a/nanosvg.h ++++ b/nanosvg.h +@@ -2778,7 +2778,7 @@ static void nsvg__content(void* ud, const char* s) + if (p->styleFlag) { + + int state = 0; +- const char* start; ++ const char* start = 0; + while (*s) { + char c = *s; + if (nsvg__isspace(c) || c == '{') { + diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake index 148412bac69ebe..4f82650cecdcf6 100644 --- a/ports/sdl2-image/portfile.cmake +++ b/ports/sdl2-image/portfile.cmake @@ -10,9 +10,11 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${SDL2_IMAGE_VERSION} + PATCHES + 0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") set(USE_JPEG OFF) if("libjpeg-turbo" IN_LIST FEATURES) @@ -29,9 +31,8 @@ if("libwebp" IN_LIST FEATURES) set(USE_WEBP ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}" -DUSE_PNG=ON @@ -40,14 +41,13 @@ vcpkg_configure_cmake( -DUSE_WEBP=${USE_WEBP} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-image) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl2-image/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2-image/copyright) - -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json index f81cd5c1b1ebad..a57f936726e08a 100644 --- a/ports/sdl2-image/vcpkg.json +++ b/ports/sdl2-image/vcpkg.json @@ -1,12 +1,20 @@ { "name": "sdl2-image", "version-string": "2.0.5", - "port-version": 3, + "port-version": 4, "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV", "homepage": "https://www.libsdl.org/projects/SDL_image", "dependencies": [ "libpng", - "sdl2" + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "libjpeg-turbo": { diff --git a/ports/sdl2-mixer/fix-featurempg123.patch b/ports/sdl2-mixer/fix-featurempg123.patch new file mode 100644 index 00000000000000..0edcdf871e45ed --- /dev/null +++ b/ports/sdl2-mixer/fix-featurempg123.patch @@ -0,0 +1,47 @@ +diff --git a/music_mpg123.c b/music_mpg123.c +index cd151b9..b4294ab 100644 +--- a/music_mpg123.c ++++ b/music_mpg123.c +@@ -31,7 +31,11 @@ + #include "music_mpg123.h" + + #include +- ++#ifdef _MSC_VER ++typedef ptrdiff_t MIX_SSIZE_T; ++#else ++typedef ssize_t MIX_SSIZE_T; ++#endif + + typedef struct { + int loaded; +@@ -49,7 +53,7 @@ typedef struct { + const char* (*mpg123_plain_strerror)(int errcode); + void (*mpg123_rates)(const long **list, size_t *number); + int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ); +- int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); ++ int (*mpg123_replace_reader_handle)( mpg123_handle *mh, MIX_SSIZE_T (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); + off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence ); + const char* (*mpg123_strerror)(mpg123_handle *mh); + } mpg123_loader; +@@ -96,7 +100,7 @@ static int MPG123_Load(void) + FUNCTION_LOADER(mpg123_plain_strerror, const char* (*)(int errcode)) + FUNCTION_LOADER(mpg123_rates, void (*)(const long **list, size_t *number)); + FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done )) +- FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) ++ FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, MIX_SSIZE_T (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) + FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence )) + FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh)) + } +@@ -181,9 +185,9 @@ static char const* mpg_err(mpg123_handle* mpg, int result) + } + + /* we're gonna override mpg123's I/O with these wrappers for RWops */ +-static ssize_t rwops_read(void* p, void* dst, size_t n) ++static MIX_SSIZE_T rwops_read(void* p, void* dst, size_t n) + { +- return (ssize_t)SDL_RWread((SDL_RWops*)p, dst, 1, n); ++ return (MIX_SSIZE_T )SDL_RWread((SDL_RWops*)p, dst, 1, n); + } + + static off_t rwops_seek(void* p, off_t offset, int whence) diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index ddae293ad5339c..c0f1a0225909e9 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -10,6 +10,8 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${SDL2_MIXER_VERSION} + PATCHES + fix-featurempg123.patch ) if ("dynamic-load" IN_LIST FEATURES) diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index c1ce25b4e76201..a0286dd919b1d8 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-mixer", "version": "2.0.4", - "port-version": 14, + "port-version": 16, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://www.libsdl.org/projects/SDL_mixer", "dependencies": [ diff --git a/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch b/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch index e69568b2323d76..269f8f5ef73906 100644 --- a/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch +++ b/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch @@ -1,14 +1,14 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2348,7 +2348,6 @@ - execute_process(COMMAND sh ${SDL2_SOURCE_DIR}/build-scripts/updaterev.sh - WORKING_DIRECTORY ${SDL2_BINARY_DIR}) - endif() +@@ -2555,7 +2555,6 @@ endif() + configure_file("${SDL2_SOURCE_DIR}/include/SDL_revision.h.cmake" + "${SDL2_BINARY_DIR}/include/SDL_revision.h") + -if(NOT WINDOWS OR CYGWIN OR MINGW) set(prefix ${CMAKE_INSTALL_PREFIX}) -@@ -2375,7 +2375,7 @@ +@@ -2590,7 +2590,7 @@ Libs.private:") set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS}) listtostrrev(SDL_LIBS _SDL_LIBS) set(SDL_LIBS ${_SDL_LIBS}) @@ -17,7 +17,7 @@ listtostr(EXTRA_LIBS _EXTRA_LIBS "-l") set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS}) list(REMOVE_DUPLICATES SDL_STATIC_LIBS) -@@ -2403,7 +2403,6 @@ +@@ -2611,7 +2611,6 @@ Libs.private:") "${SDL2_BINARY_DIR}/sdl2-config" @ONLY) configure_file("${SDL2_SOURCE_DIR}/SDL2.spec.in" "${SDL2_BINARY_DIR}/SDL2.spec" @ONLY) @@ -25,11 +25,12 @@ macro(check_add_debug_flag FLAG SUFFIX) check_c_compiler_flag(${FLAG} HAS_C_FLAG_${SUFFIX}) -@@ -2728,6 +2728,7 @@ +@@ -2956,6 +2956,7 @@ if(NOT (WINDOWS OR CYGWIN) OR MINGW) # TODO: what about the .spec file? Is it only needed for RPM creation? - install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/aclocal") + install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/aclocal") endif() +install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig") ##### Uninstall target ##### + \ No newline at end of file diff --git a/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch b/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch index b23212fa031ab6..b7c56c14bff212 100644 --- a/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch +++ b/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch @@ -1,15 +1,15 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1295,12 +1295,6 @@ +@@ -1342,12 +1342,6 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID AND NOT RISCOS AND NOT HAIKU) set(HAVE_FCITX TRUE) endif() - pkg_search_module(IBUS ibus-1.0 ibus) - if(IBUS_FOUND) - set(HAVE_IBUS_IBUS_H TRUE) -- include_directories(${IBUS_INCLUDE_DIRS}) +- target_include_directories(sdl-build-options INTERFACE "${IBUS_INCLUDE_DIRS}") - list(APPEND EXTRA_LIBS ${IBUS_LIBRARIES}) - endif() if (HAVE_IBUS_IBUS_H OR HAVE_FCITX) - set(SDL_USE_IME TRUE) + set(SDL_USE_IME 1) diff --git a/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch b/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch index e5ab214675c804..e24057c3e42041 100644 --- a/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch +++ b/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch @@ -1,6 +1,6 @@ --- a/SDL2Config.cmake +++ b/SDL2Config.cmake -@@ -32,6 +2,7 @@ +@@ -46,6 +46,7 @@ foreach(prop ${relprops}) endif() endforeach() @@ -8,7 +8,7 @@ foreach(prop ${relprops}) get_target_property(sdl2mainimplib SDL2::SDL2main ${prop}) if(sdl2mainimplib) -@@ -37,6 +37,7 @@ +@@ -53,6 +54,7 @@ foreach(prop ${relprops}) break() endif() endforeach() @@ -16,7 +16,7 @@ foreach(prop ${dbgprops}) get_target_property(sdl2implibdbg SDL2::SDL2 ${prop}) -@@ -47,6 +47,7 @@ +@@ -62,6 +64,7 @@ foreach(prop ${dbgprops}) endif() endforeach() @@ -24,7 +24,7 @@ foreach(prop ${dbgprops}) get_target_property(sdl2mainimplibdbg SDL2::SDL2main ${prop}) if(sdl2mainimplibdbg) -@@ -55,6 +55,7 @@ +@@ -69,6 +72,7 @@ foreach(prop ${dbgprops}) break() endif() endforeach() diff --git a/ports/sdl2/0004-Define-crt-macros.patch b/ports/sdl2/0004-Define-crt-macros.patch new file mode 100644 index 00000000000000..ac8f185a7c8b4c --- /dev/null +++ b/ports/sdl2/0004-Define-crt-macros.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -602,6 +602,11 @@ if(USE_GCC OR USE_CLANG) + list(APPEND EXTRA_CFLAGS -fcolor-diagnostics) + endif() + endif() + endif() ++if(MSVC) ++ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_SECURE_NO_DEPRECATE") ++ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_NONSTDC_NO_DEPRECATE") ++ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_SECURE_NO_WARNINGS") ++endif() + + if(SDL_ASSEMBLY) + diff --git a/ports/sdl2/0004-sdl2-alias-on-static-build.patch b/ports/sdl2/0004-sdl2-alias-on-static-build.patch deleted file mode 100644 index 6bb4eb061eb420..00000000000000 --- a/ports/sdl2/0004-sdl2-alias-on-static-build.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/SDL2Config.cmake -+++ b/SDL2Config.cmake -@@ -1,5 +1,17 @@ - include("${CMAKE_CURRENT_LIST_DIR}/SDL2Targets.cmake") - -+# on static-only builds create an alias -+if(NOT TARGET SDL2::SDL2 AND TARGET SDL2::SDL2-static) -+ if(CMAKE_VERSION VERSION_LESS "3.11") -+ message(FATAL_ERROR "At least CMake 3.11 is required for this configuration.") -+ elseif(CMAKE_VERSION VERSION_LESS "3.18") -+ # Aliasing local targets is not supported on CMake < 3.18, so make all targets global. -+ set_target_properties(SDL2::SDL2-static PROPERTIES IMPORTED_GLOBAL TRUE) -+ set_target_properties(SDL2::SDL2main PROPERTIES IMPORTED_GLOBAL TRUE) -+ endif() -+ add_library(SDL2::SDL2 ALIAS SDL2::SDL2-static) -+endif() -+ - # provide ${SDL2_LIBRARIES}, ${SDL2_INCLUDE_DIRS} etc, like sdl2-config.cmake does, - # for compatibility between SDL2 built with autotools and SDL2 built with CMake - diff --git a/ports/sdl2/0005-Fix-uwp-joystick.patch b/ports/sdl2/0005-Fix-uwp-joystick.patch new file mode 100644 index 00000000000000..eb67d882ddfb69 --- /dev/null +++ b/ports/sdl2/0005-Fix-uwp-joystick.patch @@ -0,0 +1,25 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1755,8 +1755,10 @@ elseif(WINDOWS) + list(APPEND EXTRA_LIBS dinput8) + endif() + if(HAVE_XINPUT_H) +- set(SDL_JOYSTICK_XINPUT 1) +- set(HAVE_XINPUT TRUE) ++ if(NOT WINDOWS_STORE) ++ set(SDL_JOYSTICK_XINPUT 1) ++ set(HAVE_XINPUT TRUE) ++ endif() + if(HAVE_WINDOWS_GAMING_INPUT_H) + set(SDL_JOYSTICK_WGI 1) + endif() +@@ -1764,7 +1766,7 @@ elseif(WINDOWS) + set(HAVE_SDL_JOYSTICK TRUE) + + if(SDL_HAPTIC) +- if(HAVE_DINPUT_H OR HAVE_XINPUT_H) ++ if((HAVE_DINPUT_H OR HAVE_XINPUT_H) AND NOT WINDOWS_STORE) + file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/windows/*.c) + if(HAVE_DINPUT_H) + set(SDL_HAPTIC_DINPUT 1) + diff --git a/ports/sdl2/0005-sdl2-fix-mingw-checks.patch b/ports/sdl2/0005-sdl2-fix-mingw-checks.patch deleted file mode 100644 index 9eda39cc0231d3..00000000000000 --- a/ports/sdl2/0005-sdl2-fix-mingw-checks.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1475,7 +1475,7 @@ elseif(WINDOWS) - if(DEFINED MSVC_VERSION AND NOT ${MSVC_VERSION} LESS 1700) - set(USE_WINSDK_DIRECTX TRUE) - endif() -- if(NOT CMAKE_COMPILER_IS_MINGW AND NOT USE_WINSDK_DIRECTX) -+ if(NOT MINGW AND NOT USE_WINSDK_DIRECTX) - if("$ENV{DXSDK_DIR}" STREQUAL "") - message_error("DIRECTX requires the \$DXSDK_DIR environment variable to be set") - endif() -@@ -1493,7 +1493,7 @@ elseif(WINDOWS) - check_include_file(dxgi.h HAVE_DXGI_H) - if(HAVE_D3D_H OR HAVE_D3D11_H OR HAVE_DDRAW_H OR HAVE_DSOUND_H OR HAVE_DINPUT_H) - set(HAVE_DIRECTX TRUE) -- if(NOT CMAKE_COMPILER_IS_MINGW AND NOT USE_WINSDK_DIRECTX) -+ if(NOT MINGW AND NOT USE_WINSDK_DIRECTX) - # TODO: change $ENV{DXSDL_DIR} to get the path from the include checks - link_directories($ENV{DXSDK_DIR}\\lib\\${PROCESSOR_ARCH}) - include_directories($ENV{DXSDK_DIR}\\Include) diff --git a/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch b/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch new file mode 100644 index 00000000000000..84a58f31838c27 --- /dev/null +++ b/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch @@ -0,0 +1,15 @@ +--- a/src/misc/winrt/SDL_sysurl.cpp ++++ b/src/misc/winrt/SDL_sysurl.cpp +@@ -18,10 +18,9 @@ + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + */ +-#include + +-#include "../../core/windows/SDL_windows.h" + #include "../SDL_sysurl.h" ++#include "../../core/windows/SDL_windows.h" + + int + SDL_SYS_OpenURL(const char *url) + diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 53d74ff7f6ac0e..fe845aa97ac395 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -1,16 +1,17 @@ -set(SDL2_VERSION 2.0.16) +set(SDL2_VERSION 2.0.20) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL - REF release-2.0.16 - SHA512 45ce71f77b01f5fd886f92e5b3d96f1f72c7e0f70c09e615384a900533b941cad65bf6b54a125a9eeb8499e2056e9a8e54d4e654bccfca9730584792a2b18fbc + REF release-2.0.20 + SHA512 f8558057a06d4507190b369b2067aee55c22ab796b90bb663fbc36218e66ec14e2feb0ecd55f9b798bfd24fc94e2b4cb93eddc52a59f0709d6cb0ebdb6d9309b HEAD_REF master PATCHES 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch 0002-sdl2-skip-ibus-on-linux.patch 0003-sdl2-disable-sdlmain-target-search-on-uwp.patch - 0004-sdl2-alias-on-static-build.patch - 0005-sdl2-fix-mingw-checks.patch # Can be removed once >= SDL 2.0.18 + 0004-Define-crt-macros.patch + 0005-Fix-uwp-joystick.patch + 0006-Update-SDL_sysurl.cpp.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) @@ -19,8 +20,8 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - vulkan VIDEO_VULKAN - x11 X11_SHARED + vulkan SDL_VULKAN + x11 SDL_X11_SHARED ) if ("x11" IN_LIST FEATURES) @@ -35,8 +36,8 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DSDL_STATIC=${SDL_STATIC} -DSDL_SHARED=${SDL_SHARED} - -DFORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} - -DLIBC=ON + -DSDL_FORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} + -DSDL_LIBC=ON ) vcpkg_cmake_install() diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 3cb3c43744d385..dc92992c6a3de4 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdl2", - "version": "2.0.16", - "port-version": 3, + "version": "2.0.20", "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", "dependencies": [ diff --git a/ports/seal/gsl.patch b/ports/seal/gsl.patch new file mode 100644 index 00000000000000..700c076bef5191 --- /dev/null +++ b/ports/seal/gsl.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0039517..4cc8a01 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,7 @@ if(SEAL_USE_MSGSL) + message(STATUS "Microsoft GSL: download ...") + seal_fetch_thirdparty_content(ExternalMSGSL) + else() +- find_package(Microsoft.GSL 3 CONFIG) ++ find_package(Microsoft.GSL 4 CONFIG) + if(NOT Microsoft.GSL_FOUND) + message(FATAL_ERROR "Microsoft GSL: not found") + else() diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index 0806056029f4f8..868a030e7668cc 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -6,6 +6,9 @@ vcpkg_from_github( REF 79234726053c45eede688400aa219fdec0810bd8 SHA512 634ad75d70f04cce220bfa9f6d13e8ddb293e8403ebd195e2c8b522b751a1a268021feea7843038037ed6d1b354b2e470ad565966a117613cf5371073afda9a4 HEAD_REF main + PATCHES + gsl.patch + shared-zstd.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/seal/shared-zstd.patch b/ports/seal/shared-zstd.patch new file mode 100644 index 00000000000000..b8515fbcdfb35c --- /dev/null +++ b/ports/seal/shared-zstd.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4cc8a01..b8c92c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -205,7 +205,7 @@ if(SEAL_USE_ZSTD) + message(FATAL_ERROR "Zstandard: must be static") + endif() + elseif(TARGET zstd::libzstd_shared) +- message(FATAL_ERROR "Zstandard: must be static") ++ set(zstd_static "zstd::libzstd_shared") + else() + message(FATAL_ERROR "Zstandard: not found") + endif() diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json index 7ff225449d0a9a..be1b20e5d800a0 100644 --- a/ports/seal/vcpkg.json +++ b/ports/seal/vcpkg.json @@ -1,9 +1,9 @@ { "name": "seal", "version-semver": "3.7.2", + "port-version": 2, "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", "homepage": "https://github.com/microsoft/SEAL", - "supports": "!windows | (windows & static)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/sentencepiece/vcpkg.json b/ports/sentencepiece/vcpkg.json index ed0f04c456d0af..ad6898b3fb18dd 100644 --- a/ports/sentencepiece/vcpkg.json +++ b/ports/sentencepiece/vcpkg.json @@ -1,7 +1,9 @@ { "name": "sentencepiece", "version": "0.1.96", + "port-version": 1, "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training", + "supports": "!((windows | uwp) & !static)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 64165b1c5eac50..59ad22c2eb87a6 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,11 +1,7 @@ -if(NOT VCPKG_TARGET_IS_OSX) - vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") -endif() - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.12/sentry-native.zip" - FILENAME "sentry-native-0.4.12.zip" - SHA512 15da4407ed5e2c8d5e56e497ccc6006b29235aef6b3a81e034c93443e20a7cfdf95d55e31b88e552c55e824eb15d6f7fafe988c453a5a6f36fe45136d7268b19 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.15/sentry-native.zip" + FILENAME "sentry-native-0.4.15.zip" + SHA512 bbe568cc92fa20d69db5bb9efc5ac1a27d05c3ac28c36addd827fba64b2945ce23cbdb3c0daf76b0a140de4949b6c76607f00000ceb7989d8a33b791d30c8152 ) vcpkg_extract_source_archive_ex( @@ -30,8 +26,13 @@ if (NOT DEFINED SENTRY_BACKEND) endif() endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") +endif() + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSENTRY_BUILD_TESTS=OFF -DSENTRY_BUILD_EXAMPLES=OFF @@ -59,7 +60,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file( - INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 0cd2e1499d970f..b25d67db0a6981 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,10 +1,10 @@ { "name": "sentry-native", - "version-semver": "0.4.12", - "port-version": 2, + "version-semver": "0.4.15", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", - "supports": "!(arm | (arm64 & !osx) | uwp)", + "license": "MIT", + "supports": "osx | (!arm & !uwp)", "dependencies": [ { "name": "curl", diff --git a/ports/serdepp/portfile.cmake b/ports/serdepp/portfile.cmake new file mode 100644 index 00000000000000..3e347b7c91c324 --- /dev/null +++ b/ports/serdepp/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO injae/serdepp + REF v0.1.4 + SHA512 da84ad82e882c0cada5c9dd3c77afd45aaf7b3b4eb150257b09b9b4854b349fdb2c39be2f6ba40bb39b34262e44609a02afba1ec860625f25a2313f7ac34a055 + HEAD_REF main +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSERDEPP_BUILD_TESTING=OFF + -DENABLE_INLINE_CPPM_TOOLS=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/serdepp) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/cmake" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/lib/cmake" +) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/serdepp/vcpkg.json b/ports/serdepp/vcpkg.json new file mode 100644 index 00000000000000..0bf3d3c7ac235f --- /dev/null +++ b/ports/serdepp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "serdepp", + "version": "0.1.4", + "description": "c++ 17 universal serialize deserialize library like rust serde, support libraries: [nlohmann_json, fmt, yaml-cpp, toml11, rapidjson]", + "homepage": "https://github.com/injae/serdepp", + "license": "MIT", + "dependencies": [ + "magic-enum", + "nameof", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/sfml/arm64.patch b/ports/sfml/arm64.patch new file mode 100644 index 00000000000000..7faefc0e6aeb1b --- /dev/null +++ b/ports/sfml/arm64.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 67b61712ec..73711753ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -253,10 +253,12 @@ if(SFML_OS_MACOSX) + endif() + endif() + +- # only the default architecture (i.e. 64-bit) is supported +- if(NOT CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64") +- message(FATAL_ERROR "Only 64-bit architecture is supported") +- endif() ++ # only the default x86_64 or arm64 are supported ++ foreach (arch IN LISTS CMAKE_OSX_ARCHITECTURES) ++ if (NOT (arch STREQUAL "x86_64" OR arch STREQUAL "arm64")) ++ message(FATAL_ERROR "Invalid arch ${arch}") ++ endif() ++ endforeach() + + # configure Xcode templates + set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)") diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index f832303a78f684..2352bfabd2a62d 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -6,22 +6,22 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH PATCHES use-system-freetype.patch stb_include.patch + arm64.patch ) -file(REMOVE_RECURSE ${SOURCE_PATH}/extlibs) +file(REMOVE_RECURSE "${SOURCE_PATH}/extlibs") # Without this, we get error: list sub-command REMOVE_DUPLICATES requires list to be present. -file(MAKE_DIRECTORY ${SOURCE_PATH}/extlibs/libs) -file(WRITE ${SOURCE_PATH}/extlibs/libs/x "") +file(MAKE_DIRECTORY "${SOURCE_PATH}/extlibs/libs") +file(WRITE "${SOURCE_PATH}/extlibs/libs/x" "") # The embedded FindFreetype doesn't properly handle debug libraries -file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/Modules/FindFreetype.cmake) +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules/FindFreetype.cmake") if(VCPKG_TARGET_IS_LINUX) message(STATUS "SFML currently requires the following libraries from the system package manager:\n libudev\n libx11\n libxrandr\n opengl\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libxrandr-dev libxi-dev libudev-dev libgl1-mesa-dev") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSFML_BUILD_FRAMEWORKS=OFF -DSFML_USE_SYSTEM_DEPS=ON @@ -29,32 +29,32 @@ vcpkg_configure_cmake( -DSFML_GENERATE_PDB=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SFML) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SFML) vcpkg_copy_pdbs() -FILE(READ ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake SFML_CONFIG) +FILE(READ "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" SFML_CONFIG) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake "set(SFML_STATIC_LIBRARIES true)\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Freetype)\n${SFML_CONFIG}") + FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" "set(SFML_STATIC_LIBRARIES true)\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Freetype)\n${SFML_CONFIG}") else() - FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake "set(SFML_STATIC_LIBRARIES false)\n${SFML_CONFIG}") + FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" "set(SFML_STATIC_LIBRARIES false)\n${SFML_CONFIG}") endif() # move sfml-main to manual link dir -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib) - file(COPY ${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib) - file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") + file(COPY "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/manual-link") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib") file(GLOB FILES "${CURRENT_PACKAGES_DIR}/share/sfml/SFML*Targets-*.cmake") foreach(FILE ${FILES}) - file(READ "${FILE}" _contents) - string(REPLACE "/lib/sfml-main" "/lib/manual-link/sfml-main" _contents "${_contents}") - file(WRITE "${FILE}" "${_contents}") + vcpkg_replace_string("${FILE}" "/lib/sfml-main" "/lib/manual-link/sfml-main") endforeach() endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY) -configure_file(${SOURCE_PATH}/license.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +vcpkg_fixup_pkgconfig() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) +configure_file("${SOURCE_PATH}/license.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index 64c7f53581cd54..de544f640ea9dd 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sfml", "version": "2.5.1", - "port-version": 10, + "port-version": 12, "description": "Simple and fast multimedia library", "homepage": "https://github.com/sfml/sfml", "dependencies": [ @@ -10,6 +10,14 @@ "libogg", "libvorbis", "openal-soft", - "stb" + "stb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/shaderc/fix-export-cmakefiles.patch b/ports/shaderc/fix-export-cmakefiles.patch new file mode 100644 index 00000000000000..75e3aba8149806 --- /dev/null +++ b/ports/shaderc/fix-export-cmakefiles.patch @@ -0,0 +1,93 @@ +diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt +index f3277f0..5fd58ef 100644 +--- a/libshaderc/CMakeLists.txt ++++ b/libshaderc/CMakeLists.txt +@@ -28,7 +28,9 @@ if (NOT BUILD_SHARED_LIBS) + add_library(shaderc STATIC ${SHADERC_SOURCES}) + shaderc_default_compile_options(shaderc) + target_include_directories(shaderc +- PUBLIC include ++ PUBLIC ++ $ ++ $ + PRIVATE ${glslang_SOURCE_DIR} + ${SPIRV-Headers_SOURCE_DIR}/include) + set(shaderc_install_target shaderc) +@@ -37,7 +39,9 @@ else() + add_library(shaderc_shared SHARED ${SHADERC_SOURCES}) + shaderc_default_compile_options(shaderc_shared) + target_include_directories(shaderc_shared +- PUBLIC include ++ PUBLIC ++ $ ++ $ + PRIVATE ${glslang_SOURCE_DIR} + ${SPIRV-Headers_SOURCE_DIR}/include) + target_compile_definitions(shaderc_shared +@@ -59,10 +63,14 @@ if(SHADERC_ENABLE_INSTALL) + DESTINATION + ${CMAKE_INSTALL_INCLUDEDIR}/shaderc) + +- install(TARGETS ${shaderc_install_target} ++ install(TARGETS ${shaderc_install_target} EXPORT unofficial-shadercTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(EXPORT unofficial-shadercTargets ++ NAMESPACE unofficial::shaderc:: ++ DESTINATION share/unofficial-shaderc ++ ) + endif(SHADERC_ENABLE_INSTALL) + + find_package(Threads) +@@ -79,6 +87,11 @@ else() + target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS}) + endif() + ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shadercTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake DESTINATION share/unofficial-shaderc) ++ + shaderc_add_tests( + TEST_PREFIX shaderc + LINK_LIBS shaderc +diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt +index 4926203..b152d7b 100644 +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -39,7 +39,10 @@ add_library(shaderc_util STATIC + + shaderc_default_compile_options(shaderc_util) + target_include_directories(shaderc_util +- PUBLIC include PRIVATE ${glslang_SOURCE_DIR}) ++ PUBLIC ++ $ ++ $ ++ PRIVATE ${glslang_SOURCE_DIR}) + # We use parts of Glslang's HLSL compilation interface, which + # now requires this preprocessor definition. + add_definitions(-DENABLE_HLSL) +@@ -50,12 +53,21 @@ target_link_libraries(shaderc_util PRIVATE + SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) + + if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS) +- install(TARGETS shaderc_util ++ install(TARGETS shaderc_util EXPORT unofficial-shaderc_utilTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(EXPORT unofficial-shaderc_utilTargets ++ NAMESPACE unofficial::shaderc_util:: ++ DESTINATION share/unofficial-shaderc_util ++ ) + endif(SHADERC_ENABLE_INSTALL) + ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shaderc_utilTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake DESTINATION share/unofficial-shaderc_util) ++ + shaderc_add_tests( + TEST_PREFIX shaderc_util + LINK_LIBS shaderc_util diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index be59aa5ba2a8c9..4a2f62cbaabf33 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -11,9 +11,10 @@ vcpkg_from_github( disable-update-version.patch fix-build-type.patch fix-install-shaderc_util.patch + fix-export-cmakefiles.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/build-version.inc DESTINATION ${SOURCE_PATH}/glslc/src) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/build-version.inc" DESTINATION "${SOURCE_PATH}/glslc/src") set(OPTIONS) if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") @@ -25,9 +26,8 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} -DSHADERC_SKIP_TESTS=true @@ -36,12 +36,14 @@ vcpkg_configure_cmake( -DSHADERC_ENABLE_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-shaderc CONFIG_PATH share/unofficial-shaderc) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-shaderc_util CONFIG_PATH share/unofficial-shaderc_util) vcpkg_copy_tools(TOOL_NAMES glslc AUTO_CLEAN) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/shaderc/vcpkg.json b/ports/shaderc/vcpkg.json index e7e490c008bfd3..903544d805f8f4 100644 --- a/ports/shaderc/vcpkg.json +++ b/ports/shaderc/vcpkg.json @@ -1,11 +1,20 @@ { "name": "shaderc", "version": "2021.1", - "port-version": 1, + "port-version": 2, "description": "A collection of tools, libraries and tests for shader compilation.", "homepage": "https://github.com/google/shaderc", + "license": "Apache-2.0", "dependencies": [ "glslang", - "spirv-tools" + "spirv-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/shaderwriter/portfile.cmake b/ports/shaderwriter/portfile.cmake index c53367fe8882a0..2d80e3fba9620c 100644 --- a/ports/shaderwriter/portfile.cmake +++ b/ports/shaderwriter/portfile.cmake @@ -1,15 +1,15 @@ - vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/ShaderWriter - REF v1.1.0 - SHA512 7c2a311f332342a2fc7d37e646314fe79f28a00292ff082903b3fc30f3ff86f222936fd2bc9d85d79a66caf854b05bfa5546f9d299c0764d695c027c5101bc74 + REF bcebc67feb99d98066dfb51a3857155ddcfa9d57 + HEAD_REF master + SHA512 675a9db22c3593426c9a364a8a2934e41f65447d450347dd5683a89e4f38dfbc914dca7f6fbfa77b0afd1fb0fd12c2316c11eded1453ae4498b448ae2267fdac ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO DragonJoker/CMakeUtils - REF 0d750fb17099157f0e15e09cdf834453f3e8557a + REF 27747f5c91acf76107220986f114efdab0a09a68 HEAD_REF master - SHA512 579ad01149180b2295a0441b3c4b575448d2f4335d013948b15c7b70c0232d3488ac296d4864a7808773fa3e3c1a8fc4de0c7b42a6595cc9b9d27f154321984a + SHA512 acd5dafc74e197886a9b1ac52b59bdbf2d136cc8b49683eda48b8ccc45eced5f68aa334c8f9c01c7d8bf5c8908b64cbf19a97c6e3666370111bb3d2551c3b469 ) get_filename_component(SRC_PATH ${CMAKE_SOURCE_PATH} DIRECTORY) @@ -22,9 +22,8 @@ file(COPY ${CMAKE_SOURCE_PATH} DESTINATION ${SOURCE_PATH}) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DPROJECTS_USE_PRECOMPILED_HEADERS=OFF -DSDW_GENERATE_SOURCE=OFF @@ -32,12 +31,9 @@ vcpkg_configure_cmake( -DSDW_BUILD_TESTS=OFF -DSDW_BUILD_STATIC_SDW=${BUILD_STATIC} -DSDW_BUILD_STATIC_SDAST=${BUILD_STATIC} - -DSDW_BUILD_EXPORTER_GLSL_STATIC=${BUILD_STATIC} - -DSDW_BUILD_EXPORTER_HLSL_STATIC=${BUILD_STATIC} - -DSDW_BUILD_EXPORTER_SPIRV_STATIC=${BUILD_STATIC} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shaderwriter) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/shaderwriter) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/shaderwriter/vcpkg.json b/ports/shaderwriter/vcpkg.json index 15f2a0bfd407f8..efd2516bb2687f 100644 --- a/ports/shaderwriter/vcpkg.json +++ b/ports/shaderwriter/vcpkg.json @@ -1,6 +1,17 @@ { "name": "shaderwriter", - "version": "1.1.0", + "version": "2.1.0", "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.", - "homepage": "https://github.com/DragonJoker/ShaderWriter" + "homepage": "https://github.com/DragonJoker/ShaderWriter", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/shiva/no_copy_dll.patch b/ports/shiva/no_copy_dll.patch new file mode 100644 index 00000000000000..add7f22a494d0c --- /dev/null +++ b/ports/shiva/no_copy_dll.patch @@ -0,0 +1,13 @@ +diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt +index eef14ee87..d52a147d8 100644 +--- a/modules/python/CMakeLists.txt ++++ b/modules/python/CMakeLists.txt +@@ -4,7 +4,7 @@ set(MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + find_package(pybind11 CONFIG REQUIRED) + + +-if (WIN32) ++if (WIN32 AND FALSE) + ## We need pyton dll + file(GLOB PYTHON_DLL ${PYTHON_LIBRARIES}/../*.dll) + diff --git a/ports/shiva/portfile.cmake b/ports/shiva/portfile.cmake index 72beec0e05fd03..884a8de108656c 100644 --- a/ports/shiva/portfile.cmake +++ b/ports/shiva/portfile.cmake @@ -1,24 +1,30 @@ -vcpkg_find_acquire_program(PYTHON2) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Milerius/shiva REF 1.0 SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1 HEAD_REF master + PATCHES no_copy_dll.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +find_library(PYTHON_RELEASE NAMES python310 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PYTHON_DEBUG NAMES python310_d python310 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +include(SelectLibraryConfigurations) +select_library_configurations(PYTHON) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS - -DSHIVA_BUILD_TESTS=OFF - -DPYTHON_EXECUTABLE=${PYTHON2} + -DSHIVA_BUILD_TESTS=OFF + "-DPYTHON_LIBRARY=${PYTHON_LIBRARIES}" + "-DPYTHON_LIBRARIES=${PYTHON_LIBRARIES}" + "-DPYTHON_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/python3/python${VCPKG_EXECUTABLE_SUFFIX}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shiva) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/shiva") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/shiva) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/shiva/LICENSE ${CURRENT_PACKAGES_DIR}/share/shiva/copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/shiva") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/shiva/LICENSE" "${CURRENT_PACKAGES_DIR}/share/shiva/copyright") diff --git a/ports/shiva/vcpkg.json b/ports/shiva/vcpkg.json index d080dd5a026c84..447297bd066507 100644 --- a/ports/shiva/vcpkg.json +++ b/ports/shiva/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shiva", - "version-string": "1.0", - "port-version": 4, + "version": "1.0", + "port-version": 5, "description": "Modern C++ Game Engine", "homepage": "https://github.com/Milerius/shiva", "dependencies": [ @@ -17,6 +17,14 @@ "nlohmann-json", "pybind11", "sol2", - "spdlog" + "spdlog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/shogun/eigen-3.4.patch b/ports/shogun/eigen-3.4.patch new file mode 100644 index 00000000000000..c6cd369b12b939 --- /dev/null +++ b/ports/shogun/eigen-3.4.patch @@ -0,0 +1,65 @@ +--- a/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp ++++ b/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp +@@ -84,9 +84,9 @@ class CMultiPsiLine : public func_base + float64_t result=0; + for(index_t bl=0; blblock(bl*n,0,n,1)*CMath::exp(log_scale*2.0); +- result+=alpha->block(bl*n,0,n,1).dot(eigen_f.block(bl*n,0,n,1))/2.0; +- eigen_f.block(bl*n,0,n,1)+=eigen_m; ++ eigen_f.segment(bl*n,n)=K*alpha->segment(bl*n,n)*CMath::exp(log_scale*2.0); ++ result+=alpha->segment(bl*n,n).dot(eigen_f.segment(bl*n,n))/2.0; ++ eigen_f.segment(bl*n,n)+=eigen_m; + } + + // get first and second derivatives of log likelihood +@@ -272,7 +272,7 @@ void CMultiLaplaceInferenceMethod::update_alpha() + { + Map alpha(m_alpha.vector, m_alpha.vlen); + for(index_t bl=0; bl chol_tmp((eigen_sD*eigen_sD.transpose()).cwiseProduct(eigen_ktrtr*CMath::exp(m_log_scale*2.0))+ + MatrixXd::Identity(m_ktrtr.num_rows, m_ktrtr.num_cols)); + MatrixXd eigen_L_tmp=chol_tmp.matrixU(); +@@ -341,11 +341,11 @@ void CMultiLaplaceInferenceMethod::update_alpha() + VectorXd tmp2=m_tmp.array().rowwise().sum(); + + for(index_t bl=0; bl &eigen_c=eigen_W; + for(index_t bl=0; bl c_tmp(eigen_c.data(),n,C); + +@@ -409,7 +409,7 @@ float64_t CMultiLaplaceInferenceMethod::get_derivative_helper(SGMatrix CMultiLaplaceInferenceMethod::get_derivative_wrt_mean( + result[i]=0; + //currently only compute the explicit term + for(index_t bl=0; bl) + +install( + TARGETS spirv-reflect EXPORT unofficial-spirv-reflect-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install( + EXPORT unofficial-spirv-reflect-config + NAMESPACE unofficial::spirv-reflect:: + DESTINATION share/unofficial-spirv-reflect +) + +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h" DESTINATION include) +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION include) diff --git a/ports/spirv-reflect/portfile.cmake b/ports/spirv-reflect/portfile.cmake new file mode 100644 index 00000000000000..62d8a16b14cbcf --- /dev/null +++ b/ports/spirv-reflect/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/SPIRV-Reflect + REF d920b79aadafe3ffd52764ac80370b15a611c83a + SHA512 3e94adb9ec80f356bd51665f10e3e1d8e6236632d259a22fab97a156c6cf6fcbd1afc102ac4578fa3f3725b6cc0cbdf530c85fa133154d6c4e313324c1d6bbf4 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +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/spirv-reflect" RENAME copyright) diff --git a/ports/spirv-reflect/vcpkg.json b/ports/spirv-reflect/vcpkg.json new file mode 100644 index 00000000000000..fc7933148422a3 --- /dev/null +++ b/ports/spirv-reflect/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "spirv-reflect", + "version-date": "2021-12-31", + "description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.", + "homepage": "https://github.com/KhronosGroup/SPIRV-Reflect", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan" + ] +} diff --git a/ports/sqlcipher/CMakeLists.txt b/ports/sqlcipher/CMakeLists.txt index 0a505139bfc171..35eeb68aaed483 100644 --- a/ports/sqlcipher/CMakeLists.txt +++ b/ports/sqlcipher/CMakeLists.txt @@ -42,6 +42,9 @@ if(NOT WIN32) find_package(Threads REQUIRED) target_link_libraries(sqlcipher PRIVATE Threads::Threads ${CMAKE_DL_LIBS}) endif() +if (UNIX AND NOT APPLE) + target_link_libraries(sqlcipher PRIVATE m) +endif() target_link_libraries(sqlcipher PRIVATE ${OPENSSL_CRYPTO_LIBRARY}) diff --git a/ports/sqlcipher/portfile.cmake b/ports/sqlcipher/portfile.cmake index 02c27357c85609..55d0b01e4460e1 100644 --- a/ports/sqlcipher/portfile.cmake +++ b/ports/sqlcipher/portfile.cmake @@ -1,12 +1,10 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -vcpkg_fail_port_install( ON_TARGET "UWP" "OSX" "Linux") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sqlcipher/sqlcipher - REF v4.4.3 - SHA512 d80177cf658c145f7328bafac14bc2779afa463fc94ef0a5e99b6654cf2eece3088ac296949130e7263f52948913ffeac253c47e33d91816e90caf1788301a9a + REF v4.5.1 + SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3 HEAD_REF master ) diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json index ed3ff2876f44b5..2d67e51759d6ee 100644 --- a/ports/sqlcipher/vcpkg.json +++ b/ports/sqlcipher/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sqlcipher", - "version": "4.4.3", + "version": "4.5.1", "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", "supports": "windows & !uwp & !static", diff --git a/ports/sqlite-orm/portfile.cmake b/ports/sqlite-orm/portfile.cmake index fc222dc584fa65..d569626d26e5c5 100644 --- a/ports/sqlite-orm/portfile.cmake +++ b/ports/sqlite-orm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fnc12/sqlite_orm - REF v1.7 - SHA512 482096eed5ef10968198a5e34c160db61a6339c8c0c098419b31fe2931f8ba0aa4a7a676c914eb7cf6202f0b0cc0e1932f92e1e07fedd7a961cfc66ddbb6730b + REF v1.7.1 + SHA512 ab934959245e8e0aaefd543ef0c1ab336547e4c311aff9dda916c7577c006622dec917313350d0d8bde4366d42b458c915fc2ea2fb927c01910fe429e55c8bbc HEAD_REF master PATCHES fix-features-build-error.patch diff --git a/ports/sqlite-orm/vcpkg.json b/ports/sqlite-orm/vcpkg.json index a56f35cd7abd0d..8ad25318483e8f 100644 --- a/ports/sqlite-orm/vcpkg.json +++ b/ports/sqlite-orm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sqlite-orm", - "version": "1.7", + "version": "1.7.1", "description": "SQLite ORM light header only library for modern C++", "homepage": "https://github.com/fnc12/sqlite_orm", "dependencies": [ diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index 7c1099bdbb5eb5..aa14b8bb9e0344 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -1,51 +1,145 @@ cmake_minimum_required(VERSION 3.10) + project(sqlite3 C) -include_directories(.) +option(ENABLE_FTS3 "Enable the FTS3 extension" OFF) +option(ENABLE_FTS4 "Enable the FTS4 extension" OFF) +option(ENABLE_FTS5 "Enable the FTS5 extension" OFF) +option(ENABLE_MEMSYS3 "Enable MEMSYS3" OFF) +option(ENABLE_MEMSYS5 "Enable MEMSYS5" OFF) +option(ENABLE_MATH_FUNCTION "Enable math functions" OFF) +option(ENABLE_LIMIT "Enable the UPDATE/DELETE LIMIT clause" OFF) +option(ENABLE_RTREE "Enable the RTREE extension" OFF) +option(ENABLE_SESSION "Enable the SESSION extension" OFF) +option(ENABLE_OMIT_LOAD_EXT "Enable loading of external extensions" OFF) +option(WITH_GEOPOLY "Enable geopoly functionality for sqlite3" OFF) +option(WITH_JSON1 "Enable JSON functionality for sqlite3" OFF) +option(WITH_ZLIB "Build sqlite3 with zlib support" OFF) +option(SQLITE3_SKIP_TOOLS "Disable build sqlite3 executable" OFF) + if(BUILD_SHARED_LIBS) if(UNIX) - set(API "-DSQLITE_API=__attribute__((visibility(\"default\")))") - elseif(CMAKE_SYSTEM_NAME MATCHES "Windows") - set(API "-DSQLITE_API=__declspec(dllexport)") + set(SQLITE_API "-DSQLITE_API=__attribute__((visibility(\"default\")))") + elseif(WIN32) + set(SQLITE_API "-DSQLITE_API=__declspec(dllexport)") else() message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}") endif() -else() - set(API "-DSQLITE_API=extern") endif() + add_library(sqlite3 sqlite3.c) +target_include_directories(sqlite3 PUBLIC $ $) + target_compile_definitions( sqlite3 PRIVATE - $<$:SQLITE_DEBUG> - ${API} - -DSQLITE_ENABLE_RTREE + $<$:SQLITE_DEBUG=1> + $<$:SQLITE_ENABLE_SELECTTRACE> + $<$:SQLITE_ENABLE_WHERETRACE> + ${SQLITE_API} -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_COLUMN_METADATA ) +if (BUILD_SHARED_LIBS) + if (UNIX) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_API=__attribute__((visibility(\"default\")))") + target_compile_definitions(sqlite3 INTERFACE "SQLITE_API=__attribute__((visibility(\"default\")))") + elseif (WIN32) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_API=__declspec(dllimport)") + target_compile_definitions(sqlite3 INTERFACE "SQLITE_API=__declspec(dllimport)") + endif() +endif() + +if (ENABLE_FTS3) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_FTS3") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_FTS3) +endif() + +if (ENABLE_FTS4) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_FTS4") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_FTS4) +endif() + +if (ENABLE_FTS5) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_FTS5") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_FTS5) +endif() + +if (ENABLE_MEMSYS3) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_MEMSYS3") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_MEMSYS3) +endif() + +if (ENABLE_MEMSYS5) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_MEMSYS5") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_MEMSYS5) +endif() + +if (ENABLE_MATH_FUNCTION) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_MATH_FUNCTIONS") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_MATH_FUNCTIONS) +endif() + +if (ENABLE_LIMIT) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_UPDATE_DELETE_LIMIT) +endif() + +if (ENABLE_RTREE) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_RTREE") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_RTREE) +endif() + +if (ENABLE_SESSION) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_SESSION SQLITE_ENABLE_PREUPDATE_HOOK) +endif() + +if (ENABLE_OMIT_LOAD_EXT) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_OMIT_LOAD_EXTENSION") + target_compile_definitions(sqlite3 PUBLIC SQLITE_OMIT_LOAD_EXTENSION) +endif() + if(WITH_GEOPOLY) - add_compile_definitions(SQLITE_ENABLE_GEOPOLY) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_GEOPOLY") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_GEOPOLY) endif() if(WITH_JSON1) - add_compile_definitions(SQLITE_ENABLE_JSON1) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_JSON1") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_JSON1) +endif() + +if (WIN32) + string(APPEND PKGCONFIG_DEFINES " -DQLITE_OS_WIN=1") + target_compile_definitions(sqlite3 PUBLIC -DSQLITE_OS_WIN=1) + + if(CMAKE_SYSTEM_NAME MATCHES "WindowsStore") + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_OS_WINRT=1") + target_compile_definitions(sqlite3 PUBLIC -DSQLITE_OS_WINRT=1) + endif() +else() + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_OS_UNIX=1") + target_compile_definitions(sqlite3 PUBLIC -DSQLITE_OS_UNIX=1) endif() -target_include_directories(sqlite3 INTERFACE $) if(NOT WIN32) find_package(Threads REQUIRED) - target_link_libraries(sqlite3 PRIVATE Threads::Threads ${CMAKE_DL_LIBS}) + target_link_libraries(sqlite3 PUBLIC Threads::Threads ${CMAKE_DL_LIBS}) endif() -if(CMAKE_SYSTEM_NAME MATCHES "WindowsStore") - target_compile_definitions(sqlite3 PRIVATE -DSQLITE_OS_WINRT=1) +if (WITH_ZLIB) + find_package(ZLIB REQUIRED) + target_link_libraries(sqlite3 PUBLIC ZLIB::ZLIB) endif() if(NOT SQLITE3_SKIP_TOOLS) add_executable(sqlite3-bin shell.c) + target_link_libraries(sqlite3-bin PRIVATE sqlite3) + install(TARGETS sqlite3-bin sqlite3 RUNTIME DESTINATION tools LIBRARY DESTINATION lib @@ -65,9 +159,13 @@ install(FILES sqlite3.h sqlite3ext.h DESTINATION include CONFIGURATIONS Release) install(EXPORT unofficial-sqlite3-targets NAMESPACE unofficial::sqlite3:: FILE unofficial-sqlite3-targets.cmake DESTINATION share/unofficial-sqlite3) if(UNIX) - set(PKGCONFIG_LIBS_PRIVATE "-lm -ldl -lpthread") + set(PKGCONFIG_LIBS_PRIVATE "-lm -ldl") + if(NOT ANDROID) + string(APPEND PKGCONFIG_LIBS_PRIVATE " -lpthread") + endif() else() set(PKGCONFIG_LIBS_PRIVATE "") endif() + configure_file(sqlite3.pc.in sqlite3.pc @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sqlite3.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 5c66acf204bcb7..30ef7c8550d74e 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,7 +1,7 @@ # Be sure to update both of these versions together. -set(SQLITE_VERSION 3370000) -set(PKGCONFIG_VERSION 3.37.0) -set(SQLITE_HASH e33935e513e52c825ebdef8eab92a4a839731a3b8fffcd5910a5dbd305ffd4cb627bf10c3d191dd934d1d6707e4a199dd098073953322768d5210fc726eb22fd) +set(SQLITE_VERSION 3370100) +set(PKGCONFIG_VERSION 3.37.1) +set(SQLITE_HASH b59343772dc4c6bb8e05fff6206eeb44861efa52c120c789ce6b733e974cf950657b6ab369aa405d75f45ed9cf1cb8128a76447bc63e9ce9822578d71581a7a3) vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2021/sqlite-amalgamation-${SQLITE_VERSION}.zip" @@ -21,10 +21,21 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/sqlite3.pc.in" DESTINATION "${SOURCE_PATH}" vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - geopoly WITH_GEOPOLY - json1 WITH_JSON1 + fts3 ENABLE_FTS3 + fts4 ENABLE_FTS4 + fts5 ENABLE_FTS5 + memsys3 ENABLE_MEMSYS3 + memsys5 ENABLE_MEMSYS5 + math ENABLE_MATH_FUNCTION + limit ENABLE_LIMIT + rtree ENABLE_RTREE + session ENABLE_SESSION + omit-load-extension ENABLE_OMIT_LOAD_EXT + geopoly WITH_GEOPOLY + json1 WITH_JSON1 + zlib WITH_ZLIB INVERTED_FEATURES - tool SQLITE3_SKIP_TOOLS + tool SQLITE3_SKIP_TOOLS ) vcpkg_cmake_configure( @@ -37,6 +48,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -58,4 +70,3 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n") -vcpkg_copy_pdbs() diff --git a/ports/sqlite3/sqlite3.pc.in b/ports/sqlite3/sqlite3.pc.in index d265632d119930..c7ecbf1a547702 100644 --- a/ports/sqlite3/sqlite3.pc.in +++ b/ports/sqlite3/sqlite3.pc.in @@ -8,4 +8,4 @@ Description: SQL database engine Version: @PKGCONFIG_VERSION@ Libs: -L${libdir} -lsqlite3 Libs.private: @PKGCONFIG_LIBS_PRIVATE@ -Cflags: -I${includedir} +Cflags: -I${includedir} @PKGCONFIG_DEFINES@ diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index 6f72afbd890af8..f59f84fc6d0341 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,8 +1,10 @@ { "name": "sqlite3", - "version": "3.37.0", + "version": "3.37.2", + "port-version": 1, "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", - "homepage": "https://sqlite.org/", + "homepage": "https://github.com/sqlite/sqlite", + "license": "blessing", "dependencies": [ { "name": "vcpkg-cmake", @@ -14,14 +16,50 @@ } ], "features": { + "fts3": { + "description": "Enable the FTS3 extension" + }, + "fts4": { + "description": "Enable the FTS4 extension" + }, + "fts5": { + "description": "Enable the FTS5 extension" + }, "geopoly": { - "description": "enable geopoly functionality for sqlite3" + "description": "Enable geopoly functionality for sqlite3" }, "json1": { - "description": "enable JSON functionality for sqlite3" + "description": "Enable JSON functionality for sqlite3" + }, + "limit": { + "description": "Enable the UPDATE/DELETE LIMIT clause" + }, + "math": { + "description": "Enable math functions" + }, + "memsys3": { + "description": "Enable MEMSYS3" + }, + "memsys5": { + "description": "Enable MEMSYS5" + }, + "omit-load-extension": { + "description": "Enable loading of external extensions" + }, + "rtree": { + "description": "Enable the RTREE extension" + }, + "session": { + "description": "Enable the SESSION extension" }, "tool": { - "description": "sqlite3 executable" + "description": "Build sqlite3 executable" + }, + "zlib": { + "description": "Build sqlite3 with zlib support", + "dependencies": [ + "zlib" + ] } } } diff --git a/ports/starlink-ast/portfile.cmake b/ports/starlink-ast/portfile.cmake index 92475ad5509dc2..058b37badff5ac 100644 --- a/ports/starlink-ast/portfile.cmake +++ b/ports/starlink-ast/portfile.cmake @@ -1,18 +1,17 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX") - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Starlink/ast/releases/download/v9.2.4/ast-9.2.4.tar.gz" - FILENAME "ast-9.2.4.tar.gz" - SHA512 84e6f243e6d9d77328b73b97355feb3990307fb9c8f9b2f30344d71e2f5e63a849cdce0090ff5b7cc16028e12d68516c885b13d76db841072c9d1d06a7742a9e + URLS "https://github.com/Starlink/ast/releases/download/v9.2.7/ast-9.2.7.tar.gz" + FILENAME "ast-9.2.7.tar.gz" + SHA512 4778658fe6b08af29b51807e2d988f8425d99d630a14d8fef9ca4ea43016d676df419a93c4b2fdecc0549c28c0665f61e366bd4e7aa896ebb8e47f56d5af1887 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE ${ARCHIVE} ) set(CONFIGURE_OPTIONS --without-fortran + --with-external-cminpack star_cv_cnf_trail_type=long star_cv_cnf_f2c_compatible=no ) diff --git a/ports/starlink-ast/vcpkg.json b/ports/starlink-ast/vcpkg.json index 5c3753df6b4cdd..5acdf6d3d990db 100644 --- a/ports/starlink-ast/vcpkg.json +++ b/ports/starlink-ast/vcpkg.json @@ -1,10 +1,13 @@ { "name": "starlink-ast", - "version-semver": "9.2.4", - "port-version": 2, + "version": "9.2.7", + "port-version": 1, "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it", "homepage": "https://starlink.eao.hawaii.edu/starlink/AST", "supports": "windows", + "dependencies": [ + "cminpack" + ], "features": { "pthreads": { "description": "build with POSIX threads support", diff --git a/ports/status-code/portfile.cmake b/ports/status-code/portfile.cmake index f369a3ba05a17d..a7bf19e776ba2c 100644 --- a/ports/status-code/portfile.cmake +++ b/ports/status-code/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/status-code - REF ab3cd8217b6a89b91708a497f77f119c096fcce3 - SHA512 266c79875fd6edb4a239768da29401193d5b710fe3d06208df010c5ca56bf80fa4558f572c738ab9290ee378437c882d072e93e8fb10fb1e3787b460f40a7102 + REF 0cca391ad9168581641b569e031f25c7ee1673b3 + SHA512 5fdf3e268d0a4a388202547ceac271832642648fdc50824a8f26d86bad1d45c93394ff6651e50232dde534e057dfadaf7a7436b893dd7b182a75bcd57e24fc9d HEAD_REF master ) diff --git a/ports/status-code/vcpkg.json b/ports/status-code/vcpkg.json index 6a47ecd029f48c..93b58daceb751e 100644 --- a/ports/status-code/vcpkg.json +++ b/ports/status-code/vcpkg.json @@ -1,6 +1,6 @@ { "name": "status-code", - "version-string": "1.0.0-ab3cd821", + "version-string": "1.0.0-20211208", "port-version": 1, "description": "Proposed SG14 status_code for the C++ standard (https://wg21.link/P1028).", "homepage": "https://github.com/ned14/status-code" diff --git a/ports/superlu/portfile.cmake b/ports/superlu/portfile.cmake index 3d21ec510ff9da..7b4f8d25a2c1f8 100644 --- a/ports/superlu/portfile.cmake +++ b/ports/superlu/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaoyeli/superlu diff --git a/ports/superlu/vcpkg.json b/ports/superlu/vcpkg.json index 08b6be02a71cb7..fc100ad2e540fd 100644 --- a/ports/superlu/vcpkg.json +++ b/ports/superlu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "superlu", - "version-string": "2020-01-07", - "port-version": 4, + "version-date": "2020-01-07", + "port-version": 5, "description": "Supernodal sparse direct solver.", "homepage": "https://github.com/xiaoyeli/superlu", "supports": "!(uwp | arm)", diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake index bce8b1f869eb57..a951b7e64a24dd 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -7,37 +7,44 @@ vcpkg_from_github( PATCHES msvc-disable-deprecated-warnings.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILD_SHARED_LIBS OFF) -elseif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(BUILD_SHARED_LIBS ON) -endif() - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(WINRT_OPTIONS -DHAVE_VSNPRINTF=1 -DPLATFORM_WINRT=1) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS ${WINRT_OPTIONS} ) - -vcpkg_install_cmake() - +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() +set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/taglib.pc") +if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib") + vcpkg_replace_string("${pcfile}" " -lz" "") +endif() +set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/taglib.pc") +if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib") + vcpkg_replace_string("${pcfile}" " -lz" "") +endif() + # remove the debug/include files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # copyright file -file(COPY ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/taglib) -file(COPY ${SOURCE_PATH}/COPYING.MPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/taglib) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL ${CURRENT_PACKAGES_DIR}/share/taglib/copyright) +file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") +file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/taglib-config.cmd" "${CURRENT_PACKAGES_DIR}/debug/bin/taglib-config.cmd") # Contains absolute paths # remove bin directory for static builds (taglib creates a cmake batch file there) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/taglib/taglib_export.h" "defined(TAGLIB_STATIC)" "1") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() vcpkg_copy_pdbs() + diff --git a/ports/taglib/vcpkg.json b/ports/taglib/vcpkg.json index f3f7239ced4d9b..54e9759ba27a56 100644 --- a/ports/taglib/vcpkg.json +++ b/ports/taglib/vcpkg.json @@ -1,10 +1,15 @@ { "name": "taglib", "version-semver": "1.12.0", + "port-version": 2, "description": "TagLib Audio Meta-Data Library", "homepage": "https://taglib.org/", "license": "LGPL-2.1 OR MPL-1.1", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/ports/taskflow/portfile.cmake b/ports/taskflow/portfile.cmake index 56e6564a3cfeff..87c60ac15ed7db 100644 --- a/ports/taskflow/portfile.cmake +++ b/ports/taskflow/portfile.cmake @@ -2,14 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taskflow/taskflow - REF cbcf750895259d1e01089d4cc4535dc962bc7848 #v3.2.0 - SHA512 584f81a8c9d314fbd5bc3497cead659488e17ded90cca9144e867ea5d18f50bd8bc554eaefc21ed82e73b5c92a89c5502434e214b0543b65442a2c261d2ef396 + REF bfad4b9a0cc5acad5fc99fb6ff6b904b79f27f93 #v3.3.0 + SHA512 489807c84438a727832e9d530c9b2948240bebee48f210ce4a8c69917cbb71306df378440621b1bf091e4aa62c86681d71afd38a3343c8ea872a4eefcabc496e HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTF_BUILD_BENCHMARKS=OFF -DTF_BUILD_CUDA=OFF @@ -19,11 +18,11 @@ vcpkg_configure_cmake( -DCMAKE_CUDA_COMPILER=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Taskflow) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Taskflow) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/taskflow/vcpkg.json b/ports/taskflow/vcpkg.json index a71f3220841c39..9d2cbca95e6e31 100644 --- a/ports/taskflow/vcpkg.json +++ b/ports/taskflow/vcpkg.json @@ -1,6 +1,17 @@ { "name": "taskflow", - "version": "3.2.0", + "version": "3.3.0", "description": "Fast Parallel Tasking Programming Library using Modern C++", - "homepage": "https://github.com/taskflow/taskflow" + "homepage": "https://github.com/taskflow/taskflow", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index bf65511b788943..e826081f8cdf25 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -1,6 +1,4 @@ -if (NOT VCPKG_TARGET_IS_LINUX AND NOT VCPKG_TARGET_IS_OSX) - vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") -endif() +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index 101e41bd7b5b17..09ab4cd1e33b52 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tbb", "version-string": "2020_U3", - "port-version": 6, + "port-version": 8, "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/01org/tbb", "supports": "!(uwp | arm | arm64) | linux | osx" diff --git a/ports/tcb-span/portfile.cmake b/ports/tcb-span/portfile.cmake new file mode 100644 index 00000000000000..48edffef3d4bf7 --- /dev/null +++ b/ports/tcb-span/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tcbrindle/span + REF 427f6bd0bbf36ad46aec4d8bdd7760beeb10dd33 # master commit 2021-12-15 + SHA512 c775bd50bc68d98fcde5e99bb9b6594c8ac9ef15fa15efe89c253b4135df77d83e58743d3c7e90d3aff03429251497a7d56d1900f6e258416c0664a82326243c + HEAD_REF master +) + +# Just a single header +file( + INSTALL "${SOURCE_PATH}/include/tcb/span.hpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/tcb" +) + +# Handle copyright +file( + INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/ports/tcb-span/vcpkg.json b/ports/tcb-span/vcpkg.json new file mode 100644 index 00000000000000..777f195d002cb4 --- /dev/null +++ b/ports/tcb-span/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tcb-span", + "version-date": "2021-12-15", + "description": "Implementation of C++20's std::span for older compilers", + "homepage": "https://github.com/tcbrindle/span", + "license": "BSL-1.0" +} diff --git a/ports/teemo/portfile.cmake b/ports/teemo/portfile.cmake index c4688b1889f94c..6d0a1a7ee6a7bd 100644 --- a/ports/teemo/portfile.cmake +++ b/ports/teemo/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/teemo - REF 72037259a77a618160e9a9129873c39eb888e632 - SHA512 b9b3df732b8378048405d395d297920f606bbc1c698cebe8125efab952438ee59cadf940886506e8c044e06d139532a15ac3ea2dcd48a18754ac9843bb2287a9 + REF abfff2b724f3ae9f7968392178005f648fe666e3 + SHA512 56b1791159179c7f84523bf3d4b21f5272fce11843da0f0993e58563414a11637ccee50fe5a520089e16df5e17acf2308c2993266156ee49d9d07b1d7211f151 HEAD_REF master ) @@ -27,7 +25,11 @@ elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/teemo") vcpkg_cmake_config_fixup(CONFIG_PATH share/teemo) endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h" "#ifdef TEEMO_STATIC" "#if $") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h" "#ifdef TEEMO_STATIC" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h" "#ifdef TEEMO_STATIC" "#if 0") +endif() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/teemo/vcpkg.json b/ports/teemo/vcpkg.json index a2b103b16ccc30..ed999e2ebac17a 100644 --- a/ports/teemo/vcpkg.json +++ b/ports/teemo/vcpkg.json @@ -1,6 +1,8 @@ { "name": "teemo", - "version": "2.3", + "version": "2.6", + "port-version": 1, + "maintainers": "winsoft666 ", "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.", "homepage": "https://github.com/winsoft666/teemo", "supports": "!osx & !uwp & !arm", diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake index 2c1cfc2db2da9b..ee9926b15d5e8a 100644 --- a/ports/tensorflow-cc/portfile.cmake +++ b/ports/tensorflow-cc/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "UWP") - if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() set(TF_LIB_SUFFIX "_cc") set(TF_PORT_SUFFIX "-cc") -set(TF_INCLUDE_DIRS "${CURRENT_INSTALLED_DIR}/include/tensorflow-external ${CURRENT_INSTALLED_DIR}/include/tensorflow-external/src") +set(TF_INCLUDE_DIRS "\${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external \${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external/src") list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/tensorflow-common") include(tensorflow-common) diff --git a/ports/tensorflow-cc/vcpkg.json b/ports/tensorflow-cc/vcpkg.json index b2f1edcc77f92e..9bb69848cd3cde 100644 --- a/ports/tensorflow-cc/vcpkg.json +++ b/ports/tensorflow-cc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tensorflow-cc", - "version-semver": "2.6.0", + "version-semver": "2.7.0", + "port-version": 2, "description": "Library for computation using data flow graphs for scalable machine learning (C++ API version)", "homepage": "https://github.com/tensorflow/tensorflow", "supports": "!(x86 | arm | uwp)", diff --git a/ports/tensorflow-common/Update-bazel-max-version.patch b/ports/tensorflow-common/Update-bazel-max-version.patch deleted file mode 100644 index 172a6439d319f7..00000000000000 --- a/ports/tensorflow-common/Update-bazel-max-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.py b/configure.py ---- a/configure.py -+++ b/configure.py -@@ -50,7 +50,7 @@ - _TF_BAZELRC = '' - _TF_CURRENT_BAZEL_VERSION = None - _TF_MIN_BAZEL_VERSION = '3.7.2' --_TF_MAX_BAZEL_VERSION = '3.99.0' -+_TF_MAX_BAZEL_VERSION = '4.1.0' - - NCCL_LIB_PATHS = [ - 'lib64/', 'lib/powerpc64le-linux-gnu/', 'lib/x86_64-linux-gnu/', '' diff --git a/ports/tensorflow-common/fix-windows-build.patch b/ports/tensorflow-common/fix-windows-build.patch index 8450299e80f7fb..9f7f8dea8d29f1 100644 --- a/ports/tensorflow-common/fix-windows-build.patch +++ b/ports/tensorflow-common/fix-windows-build.patch @@ -10,22 +10,6 @@ diff --git a/tensorflow/core/kernels/depthtospace_op.cc b/tensorflow/core/kernel if (is_int8x4) { // NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32. auto Tinput_v = input.template reinterpret_last_dimension(); -@@ -173,15 +173,6 @@ - } - }; - --#ifdef WIN32 --template --struct DepthToSpaceOpFunctor { -- void operator()(const CPUDevice& d, typename TTypes::ConstTensor input, -- int block_size, typename TTypes::Tensor output) { -- LOG(FATAL) << "Trivial implementation to make debug build compile."; -- } --}; --#endif - } // namespace functor - - #define REGISTER(type) \ diff --git a/tensorflow/core/kernels/spacetodepth_op.cc b/tensorflow/core/kernels/spacetodepth_op.cc --- a/tensorflow/core/kernels/spacetodepth_op.cc @@ -39,19 +23,3 @@ diff --git a/tensorflow/core/kernels/spacetodepth_op.cc b/tensorflow/core/kernel using RT = typename RawType::type; if (data_format_ == FORMAT_NCHW_VECT_C) { // NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32. -@@ -189,15 +189,6 @@ - } - }; - --#ifdef WIN32 --template --struct SpaceToDepthOpFunctor { -- void operator()(const CPUDevice& d, typename TTypes::ConstTensor input, -- int block_size, typename TTypes::Tensor output) { -- LOG(FATAL) << "Trivial implementation to make debug build compile."; -- } --}; --#endif - } // namespace functor - - #define REGISTER(type) \ diff --git a/ports/tensorflow-common/generate_static_link_cmd_linux.py b/ports/tensorflow-common/generate_static_link_cmd_linux.py index fa1f73656cf549..56a31ca0abddc7 100644 --- a/ports/tensorflow-common/generate_static_link_cmd_linux.py +++ b/ports/tensorflow-common/generate_static_link_cmd_linux.py @@ -1,8 +1,9 @@ import re import sys -version = sys.argv[2] -lib_suffix = "" if len(sys.argv) < 4 else sys.argv[3] +params_path = sys.argv[2] +version = sys.argv[3] +lib_suffix = "" if len(sys.argv) < 5 else sys.argv[4] with open(sys.argv[1], "r") as f_in: with open("static_link.sh", "w") as f_out: diff --git a/ports/tensorflow-common/generate_static_link_cmd_macos.py b/ports/tensorflow-common/generate_static_link_cmd_macos.py index f7b99763eaa545..470a6a6e6230e0 100644 --- a/ports/tensorflow-common/generate_static_link_cmd_macos.py +++ b/ports/tensorflow-common/generate_static_link_cmd_macos.py @@ -2,12 +2,13 @@ import re import sys -version = sys.argv[2] -lib_suffix = "" if len(sys.argv) < 4 else sys.argv[3] +params_path = sys.argv[2] +version = sys.argv[3] +lib_suffix = "" if len(sys.argv) < 5 else sys.argv[4] with open(sys.argv[1], "r") as f_in: with open("static_link.sh", "w") as f_out: - if os.path.isfile(f"libtensorflow_framework.{version}.dylib-2.params"): + if os.path.isfile(f"{params_path}/libtensorflow_framework.{version}.dylib-2.params"): p_cd = re.compile(r"^\((cd .*) && \\$") p_linker = re.compile(fr"^\s*.+cc_wrapper.sh.+(@bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib-2\.params).*") f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") diff --git a/ports/tensorflow-common/generate_static_link_cmd_windows.py b/ports/tensorflow-common/generate_static_link_cmd_windows.py index 82f01a76893181..b75bdba6445624 100644 --- a/ports/tensorflow-common/generate_static_link_cmd_windows.py +++ b/ports/tensorflow-common/generate_static_link_cmd_windows.py @@ -2,8 +2,9 @@ import re import sys -version = sys.argv[2] -lib_suffix = "" if len(sys.argv) < 4 else sys.argv[3] +params_path = sys.argv[2] +version = sys.argv[3] +lib_suffix = "" if len(sys.argv) < 5 else sys.argv[4] with open(sys.argv[1], "r") as f_in: with open("static_link.bat", "w") as f_out: diff --git a/ports/tensorflow-common/portfile.cmake b/ports/tensorflow-common/portfile.cmake index bbfc287df5c544..45fb70e27099a2 100644 --- a/ports/tensorflow-common/portfile.cmake +++ b/ports/tensorflow-common/portfile.cmake @@ -18,7 +18,6 @@ set(TENSORFLOW_FILES "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-static.cmake.in" "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-dll.cmake.in" "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-lib.cmake.in" - "${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch" ) file(COPY ${TENSORFLOW_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake index 0813dd94e14313..fd1ff2b021afa7 100644 --- a/ports/tensorflow-common/tensorflow-common.cmake +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -1,5 +1,5 @@ -set(TF_VERSION 2.6.0) -set(TF_VERSION_SHORT 2.6) +set(TF_VERSION 2.7.0) +set(TF_VERSION_SHORT 2.7) vcpkg_find_acquire_program(BAZEL) get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY) @@ -9,7 +9,7 @@ set(ENV{BAZEL_BIN_PATH} "${BAZEL}") function(tensorflow_try_remove_recurse_wait PATH_TO_REMOVE) file(REMOVE_RECURSE ${PATH_TO_REMOVE}) if(EXISTS "${PATH_TO_REMOVE}") - vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND} -E sleep 5 WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-sleep-${TARGET_TRIPLET}) + vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND} -E sleep 5 WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-sleep-${TARGET_TRIPLET}) file(REMOVE_RECURSE ${PATH_TO_REMOVE}) endif() endfunction() @@ -39,29 +39,34 @@ if(CMAKE_HOST_WIN32) set(ENV{BAZEL_VC_FULL_VERSION} $ENV{VCToolsVersion}) set(PYTHON3 "${MSYS_ROOT}/mingw64/bin/python3.exe") - vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getsitepackages()[0])" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) + vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getsitepackages()[0])" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) else() vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path(PREPEND ${PYTHON3_DIR}) + + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m venv --symlinks "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-venv-${TARGET_TRIPLET}) + vcpkg_add_to_path(PREPEND ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv/bin) + set(PYTHON3 ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv/bin/python3) + set(ENV{VIRTUAL_ENV} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv) if(VCPKG_TARGET_IS_OSX) + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install -U pip WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-pip-${TARGET_TRIPLET}) # acceleration libs currently broken on macOS => force numpy user space reinstall without BLAS/LAPACK/ATLAS # remove this work-around again, i.e. default to "else" branch, once acceleration libs are fixed upstream set(ENV{BLAS} "None") set(ENV{LAPACK} "None") set(ENV{ATLAS} "None") - vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install --user -U --force-reinstall numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pip-${TARGET_TRIPLET}) + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install -U --force-reinstall numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequistes-pip-${TARGET_TRIPLET}) else() - vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install --user -U numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pip-${TARGET_TRIPLET}) + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install -U pip numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-pip-${TARGET_TRIPLET}) endif() - vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getusersitepackages())" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) + + vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getusersitepackages())" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) endif() set(ENV{PYTHON_BIN_PATH} "${PYTHON3}") set(ENV{PYTHON_LIB_PATH} "${PYTHON_LIB_PATH}") # check if numpy can be loaded -vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import numpy" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-numpy-${TARGET_TRIPLET}) +vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import numpy" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-numpy-${TARGET_TRIPLET}) set(ENV{USE_DEFAULT_PYTHON_LIB_PATH} 1) set(ENV{TF_NEED_KAFKA} 0) @@ -125,7 +130,15 @@ else() endif() endif() -foreach(BUILD_TYPE dbg rel) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND PORT_BUILD_CONFIGS "dbg") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + list(APPEND PORT_BUILD_CONFIGS "rel") +endif() + +foreach(BUILD_TYPE IN LISTS PORT_BUILD_CONFIGS) # prefer repeated source extraction here for each build type over extracting once above the loop and copying because users reported issues with copying symlinks set(STATIC_ONLY_PATCHES) set(WINDOWS_ONLY_PATCHES) @@ -139,11 +152,10 @@ foreach(BUILD_TYPE dbg rel) OUT_SOURCE_PATH SOURCE_PATH REPO tensorflow/tensorflow REF "v${TF_VERSION}" - SHA512 d052da4b324f1b5ac9c904ac3cca270cefbf916be6e5968a6835ef3f8ea8c703a0b90be577ac5205edf248e8e6c7ee8817b6a1b383018bb77c381717c6205e05 + SHA512 f1e892583c7b3a73d4d39ec65dc135a5b02c789b357d57414ad2b6d05ad9fbfc8ef81918ba6410e314abd6928b76f764e6ef64c0b0c84b58b50796634be03f39 HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" # Fix namespace error - "${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch" ${STATIC_ONLY_PATCHES} ${WINDOWS_ONLY_PATCHES} ) @@ -196,17 +208,17 @@ foreach(BUILD_TYPE dbg rel) separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) separate_arguments(VCPKG_C_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_DEBUG}) foreach(OPT IN LISTS VCPKG_C_FLAGS VCPKG_C_FLAGS_DEBUG) - list(APPEND COPTS "--copt='${OPT}'") + list(APPEND COPTS "--copt=${OPT}") endforeach() separate_arguments(VCPKG_CXX_FLAGS ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS}) separate_arguments(VCPKG_CXX_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS_DEBUG}) foreach(OPT IN LISTS VCPKG_CXX_FLAGS VCPKG_CXX_FLAGS_DEBUG) - list(APPEND CXXOPTS "--cxxopt='${OPT}'") + list(APPEND CXXOPTS "--cxxopt=${OPT}") endforeach() separate_arguments(VCPKG_LINKER_FLAGS ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS}) separate_arguments(VCPKG_LINKER_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS_DEBUG}) foreach(OPT IN LISTS VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_DEBUG) - list(APPEND LINKOPTS "--linkopt='${OPT}'") + list(APPEND LINKOPTS "--linkopt=${OPT}") endforeach() else() set(BUILD_OPTS --compilation_mode=opt) @@ -214,17 +226,17 @@ foreach(BUILD_TYPE dbg rel) separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) separate_arguments(VCPKG_C_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_RELEASE}) foreach(OPT IN LISTS VCPKG_C_FLAGS VCPKG_C_FLAGS_RELEASE) - list(APPEND COPTS "--copt='${OPT}'") + list(APPEND COPTS "--copt=${OPT}") endforeach() separate_arguments(VCPKG_CXX_FLAGS ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS}) separate_arguments(VCPKG_CXX_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS_RELEASE}) foreach(OPT IN LISTS VCPKG_CXX_FLAGS VCPKG_CXX_FLAGS_RELEASE) - list(APPEND CXXOPTS "--cxxopt='${OPT}'") + list(APPEND CXXOPTS "--cxxopt=${OPT}") endforeach() separate_arguments(VCPKG_LINKER_FLAGS ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS}) separate_arguments(VCPKG_LINKER_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS_RELEASE}) foreach(OPT IN LISTS VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_RELEASE) - list(APPEND LINKOPTS "--linkopt='${OPT}'") + list(APPEND LINKOPTS "--linkopt=${OPT}") endforeach() endif() @@ -286,7 +298,7 @@ foreach(BUILD_TYPE dbg rel) endif() # for some reason stdout of bazel ends up in stderr, so use err log file in the following command vcpkg_execute_build_process( - COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_${PLATFORM_SUFFIX}.py" "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-${BUILD_TYPE}-err.log" ${TF_VERSION} ${TF_LIB_SUFFIX} + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_${PLATFORM_SUFFIX}.py" "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-${BUILD_TYPE}-err.log" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow" ${TF_VERSION} ${TF_LIB_SUFFIX} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-${TARGET_TRIPLET}-${BUILD_TYPE} LOGNAME postbuild2-${TARGET_TRIPLET}-${BUILD_TYPE} ) diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json index dae75635c4f0b9..56d7b1b3c0dafb 100644 --- a/ports/tensorflow-common/vcpkg.json +++ b/ports/tensorflow-common/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tensorflow-common", - "version-semver": "2.6.0", + "version-semver": "2.7.0", + "port-version": 2, "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.", "homepage": "https://github.com/tensorflow/tensorflow" } diff --git a/ports/tensorflow/portfile.cmake b/ports/tensorflow/portfile.cmake index a393a6ab9488b3..1782730f9b409e 100644 --- a/ports/tensorflow/portfile.cmake +++ b/ports/tensorflow/portfile.cmake @@ -1,8 +1,6 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") - set(TF_LIB_SUFFIX "") set(TF_PORT_SUFFIX "") -set(TF_INCLUDE_DIRS "${CURRENT_INSTALLED_DIR}/include") +set(TF_INCLUDE_DIRS "\${TENSORFLOW_INSTALL_PREFIX}/include") list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/tensorflow-common") include(tensorflow-common) diff --git a/ports/tensorflow/vcpkg.json b/ports/tensorflow/vcpkg.json index b00a067fcf3bf3..2c00ec901f0df2 100644 --- a/ports/tensorflow/vcpkg.json +++ b/ports/tensorflow/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tensorflow", - "version-semver": "2.6.0", + "version-semver": "2.7.0", + "port-version": 2, "description": "Library for computation using data flow graphs for scalable machine learning (C API version)", "homepage": "https://github.com/tensorflow/tensorflow", "supports": "!(x86 | arm | uwp)", diff --git a/ports/tensorpipe/portfile.cmake b/ports/tensorpipe/portfile.cmake index d6e941d72f4d80..b81a37c89117b7 100644 --- a/ports/tensorpipe/portfile.cmake +++ b/ports/tensorpipe/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "windows" "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json index 82971d8ad4a6d4..3ddcb1d5a2b1fa 100644 --- a/ports/tensorpipe/vcpkg.json +++ b/ports/tensorpipe/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tensorpipe", "version-date": "2021-04-26", + "port-version": 1, "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", "supports": "linux | osx", diff --git a/ports/tesseract/fix-timeval.patch b/ports/tesseract/fix-timeval.patch new file mode 100644 index 00000000000000..5a3274830d1fa7 --- /dev/null +++ b/ports/tesseract/fix-timeval.patch @@ -0,0 +1,14 @@ +diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h +index d39a6dd..3755632 100644 +--- a/src/ccutil/ocrclass.h ++++ b/src/ccutil/ocrclass.h +@@ -28,6 +28,9 @@ + + #include + #include ++#ifndef _WIN32 ++#include ++#endif + #ifdef _WIN32 + #include // for timeval + #endif diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 68926f963aee4d..6978f5625d0797 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -5,15 +5,17 @@ vcpkg_from_github( SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2 PATCHES fix-tiff-linkage.patch + fix-timeval.patch # Remove this patch in the next update ) # The built-in cmake FindICU is better -file(REMOVE ${SOURCE_PATH}/cmake/FindICU.cmake) +file(REMOVE "${SOURCE_PATH}/cmake/FindICU.cmake") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - training-tools BUILD_TRAINING_TOOLS + FEATURES + training-tools BUILD_TRAINING_TOOLS ) if("cpu-independed" IN_LIST FEATURES) @@ -22,10 +24,10 @@ else() set(TARGET_ARCHITECTURE auto) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} -DSTATIC=${BUILD_STATIC} -DUSE_SYSTEM_ICU=True -DCMAKE_DISABLE_FIND_PACKAGE_LibArchive=ON @@ -34,14 +36,18 @@ vcpkg_configure_cmake( -DTARGET_ARCHITECTURE=${TARGET_ARCHITECTURE} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -file(READ ${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake TESSERACT_CONFIG) -string(REPLACE "find_package(Leptonica REQUIRED)" - "find_package(Leptonica REQUIRED) -find_package(LibArchive REQUIRED)" TESSERACT_CONFIG "${TESSERACT_CONFIG}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake "${TESSERACT_CONFIG}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake" + "find_package(Leptonica REQUIRED)" +[[ +find_package(Leptonica REQUIRED) +find_package(LibArchive REQUIRED) +]] +) vcpkg_copy_tools(TOOL_NAMES tesseract AUTO_CLEAN) @@ -60,9 +66,8 @@ if("training-tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES ${TRAINING_TOOLS} AUTO_CLEAN) endif() -vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index 4418a631100977..6b2477d6b462eb 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,13 +1,21 @@ { "name": "tesseract", "version": "4.1.1", - "port-version": 8, + "port-version": 10, "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", - "supports": "!(windows & (arm | arm64))", + "supports": "!arm", "dependencies": [ "leptonica", - "libarchive" + "libarchive", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cpu-independed": { diff --git a/ports/tfhe/portfile.cmake b/ports/tfhe/portfile.cmake index fc06a54a600b4f..6eb77f140cf0d6 100644 --- a/ports/tfhe/portfile.cmake +++ b/ports/tfhe/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Unix" ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tfhe/tfhe diff --git a/ports/tfhe/vcpkg.json b/ports/tfhe/vcpkg.json index 73898248b8f2d9..9749d5d1c101ba 100644 --- a/ports/tfhe/vcpkg.json +++ b/ports/tfhe/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tfhe", "version-semver": "1.0.1", - "port-version": 2, + "port-version": 3, "description": "TFHE is open-source software distributed under the terms of the Apache 2.0 license.", "homepage": "https://github.com/tfhe/tfhe", "supports": "!windows" diff --git a/ports/tgui/portfile.cmake b/ports/tgui/portfile.cmake index e30d93ac4f745e..fc5fa414f40f05 100644 --- a/ports/tgui/portfile.cmake +++ b/ports/tgui/portfile.cmake @@ -23,10 +23,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tool TGUI_BUILD_GUI_BUILDER ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DTGUI_MISC_INSTALL_PREFIX=${TGUI_SHARE_PATH} -DTGUI_SHARED_LIBS=${TGUI_SHARED_LIBS} @@ -34,8 +33,8 @@ vcpkg_configure_cmake( -DTGUI_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/TGUI) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TGUI) vcpkg_copy_pdbs() if("tool" IN_LIST FEATURES) @@ -60,5 +59,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/nanosvg" "${CU file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/doc") +vcpkg_fixup_pkgconfig() + # Handle copyright file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tgui/vcpkg.json b/ports/tgui/vcpkg.json index 387a20c909c0ac..2dce591863e7bd 100644 --- a/ports/tgui/vcpkg.json +++ b/ports/tgui/vcpkg.json @@ -1,9 +1,20 @@ { "name": "tgui", "version-date": "2021-04-19", - "port-version": 2, + "port-version": 3, "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", "homepage": "https://tgui.eu", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "sdl2", "sfml" diff --git a/ports/theia/eigen-3.4.patch b/ports/theia/eigen-3.4.patch new file mode 100644 index 00000000000000..9bbd5e24b0bd9d --- /dev/null +++ b/ports/theia/eigen-3.4.patch @@ -0,0 +1,24 @@ +--- a/libraries/akaze/src/nldiffusion_functions.cpp ++++ b/libraries/akaze/src/nldiffusion_functions.cpp +@@ -222,8 +222,8 @@ void halfsample_image(const RowMatrixXf& src, RowMatrixXf& dst) { + + // Do the whole resampling in one pass by using neighboring values. First, we + // compute the borders. +- const double x_kernel_size = static_cast(src.cols()) / dst.cols(); +- const double y_kernel_size = static_cast(src.rows()) / dst.rows(); ++ const int x_kernel_size = static_cast(src.cols()) / dst.cols(); ++ const int y_kernel_size = static_cast(src.rows()) / dst.rows(); + + // Do simple linear interpolation. + if (x_kernel_size == 2 && y_kernel_size == 2) { +@@ -237,8 +237,8 @@ void halfsample_image(const RowMatrixXf& src, RowMatrixXf& dst) { + return; + } + +- const double x_kernel_clamped_size = static_cast(ceil(x_kernel_size)); +- const double y_kernel_clamped_size = static_cast(ceil(y_kernel_size)); ++ const int x_kernel_clamped_size = static_cast(ceil(static_cast(src.cols()) / dst.cols())); ++ const int y_kernel_clamped_size = static_cast(ceil(static_cast(src.rows()) / dst.rows())); + + // Set up precomputed factor matrices. + Eigen::RowVectorXf x_kernel_mul(static_cast(x_kernel_clamped_size)), diff --git a/ports/theia/portfile.cmake b/ports/theia/portfile.cmake index 6fa187a1ec3ff4..c68a4a685821f7 100644 --- a/ports/theia/portfile.cmake +++ b/ports/theia/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES fix-external-dependencies.patch fix-external-dependencies2.patch + eigen-3.4.patch ) file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake) diff --git a/ports/theia/vcpkg.json b/ports/theia/vcpkg.json index f424735b4877e5..c02f1aecd22985 100644 --- a/ports/theia/vcpkg.json +++ b/ports/theia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "theia", "version-string": "0.8", - "port-version": 5, + "port-version": 6, "description": "An open source library for multiview geometry and structure from motion", "homepage": "https://github.com/sweeneychris/TheiaSfM", "dependencies": [ diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake index 159ed86aaa7a16..350d9885967159 100644 --- a/ports/tidy-html5/portfile.cmake +++ b/ports/tidy-html5/portfile.cmake @@ -8,35 +8,28 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" NO_CHARSET_FLAG OPTIONS -DBUILD_SHARED_LIB=OFF -DTIDY_CONSOLE_SHARED=OFF ) +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt/bin") +vcpkg_cmake_install() -vcpkg_install_cmake() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tidyd.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tidyd) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/tidy-html5) +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd.exe") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd") -if(VCPKG_TARGET_IS_WINDOWS) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tidy.exe ${CURRENT_PACKAGES_DIR}/tools/tidy-html5/tidy.exe) -else() - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tidy ${CURRENT_PACKAGES_DIR}/tools/tidy-html5/tidy) -endif() +vcpkg_copy_tools(TOOL_NAMES tidy AUTO_CLEAN) 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() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) - -file(INSTALL ${SOURCE_PATH}/README/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tidy-html5 RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL "${SOURCE_PATH}/README/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() diff --git a/ports/tidy-html5/vcpkg.json b/ports/tidy-html5/vcpkg.json index 7071cab8fae270..1c16d8657d1192 100644 --- a/ports/tidy-html5/vcpkg.json +++ b/ports/tidy-html5/vcpkg.json @@ -1,7 +1,18 @@ { "name": "tidy-html5", - "version-string": "5.7.28", - "port-version": 4, + "version": "5.7.28", + "port-version": 5, "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.", - "homepage": "https://github.com/htacg/tidy-html5" + "homepage": "https://github.com/htacg/tidy-html5", + "license": null, + "dependencies": [ + { + "name": "libxslt", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/tiff/fix-pkgconfig.patch b/ports/tiff/fix-pkgconfig.patch index a67910ef5709f5..f5bcdec3e492a8 100644 --- a/ports/tiff/fix-pkgconfig.patch +++ b/ports/tiff/fix-pkgconfig.patch @@ -1,3 +1,14 @@ +From f337e19d0d0564b1b000ecd5dfbefed6c37f4d5b Mon Sep 17 00:00:00 2001 +From: Matthias Kuhn +Date: Tue, 21 Dec 2021 07:57:09 +0000 +Subject: [PATCH] Fix pkgconfig + +--- + CMakeLists.txt | 4 ++-- + libtiff-4.pc.in | 3 ++- + libtiff/CMakeLists.txt | 19 +++++++++++++++++++ + 3 files changed, 23 insertions(+), 3 deletions(-) + diff --git a/CMakeLists.txt b/CMakeLists.txt index 2188f97..93e6a34 100644 --- a/CMakeLists.txt @@ -35,7 +46,7 @@ index abe75a6..8899725 100644 Cflags: -I${includedir} +Requires.private: @tiff_requires_private@ diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt -index db5f140..6db71ee 100755 +index db5f140..32721ec 100755 --- a/libtiff/CMakeLists.txt +++ b/libtiff/CMakeLists.txt @@ -106,14 +106,19 @@ target_include_directories(tiff @@ -58,7 +69,7 @@ index db5f140..6db71ee 100755 if(JPEG_DUAL_MODE_8_12) target_include_directories(tiff PRIVATE ${JPEG12_INCLUDE_DIR}) target_link_libraries(tiff PRIVATE ${JPEG12_LIBRARIES}) -@@ -127,14 +132,23 @@ if(LERC_SUPPORT) +@@ -127,15 +132,29 @@ if(LERC_SUPPORT) endif() if(LZMA_SUPPORT) target_link_libraries(tiff PRIVATE LibLZMA::LibLZMA) @@ -73,12 +84,21 @@ index db5f140..6db71ee 100755 + string(APPEND tiff_requires_private " libwebp") endif() target_link_libraries(tiff PRIVATE CMath::CMath) -+if(CMath_LIBRARY) -+ string(APPEND tiff_libs_private " -lm") + ++include(CheckLibraryExists) ++ ++CHECK_LIBRARY_EXISTS(m sin "" HAVE_LIB_M) ++ ++if (HAVE_LIB_M) ++ string(APPEND tiff_libs_private " -lm") +endif() + +set(tiff_libs_private "${tiff_libs_private}" PARENT_SCOPE) +set(tiff_requires_private "${tiff_requires_private}" PARENT_SCOPE) - ++ set_target_properties(tiff PROPERTIES SOVERSION ${SO_COMPATVERSION}) if(NOT CYGWIN) + # This property causes shared libraries on Linux to have the full version +-- +2.25.1 + diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 57b7543b30367b..c8d53313f3ba21 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -1,19 +1,15 @@ set(LIBTIFF_VERSION 4.3.0) -vcpkg_download_distfile(ARCHIVE - URLS "https://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz" - FILENAME "tiff-${LIBTIFF_VERSION}.tar.gz" - SHA512 e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${ARCHIVE}" - REF ${LIBTIFF_VERSION} - PATCHES - cmakelists.patch - fix-pkgconfig.patch - FindCMath.patch + REPO libtiff/libtiff + REF v${LIBTIFF_VERSION} + SHA512 eaa2503dc1805283e0590b06e3e660a793fe849ae8b975b2d69369695d65a40640787c156574faaca856917be799eeb844e60f55555e1f219dd513cef66ea95d + HEAD_REF master + PATCHES cmakelists.patch + fix-pkgconfig.patch + FindCMath.patch ) set(EXTRA_OPTIONS "") @@ -21,13 +17,6 @@ if(VCPKG_TARGET_IS_UWP) list(APPEND EXTRA_OPTIONS "-DUSE_WIN32_FILEIO=OFF") # On UWP we use the unix I/O api. endif() -if("cxx" IN_LIST FEATURES) - vcpkg_fail_port_install( - MESSAGE "Feature 'cxx' is not supported on ${VCPKG_TARGET_ARCHITECTURE}." - ON_ARCH arm arm64 - ) -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cxx cxx diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index b722944ea1dc9f..40b159093c6eb3 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -20,9 +20,9 @@ if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") list(APPEND z_vcpkg_tiff_libraries ${WEBP_LIBRARIES}) endif() if(@lzma@) - find_package(LibLZMA CONFIG ${z_vcpkg_tiff_find_options}) + find_package(LibLZMA ${z_vcpkg_tiff_find_options}) list(APPEND z_vcpkg_tiff_link_libraries LibLZMA::LibLZMA) - list(APPEND z_vcpkg_tiff_libraries ${LZMA_LIBRARIES}) + list(APPEND z_vcpkg_tiff_libraries ${LIBLZMA_LIBRARIES}) endif() if(@jpeg@) find_package(JPEG ${z_vcpkg_tiff_find_options}) diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 764fcf55dec36c..59f4c26e80e629 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,9 +1,10 @@ { "name": "tiff", "version": "4.3.0", - "port-version": 2, + "port-version": 6, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", @@ -17,7 +18,8 @@ ], "features": { "cxx": { - "description": "Build C++ libtiffxx library" + "description": "Build C++ libtiffxx library", + "supports": "!arm" }, "jpeg": { "description": "Support JPEG compression in TIFF image files", diff --git a/ports/tinkerforge/portfile.cmake b/ports/tinkerforge/portfile.cmake index cfc5c3989075b9..96f561ae5e91e1 100644 --- a/ports/tinkerforge/portfile.cmake +++ b/ports/tinkerforge/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(VERSION 2_1_25) vcpkg_download_distfile(ARCHIVE diff --git a/ports/tinkerforge/vcpkg.json b/ports/tinkerforge/vcpkg.json index 6590a57f116195..bc809a76a17af5 100644 --- a/ports/tinkerforge/vcpkg.json +++ b/ports/tinkerforge/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinkerforge", - "version-string": "2.1.25", - "port-version": 1, + "version": "2.1.25", + "port-version": 2, "description": "Tinkerforge C API bindings for bricks and bricklets", "supports": "!uwp" } diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 12e6f5cb97ed6c..5a697f13f85dc0 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -1,28 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF - REF c57a5fec1a847ec0e7b482b2da72e1f04fc2e147 - SHA512 a968e79b4b7a6f5f189328a8dc493da5c0d568526b5dca46b9bfc0cf85295fb348bd0b38828fedbb7b6e4467fc8932d0d7b435b4acbfe662e954cbed1d0ea914 + REF 6e56015f56ee0f387f1b8c76e50eb35ac60372da #2022-02-15 + SHA512 46f55a163cfed2d8fadd7ac0425b190c59136252e5f60d945f6655d0a6df20ea08f272d25c66e76df4c8c0340f654cef875da12627b8bef88f8f6e875fc1bf48 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DBUILD_DEMO=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/TinyEXIF) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyEXIF) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyexif RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tinyexif/vcpkg.json b/ports/tinyexif/vcpkg.json index 1d5a0f8cc2d930..708541d3d9f2ad 100644 --- a/ports/tinyexif/vcpkg.json +++ b/ports/tinyexif/vcpkg.json @@ -1,10 +1,17 @@ { "name": "tinyexif", - "version-string": "1.0.2", - "port-version": 7, + "version-date": "2022-02-15", "description": "tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images", "homepage": "https://github.com/cdcseacave/TinyEXIF", "dependencies": [ - "tinyxml2" + "tinyxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/tinyfiledialogs/portfile.cmake b/ports/tinyfiledialogs/portfile.cmake index 10929dec1d0501..b93dec69f4f23c 100644 --- a/ports/tinyfiledialogs/portfile.cmake +++ b/ports/tinyfiledialogs/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( diff --git a/ports/tinyfiledialogs/vcpkg.json b/ports/tinyfiledialogs/vcpkg.json index 6bc220ee0eac32..ca44d2c9e5983a 100644 --- a/ports/tinyfiledialogs/vcpkg.json +++ b/ports/tinyfiledialogs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinyfiledialogs", "version": "3.8.8", - "port-version": 3, + "port-version": 4, "description": "Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more", "homepage": "https://sourceforge.net/projects/tinyfiledialogs/", "supports": "!uwp", diff --git a/ports/tl-ranges/portfile.cmake b/ports/tl-ranges/portfile.cmake new file mode 100644 index 00000000000000..fff05a10df5677 --- /dev/null +++ b/ports/tl-ranges/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TartanLlama/ranges + REF f1aa65d89cee16071f1f5b21e32df5f8ff0d1688 + SHA512 0b94ceba4aaa26a2aefff7837df7b832aea79a5822fb33f18ba47610aed7341ff173b23b8fe9dbf8060c144edd44ae916a3c71db440a66f3c1e8f7bdab27d767 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRANGES_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/tl-ranges/vcpkg.json b/ports/tl-ranges/vcpkg.json new file mode 100644 index 00000000000000..209585d340ec83 --- /dev/null +++ b/ports/tl-ranges/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "tl-ranges", + "version-date": "2021-12-02", + "description": "Ranges that didn't make C++20", + "homepage": "https://tl.tartanllama.xyz", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/tmx/portfile.cmake b/ports/tmx/portfile.cmake index 1ddf5a4f2020c5..ee76169108b2d6 100644 --- a/ports/tmx/portfile.cmake +++ b/ports/tmx/portfile.cmake @@ -13,9 +13,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxExports.cmake" "${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxTargets.cmake") vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tmx) -file(RENAME "${CURRENT_PACKAGES_DIR}/share/tmx/tmxTargets.cmake" "${CURRENT_PACKAGES_DIR}/share/tmx/tmxExports.cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/tmx/vcpkg.json b/ports/tmx/vcpkg.json index f21eba4edd8abf..764177045fe678 100644 --- a/ports/tmx/vcpkg.json +++ b/ports/tmx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tmx", "version": "1.2.0", + "port-version": 1, "description": "A portable C library to load tiled maps in your games.", "dependencies": [ "libxml2", diff --git a/ports/tomlplusplus/portfile.cmake b/ports/tomlplusplus/portfile.cmake index b1c3e85b01e4a9..5c5dca5826b0f1 100644 --- a/ports/tomlplusplus/portfile.cmake +++ b/ports/tomlplusplus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO marzer/tomlplusplus - REF v2.5.0 - SHA512 7394cda2009b37e88f9028ee5d1887120bed7042833c7cb218d7705cdc92273c81a84163ff0be034d3f23c8dd93e63b7615134a4b0e1c580e1e945fae45c7d35 + REF v3.0.1 + SHA512 bfb05d16715d1e8b54177e905c0a83470e7472c9c474874d70528558bbf0b0ba0daae67e1e44d99c45de3f87918bca57e889caba2e3da5e351045aee7e6a144b HEAD_REF master ) diff --git a/ports/tomlplusplus/vcpkg.json b/ports/tomlplusplus/vcpkg.json index b8833ee25f9e3b..39bfa48c44ec9e 100644 --- a/ports/tomlplusplus/vcpkg.json +++ b/ports/tomlplusplus/vcpkg.json @@ -1,14 +1,18 @@ { "name": "tomlplusplus", - "version": "2.5.0", - "port-version": 2, + "version": "3.0.1", "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/tool-meson/portfile.cmake b/ports/tool-meson/portfile.cmake index c39e614071f42d..ed3c452cce531f 100644 --- a/ports/tool-meson/portfile.cmake +++ b/ports/tool-meson/portfile.cmake @@ -1,7 +1,4 @@ -# This port represents a dependency on the Meson build system. -# In the future, it is expected that this port acquires and installs Meson. -# Currently is used in ports that call vcpkg_find_acquire_program(MESON) in order to force rebuilds. - +#deprecated port. -> new port "vcpkg-tool-meson" for better grouping with other vcpkg tools set(VCPKG_POLICY_EMPTY_PACKAGE enabled) vcpkg_find_acquire_program(MESON) message(STATUS "Using meson: ${MESON}") \ No newline at end of file diff --git a/ports/tool-meson/vcpkg.json b/ports/tool-meson/vcpkg.json index 936b5d6c54ab48..4601eda681b897 100644 --- a/ports/tool-meson/vcpkg.json +++ b/ports/tool-meson/vcpkg.json @@ -1,6 +1,12 @@ { "name": "tool-meson", - "version": "0.58.1", + "version-date": "2022-01-21", "description": "Meson build system", - "homepage": "https://github.com/mesonbuild/meson" + "homepage": "https://github.com/mesonbuild/meson", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] } diff --git a/ports/tracy/add-install.patch b/ports/tracy/add-install.patch new file mode 100644 index 00000000000000..f616ba38d0c524 --- /dev/null +++ b/ports/tracy/add-install.patch @@ -0,0 +1,117 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 00000000..601d2a4d +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,111 @@ ++cmake_minimum_required(VERSION 3.10) ++ ++project(Tracy LANGUAGES CXX) ++ ++find_package(Threads REQUIRED) ++ ++add_library(TracyClient TracyClient.cpp) ++target_compile_features(TracyClient PUBLIC cxx_std_11) ++target_include_directories(TracyClient SYSTEM PUBLIC ++ $ ++ $) ++target_link_libraries( ++ TracyClient ++ PUBLIC ++ Threads::Threads ++ ${CMAKE_DL_LIBS} ++) ++ ++if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ++ find_library(EXECINFO_LIBRARY NAMES execinfo REQUIRED) ++ target_link_libraries(TracyClient PUBLIC ${EXECINFO_LIBRARY}) ++endif() ++ ++add_library(Tracy::TracyClient ALIAS TracyClient) ++ ++macro(set_option option help value) ++ option(${option} ${help} ${value}) ++ if(${option}) ++ message(STATUS "${option}: ON") ++ target_compile_definitions(TracyClient PUBLIC ${option}) ++ else() ++ message(STATUS "${option}: OFF") ++ endif() ++endmacro() ++ ++set_option(TRACY_ENABLE "Enable profiling" ON) ++set_option(TRACY_ON_DEMAND "On-demand profiling" OFF) ++set_option(TRACY_CALLSTACK "Collect call stacks" OFF) ++set_option(TRACY_ONLY_LOCALHOST "Only listen on the localhost interface" OFF) ++set_option(TRACY_NO_BROADCAST "Disable client discovery by broadcast to local network" OFF) ++set_option(TRACY_NO_CODE_TRANSFER "Disable collection of source code" OFF) ++set_option(TRACY_NO_CONTEXT_SWITCH "Disable capture of context switches" OFF) ++set_option(TRACY_NO_EXIT "Client executable does not exit until all profile data is sent to server" OFF) ++set_option(TRACY_NO_FRAME_IMAGE "Disable capture of frame images" OFF) ++set_option(TRACY_NO_SAMPLING "Disable call stack sampling" OFF) ++set_option(TRACY_NO_VERIFY "Disable zone validation for C API" OFF) ++set_option(TRACY_NO_VSYNC_CAPTURE "Disable capture of hardware Vsync events" OFF) ++ ++if(BUILD_SHARED_LIBS) ++ target_compile_definitions(TracyClient PRIVATE TRACY_EXPORTS) ++ target_compile_definitions(TracyClient PUBLIC TRACY_IMPORTS) ++endif() ++ ++include(CMakePackageConfigHelpers) ++include(GNUInstallDirs) ++ ++set(includes ++ ${CMAKE_CURRENT_LIST_DIR}/TracyC.h ++ ${CMAKE_CURRENT_LIST_DIR}/Tracy.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/TracyD3D11.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/TracyD3D12.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/TracyLua.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/TracyOpenCL.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/TracyOpenGL.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/TracyVulkan.hpp) ++ ++set(client_includes ++ ${CMAKE_CURRENT_LIST_DIR}/client/tracy_concurrentqueue.h ++ ${CMAKE_CURRENT_LIST_DIR}/client/tracy_rpmalloc.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracyArmCpuTable.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracyCallstack.h ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracyCallstack.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracyDxt1.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracyFastVector.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracyLock.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracyProfiler.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracyRingBuffer.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracyScoped.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracySysTime.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracySysTrace.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/client/TracyThread.hpp) ++ ++set(common_includes ++ ${CMAKE_CURRENT_LIST_DIR}/common/tracy_lz4.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/common/tracy_lz4hc.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/common/TracyAlign.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/common/TracyAlloc.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/common/TracyApi.h ++ ${CMAKE_CURRENT_LIST_DIR}/common/TracyColor.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/common/TracyForceInline.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/common/TracyMutex.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/common/TracyProtocol.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/common/TracyQueue.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/common/TracySocket.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/common/TracySystem.hpp) ++ ++install(TARGETS TracyClient ++ EXPORT TracyConfig ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES ${includes} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(FILES ${client_includes} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/client) ++install(FILES ${common_includes} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common) ++install(EXPORT TracyConfig ++ NAMESPACE Tracy:: ++ FILE TracyConfig.cmake ++ DESTINATION share/Tracy) diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake new file mode 100644 index 00000000000000..384628e3ac3fac --- /dev/null +++ b/ports/tracy/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfpld/tracy + REF 07778badcced109b8190805fbf2d7abfaef0d3b9 + SHA512 17f52d2b9558a2a6ebada5a405f74a8c6eb51c8dfb794a182cf7635cbe48206e1edce3bf6f5e9358ec8b24e9c0cba4019c8eb14bb37524ea762a80aece04652f + HEAD_REF master + PATCHES + add-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Cleanup +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json new file mode 100644 index 00000000000000..8b5169e393e962 --- /dev/null +++ b/ports/tracy/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "tracy", + "version": "0.7.8", + "port-version": 2, + "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", + "homepage": "https://github.com/wolfpld/tracy", + "supports": "!(windows & (arm | uwp))", + "dependencies": [ + { + "name": "pthreads", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index 85d70569169828..f2dcdfb46b19de 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.3 - SHA512 2d032c59ad1b57bb1711fe99436fbc8eec5400d91bf310986cb4985e2c2ce1143844701a67241d0fe8dc7ab706b828feded3138aef8cf9d5620e581a1a770079 + REF v1.5.5 + SHA512 41068dcefcaf55908735126375b65a83a7d7085f30d5eb14e8d73fa255405ec77164c34b9ef0e5e6da3aeae3e66b9d57d4fca8901d63d4414bf8e857bd25dcd4 HEAD_REF master PATCHES vcpkg.patch diff --git a/ports/trantor/vcpkg.json b/ports/trantor/vcpkg.json index 5ac05984aaf8ad..3af0abe63ec8fd 100644 --- a/ports/trantor/vcpkg.json +++ b/ports/trantor/vcpkg.json @@ -1,8 +1,9 @@ { "name": "trantor", - "version-semver": "1.5.3", + "version-semver": "1.5.5", "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", "dependencies": [ "c-ares", "openssl", diff --git a/ports/triangle/portfile.cmake b/ports/triangle/portfile.cmake index 38b027986b68f3..15f027c2cd2b36 100644 --- a/ports/triangle/portfile.cmake +++ b/ports/triangle/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_download_distfile(ARCHIVE_FILE URLS "http://www.netlib.org/voronoi/triangle.zip" FILENAME "triangle.zip" diff --git a/ports/triangle/vcpkg.json b/ports/triangle/vcpkg.json index 816f5015221ca4..29cd78867285e5 100644 --- a/ports/triangle/vcpkg.json +++ b/ports/triangle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "triangle", - "version-string": "1.6", - "port-version": 1, + "version": "1.6", + "port-version": 2, "description": "A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator.", "homepage": "http://www.cs.cmu.edu/~quake/triangle.html", "supports": "!uwp" diff --git a/ports/triton/fix-dependencies.patch b/ports/triton/fix-dependencies.patch new file mode 100644 index 00000000000000..b7466a5944f76c --- /dev/null +++ b/ports/triton/fix-dependencies.patch @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8bbe47..966ded8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -99,9 +99,9 @@ list(APPEND CMAKE_MODULE_PATH "${TRITON_ROOT}/CMakeModules/") + # Find Z3 + if(Z3_INTERFACE) + message(STATUS "Compiling with Z3 SMT solver") +- find_package(Z3 REQUIRED) +- include_directories(${Z3_INCLUDE_DIRS}) ++ find_package(Z3 CONFIG REQUIRED) + set(TRITON_Z3_INTERFACE ON) ++ set(Z3_LIBRARIES z3::libz3) + endif() + + # Find bitwuzla +diff --git a/CMakeModules/FindCAPSTONE.cmake b/CMakeModules/FindCAPSTONE.cmake +index ff2c63f..4dcf9af 100644 +--- a/CMakeModules/FindCAPSTONE.cmake ++++ b/CMakeModules/FindCAPSTONE.cmake +@@ -26,9 +26,11 @@ if(NOT CAPSTONE_INCLUDE_DIRS AND NOT CAPSTONE_LIBRARIES) + NAMES capstone/capstone.h + PATHS ${CAPSTONE_PKGCONF_INCLUDE_DIRS} + ) ++ ++ string(APPEND CAPSTONE_INCLUDE_DIR "/capstone") + + find_library(CAPSTONE_LIBRARY +- NAMES capstone ++ NAMES capstone capstone_dll + PATHS ${CAPSTONE_PKGCONF_LIBRARY_DIRS} + ) + +diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in +index 94c58bc..115d697 100644 +--- a/src/libtriton/Config.cmake.in ++++ b/src/libtriton/Config.cmake.in +@@ -40,10 +40,6 @@ if (TRITON_LLVM_INTERFACE) + include_directories("@LLVM_INCLUDE_DIRS@") + endif() + +-# Z3 include directories +-if (TRITON_Z3_INTERFACE) +- include_directories("@Z3_INCLUDE_DIRS@") +-endif() + + # Bitwuzla include directories + if (TRITON_BITWUZLA_INTERFACE) diff --git a/ports/triton/fix-python.patch b/ports/triton/fix-python.patch new file mode 100644 index 00000000000000..19c0604f500965 --- /dev/null +++ b/ports/triton/fix-python.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 966ded8..baf0ec3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,6 @@ if(PYTHON_BINDINGS) + find_package(PythonInterp ${PYTHON_VERSION} REQUIRED) + find_package(PythonLibs ${PYTHON_VERSION} REQUIRED) + include_directories(${PYTHON_INCLUDE_DIRS}) +- add_definitions("-DPYTHON_LIBRARIES=\"${PYTHON_LIBRARIES}\"") + add_custom_target(test-python + COMMAND ${PYTHONPATH_CMD} ${PYTHON_EXECUTABLE} -m unittest discover ${TRITON_ROOT}/src/testers/unittests + DEPENDS python-triton +diff --git a/src/libtriton/CMakeLists.txt b/src/libtriton/CMakeLists.txt +index 6770b08..701d55b 100644 +--- a/src/libtriton/CMakeLists.txt ++++ b/src/libtriton/CMakeLists.txt +@@ -326,8 +326,8 @@ if(PYTHON_BINDINGS) + ) + execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) + if(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) ++ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION share/triton) + else() +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) ++ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION share/triton) + endif() + endif() diff --git a/ports/triton/fix-usage.patch b/ports/triton/fix-usage.patch new file mode 100644 index 00000000000000..931ce2239797c6 --- /dev/null +++ b/ports/triton/fix-usage.patch @@ -0,0 +1,14 @@ +diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in +index 683b5f2..94c58bc 100644 +--- a/src/libtriton/Config.cmake.in ++++ b/src/libtriton/Config.cmake.in +@@ -19,6 +19,9 @@ message(STATUS "Found Triton: ${CMAKE_CURRENT_LIST_DIR}/tritonConfig.cmake (foun + + include(CMakeFindDependencyMacro) + find_dependency(Boost) ++if (@Z3_INTERFACE@) ++ find_dependency(Z3 CONFIG) ++endif() + + # Triton include + include_directories("@CMAKE_INSTALL_PREFIX@/include") diff --git a/ports/triton/portfile.cmake b/ports/triton/portfile.cmake new file mode 100644 index 00000000000000..90e25594fd71a5 --- /dev/null +++ b/ports/triton/portfile.cmake @@ -0,0 +1,60 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO JonathanSalwan/Triton + REF 64a2b9b0490c82e41b37e623b1d0da14e2382e7a + SHA512 ff99a270813043df2bc0da765e04aae4b9d5a911d20c6e5ffca1472eae8d6e1fcfff3cd56da023d6a77a647644839430bf72902acd84ec521a0e098f185d275c + PATCHES + fix-dependencies.patch + fix-usage.patch + fix-python.patch +) + +file(REMOVE "${SOURCE_PATH}/CMakeModules/FindZ3.cmake") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATICLIB) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATICCRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "python" PYTHON_BINDINGS +) + +set(ADDITIONAL_OPTIONS ) +if(PYTHON_BINDINGS) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND ADDITIONAL_OPTIONS + -DPYTHON_EXECUTABLE=${PYTHON3} + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DZ3_INTERFACE=ON + -DBUILD_SHARED_LIBS=${STATICLIB} + -DMSVC_STATIC=${STATICCRT} + -DBUILD_EXAMPLES=OFF + -DENABLE_TEST=OFF + -DCAPSTONE_PKGCONF_INCLUDE_DIRS="${CURRENT_INSTALLED_DIR}/include" + ${ADDITIONAL_OPTIONS} + OPTIONS_DEBUG + -DCAPSTONE_PKGCONF_LIBRARY_DIRS="${CURRENT_INSTALLED_DIR}/debug/lib" + OPTIONS_RELEASE + -DCAPSTONE_PKGCONF_LIBRARY_DIRS="${CURRENT_INSTALLED_DIR}/lib" + +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +# Move cmake configs +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +# Remove duplicate files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/triton/vcpkg.json b/ports/triton/vcpkg.json new file mode 100644 index 00000000000000..dc81d068d185f9 --- /dev/null +++ b/ports/triton/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "triton", + "version": "0.9", + "port-version": 1, + "description": "Triton is a Dynamic Binary Analysis (DBA) framework. It provides internal components like a Dynamic Symbolic Execution (DSE) engine, a dynamic taint engine, AST representations of the x86, x86-64, ARM32 and AArch64 Instructions Set Architecture (ISA), SMT simplification passes, an SMT solver interface and, the last but not least, Python bindings.", + "homepage": "https://github.com/JonathanSalwan/Triton", + "license": "Apache-2.0", + "supports": "!arm", + "dependencies": [ + "boost-math", + "boost-multiprecision", + "boost-numeric-conversion", + { + "name": "capstone", + "default-features": false, + "features": [ + "arm", + "arm64", + "x86" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "z3" + ], + "features": { + "python": { + "description": "Build Triton with Python bindings", + "dependencies": [ + { + "name": "python3", + "default-features": false + } + ] + } + } +} diff --git a/ports/ttauri/portfile.cmake b/ports/ttauri/portfile.cmake index b2878a2d263173..52eeca7babc609 100644 --- a/ports/ttauri/portfile.cmake +++ b/ports/ttauri/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") -vcpkg_fail_port_install(ON_TARGET "linux" "uwp" "osx") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/ttauri/vcpkg.json b/ports/ttauri/vcpkg.json index 5bc11e747c8c7b..b59bd25f4c94a8 100644 --- a/ports/ttauri/vcpkg.json +++ b/ports/ttauri/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ttauri", "version": "0.5.0", + "port-version": 1, "maintainers": "@takev", "description": "A portable, low latency, retained-mode GUI framework written in C++.", "homepage": "https://github.com/ttauri-project/ttauri", diff --git a/ports/turbobase64/portfile.cmake b/ports/turbobase64/portfile.cmake index 0c4e89e63a7992..e4db2c00b66a3d 100644 --- a/ports/turbobase64/portfile.cmake +++ b/ports/turbobase64/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO powturbo/Turbo-Base64 diff --git a/ports/turbobase64/vcpkg.json b/ports/turbobase64/vcpkg.json index dc418d68ba07c8..b0e93558d77ab2 100644 --- a/ports/turbobase64/vcpkg.json +++ b/ports/turbobase64/vcpkg.json @@ -1,7 +1,8 @@ { "name": "turbobase64", - "version-string": "2020-01-12", - "port-version": 1, + "version-date": "2020-01-12", + "port-version": 2, "description": "Fastest Base64 SIMD/Neon library", - "homepage": "https://github.com/powturbo/Turbo-Base64" + "homepage": "https://github.com/powturbo/Turbo-Base64", + "supports": "!windows" } diff --git a/ports/tvision/portfile.cmake b/ports/tvision/portfile.cmake index c8f42021d83bf5..4df140166bb0e2 100644 --- a/ports/tvision/portfile.cmake +++ b/ports/tvision/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO magiblot/tvision @@ -20,4 +18,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tvision/vcpkg.json b/ports/tvision/vcpkg.json index 4e1f52a18962ce..9d2af79cc2e833 100644 --- a/ports/tvision/vcpkg.json +++ b/ports/tvision/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tvision", "version-date": "2021-08-10", + "port-version": 1, "description": "A modern port of Turbo Vision 2.0, the classical framework for text-based user interfaces.", "homepage": "https://github.com/magiblot/tvision", "license": "MIT", diff --git a/ports/uchardet/portfile.cmake b/ports/uchardet/portfile.cmake index 0e6a69566553e4..a4b5f21778e922 100644 --- a/ports/uchardet/portfile.cmake +++ b/ports/uchardet/portfile.cmake @@ -1,11 +1,14 @@ -vcpkg_from_git( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH - URL https://gitlab.freedesktop.org/uchardet/uchardet + REPO uchardet/uchardet REF 6f38ab95f55afd45ee6ccefcb92d21034b4a2521 - PATCHES - fix-uwp-build.patch + SHA512 a2e655d6e1eb6934cf93d99d27dfebc382eb01b6e62021f56b3fa71d269a851e7d68fe57536d40470e0329b3aa035467a9cdd9e11698f8ff76f06611ea7a58d1 + HEAD_REF master + PATCHES fix-uwp-build.patch ) + vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES diff --git a/ports/uchardet/vcpkg.json b/ports/uchardet/vcpkg.json index 6175ae9a45ecca..821a9cdea739cd 100644 --- a/ports/uchardet/vcpkg.json +++ b/ports/uchardet/vcpkg.json @@ -1,7 +1,7 @@ { "name": "uchardet", "version-date": "2021-09-03", - "port-version": 1, + "port-version": 2, "description": "An encoding detector library ported from Mozilla.", "homepage": "https://cgit.freedesktop.org/uchardet/uchardet/", "dependencies": [ diff --git a/ports/umock-c/portfile.cmake b/ports/umock-c/portfile.cmake index 71fb57c1d75869..4e9345fcd8faa5 100644 --- a/ports/umock-c/portfile.cmake +++ b/ports/umock-c/portfile.cmake @@ -36,5 +36,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR configure_file(${SOURCE_PATH}/readme.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() - - diff --git a/ports/umock-c/vcpkg.json b/ports/umock-c/vcpkg.json index 0456f2b9876d5d..d791b44b5c0edc 100644 --- a/ports/umock-c/vcpkg.json +++ b/ports/umock-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "umock-c", - "version-string": "2020-06-17", - "port-version": 2, + "version-date": "2022-01-21", "description": "A pure C mocking library", "homepage": "https://github.com/Azure/umock-c", "dependencies": [ diff --git a/ports/unicorn-lib/CMakeLists.txt b/ports/unicorn-lib/CMakeLists.txt index 16c160080a93e1..b668c3c09a77e0 100644 --- a/ports/unicorn-lib/CMakeLists.txt +++ b/ports/unicorn-lib/CMakeLists.txt @@ -4,8 +4,7 @@ project(Unicorn_Lib LANGUAGES CXX DESCRIPTION "Unicode library for C++ by Ross S set(CMAKE_CXX_STANDARD 17) option(UNICORN_LIB_SKIP_HEADERS "If the headers installation is skipped or not." OFF) -find_path(RS_CORE_LIB_INCLUDE_DIR rs-core/common.hpp) -#find_library(RW_UTILITIES_LIBRARY NAMES rw_utilities) +include(SelectLibraryConfigurations) find_package(ZLIB REQUIRED) find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d pcre2-8-staticd HINTS ${INSTALLED_LIB_PATH}) find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 pcre2-8-static HINTS ${INSTALLED_LIB_PATH}) @@ -13,26 +12,25 @@ select_library_configurations(PCRE2) file(GLOB_RECURSE UNICORN_LIB_SOURCES ${PROJECT_SOURCE_DIR}/unicorn/*.cpp) foreach(ITR ${UNICORN_LIB_SOURCES}) - if(ITR MATCHES "(.*)-test.cpp(.*)") - list(REMOVE_ITEM UNICORN_LIB_SOURCES ${ITR}) - endif() + if(ITR MATCHES "(.*)-test.cpp(.*)") + list(REMOVE_ITEM UNICORN_LIB_SOURCES ${ITR}) + endif() endforeach() add_library(unicorn-lib ${UNICORN_LIB_SOURCES}) target_include_directories( - unicorn-lib - PUBLIC ${PROJECT_SOURCE_DIR} - PUBLIC ${RS_CORE_LIB_INCLUDE_DIR} + unicorn-lib + PUBLIC ${PROJECT_SOURCE_DIR} ) target_compile_definitions( - unicorn-lib - PRIVATE -DUNICODE -D_UNICODE _CRT_SECURE_NO_WARNINGS + unicorn-lib + PRIVATE -DUNICODE -D_UNICODE _CRT_SECURE_NO_WARNINGS ) target_link_libraries(unicorn-lib PUBLIC ${PCRE2_LIBRARY}) target_link_libraries(unicorn-lib PUBLIC ZLIB::ZLIB) if(NOT UNICORN_LIB_SKIP_HEADERS) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/unicorn DESTINATION include FILES_MATCHING PATTERN "*.hpp") + install(DIRECTORY ${PROJECT_SOURCE_DIR}/unicorn DESTINATION include FILES_MATCHING PATTERN "*.hpp") endif() install(TARGETS unicorn-lib RUNTIME DESTINATION bin diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index dfdc82bcacfac4..a206c633cb358c 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -6,24 +6,22 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF 01cc7fcd2d60dbc083767d448477638e5ec8b92a # 2020-03-02 - SHA512 d8ffb80c589b34d850a507570d7d8ec707a6a23b469d484f47c80566883bd4883da23a4701434f361231a7615065ff5f1e42e40c028975f43f198c307353ec9d + REF 44e975ffc8dcd8dedbe01a8cbe7812e351f3f74f # 2022-01-24 + SHA512 b22264420174c950ca8025e861366118d79a53edce9297d84af9511e255af5971c3719f0b464f4a4886848edea7c2ba4ae32ce9abab135628d64adbde5fa7b0d HEAD_REF master ) file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DUNICORN_LIB_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/unicorn-lib/vcpkg.json b/ports/unicorn-lib/vcpkg.json index 5aee950513572c..9a7ed9aeb2b030 100644 --- a/ports/unicorn-lib/vcpkg.json +++ b/ports/unicorn-lib/vcpkg.json @@ -1,13 +1,19 @@ { "name": "unicorn-lib", - "version-date": "2020-03-02", - "port-version": 2, + "version-date": "2022-01-24", "description": "Unicode library for C++ by Ross Smith", "homepage": "https://github.com/CaptainCrowbar/unicorn-lib", + "license": "MIT", "dependencies": [ - "libiconv", "pcre2", - "rs-core-lib", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/unicorn/vcpkg.json b/ports/unicorn/vcpkg.json index bc01677b816118..0f636649c02787 100644 --- a/ports/unicorn/vcpkg.json +++ b/ports/unicorn/vcpkg.json @@ -1,8 +1,8 @@ { "name": "unicorn", - "version-string": "2020-09-14", - "port-version": 1, + "version-date": "2020-09-14", + "port-version": 2, "description": "Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework", "homepage": "https://github.com/unicorn-engine/unicorn", - "supports": "!uwp" + "supports": "windows & !uwp & !arm" } diff --git a/ports/unixodbc/portfile.cmake b/ports/unixodbc/portfile.cmake index cc92b8c84fad05..f2e726b8cdc4c4 100644 --- a/ports/unixodbc/portfile.cmake +++ b/ports/unixodbc/portfile.cmake @@ -35,6 +35,16 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc" "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/share/man" - ) +) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unixodbcConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/unixodbc/vcpkg.json b/ports/unixodbc/vcpkg.json index eace4508be5779..e844edf3c4412a 100644 --- a/ports/unixodbc/vcpkg.json +++ b/ports/unixodbc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "unixodbc", "version": "2.3.9", + "port-version": 1, "description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX", "homepage": "https://github.com/lurcher/unixODBC", "supports": "osx | linux" diff --git a/ports/unrar/Config.cmake.in b/ports/unrar/Config.cmake.in new file mode 100644 index 00000000000000..79add4e2fef378 --- /dev/null +++ b/ports/unrar/Config.cmake.in @@ -0,0 +1,22 @@ + +get_filename_component(_unrar_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_unrar_root "${_unrar_root}" PATH) +get_filename_component(_unrar_root "${_unrar_root}" PATH) + +set(_unrar_lib "${_unrar_root}/lib/unrar.lib") +if (EXISTS "${_unrar_lib}") + + add_library(unofficial::unrar::unrar INTERFACE IMPORTED) + set_target_properties(unofficial::unrar::unrar PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_unrar_root}/include") + set_target_properties(unofficial::unrar::unrar PROPERTIES IMPORTED_LOCATION "${_unrar_lib}") + set_property(TARGET unofficial::unrar::unrar APPEND PROPERTY IMPORTED_CONFIGURATIONS) + set(unrar_FOUND TRUE) + +else() + + set(unrar_FOUND FALSE) + +endif() +unset(_unrar_lib) + +unset(_unrar_root) diff --git a/ports/unrar/portfile.cmake b/ports/unrar/portfile.cmake index 239316f0766c9c..a7041a813b81fe 100644 --- a/ports/unrar/portfile.cmake +++ b/ports/unrar/portfile.cmake @@ -26,15 +26,17 @@ vcpkg_build_msbuild( ) #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) +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) +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/unrar RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/unrar/vcpkg.json b/ports/unrar/vcpkg.json index 5646a0190afb94..579dc62ea73862 100644 --- a/ports/unrar/vcpkg.json +++ b/ports/unrar/vcpkg.json @@ -1,7 +1,9 @@ { "name": "unrar", - "version-string": "5.8.1", - "port-version": 1, + "version": "5.8.1", + "port-version": 3, "description": "rarlab's unrar library", - "homepage": "https://www.rarlab.com" + "homepage": "https://www.rarlab.com", + "license": null, + "supports": "windows & !uwp & !arm & !static" } diff --git a/ports/urdfdom/0003_import_prefix.patch b/ports/urdfdom/0003_import_prefix.patch deleted file mode 100644 index 3353774af69c10..00000000000000 --- a/ports/urdfdom/0003_import_prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/urdfdom-config.cmake.in b/cmake/urdfdom-config.cmake.in -index fb81b47..3ccad51 100644 ---- a/cmake/urdfdom-config.cmake.in -+++ b/cmake/urdfdom-config.cmake.in -@@ -3,6 +3,10 @@ if (@PKG_NAME@_CONFIG_INCLUDED) - endif() - set(@PKG_NAME@_CONFIG_INCLUDED TRUE) - -+# Vcpkg fix-ups -+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) -+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -+ - set(@PKG_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include" "@TinyXML_INCLUDE_DIRS@") - - foreach(lib @PKG_LIBRARIES@) diff --git a/ports/urdfdom/0005-fix-config-and-install.patch b/ports/urdfdom/0005-fix-config-and-install.patch new file mode 100644 index 00000000000000..a0b654fd0c699e --- /dev/null +++ b/ports/urdfdom/0005-fix-config-and-install.patch @@ -0,0 +1,101 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f0d115d..9acbfbe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,17 +58,18 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}" + + enable_testing() + +-add_subdirectory(urdf_parser) +- + if(WIN32 AND NOT CYGWIN) + set(CMAKE_CONFIG_INSTALL_DIR CMake) + else() + set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/cmake/) + endif() + ++add_subdirectory(urdf_parser) ++ + set(PKG_NAME ${PROJECT_NAME}) + set(PKG_LIBRARIES urdfdom_sensor urdfdom_model_state urdfdom_model urdfdom_world) + set(PKG_DEPENDS urdfdom_headers console_bridge) ++set(PKG_EXPORTS urdfdom) + set(cmake_conf_file "cmake/urdfdom-config.cmake") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${cmake_conf_file}.in" "${CMAKE_BINARY_DIR}/${cmake_conf_file}" @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/${cmake_conf_file} +diff --git a/cmake/urdfdom-config.cmake.in b/cmake/urdfdom-config.cmake.in +index fb81b47..8b4ef8f 100644 +--- a/cmake/urdfdom-config.cmake.in ++++ b/cmake/urdfdom-config.cmake.in +@@ -3,8 +3,12 @@ if (@PKG_NAME@_CONFIG_INCLUDED) + endif() + set(@PKG_NAME@_CONFIG_INCLUDED TRUE) + +-set(@PKG_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include" "@TinyXML_INCLUDE_DIRS@") ++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + ++set(@PKG_NAME@_INCLUDE_DIRS "${_IMPORT_PREFIX}/include" "@TinyXML_INCLUDE_DIRS@") ++ ++if (0) + foreach(lib @PKG_LIBRARIES@) + set(onelib "${lib}-NOTFOUND") + find_library(onelib ${lib} +@@ -25,3 +29,13 @@ foreach(dep @PKG_DEPENDS@) + list(APPEND @PKG_NAME@_INCLUDE_DIRS ${${dep}_INCLUDE_DIRS}) + list(APPEND @PKG_NAME@_LIBRARIES ${${dep}_LIBRARIES}) + endforeach() ++endif() ++ ++include(CMakeFindDependencyMacro) ++find_dependency(console_bridge) ++ ++foreach(exp @PKG_EXPORTS@) ++ include(${@PROJECT_NAME@_DIR}/${exp}Export.cmake) ++endforeach() ++ ++set(@PKG_NAME@_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) +\ No newline at end of file +diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt +index 731b57a..ebd0586 100644 +--- a/urdf_parser/CMakeLists.txt ++++ b/urdf_parser/CMakeLists.txt +@@ -39,10 +39,32 @@ if(BUILD_TESTING) + add_subdirectory(test) + endif() + +-INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test +- DESTINATION ${CMAKE_INSTALL_BINDIR}) +-INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++INSTALL( ++ TARGETS ++ check_urdf ++ urdf_to_graphiz ++ urdf_mem_test ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++INSTALL( ++ TARGETS ++ urdfdom_model ++ urdfdom_world ++ urdfdom_sensor ++ urdfdom_model_state ++ EXPORT ++ urdfdom ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++install( ++ EXPORT urdfdom ++ DESTINATION ${CMAKE_CONFIG_INSTALL_DIR} ++ NAMESPACE "${PROJECT_NAME}::" ++ FILE "urdfdomExport.cmake" ++) ++ + INSTALL(DIRECTORY include/urdf_parser DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/ports/urdfdom/portfile.cmake b/ports/urdfdom/portfile.cmake index 46226bc0e59bf2..ef1dfa803618fa 100644 --- a/ports/urdfdom/portfile.cmake +++ b/ports/urdfdom/portfile.cmake @@ -9,47 +9,32 @@ vcpkg_from_github( PATCHES 0001_use_math_defines.patch 0002_fix_exports.patch - 0003_import_prefix.patch 0004_fix-dependency-console_bridge.patch + 0005-fix-config-and-install.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) +vcpkg_copy_tools(TOOL_NAMES check_urdf urdf_mem_test urdf_to_graphiz AUTO_CLEAN) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/urdfdom/cmake) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/urdfdom) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/urdfdom/cmake) + # Empty folders + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/urdfdom") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) vcpkg_fixup_pkgconfig() endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ ${CURRENT_PACKAGES_DIR}/tools/${PORT}/) - -file(GLOB URDFDOM_DLLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) -foreach(URDFDOM_DLL_DEBUG ${URDFDOM_DLLS_DEBUG}) - file(COPY ${URDFDOM_DLL_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${URDFDOM_DLL_DEBUG}) -endforeach() - -file(GLOB URDFDOM_DLLS_RELEASE ${CURRENT_PACKAGES_DIR}/lib/*.dll) -foreach(URDFDOM_DLL_RELEASE ${URDFDOM_DLLS_RELEASE}) - file(COPY ${URDFDOM_DLL_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE ${URDFDOM_DLL_RELEASE}) -endforeach() - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/urdfdom/vcpkg.json b/ports/urdfdom/vcpkg.json index d235316bcb11e7..0b9ee602cb2187 100644 --- a/ports/urdfdom/vcpkg.json +++ b/ports/urdfdom/vcpkg.json @@ -1,12 +1,20 @@ { "name": "urdfdom", - "version-string": "1.0.4", - "port-version": 4, + "version": "1.0.4", + "port-version": 5, "description": "Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.", "homepage": "https://github.com/ros/urdfdom", "dependencies": [ "console-bridge", "tinyxml", - "urdfdom-headers" + "urdfdom-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/urho3d/fix-dependency-readline.patch b/ports/urho3d/fix-dependency-readline.patch new file mode 100644 index 00000000000000..ec36fb39ac17d2 --- /dev/null +++ b/ports/urho3d/fix-dependency-readline.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/Modules/FindReadline.cmake b/cmake/Modules/FindReadline.cmake +index ad5fbd0..f1ee2e8 100644 +--- a/cmake/Modules/FindReadline.cmake ++++ b/cmake/Modules/FindReadline.cmake +@@ -48,4 +48,8 @@ endif () + include (FindPackageHandleStandardArgs) + find_package_handle_standard_args (Readline REQUIRED_VARS READLINE_LIBRARIES READLINE_INCLUDE_DIRS FAIL_MESSAGE "Could NOT find Readline development library") + ++if (READLINE_FOUND) ++ set(READLINE_LIBRARIES ${READLINE_LIBRARIES} curses) ++endif() ++ + mark_as_advanced (READLINE_INCLUDE_DIRS READLINE_LIBRARIES) +diff --git a/cmake/Modules/UrhoCommon.cmake b/cmake/Modules/UrhoCommon.cmake +index b196095..9dd0ee9 100644 +--- a/cmake/Modules/UrhoCommon.cmake ++++ b/cmake/Modules/UrhoCommon.cmake +@@ -226,9 +226,9 @@ if (CMAKE_PROJECT_NAME STREQUAL Urho3D) + option (URHO3D_TESTING "Enable testing support") + # By default this option is off (i.e. we use the MSVC dynamic runtime), this can be switched on if using Urho3D as a STATIC library + cmake_dependent_option (URHO3D_STATIC_RUNTIME "Use static C/C++ runtime libraries and eliminate the need for runtime DLLs installation (VS only)" FALSE "MSVC" FALSE) +- if (((URHO3D_LUA AND NOT URHO3D_LUAJIT) OR URHO3D_DATABASE_SQLITE) AND NOT ANDROID AND NOT IOS AND NOT TVOS AND NOT WEB AND NOT WIN32) ++ if (URHO3D_ENABLE_READLINE AND ((URHO3D_LUA AND NOT URHO3D_LUAJIT) OR URHO3D_DATABASE_SQLITE) AND NOT ANDROID AND NOT IOS AND NOT TVOS AND NOT WEB AND NOT WIN32) + # Find GNU Readline development library for Lua interpreter and SQLite's isql +- find_package (Readline) ++ find_package (Readline REQUIRED) + endif () + if (CPACK_SYSTEM_NAME STREQUAL Linux) + cmake_dependent_option (URHO3D_USE_LIB64_RPM "Enable 64-bit RPM CPack generator using /usr/lib64 and disable all other generators (Debian-based host only)" FALSE "URHO3D_64BIT AND NOT HAS_LIB64" FALSE) diff --git a/ports/urho3d/portfile.cmake b/ports/urho3d/portfile.cmake index dafdbe1afb8d66..a79dcf22589204 100644 --- a/ports/urho3d/portfile.cmake +++ b/ports/urho3d/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( externalproject.patch add_options.patch fix-install.patch + fix-dependency-readline.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -21,16 +22,16 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + readline URHO3D_ENABLE_READLINE tools URHO3D_BUILD_TOOLS examples URHO3D_BUILD_SAMPLES ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DURHO3D_LIB_TYPE=${URHO3D_LIB_TYPE} - -DURHO3D_C++11=ON -DURHO3D_PCH=OFF ) @@ -100,7 +101,7 @@ list(APPEND SDL_RELATED_HEADERS "${CURRENT_PACKAGES_DIR}/include/Urho3D/IO/NamedPipe.h" "${CURRENT_PACKAGES_DIR}/include/Urho3D/IO/RWOpsWrapper.h" ) -foreach (SDL_RELATED_HEADER ${SDL_RELATED_HEADERS}) +foreach (SDL_RELATED_HEADER IN LISTS SDL_RELATED_HEADERS) vcpkg_replace_string("${SDL_RELATED_HEADER}" "#include ] [CONFIG_PATH ] + [TOOLS_PATH ] [DO_NOT_DELETE_PARENT_CONFIG_PATH] [NO_PREFIX_CORRECTION] ) @@ -34,11 +35,13 @@ and applies a rather simply correction which in some cases will yield the wrong ## How it Works 1. Moves `/debug//*targets-debug.cmake` to `/share/${PACKAGE_NAME}`. -2. Removes `/debug//*config.cmake`. -3. Transform all references matching `/bin/*.exe` to `/tools//*.exe` on Windows. -4. Transform all references matching `/bin/*` to `/tools//*` on other platforms. -5. Fixes `${_IMPORT_PREFIX}` in auto generated targets. -6. Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets. +2. Transforms all references matching `/bin/*.exe` to `/${TOOLS_PATH}/*.exe` on Windows. +3. Transforms all references matching `/bin/*` to `/${TOOLS_PATH}/*` on other platforms. +4. Fixes `${_IMPORT_PREFIX}` in auto generated targets. +5. Replaces `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs. +6. Merges INTERFACE_LINK_LIBRARIES of release and debug configurations. +7. Replaces `${CURRENT_INSTALLED_DIR}` with `${VCPKG_IMPORT_PREFIX}` in targets. +8. Removes `/debug//*config.cmake`. ## Examples @@ -52,7 +55,7 @@ endif() set(Z_VCPKG_CMAKE_CONFIG_FIXUP_GUARD ON CACHE INTERNAL "guard variable") function(vcpkg_cmake_config_fixup) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "PACKAGE_NAME;CONFIG_PATH" "") + cmake_parse_arguments(PARSE_ARGV 0 "arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "PACKAGE_NAME;CONFIG_PATH;TOOLS_PATH" "") if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "vcpkg_cmake_config_fixup was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") @@ -63,6 +66,9 @@ function(vcpkg_cmake_config_fixup) if(NOT arg_CONFIG_PATH) set(arg_CONFIG_PATH "share/${arg_PACKAGE_NAME}") endif() + if(NOT arg_TOOLS_PATH) + set(arg_TOOLS_PATH "tools/${PORT}") + endif() set(target_path "share/${arg_PACKAGE_NAME}") string(REPLACE "." "\\." EXECUTABLE_SUFFIX "${VCPKG_TARGET_EXECUTABLE_SUFFIX}") @@ -130,23 +136,13 @@ function(vcpkg_cmake_config_fixup) endif() endif() - file(GLOB_RECURSE unused_files - "${debug_share}/*[Tt]argets.cmake" - "${debug_share}/*[Cc]onfig.cmake" - "${debug_share}/*[Cc]onfigVersion.cmake" - "${debug_share}/*[Cc]onfig-version.cmake" - ) - foreach(unused_file IN LISTS unused_files) - file(REMOVE "${unused_file}") - endforeach() - file(GLOB_RECURSE release_targets "${release_share}/*-release.cmake" ) foreach(release_target IN LISTS release_targets) file(READ "${release_target}" contents) string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}") - string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/tools/${PORT}/\\1" contents "${contents}") + string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/${arg_TOOLS_PATH}/\\1" contents "${contents}") file(WRITE "${release_target}" "${contents}") endforeach() @@ -159,7 +155,7 @@ function(vcpkg_cmake_config_fixup) file(READ "${debug_target}" contents) string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}") - string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \";]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/tools/${PORT}/\\1" contents "${contents}") + string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \";]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/${arg_TOOLS_PATH}/\\1" contents "${contents}") string(REPLACE "\${_IMPORT_PREFIX}/lib" "\${_IMPORT_PREFIX}/debug/lib" contents "${contents}") string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/debug/bin" contents "${contents}") file(WRITE "${release_share}/${debug_target_rel}" "${contents}") @@ -168,9 +164,17 @@ function(vcpkg_cmake_config_fixup) endforeach() endif() - #Fix ${_IMPORT_PREFIX} in cmake generated targets and configs; - #Since those can be renamed we have to check in every *.cmake + #Fix ${_IMPORT_PREFIX} and absolute paths in cmake generated targets and configs; + #Since those can be renamed we have to check in every *.cmake, but only once. file(GLOB_RECURSE main_cmakes "${release_share}/*.cmake") + if(NOT DEFINED Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) + vcpkg_list(SET Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) + endif() + foreach(already_fixed_up IN LISTS Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) + vcpkg_list(REMOVE_ITEM main_cmakes "${already_fixed_up}") + endforeach() + vcpkg_list(APPEND Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP ${main_cmakes}) + set(Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP "${Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP}" CACHE INTERNAL "") foreach(main_cmake IN LISTS main_cmakes) file(READ "${main_cmake}" contents) @@ -201,26 +205,66 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] contents "${contents}") # This is a meson-related workaround, see https://github.com/mesonbuild/meson/issues/6955 endif() - #Fix wrongly absolute paths to install dir with the correct dir using ${_IMPORT_PREFIX} + # Merge release and debug configurations of target property INTERFACE_LINK_LIBRARIES. + string(REPLACE "${release_share}/" "${debug_share}/" debug_cmake "${main_cmake}") + if(DEFINED VCPKG_BUILD_TYPE) + # Skip. Warning: A release-only port in a dual-config installation + # may pull release dependencies into the debug configuration. + elseif(NOT contents MATCHES "INTERFACE_LINK_LIBRARIES") + # Skip. No relevant properties. + elseif(NOT contents MATCHES "# Generated CMake target import file\\.") + # Skip. No safe assumptions about a matching debug import file. + elseif(NOT EXISTS "${debug_cmake}") + message(SEND_ERROR "Did not find a debug import file matching '${main_cmake}'") + else() + file(READ "${debug_cmake}" debug_contents) + while(contents MATCHES "set_target_properties\\(([^ \$]*) PROPERTIES[^)]*\\)") + set(matched_command "${CMAKE_MATCH_0}") + string(REPLACE "+" "\\+" target "${CMAKE_MATCH_1}") + if(NOT debug_contents MATCHES "set_target_properties\\(${target} PROPERTIES[^)]*\\)") + message(SEND_ERROR "Did not find a debug configuration for target '${target}'.") + endif() + set(debug_command "${CMAKE_MATCH_0}") + string(REGEX MATCH " INTERFACE_LINK_LIBRARIES \"([^\"]*)\"" release_line "${matched_command}") + set(release_libs "${CMAKE_MATCH_1}") + string(REGEX MATCH " INTERFACE_LINK_LIBRARIES \"([^\"]*)\"" debug_line "${debug_command}") + set(debug_libs "${CMAKE_MATCH_1}") + z_vcpkg_cmake_config_fixup_merge(merged_libs release_libs debug_libs) + string(REPLACE "${release_line}" " INTERFACE_LINK_LIBRARIES \"${merged_libs}\"" updated_command "${matched_command}") + string(REPLACE "set_target_properties" "set_target_properties::done" updated_command "${updated_command}") # Prevend 2nd match + string(REPLACE "${matched_command}" "${updated_command}" contents "${contents}") + endwhile() + string(REPLACE "set_target_properties::done" "set_target_properties" contents "${contents}") # Restore original command + endif() + + #Fix absolute paths to installed dir with ones relative to ${CMAKE_CURRENT_LIST_DIR} #This happens if vcpkg built libraries are directly linked to a target instead of using - #an imported target for it. We could add more logic here to identify defect target files. - #Since the replacement here in a multi config build always requires a generator expression - #in front of the absoulte path to ${CURRENT_INSTALLED_DIR}. So the match should always be at - #least >:${CURRENT_INSTALLED_DIR}. - #In general the following generator expressions should be there: - #\$<\$:${CURRENT_INSTALLED_DIR}/debug/lib/somelib> - #and/or - #\$<\$>:${CURRENT_INSTALLED_DIR}/lib/somelib> - #with ${CURRENT_INSTALLED_DIR} being fully expanded - string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${_IMPORT_PREFIX}]] contents "${contents}") - - # Patch out any remaining absolute references + #an imported target. + string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${VCPKG_IMPORT_PREFIX}]] contents "${contents}") file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}" cmake_current_packages_dir) - string(REPLACE "${cmake_current_packages_dir}" [[${_IMPORT_PREFIX}]] contents "${contents}") + string(REPLACE "${cmake_current_packages_dir}" [[${VCPKG_IMPORT_PREFIX}]] contents "${contents}") + # If ${VCPKG_IMPORT_PREFIX} was actually used, inject a definition of it: + string(FIND "${contents}" [[${VCPKG_IMPORT_PREFIX}]] index) + if (NOT index STREQUAL "-1") + get_filename_component(main_cmake_dir "${main_cmake}" DIRECTORY) + # Calculate relative to be a sequence of "../" + file(RELATIVE_PATH relative "${main_cmake_dir}" "${cmake_current_packages_dir}") + string(PREPEND contents "get_filename_component(VCPKG_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_DIR}\/${relative}\" ABSOLUTE)\n") + endif() file(WRITE "${main_cmake}" "${contents}") endforeach() + file(GLOB_RECURSE unused_files + "${debug_share}/*[Tt]argets.cmake" + "${debug_share}/*[Cc]onfig.cmake" + "${debug_share}/*[Cc]onfigVersion.cmake" + "${debug_share}/*[Cc]onfig-version.cmake" + ) + foreach(unused_file IN LISTS unused_files) + file(REMOVE "${unused_file}") + endforeach() + # Remove /debug// if it's empty. file(GLOB_RECURSE remaining_files "${debug_share}/*") if(remaining_files STREQUAL "") @@ -234,4 +278,35 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] endif() endfunction() - +# Merges link interface library lists for release and debug +# into a single expression which use generator expression as necessary. +function(z_vcpkg_cmake_config_fixup_merge out_var release_var debug_var) + set(release_libs "VCPKG;${${release_var}}") + string(REGEX REPLACE ";optimized;([^;]*)" ";\\1" release_libs "${release_libs}") + string(REGEX REPLACE ";debug;([^;]*)" ";" release_libs "${release_libs}") + list(REMOVE_AT release_libs 0) + list(FILTER release_libs EXCLUDE REGEX [[^\\[$]<\\[$]:]]) + list(TRANSFORM release_libs REPLACE [[^\\[$]<\\[$]>:(.*)>$]] "\\1") + + set(debug_libs "VCPKG;${${debug_var}}") + string(REGEX REPLACE ";optimized;([^;]*)" ";" debug_libs "${debug_libs}") + string(REGEX REPLACE ";debug;([^;]*)" ";\\1" debug_libs "${debug_libs}") + list(REMOVE_AT debug_libs 0) + list(FILTER debug_libs EXCLUDE REGEX [[^\\[$]<\\[$]>:]]) + list(TRANSFORM debug_libs REPLACE [[^\\[$]<\\[$]:(.*)>$]] "\\1") + + set(merged_libs "") + foreach(release_lib debug_lib IN ZIP_LISTS release_libs debug_libs) + if(release_lib STREQUAL debug_lib) + list(APPEND merged_libs "${release_lib}") + else() + if(release_lib) + list(APPEND merged_libs "\\\$<\\\$>:${release_lib}>") + endif() + if(debug_lib) + list(APPEND merged_libs "\\\$<\\\$:${debug_lib}>") + endif() + endif() + endforeach() + set("${out_var}" "${merged_libs}" PARENT_SCOPE) +endfunction() diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 49b1387178e8c5..0061a046eab5c0 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake", - "version-date": "2021-09-13" + "version-date": "2022-01-19" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake index ef27a6c91bf3f3..5520f0de318e3c 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake @@ -19,6 +19,8 @@ and this is something we recommend doing whenever possible. Otherwise, you can use `TARGET` to set the target to build. This function defaults to not passing a target to cmake. +[`vcpkg_cmake_install()`]: vcpkg_cmake_install.md + `LOGFILE_BASE` is used to set the base of the logfile names; by default, this is `build`, and thus the logfiles end up being something like `build-x86-windows-dbg.log`; if you use `vcpkg_cmake_install`, @@ -46,10 +48,10 @@ function(vcpkg_cmake_build) set(arg_LOGFILE_BASE "build") endif() - set(build_args) - set(target_args) - set(parallel_args) - set(no_parallel_args) + set(build_args "") + set(target_args "") + set(parallel_args "") + set(no_parallel_args "") if(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Ninja") set(build_args "-v") # verbose output @@ -63,8 +65,15 @@ function(vcpkg_cmake_build) set(parallel_args "/m") elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "NMake Makefiles") # No options are currently added for nmake builds + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") + set(build_args "VERBOSE=1") + set(parallel_args "-j${VCPKG_CONCURRENCY}") + set(no_parallel_args "") + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") + list(APPEND parallel_args -jobs "${VCPKG_CONCURRENCY}") + list(APPEND no_parallel_args -jobs 1) else() - message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles") + message(WARNING "Unrecognized GENERATOR setting from vcpkg_cmake_configure().") endif() if(DEFINED arg_TARGET) diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index c9657bfa9a0941..95ee7e23ea1d80 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -86,7 +86,7 @@ This command supplies many common arguments to CMake. To see the full list, exam * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) +* [opencv4](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv4/portfile.cmake) #]===] if(Z_VCPKG_CMAKE_CONFIGURE_GUARD) return() @@ -150,15 +150,11 @@ function(vcpkg_cmake_configure) set(ninja_can_be_used ON) # Ninja as generator set(ninja_host ON) # Ninja as parallel configurator - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(targetting_uwp ON) - endif() - if(host_architecture STREQUAL "x86") # Prebuilt ninja binaries are only provided for x64 hosts set(ninja_can_be_used OFF) set(ninja_host OFF) - elseif(targetting_uwp) + elseif(VCPKG_TARGET_IS_UWP) # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility set(ninja_can_be_used OFF) endif() @@ -241,15 +237,21 @@ function(vcpkg_cmake_configure) list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") endif() + set(build_dir_release "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + set(build_dir_debug "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") file(REMOVE_RECURSE - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + "${build_dir_release}" + "${build_dir_debug}") + file(MAKE_DIRECTORY "${build_dir_release}") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${build_dir_debug}") + endif() if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") - if(targetting_uwp AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + if(VCPKG_TARGET_IS_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + elseif(VCPKG_TARGET_IS_ANDROID AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(VCPKG_CMAKE_SYSTEM_VERSION 21) endif() endif() @@ -278,22 +280,22 @@ function(vcpkg_cmake_configure) endif() if(NOT DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR _TARGETTING_UWP) + if(VCPKG_TARGET_IS_MINGW) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") + elseif(VCPKG_TARGET_IS_WINDOWS) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + elseif(VCPKG_TARGET_IS_LINUX) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") + elseif(VCPKG_TARGET_IS_ANDROID) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + elseif(VCPKG_TARGET_IS_OSX) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") + elseif(VCPKG_TARGET_IS_IOS) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + elseif(VCPKG_TARGET_IS_FREEBSD) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + elseif(VCPKG_TARGET_IS_OPENBSD) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") endif() endif() @@ -371,7 +373,8 @@ function(vcpkg_cmake_configure) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") set(line "build ../CMakeCache.txt: CreateProcess\n ") - string(APPEND line "process = \"${CMAKE_COMMAND}\" -S \"${arg_SOURCE_PATH}\" -B .. ") + string(APPEND line "process = \"${CMAKE_COMMAND}\" -E chdir \"${build_dir_release}\" ") + string(APPEND line "\"${CMAKE_COMMAND}\" -S \"${arg_SOURCE_PATH}\" ") if(DEFINED arg_OPTIONS AND NOT arg_OPTIONS STREQUAL "") list(JOIN arg_OPTIONS "\" \"" options) @@ -388,7 +391,8 @@ function(vcpkg_cmake_configure) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(line "build ../../${TARGET_TRIPLET}-dbg/CMakeCache.txt: CreateProcess\n ") - string(APPEND line "process = \"${CMAKE_COMMAND}\" -S \"${arg_SOURCE_PATH}\" -B \"../../${TARGET_TRIPLET}-dbg\" ") + string(APPEND line "process = \"${CMAKE_COMMAND}\" -E chdir \"${build_dir_debug}\" ") + string(APPEND line "\"${CMAKE_COMMAND}\" -S \"${arg_SOURCE_PATH}\" ") if(DEFINED arg_OPTIONS AND NOT arg_OPTIONS STREQUAL "") list(JOIN arg_OPTIONS "\" \"" options) @@ -404,13 +408,13 @@ function(vcpkg_cmake_configure) string(APPEND parallel_configure_contents "${line}\n\n") endif() - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure") - file(WRITE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure/build.ninja" "${parallel_configure_contents}") + file(MAKE_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure") + file(WRITE "${build_dir_release}/vcpkg-parallel-configure/build.ninja" "${parallel_configure_contents}") message(STATUS "${configuring_message}") vcpkg_execute_required_process( COMMAND ninja -v - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure" + WORKING_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure" LOGNAME "${arg_LOGFILE_BASE}" ) list(APPEND config_logs @@ -419,7 +423,6 @@ function(vcpkg_cmake_configure) else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "${configuring_message}-dbg") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" @@ -428,7 +431,7 @@ function(vcpkg_cmake_configure) -G "${generator}" "-DCMAKE_BUILD_TYPE=Debug" "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + WORKING_DIRECTORY "${build_dir_debug}" LOGNAME "${arg_LOGFILE_BASE}-dbg" ) list(APPEND config_logs @@ -438,7 +441,6 @@ function(vcpkg_cmake_configure) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") message(STATUS "${configuring_message}-rel") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" @@ -447,7 +449,7 @@ function(vcpkg_cmake_configure) -G "${generator}" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + WORKING_DIRECTORY "${build_dir_release}" LOGNAME "${arg_LOGFILE_BASE}-rel" ) list(APPEND config_logs diff --git a/ports/vcpkg-cmake/vcpkg_cmake_install.cmake b/ports/vcpkg-cmake/vcpkg_cmake_install.cmake index 0a609aa8da35fd..6eddcfb912ba9e 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_install.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_install.cmake @@ -14,7 +14,7 @@ vcpkg_cmake_install( with additional parameters to set the `TARGET` to `install`, and to set the `LOGFILE_ROOT` to `install` as well. -[`vcpkg_cmake_build()`]: vcpkg_cmake_build.cmake +[`vcpkg_cmake_build()`]: vcpkg_cmake_build.md ## Examples: diff --git a/ports/vcpkg-gfortran/portfile.cmake b/ports/vcpkg-gfortran/portfile.cmake index 7939c7684da28a..d1b7168a54a13b 100644 --- a/ports/vcpkg-gfortran/portfile.cmake +++ b/ports/vcpkg-gfortran/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "linux" "osx") include(vcpkg_find_fortran) vcpkg_find_fortran(FORTRAN_CMAKE) if(VCPKG_USE_INTERNAL_Fortran) @@ -49,4 +48,4 @@ if(VCPKG_USE_INTERNAL_Fortran) set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) else() set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -endif() \ No newline at end of file +endif() diff --git a/ports/vcpkg-gfortran/vcpkg.json b/ports/vcpkg-gfortran/vcpkg.json index 604a1626d30cd0..ea146c4203bf2c 100644 --- a/ports/vcpkg-gfortran/vcpkg.json +++ b/ports/vcpkg-gfortran/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-gfortran", - "version-string": "3", - "port-version": 1, + "version": "3", + "port-version": 2, "description": "Metaport to install gfortran dependencies from msys if VCPKG_USE_EXTERNAL_Fortran is false", "supports": "windows & !arm" } diff --git a/ports/vcpkg-gn/vcpkg.json b/ports/vcpkg-gn/vcpkg.json index 64bdccd0e68a1f..26d89e6802de25 100644 --- a/ports/vcpkg-gn/vcpkg.json +++ b/ports/vcpkg-gn/vcpkg.json @@ -1,6 +1,13 @@ { "name": "vcpkg-gn", "version-date": "2021-11-16", + "port-version": 1, "description": "https://gn.googlesource.com/gn/+/4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e", - "supports": "native & !x86" + "supports": "native & !x86", + "dependencies": [ + { + "name": "vcpkg-tool-python2", + "host": true + } + ] } diff --git a/ports/vcpkg-pkgconfig-get-modules/portfile.cmake b/ports/vcpkg-pkgconfig-get-modules/portfile.cmake index 18df919b49f362..f82cf371bd6f5c 100644 --- a/ports/vcpkg-pkgconfig-get-modules/portfile.cmake +++ b/ports/vcpkg-pkgconfig-get-modules/portfile.cmake @@ -4,9 +4,10 @@ if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) endif() file(COPY - "${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake" "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/x_vcpkg_pkgconfig_get_modules.cmake" @ONLY) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json index 3098b94f3fd7a1..06a3a549eeda93 100644 --- a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json +++ b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json @@ -1,5 +1,11 @@ { "name": "vcpkg-pkgconfig-get-modules", - "version-date": "2021-04-02", - "port-version": 1 + "version-date": "2022-02-10", + "dependencies": [ + { + "name": "pkgconf", + "host": true, + "default-features": false + } + ] } 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 cfe417be0a1cd3..5a4dec12b953db 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 @@ -9,6 +9,7 @@ Retrieve required module information from pkgconfig modules x_vcpkg_pkgconfig_get_modules( PREFIX MODULES ... + [CFLAGS] [LIBS] [LIBRARIES] [LIBRARIES_DIRS] @@ -45,7 +46,7 @@ endif() set(Z_VCPKG_PKGCONFIG_GET_MODULES_GUARD ON CACHE INTERNAL "guard variable") function(x_vcpkg_pkgconfig_get_modules) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS" "PREFIX" "MODULES") + cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS" "PREFIX" "MODULES") if(NOT DEFINED arg_PREFIX OR arg_PREFIX STREQUAL "") message(FATAL_ERROR "x_vcpkg_pkgconfig_get_modules requires parameter PREFIX!") endif() @@ -56,7 +57,8 @@ function(x_vcpkg_pkgconfig_get_modules) message(FATAL_ERROR "extra arguments passed to x_vcpkg_pkgconfig_get_modules: ${arg_UNPARSED_ARGUMENTS}") endif() - vcpkg_find_acquire_program(PKGCONFIG) + set(PKGCONFIG "${CURRENT_INSTALLED_DIR}/../@HOST_TRIPLET@/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@") + set(backup_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}") set(var_suffixes) @@ -94,6 +96,14 @@ function(x_vcpkg_pkgconfig_get_modules) ) list(APPEND var_suffixes INCLUDE_DIRS_RELEASE) endif() + if(arg_CFLAGS) + execute_process( + COMMAND "${PKGCONFIG}" --cflags ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_CFLAGS_RELEASE + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes CFLAGS_RELEASE) + endif() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}") @@ -129,6 +139,14 @@ function(x_vcpkg_pkgconfig_get_modules) ) list(APPEND var_suffixes INCLUDE_DIRS_DEBUG) endif() + if(arg_CFLAGS) + execute_process( + COMMAND "${PKGCONFIG}" --cflags ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_CFLAGS_DEBUG + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes CFLAGS_DEBUG) + endif() endif() set(ENV{PKG_CONFIG_PATH} "${backup_PKG_CONFIG_PATH}") diff --git a/ports/vcpkg-tool-lessmsi/portfile.cmake b/ports/vcpkg-tool-lessmsi/portfile.cmake new file mode 100644 index 00000000000000..cd523cf412cbc3 --- /dev/null +++ b/ports/vcpkg-tool-lessmsi/portfile.cmake @@ -0,0 +1,17 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(version v1.10.0) + +vcpkg_download_distfile(archive_path + URLS "https://github.com/activescott/lessmsi/releases/download/${version}/lessmsi-${version}.zip" + FILENAME "lessmsi-${version}.zip" + SHA512 91be9363d75e8ca0129304008ddc26fe575cc4fd76d7f43ef0a6ff414855dc1c6e412f4e694b2950026e02cc3d31b18bd8c2e4c03e1ddce01477f3f2d2197479 +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(ARCHIVE_EXTRACT + INPUT "${archive_path}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" +) + diff --git a/ports/vcpkg-tool-lessmsi/vcpkg.json b/ports/vcpkg-tool-lessmsi/vcpkg.json new file mode 100644 index 00000000000000..df6fc3711bb9c7 --- /dev/null +++ b/ports/vcpkg-tool-lessmsi/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vcpkg-tool-lessmsi", + "version": "1.10.0", + "description": "This is a utility with a graphical user interface and a command line interface that can be used to view and extract the contents of an MSI file.", + "homepage": "https://github.com/activescott/lessmsi", + "license": "MIT", + "supports": "native & windows" +} diff --git a/ports/vcpkg-tool-meson/fix_linker_detection.patch b/ports/vcpkg-tool-meson/fix_linker_detection.patch new file mode 100644 index 00000000000000..89e6dfa214b850 --- /dev/null +++ b/ports/vcpkg-tool-meson/fix_linker_detection.patch @@ -0,0 +1,25 @@ +diff --git a/tools/meson/mesonbuild/compilers/detect.py b/tools/meson/mesonbuild/compilers/detect.py +index 1eacecfa8..74668da1a 100644 +--- a/tools/meson/mesonbuild/compilers/detect.py ++++ b/tools/meson/mesonbuild/compilers/detect.py +@@ -292,7 +292,7 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker + linkers = default_linkers + popen_exceptions = {} + for linker in linkers: +- if not {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'}.isdisjoint(linker): ++ if any(os.path.basename(x) in {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'} for x in linker): + arg = '/?' + elif not {'ar2000', 'ar2000.exe'}.isdisjoint(linker): + arg = '?' +diff --git a/tools/meson/mesonbuild/linkers/detect.py b/tools/meson/mesonbuild/linkers/detect.py +index 0bfd7083b..323801d9a 100644 +--- a/tools/meson/mesonbuild/linkers/detect.py ++++ b/tools/meson/mesonbuild/linkers/detect.py +@@ -72,6 +72,7 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty + override = [] # type: T.List[str] + value = env.lookup_binary_entry(for_machine, comp_class.language + '_ld') + if value is not None: ++ compiler = value + override = comp_class.use_linker_args(value[0]) + check_args += override + diff --git a/ports/vcpkg-tool-meson/meson-intl.patch b/ports/vcpkg-tool-meson/meson-intl.patch new file mode 100644 index 00000000000000..614db056d6acfa --- /dev/null +++ b/ports/vcpkg-tool-meson/meson-intl.patch @@ -0,0 +1,14 @@ +diff --git a/tools/meson/mesonbuild/dependencies/misc.py b/tools/meson/mesonbuild/dependencies/misc.py +index 537af1f89..43d7febf2 100644 +--- a/tools/meson/mesonbuild/dependencies/misc.py ++++ b/tools/meson/mesonbuild/dependencies/misc.py +@@ -610,7 +610,8 @@ iconv_factory = DependencyFactory( + + intl_factory = DependencyFactory( + 'intl', ++ [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM, DependencyMethods.CMAKE], ++ cmake_name='Intl', +- [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM], + builtin_class=IntlBuiltinDependency, + system_class=IntlSystemDependency, + ) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake new file mode 100644 index 00000000000000..c4a94114651fb7 --- /dev/null +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -0,0 +1,62 @@ +# This port represents a dependency on the Meson build system. +# In the future, it is expected that this port acquires and installs Meson. +# Currently is used in ports that call vcpkg_find_acquire_program(MESON) in order to force rebuilds. + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(program MESON) +set(program_version 0.60.2) +set(program_name meson) +set(search_names meson meson.py) +set(interpreter PYTHON3) +set(apt_package_name "meson") +set(brew_package_name "meson") +set(ref 5e9b709ad0b34d8ac920dff057a5361080c0889b) +set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/meson") +set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") +set(download_filename "meson-${ref}.tar.gz") +set(download_sha512 5fb89c6b81f75825b6f300039db6dae9d907c81403a8ebe30c7426729d5cb3179e30b9b84d6ed756c2aa39ca34ea681afa0c5cd78835a94c43d5ab25e625abd0) +set(supported_on_unix ON) +set(version_command --version) +set(extra_search_args EXACT_VERSION_MATCH) + +vcpkg_find_acquire_program(PYTHON3) + +# Reenable if no patching of meson is required within vcpkg +# z_vcpkg_find_acquire_program_find_external("${program}" +# ${extra_search_args} +# PROGRAM_NAME "${program_name}" +# MIN_VERSION "${program_version}" +# INTERPRETER "${interpreter}" +# NAMES ${search_names} +# VERSION_COMMAND ${version_command} +# ) + +if(NOT "${program}") + vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" + ) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") + vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" + ) + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/meson-${ref}" "${CURRENT_PACKAGES_DIR}/tools/meson") + z_vcpkg_apply_patches( + SOURCE_PATH "${CURRENT_PACKAGES_DIR}" + PATCHES meson-intl.patch + fix_linker_detection.patch + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases") +endif() + +z_vcpkg_find_acquire_program_find_internal("${program}" + INTERPRETER "${interpreter}" + PATHS ${paths_to_search} + NAMES ${search_names} +) + +message(STATUS "Using meson: ${MESON}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${program_version}") # For vcpkg_find_acquire_program diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json new file mode 100644 index 00000000000000..82a1d87aeb01ff --- /dev/null +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vcpkg-tool-meson", + "version": "0.60.2", + "port-version": 2, + "description": "Meson build system", + "homepage": "https://github.com/mesonbuild/meson", + "supports": "native" +} diff --git a/ports/vcpkg-tool-python2/portfile.cmake b/ports/vcpkg-tool-python2/portfile.cmake new file mode 100644 index 00000000000000..703173bba9a87a --- /dev/null +++ b/ports/vcpkg-tool-python2/portfile.cmake @@ -0,0 +1,60 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if(VCPKG_TARGET_IS_WINDOWS) + set(arch_suffix "") + set(program_name python) + set(program_version 2.7.18) + 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}.msi") + set(download_filename "python-${program_version}.msi") + set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) + else() + set(tool_subdirectory "python-${program_version}-x64") + set(arch_suffix ".amd64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") + set(download_filename "python-${program_version}.amd64.msi") + set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) + endif() + set(paths_to_search "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") + + vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" + ) + set(output_path "${CURRENT_PACKAGES_DIR}/manual-tools") # vcpkg.cmake adds everything in /tools to CMAKE_PROGRAM_PATH. That is not desired for Python2 + file(MAKE_DIRECTORY "${output_path}") + cmake_path(NATIVE_PATH archive_path archive_path_native) # lessmsi is a bit picky about path formats. + message(STATUS "Extracting Python2 ...") + vcpkg_execute_in_download_mode( + COMMAND "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" x "${archive_path_native}" # Using output_path here does not work in bash + WORKING_DIRECTORY "${output_path}" + OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-out.log" + ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-err.log" + RESULT_VARIABLE error_code + ) + if(error_code) + message(FATAL_ERROR "Couldn't extract Python2 with lessmsi!") + endif() + message(STATUS "Extracting Python2 ... finished!") + file(RENAME "${output_path}/python-2.7.18${arch_suffix}/SourceDir/" "${output_path}/${PORT}/") + file(REMOVE_RECURSE "${output_path}/python-2.7.18.amd64" + # Files below are not part of a msiexec installation/extraction. + "${output_path}/${PORT}/Windows" + "${output_path}/${PORT}/Microsoft.VC90.CRT.manifest" + "${output_path}/${PORT}/msvcr90.dll") + z_vcpkg_find_acquire_program_find_internal("PYTHON2" + INTERPRETER "${interpreter}" + PATHS ${paths_to_search} + NAMES ${program_name} + ) + if(NOT PYTHON2) + message(FATAL_ERROR "Unable to find python2: ${PYTHON2}") + endif() + message(STATUS "Using python2: ${PYTHON2}") + set(details "set(program_version \"${program_version}\")\n") + string(APPEND details "set(paths_to_search \"\${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}\")\n") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/details.cmake" "${details}") +endif() + diff --git a/ports/vcpkg-tool-python2/vcpkg.json b/ports/vcpkg-tool-python2/vcpkg.json new file mode 100644 index 00000000000000..346a8b15c90027 --- /dev/null +++ b/ports/vcpkg-tool-python2/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "vcpkg-tool-python2", + "version": "2.7.18", + "description": "Python 2", + "homepage": "https://www.python.org/download/releases/2.0/", + "license": "PSF-2.0", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-tool-lessmsi", + "host": true, + "platform": "windows" + } + ] +} diff --git a/ports/vectorclass/portfile.cmake b/ports/vectorclass/portfile.cmake index 2ec2732627b062..ae582388996cfa 100644 --- a/ports/vectorclass/portfile.cmake +++ b/ports/vectorclass/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vectorclass/version2 diff --git a/ports/vectorclass/vcpkg.json b/ports/vectorclass/vcpkg.json index ce2f69c8423b4e..40b26d7546c956 100644 --- a/ports/vectorclass/vcpkg.json +++ b/ports/vectorclass/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vectorclass", "version-string": "2.00.01", - "port-version": 1, + "port-version": 2, "description": "C++ class library for using the Single Instruction Multiple Data (SIMD) instructions in modern Microprocessors", "homepage": "https://github.com/vectorclass/version2", "supports": "!(arm | arm64)" diff --git a/ports/vk-bootstrap/portfile.cmake b/ports/vk-bootstrap/portfile.cmake new file mode 100644 index 00000000000000..f0a1c3a6caafc1 --- /dev/null +++ b/ports/vk-bootstrap/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO charles-lunarg/vk-bootstrap + REF 142986cdb767037118b687387b097ff6b3e7fe7d + SHA512 1dc32f09f4548ffaf71d39d5200d60a9bd58971327039f2adb4327fdb885f984bbd91409d28dbfc24e5fdac8c241824e141a2558cddc1b86b84cf2376e7d7567 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/${PORT}-config.cmake" "${CMAKE_CURRENT_LIST_DIR}/${PORT}-targets-release.cmake" "${CMAKE_CURRENT_LIST_DIR}/${PORT}-targets-debug.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/vk-bootstrap/vcpkg.json b/ports/vk-bootstrap/vcpkg.json new file mode 100644 index 00000000000000..5126f4ca18c177 --- /dev/null +++ b/ports/vk-bootstrap/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "vk-bootstrap", + "version": "0.5", + "description": "Vulkan bootstraping library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + "vulkan" + ] +} diff --git a/ports/vk-bootstrap/vk-bootstrap-config.cmake b/ports/vk-bootstrap/vk-bootstrap-config.cmake new file mode 100644 index 00000000000000..4d2244eae84289 --- /dev/null +++ b/ports/vk-bootstrap/vk-bootstrap-config.cmake @@ -0,0 +1,14 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +add_library(vk-bootstrap::vk-bootstrap SHARED IMPORTED) +set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include" +) + +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +file(GLOB CONFIG_FILES "${_DIR}/vk-bootstrap-targets-*.cmake") +foreach(f ${CONFIG_FILES}) + include(${f}) +endforeach() diff --git a/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake b/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake new file mode 100644 index 00000000000000..ec882d433665a9 --- /dev/null +++ b/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake @@ -0,0 +1,12 @@ +#---------------------------------------------------------------- +# Generated CMake target import file for configuration "Debug". +#---------------------------------------------------------------- + +set(CMAKE_IMPORT_FILE_VERSION 1) + +set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) +set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES + IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/vk-bootstrap.lib" +) + +set(CMAKE_IMPORT_FILE_VERSION) diff --git a/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake b/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake new file mode 100644 index 00000000000000..a25d3be076c46e --- /dev/null +++ b/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake @@ -0,0 +1,12 @@ +#---------------------------------------------------------------- +# Generated CMake target import file for configuration "Debug". +#---------------------------------------------------------------- + +set(CMAKE_IMPORT_FILE_VERSION 1) + +set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES + IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/vk-bootstrap.lib" +) + +set(CMAKE_IMPORT_FILE_VERSION) diff --git a/ports/vlpp/CMakeLists.txt b/ports/vlpp/CMakeLists.txt index f8df1b338d202c..5c254595f4eb92 100644 --- a/ports/vlpp/CMakeLists.txt +++ b/ports/vlpp/CMakeLists.txt @@ -13,6 +13,10 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") endif() +if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 14) +endif() + # Create and configure the target add_library(Vlpp ${SRCS}) diff --git a/ports/vlpp/portfile.cmake b/ports/vlpp/portfile.cmake index 96a04e6cbd5faf..b7f91d9ee7bd40 100644 --- a/ports/vlpp/portfile.cmake +++ b/ports/vlpp/portfile.cmake @@ -8,20 +8,19 @@ 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_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Tools -file(INSTALL ${SOURCE_PATH}/Tools/CppMerge.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools) +file(INSTALL "${SOURCE_PATH}/Tools/CppMerge.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/vlpp RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vlpp" RENAME copyright) diff --git a/ports/vlpp/vcpkg.json b/ports/vlpp/vcpkg.json index 85650b62a2ee16..3bc64f290ebba5 100644 --- a/ports/vlpp/vcpkg.json +++ b/ports/vlpp/vcpkg.json @@ -1,7 +1,13 @@ { "name": "vlpp", "version-string": "0.11.0.0", - "port-version": 1, + "port-version": 2, "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" + "homepage": "https://github.com/vczh-libraries/Release", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/vtk/FindLZ4.patch b/ports/vtk/FindLZ4.patch index 7f65de529cd788..635d0261b5c0ab 100644 --- a/ports/vtk/FindLZ4.patch +++ b/ports/vtk/FindLZ4.patch @@ -42,8 +42,8 @@ index 8c94e3bcd..ade3f9451 100644 - endif () -endif () +find_package(LZ4 CONFIG REQUIRED) -+set_target_properties(lz4::lz4 PROPERTIES IMPORTED_GLOBAL TRUE) +if(NOT TARGET LZ4::LZ4) -+add_library(LZ4::LZ4 ALIAS lz4::lz4) ++ add_library(LZ4::LZ4 INTERFACE IMPORTED) ++ target_link_libraries(LZ4::LZ4 INTERFACE lz4::lz4) +endif() \ No newline at end of file diff --git a/ports/vtk/FindLZMA.patch b/ports/vtk/FindLZMA.patch index cb7f80963a2916..990f2b2ae5ccc9 100644 --- a/ports/vtk/FindLZMA.patch +++ b/ports/vtk/FindLZMA.patch @@ -1,86 +1,16 @@ -diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake -index 0c8c7943c..d60669484 100644 ---- a/CMake/FindLZMA.cmake -+++ b/CMake/FindLZMA.cmake -@@ -1,9 +1,17 @@ - find_path(LZMA_INCLUDE_DIR - NAMES lzma.h - DOC "lzma include directory") --find_library(LZMA_LIBRARY -+# Note LZMA_LIBRARY is set somewhere else. Maybe one of the configs/wrappers installed by VCPKG defines it. -+# The original FindLZMA chokes on it since it contains optimized/debug keywords -+# VTK should probably switch to FindLibLZMA from CMake -+find_library(LZMA_LIBRARY_RELEASE - NAMES lzma - DOC "lzma library") -+find_library(LZMA_LIBRARY_DEBUG -+ NAMES lzmad lzma NAMES_PER_DIR -+ DOC "lzma library") -+ include(SelectLibraryConfigurations) -+ select_library_configurations( LZMA ) - - if (LZMA_INCLUDE_DIR) - file(STRINGS "${LZMA_INCLUDE_DIR}/lzma/version.h" _lzma_version_lines -@@ -20,22 +26,50 @@ endif () - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(LZMA -- REQUIRED_VARS LZMA_LIBRARY LZMA_INCLUDE_DIR -+ REQUIRED_VARS LZMA_LIBRARY LZMA_LIBRARY_RELEASE LZMA_LIBRARY_DEBUG LZMA_INCLUDE_DIR - VERSION_VAR LZMA_VERSION) - - if (LZMA_FOUND) - set(LZMA_LIBRARIES "${LZMA_LIBRARY}") - set(LZMA_INCLUDE_DIRS "${LZMA_INCLUDE_DIR}") -- -+ - if (NOT TARGET LZMA::LZMA) - include(vtkDetectLibraryType) -- vtk_detect_library_type(lzma_library_type -- PATH "${LZMA_LIBRARY}") -- add_library(LZMA::LZMA "${lzma_library_type}" IMPORTED) -- unset(lzma_library_type) -- set_target_properties(LZMA::LZMA PROPERTIES -- IMPORTED_LOCATION "${LZMA_LIBRARY}" -- IMPORTED_IMPLIB "${LZMA_LIBRARY}" -- INTERFACE_INCLUDE_DIRECTORIES "${LZMA_INCLUDE_DIR}") -- endif () -+ if(LZMA_LIBRARY_RELEASE) -+ vtk_detect_library_type(lzma_library_type -+ PATH "${LZMA_LIBRARY_RELEASE}") -+ elseif(LZMA_LIBRARY_DEBUG) -+ vtk_detect_library_type(lzma_library_type -+ PATH "${LZMA_LIBRARY_DEBUG}") -+ else() -+ vtk_detect_library_type(lzma_library_type -+ PATH "${LZMA_LIBRARY}") -+ endif() -+ -+ add_library(LZMA::LZMA "${lzma_library_type}" IMPORTED) -+ set_target_properties(LZMA::LZMA PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${LZMA_INCLUDE_DIR}") -+ if(LZMA_LIBRARY_RELEASE) -+ set_target_properties(LZMA::LZMA PROPERTIES -+ IMPORTED_LOCATION_RELEASE "${LZMA_LIBRARY_RELEASE}" -+ IMPORTED_IMPLIB_RELEASE "${LZMA_LIBRARY_RELEASE}") -+ endif() -+ if(LZMA_LIBRARY_DEBUG) -+ set_target_properties(LZMA::LZMA PROPERTIES -+ IMPORTED_LOCATION_DEBUG "${LZMA_LIBRARY_DEBUG}" -+ IMPORTED_IMPLIB_DEBUG "${LZMA_LIBRARY_DEBUG}") -+ endif() -+ -+ # Guard against possible stupidity of depending projects reading only LOCATION without configuration -+ if(CMAKE_BUILD_TYPE MATCHES "Debug") -+ set_target_properties(LZMA::LZMA PROPERTIES -+ IMPORTED_LOCATION "${LZMA_LIBRARY_DEBUG}" -+ IMPORTED_IMPLIB "${LZMA_LIBRARY_DEBUG}") -+ else() -+ set_target_properties(LZMA::LZMA PROPERTIES -+ IMPORTED_LOCATION "${LZMA_LIBRARY_RELEASE}" -+ IMPORTED_IMPLIB "${LZMA_LIBRARY_RELEASE}") -+ endif() -+ endif() -+ #set_target_properties(LZMA::LZMA PROPERTIES IMPORTED_GLOBAL TRUE) - endif () - \ No newline at end of file +diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake +index 0c8c794..796558c 100644 +--- a/CMake/FindLZMA.cmake ++++ b/CMake/FindLZMA.cmake +@@ -1,3 +1,11 @@ ++find_package(LibLZMA) ++set(LZMA_INCLUDE_DIR "${LIBLZMA_INCLUDE_DIR}" CACHE INTERNAL "") ++set(LZMA_LIBRARY "${LIBLZMA_LIBRARIES}" CACHE INTERNAL "") ++if(NOT TARGET LZMA::LZMA) ++ add_library(LZMA::LZMA INTERFACE IMPORTED) ++ target_link_libraries(LZMA::LZMA INTERFACE LibLZMA::LibLZMA) ++endif() ++ + find_path(LZMA_INCLUDE_DIR + NAMES lzma.h + DOC "lzma include directory") diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index cff5332c1fe36c..64dd5901a025df 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -296,6 +296,9 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindEXPAT.cmake") file(RENAME "${CURRENT_PACKAGES_DIR}/share/licenses" "${CURRENT_PACKAGES_DIR}/share/${PORT}/licenses") +if(EXISTS "${CURRENT_PACKAGES_DIR}/include/vtk-9.0/vtkChemistryConfigure.h") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/vtk-9.0/vtkChemistryConfigure.h" "${SOURCE_PATH}" "not/existing") +endif() # ============================================================================= # Usage configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 2ce6162f33feba..fb5a115dc61b69 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,9 +1,10 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 5, + "port-version": 10, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", + "license": "BSD-3-Clause", "dependencies": [ "double-conversion", "eigen3", @@ -30,7 +31,7 @@ "lz4", "netcdf-c", "pegtl-2", - "proj4", + "proj", "pugixml", "sqlite3", "tiff", diff --git a/ports/vulkan-headers/portfile.cmake b/ports/vulkan-headers/portfile.cmake index c6f59423e9eb7f..45b6eddf9a9c8b 100644 --- a/ports/vulkan-headers/portfile.cmake +++ b/ports/vulkan-headers/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Headers - REF v1.2.184 - SHA512 95ee241ca82ba4373dc53aefec36839b6a08478434742bd8de6750d875a7a5fcb2225afae5f6f400a7b302af87da7e226b725be5435236694e816e141a3b24ef + REF 52a76fd0a693708eb8c25bd0ab7a1008091f64d4 #v1.2.203 + SHA512 e3a337f0f1d0d003db522385b40ed187416e2246e64718b7d980ecdd92ac400a9e96b06dbb52c6f09cf7725772b5772727efb61c0e2f3a67989fe693fa569d38 HEAD_REF master ) diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json index 8059e77b7d4e02..72f26304519bcc 100644 --- a/ports/vulkan-headers/vcpkg.json +++ b/ports/vulkan-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-headers", - "version-semver": "1.2.184", + "version": "1.2.203", "description": "Vulkan header files and API registry", "homepage": "https://github.com/KhronosGroup/Vulkan-Headers" } diff --git a/ports/vulkan-hpp/portfile.cmake b/ports/vulkan-hpp/portfile.cmake index 9e790f5f4be7ee..79e062ef88d63e 100644 --- a/ports/vulkan-hpp/portfile.cmake +++ b/ports/vulkan-hpp/portfile.cmake @@ -3,12 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Hpp - REF v1.2.184 - SHA512 564bb5fd3b89fc8078e3c4d99c719f4d62166d78891bc529d6d07add1843137ec8f62a92dbdcfa9ffa8a9677fba41da1b591a033c61b27c43c70c25be32c3205 + REF 3de6ccafd688df4be0c7830c23167535c511594d #v1.2.203 + SHA512 a3d3058afd88d9313a676acf49d908f0b00010b34de1e4b1263c3e20079f1ba829c050e5c26c835963b8f117bc9b118e4dea2ad295867da7b657a0890f46fecc HEAD_REF master ) -file(COPY ${SOURCE_PATH}/vulkan/vulkan.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/vulkan) +file(COPY "${SOURCE_PATH}/vulkan/vulkan.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vulkan") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/vulkan-hpp/vcpkg.json b/ports/vulkan-hpp/vcpkg.json index b0e141774dc1cb..a678cb79107d85 100644 --- a/ports/vulkan-hpp/vcpkg.json +++ b/ports/vulkan-hpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vulkan-hpp", - "version-string": "1.2.184", - "port-version": 1, + "version": "1.2.203", "description": "Header only C++ bindings for the Vulkan C API", "dependencies": [ "vulkan" diff --git a/ports/wampcc/portfile.cmake b/ports/wampcc/portfile.cmake index e50d780dcd5787..6940a964c86007 100644 --- a/ports/wampcc/portfile.cmake +++ b/ports/wampcc/portfile.cmake @@ -3,15 +3,6 @@ if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(BUILD_ARCH "Win32") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(BUILD_ARCH "x64") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(BUILD_ARCH "ARM") -else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -21,33 +12,22 @@ vcpkg_from_github( HEAD_REF master ) -# Utils build is broken under Windows -if ("utils" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "'utils' build is broken under Windows") - endif() - - set(ENABLE_UTILS ON) -else() - set(ENABLE_UTILS OFF) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + examples BUILD_EXAMPLES + utils BUILD_UTILS +) -if ("examples" IN_LIST FEATURES) - set(ENABLE_EXAMPLES ON) -else() - set(ENABLE_EXAMPLES OFF) -endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_UTILS:BOOL=${ENABLE_UTILS} - -DBUILD_EXAMPLES:BOOL=${ENABLE_EXAMPLES} -DBUILD_TESTS:BOOL=OFF # Tests build is broken + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wampcc RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() diff --git a/ports/wampcc/vcpkg.json b/ports/wampcc/vcpkg.json index 025aed5a301a5c..a1d9924918c717 100644 --- a/ports/wampcc/vcpkg.json +++ b/ports/wampcc/vcpkg.json @@ -1,19 +1,26 @@ { "name": "wampcc", - "version-string": "2019-09-04", - "port-version": 2, + "version-date": "2019-09-04", + "port-version": 3, "description": "Wampcc is C++ library that implements the Web Application Messaging Protocol (WAMP) protocol.", + "license": "MIT", + "supports": "!(windows & arm64)", "dependencies": [ "jansson", "libuv", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } ], "features": { "examples": { "description": "Build example apps" }, "utils": { - "description": "Build utility apps" + "description": "Build utility apps", + "supports": "!windows" } } } diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index dca45cfe4502b1..db56a648edffa4 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -3,40 +3,39 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2021.06.14.00 - SHA512 15fd2c9515ec3d0c3293a8f96d01d3e91e2ef82694d592aae6573648957f691a7da5d7c2aef7391a827a67e2f58fef7668778e0f0323aac11c5b16a1ba889cc3 + REF v2022.01.31.00 + SHA512 bb0ce38e7a54c094a828dbf75c0b719e49b2c39420bb648d54dbc13a083c982c31f104903d8d93558e254bdf1133dbf320f170a83c30fec78bdb9eeaf085a10a HEAD_REF master PATCHES fix-config-cmake.patch fix_dependency.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/wangle" - PREFER_NINJA OPTIONS -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DINCLUDE_INSTALL_DIR:STRING=include ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/wangle) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wangle) -file(READ ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake _contents) +file(READ "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake" _contents) STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake" "${_contents}") vcpkg_copy_pdbs() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/include/wangle/util/test - ${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs - ${CURRENT_PACKAGES_DIR}/include/wangle/service/test - ${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/include/wangle/util/test" + "${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs" + "${CURRENT_PACKAGES_DIR}/include/wangle/service/test" + "${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test" ) -file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CURRENT_PORT_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/wangle/vcpkg.json b/ports/wangle/vcpkg.json index c499e71f04ece4..ed42769bf0f268 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,8 +1,9 @@ { "name": "wangle", - "version-string": "2021.06.14.00", + "version-string": "2022.01.31.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", "dependencies": [ "boost-context", "boost-filesystem", @@ -14,6 +15,14 @@ "folly", "glog", "libevent", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index aa7300aa5b867b..2c0dba8ad00b2a 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dbry/WavPack diff --git a/ports/wavpack/vcpkg.json b/ports/wavpack/vcpkg.json index bf488fb5431be4..7918e036d04b8f 100644 --- a/ports/wavpack/vcpkg.json +++ b/ports/wavpack/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wavpack", "version": "5.4.0", + "port-version": 1, "description": "WavPack encode/decode library, command-line programs, and several plugins", "homepage": "https://github.com/dbry/WavPack", "supports": "!(arm | arm64)" diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index d6b3bcbb194347..d03741ced3b537 100644 --- a/ports/wil/portfile.cmake +++ b/ports/wil/portfile.cmake @@ -2,22 +2,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/wil - REF 5a21cac10640f54b7ef886031f4d9ed427bef4c5 - SHA512 b1a6703dd75eee66f81c54bb5c01bc9acc7354c113fd556afb2dd95361db7e9f94c9e958d9a0b897359084c9c08cb725bbe214fdaccf2e662c1ca4aa73c3345a + REF f9284c19c9873664978b873b8858d7dfacc6af1e + SHA512 df81e7f12f15f8e382f537f783c33c9833bb83c4d86d571bd47503e7400698686f51a8a50efd2224c95a5409ab8ef719186d806afbfc4ea2af8d4fd7f8dce024 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWIL_BUILD_TESTS=OFF -DWIL_BUILD_PACKAGING=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/WIL) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/WIL) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/wil/vcpkg.json b/ports/wil/vcpkg.json index fca2add1144a16..9914ec02d6580e 100644 --- a/ports/wil/vcpkg.json +++ b/ports/wil/vcpkg.json @@ -1,7 +1,16 @@ { "name": "wil", - "version-string": "2021-08-03", - "port-version": 1, + "version-date": "2021-12-25", "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" + "homepage": "https://github.com/microsoft/wil", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/wincrypt/vcpkg.json b/ports/wincrypt/vcpkg.json index 02cad22f7c9d86..938cad7fab0396 100644 --- a/ports/wincrypt/vcpkg.json +++ b/ports/wincrypt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wincrypt", - "version-string": "0.0", - "port-version": 3, - "description": "Windows Cryptography." + "version": "0.0", + "port-version": 4, + "description": "Windows Cryptography.", + "supports": "windows" } diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index 196ad02b8f8623..aebe6997f94ca2 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -10,12 +10,6 @@ vcpkg_download_distfile(ARCHIVE SHA512 89a5109ed17f8069f7a43497f6fec817c58620dbc5fa506e52069b9113c5bc13f69c307affe611281cb727cfa0f8529d07044d41427e350b24468ccc89a87f33 ) -vcpkg_download_distfile(COPYRIGHT - URLS "https://www.winpcap.org/misc/copyright.htm" - FILENAME "Wpcap_license.htm" - SHA512 bb2519e8f3d02c408fa3f2ef339adda1cc31338d05d2fa4ce25d5369427243fd3e2abc4b21aa654b2be5791f53c2281847a4a15778ffcb90576fd166140c7d2e -) - # MSBuild performs in-source builds, so to ensure reliability we must clear them each time file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src) @@ -174,4 +168,5 @@ endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif") -configure_file(${COPYRIGHT} "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files. +") diff --git a/ports/winpcap/vcpkg.json b/ports/winpcap/vcpkg.json index aa4d923477fb3c..be838b77b2ba62 100644 --- a/ports/winpcap/vcpkg.json +++ b/ports/winpcap/vcpkg.json @@ -1,7 +1,8 @@ { "name": "winpcap", "version": "4.1.3", - "port-version": 6, + "port-version": 8, "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.", - "homepage": "https://www.winpcap.org" + "homepage": "https://www.winpcap.org", + "supports": "windows" } diff --git a/ports/winreg/portfile.cmake b/ports/winreg/portfile.cmake index e4c5b08cefc0b6..baa5775f25baeb 100644 --- a/ports/winreg/portfile.cmake +++ b/ports/winreg/portfile.cmake @@ -1,11 +1,8 @@ -# WinReg - Header-only library -vcpkg_fail_port_install(ON_TARGET "linux" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GiovanniDicanio/WinReg - REF 2594342b7fe6065430bc377961c37d30614cb4ff #v4.1.2 - SHA512 924cdb77518c3f0843e95cd7e7d4626d4c0c466444cd79fdfa6943975154a54f4eb0d4bd45b8d37d73c650467b1d2728543176688f356c5100d98810e95c9fe8 + REF bcdce7361be8409887adac6f6b5cb0a436a489aa #v5.0.0 + SHA512 8a112cc505ba9ec4431e80ee77b6a08389ea8ed92c2d75be191e2494818913ad01d6b4cc0ccf213dd2dd3455594434ba3876fa385e71bdbb758797672c844d8d HEAD_REF master ) @@ -13,4 +10,4 @@ vcpkg_from_github( file(COPY "${SOURCE_PATH}/WinReg/WinReg.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/winreg/vcpkg.json b/ports/winreg/vcpkg.json index 7aa2cbf4a9c4ec..d3588bdf49ecdc 100644 --- a/ports/winreg/vcpkg.json +++ b/ports/winreg/vcpkg.json @@ -1,7 +1,8 @@ { "name": "winreg", - "version": "4.1.2", + "version": "5.0.0", "description": "High-level C++ wrapper around the Windows Registry C API.", "homepage": "https://github.com/GiovanniDicanio/WinReg", + "license": "MIT", "supports": "windows | uwp" } diff --git a/ports/winsock2/vcpkg.json b/ports/winsock2/vcpkg.json index 472dc00d27e74c..02e569826770ac 100644 --- a/ports/winsock2/vcpkg.json +++ b/ports/winsock2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "winsock2", - "version-string": "0.0", - "port-version": 3, - "description": "Windows Sockets." + "version": "0.0", + "port-version": 4, + "description": "Windows Sockets.", + "supports": "windows" } diff --git a/ports/winsparkle/portfile.cmake b/ports/winsparkle/portfile.cmake new file mode 100644 index 00000000000000..ca90f074323ddf --- /dev/null +++ b/ports/winsparkle/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/vslavik/winsparkle/releases/download/v0.7.0/WinSparkle-0.7.0.zip" + FILENAME "winsparkle-070.zip" + SHA512 c2cf29e1880534c170110f8e5a966939aecc9a9e05afc87868400074f1492fcac949b61e2ce4636eadd2f127caad3660e0f763476e9523aad3834d673f6edd77 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") +file(INSTALL "${SOURCE_PATH}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" FILES_MATCHING PATTERN "*.bat") + + +# Note: It is an explicit design goal for WinSparkle to be a single +# self-contained DLL with no external dependencies (to the point that +# it even links to static CRT!). This matters for e.g. in-app delta updates +# or re-launching the app after update. It is not statically linked even if a +# static linking is used for everything else. +set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/lib") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/lib") +else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/winsparkle/vcpkg.json b/ports/winsparkle/vcpkg.json new file mode 100644 index 00000000000000..f7c289514275ee --- /dev/null +++ b/ports/winsparkle/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "winsparkle", + "version": "0.7.0", + "description": "WinSparkle is an easy-to-use software update library for Windows developers.", + "homepage": "https://winsparkle.org", + "license": "MIT", + "supports": "windows & !(arm | uwp)" +} diff --git a/ports/wintoast/portfile.cmake b/ports/wintoast/portfile.cmake index c99d50212da6ef..3cbb33b65e8a9b 100644 --- a/ports/wintoast/portfile.cmake +++ b/ports/wintoast/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,19 +8,18 @@ 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_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_RELEASE -DINSTALL_HEADERS=ON OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Install license -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/wintoast/vcpkg.json b/ports/wintoast/vcpkg.json index 2d0a41de5d2fe4..b96aa95b300586 100644 --- a/ports/wintoast/vcpkg.json +++ b/ports/wintoast/vcpkg.json @@ -1,7 +1,13 @@ { "name": "wintoast", - "version-string": "1.2.0", - "port-version": 1, + "version": "1.2.0", + "port-version": 2, "description": "WinToast is a lightly library written in C++ which brings a complete integration of the modern toast notifications of Windows 8 & Windows 10.", - "supports": "!uwp" + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index cbe4051f75fec1..f4b48dc3084015 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wpilibsuite/allwpilib diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json index c96157cc6ad224..b0e07c291179d9 100644 --- a/ports/wpilib/vcpkg.json +++ b/ports/wpilib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wpilib", "version-string": "2020.3.2", - "port-version": 1, + "port-version": 2, "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", "supports": "!osx", diff --git a/ports/wt/0007-boost_1_77_0.patch b/ports/wt/0007-boost_1_77_0.patch deleted file mode 100644 index 8fed5713d0d7c0..00000000000000 --- a/ports/wt/0007-boost_1_77_0.patch +++ /dev/null @@ -1,15 +0,0 @@ - src/Wt/Render/CssParser.C | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Wt/Render/CssParser.C b/src/Wt/Render/CssParser.C -index b8d409e..6bb47b4 100644 ---- a/src/Wt/Render/CssParser.C -+++ b/src/Wt/Render/CssParser.C -@@ -39,6 +39,7 @@ using namespace Wt::Render; - #include - #endif - #include -+#include - - #include - diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 30dd1af9a9876d..9b8dd56241f0f7 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emweb/wt - REF d3ee790da1826529e3d025d919f5c3608d029562 # 4.5.0 - SHA512 2fe66269bb59db81d3611f2857ac3ba0ae7448a54d216bd7aa72701f1e6e291a738421f460f4614198785bbd084ab1e19e84a3f67cbc15556015e2f259941f11 + REF bc76cbea5bb845c4d0fb642968eb1b278ddbb047 # 4.6.1 + SHA512 416baaaf89cdbe2e9cf234df44dc0b90493c995b52ca9840cb5a5acf2904fe7d81da178ac4e0bf06dcd44fbac74fa75fe570901dd8fd4987a1bec4aeb54baad6 HEAD_REF master PATCHES 0002-link-glew.patch 0005-XML_file_path.patch 0006-GraphicsMagick.patch - 0007-boost_1_77_0.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) @@ -45,7 +44,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" GENERATOR Ninja OPTIONS -DINSTALL_CONFIG_FILE_PATH="${DOWNLOADS}/wt" @@ -55,6 +54,9 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF + -DWTHTTP_CONFIGURATION= + -DCONFIGURATION= + -DCONNECTOR_HTTP=ON -DENABLE_HARU=ON -DHARU_DYNAMIC=${SHARED_LIBS} @@ -72,16 +74,22 @@ vcpkg_cmake_configure( -DUSE_SYSTEM_GLEW=ON -DCMAKE_INSTALL_DIR=share + # see https://redmine.webtoolkit.eu/issues/9646 + -DWTHTTP_CONFIGURATION= + -DCONFIGURATION= + ) vcpkg_cmake_install() vcpkg_cmake_config_fixup() # There is no way to suppress installation of the headers and resource files in debug build. -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/var" "${CURRENT_PACKAGES_DIR}/debug/var") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/var) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/var) +# RUNDIR is only used for wtfcgi what we don't build. See https://redmine.webtoolkit.eu/issues/9646 +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "#define RUNDIR \"${CURRENT_PACKAGES_DIR}/var/run/wt\"" "") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json index 303e56c7775fca..727e7cd835f233 100644 --- a/ports/wt/vcpkg.json +++ b/ports/wt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wt", - "version-string": "4.5.0", - "port-version": 2, + "version": "4.6.1", "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", "dependencies": [ diff --git a/ports/wtl/appwizard_setup.js-vs2022.patch b/ports/wtl/appwizard_setup.js-vs2022.patch new file mode 100644 index 00000000000000..1f0f4e5f0c1deb --- /dev/null +++ b/ports/wtl/appwizard_setup.js-vs2022.patch @@ -0,0 +1,35 @@ +--- a/AppWizard/Setup.js ++++ b/AppWizard/Setup.js +@@ -185,26 +185,30 @@ + } + } + +-// Search for Visual Studio 2017-2019 +- var nVersionsNew = 2; ++// Search for Visual Studio 2017/2019/2022 ++ var nVersionsNew = 3; + + var strWizardFolderNew = "Common7\\IDE\\VC\\vcprojects"; + + var astrVersionsNew = new Array(); + astrVersionsNew[0] = "Visual Studio 2017 (15.0)"; + astrVersionsNew[1] = "Visual Studio 2019 (16.0)"; ++ astrVersionsNew[2] = "Visual Studio 2022 (17.0)"; + + var astrWizVerNew = new Array(); + astrWizVerNew[0] = "15.0"; + astrWizVerNew[1] = "16.0"; ++ astrWizVerNew[2] = "17.0"; + + var astrParamVerNew = new Array(); + astrParamVerNew[0] = "15"; + astrParamVerNew[1] = "16"; ++ astrParamVerNew[2] = "17"; + + var astrFilterVer = new Array(); + astrFilterVer[0] = "[15.0,16.0]"; + astrFilterVer[1] = "[16.0,17.0]"; ++ astrFilterVer[2] = "[17.0,18.0]"; + + // Ensure that we can run vswhere.exe + var strProgFileRegKey_x86 = "HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\ProgramFilesDir (x86)"; diff --git a/ports/wtl/atlmisc.h-bug329.patch b/ports/wtl/atlmisc.h-bug329.patch new file mode 100644 index 00000000000000..6bffba9be13d17 --- /dev/null +++ b/ports/wtl/atlmisc.h-bug329.patch @@ -0,0 +1,11 @@ +--- a/Include/atlmisc.h ++++ b/Include/atlmisc.h +@@ -628,7 +628,7 @@ + { + ATLASSERT(m_hFind != NULL); + +- ATL::CString strResult("file://"); ++ ATL::CString strResult(_T("file://")); + strResult += GetFilePath(); + return strResult; + } diff --git a/ports/wtl/portfile.cmake b/ports/wtl/portfile.cmake index 4c1bb2b77ac348..4c6845f1b5d431 100644 --- a/ports/wtl/portfile.cmake +++ b/ports/wtl/portfile.cmake @@ -5,6 +5,9 @@ vcpkg_from_sourceforge( FILENAME "WTL10_10320_Release.zip" NO_REMOVE_ONE_LEVEL SHA512 086a6cf6a49a4318a8c519136ba6019ded7aa7f2c1d85f78c30b21183654537b3428a400a64fcdacba3a7a10a9ef05137b6f2119f59594da300d55f9ebfb1309 + PATCHES + appwizard_setup.js-vs2022.patch + atlmisc.h-bug329.patch ) file(INSTALL ${SOURCE_PATH}/Include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT} FILES_MATCHING PATTERN "*.h") diff --git a/ports/wtl/vcpkg.json b/ports/wtl/vcpkg.json index 733316f0d96575..64dcf3157588e3 100644 --- a/ports/wtl/vcpkg.json +++ b/ports/wtl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wtl", "version-string": "10.0.10320", - "port-version": 1, + "port-version": 2, "description": "Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components.", "homepage": "https://sourceforge.net/projects/wtl/" } diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 5b5ecd730724d9..3e3a057992ff7d 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets @@ -24,15 +22,18 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUA endif() # This may be set to ON by users in a custom triplet. -# wxUSE_STL=ON and wxUSE_STL=OFF are not API compatible which is why this must be set -# in a custom triplet rather than a port feature. +# The use of 'wxUSE_STL' and 'WXWIDGETS_USE_STD_CONTAINERS' (ON or OFF) are not API compatible +# which is why they must be set in a custom triplet rather than a port feature. if(NOT DEFINED WXWIDGETS_USE_STL) set(WXWIDGETS_USE_STL OFF) endif() -vcpkg_configure_cmake( +if(NOT DEFINED WXWIDGETS_USE_STD_CONTAINERS) + set(WXWIDGETS_USE_STD_CONTAINERS OFF) +endif() + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DwxUSE_REGEX=builtin -DwxUSE_ZLIB=sys @@ -42,10 +43,11 @@ vcpkg_configure_cmake( -DwxUSE_LIBTIFF=sys -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON -DwxUSE_STL=${WXWIDGETS_USE_STL} + -DwxUSE_STD_CONTAINERS=${WXWIDGETS_USE_STD_CONTAINERS} ${OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") if(DLLS) @@ -97,13 +99,20 @@ endforeach() if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/wx/setup.h) file(GLOB_RECURSE WX_SETUP_H_FILES_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/*.h) file(GLOB_RECURSE WX_SETUP_H_FILES_REL ${CURRENT_PACKAGES_DIR}/lib/*.h) - - string(REPLACE "${CURRENT_PACKAGES_DIR}/debug/lib/" "" WX_SETUP_H_FILES_DBG "${WX_SETUP_H_FILES_DBG}") - string(REPLACE "/setup.h" "" WX_SETUP_H_DBG_RELATIVE "${WX_SETUP_H_FILES_DBG}") - - string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/" "" WX_SETUP_H_FILES_REL "${WX_SETUP_H_FILES_REL}") - string(REPLACE "/setup.h" "" WX_SETUP_H_REL_RELATIVE "${WX_SETUP_H_FILES_REL}") - + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "${CURRENT_PACKAGES_DIR}" "") + + string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/" "" WX_SETUP_H_FILES_REL "${WX_SETUP_H_FILES_REL}") + string(REPLACE "/setup.h" "" WX_SETUP_H_REL_RELATIVE "${WX_SETUP_H_FILES_REL}") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "${CURRENT_PACKAGES_DIR}" "") + + string(REPLACE "${CURRENT_PACKAGES_DIR}/debug/lib/" "" WX_SETUP_H_FILES_DBG "${WX_SETUP_H_FILES_DBG}") + string(REPLACE "/setup.h" "" WX_SETUP_H_DBG_RELATIVE "${WX_SETUP_H_FILES_DBG}") + endif() + configure_file(${CMAKE_CURRENT_LIST_DIR}/setup.h.in ${CURRENT_PACKAGES_DIR}/include/wx/setup.h @ONLY) endif() file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets) diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 540e2147fc7923..1663c7812e2516 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,10 +1,11 @@ { "name": "wxwidgets", "version-semver": "3.1.5", - "port-version": 3, + "port-version": 7, "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", - "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option." + "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", + "Set WXWIDGETS_USE_STD_CONTAINERS in a custom triplet to build with the wxUSE_STD_CONTAINERS build option." ], "homepage": "https://github.com/wxWidgets/wxWidgets", "supports": "!uwp", @@ -12,6 +13,14 @@ "expat", "libpng", "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/x-plane/portfile.cmake b/ports/x-plane/portfile.cmake index 56ea2e77e82bad..3b7c9a6790cafc 100644 --- a/ports/x-plane/portfile.cmake +++ b/ports/x-plane/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64" "wasm32") - vcpkg_download_distfile(ARCHIVE URLS "http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip" FILENAME "XPSDK303.zip" @@ -16,7 +14,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug/lib - ) + ) endif() # copy headers & sources diff --git a/ports/x-plane/vcpkg.json b/ports/x-plane/vcpkg.json index 4884ca8e8d0ceb..6402bd4b52b7f1 100644 --- a/ports/x-plane/vcpkg.json +++ b/ports/x-plane/vcpkg.json @@ -1,6 +1,7 @@ { "name": "x-plane", - "version-string": "3.0.3", + "version": "3.0.3", + "port-version": 1, "description": "The X-Plane Plugin SDK", "homepage": "https://developer.x-plane.com/sdk/", "supports": "!(x86 | arm | wasm32)" diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 159f802ce71307..33e6979ac0e776 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -1,14 +1,12 @@ set(X264_VERSION 164) -vcpkg_fail_port_install(ON_ARCH "arm") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mirror/x264 REF 5db6aa6cab1b146e07b60cc1736a01f21da01154 SHA512 d2cdd40d195fd6507abacc8b8810107567dff2c0a93424ba1eb00b544cb78a5430f00f9bcf8f19bd663ae77849225577da05bfcdb57948a8af9dc32a7c8b9ffd HEAD_REF stable - PATCHES + PATCHES "uwp-cflags.patch" ) @@ -61,11 +59,13 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(VCPKG_TARGET_IS_WINDOWS) set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc") if(EXISTS "${pcfile}") - vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") + vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") endif() - set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc") - if(EXISTS "${pcfile}") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc") + if(EXISTS "${pcfile}") vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") + endif() endif() endif() diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 82e50e3c67579b..436cf0b5efd276 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,10 +1,10 @@ { "name": "x264", "version-string": "164-5db6aa6cab1b146", - "port-version": 1, + "port-version": 4, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://github.com/mirror/x264", - "supports": "!arm", + "supports": "!(arm & windows)", "dependencies": [ { "name": "pthread", diff --git a/ports/xaudio2redist/portfile.cmake b/ports/xaudio2redist/portfile.cmake index 2e8b479ca2a813..9d4c4d5d911a65 100644 --- a/ports/xaudio2redist/portfile.cmake +++ b/ports/xaudio2redist/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "Linux" "OSX") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/xaudio2redist/vcpkg.json b/ports/xaudio2redist/vcpkg.json index cb596c2fa7dbfa..ba5655191c595d 100644 --- a/ports/xaudio2redist/vcpkg.json +++ b/ports/xaudio2redist/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xaudio2redist", - "version-string": "1.2.8", + "version": "1.2.8", + "port-version": 1, "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", "supports": "windows & !arm & !uwp & !static" diff --git a/ports/xbyak/portfile.cmake b/ports/xbyak/portfile.cmake index 2bfc9ff8fcc4ae..67ac1435917fbe 100644 --- a/ports/xbyak/portfile.cmake +++ b/ports/xbyak/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO herumi/xbyak diff --git a/ports/xbyak/vcpkg.json b/ports/xbyak/vcpkg.json index cf7a9efbd38895..cc668903b825f5 100644 --- a/ports/xbyak/vcpkg.json +++ b/ports/xbyak/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xbyak", "version-string": "6.00", + "port-version": 1, "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", "homepage": "https://github.com/herumi/xbyak", "supports": "!(arm | uwp)", diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 22d44193d804a7..d09f442519d8fe 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -56,7 +56,7 @@ configure_file( ${CURRENT_PACKAGES_DIR}/share/xercesc @ONLY ) - + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" @@ -66,3 +66,13 @@ file(REMOVE_RECURSE file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_fixup_pkgconfig() +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(pc_file_release "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xerces-c.pc") + set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xerces-c.pc") + if(EXISTS "${pc_file_release}") + vcpkg_replace_string("${pc_file_release}" "-lxerces-c" "-lxerces-c_3") + endif() + if(EXISTS "${pc_file_debug}") + vcpkg_replace_string("${pc_file_debug}" "-lxerces-c" "-lxerces-c_3D") + endif() +endif() \ No newline at end of file diff --git a/ports/xerces-c/vcpkg.json b/ports/xerces-c/vcpkg.json index bb836f898b76b5..41cb5a1cb8fe1b 100644 --- a/ports/xerces-c/vcpkg.json +++ b/ports/xerces-c/vcpkg.json @@ -1,9 +1,10 @@ { "name": "xerces-c", - "version-string": "3.2.3", - "port-version": 3, + "version": "3.2.3", + "port-version": 4, "description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.", "homepage": "https://github.com/apache/xerces-c", + "license": "Apache-2.0", "features": { "icu": { "description": "ICU support", diff --git a/ports/xmsh/portfile.cmake b/ports/xmsh/portfile.cmake deleted file mode 100644 index 7d74e7da9cd9dd..00000000000000 --- a/ports/xmsh/portfile.cmake +++ /dev/null @@ -1,37 +0,0 @@ -vcpkg_find_acquire_program(PYTHON3) - -vcpkg_fail_port_install(ON_TARGET "Windows") -message("Building with a gcc version less than 7.1.0 is not supported.") - -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.com - OUT_SOURCE_PATH SOURCE_PATH - REPO libxmsh/xmsh - REF e1900845b796ef977db70519b2ac08eebd788236 - SHA512 643c6c94956de9b6fae635b6528e8ba756f4a2bc38de71613c2dd8d47f4a043aee7b6e7fec1870b306be3bea9f5c0c81d1d343bfc27883b3fba986fbc5b15406 - HEAD_REF master -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DPYTHON3_EXECUTABLE=${PYTHON3} -) - -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYPATH ${PYTHON3} PATH) -set(ENV{PATH} "$ENV{PATH};${PYPATH}") - -vcpkg_install_cmake() - -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -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() - -file(INSTALL ${SOURCE_PATH}/copyright.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/xmsh/vcpkg.json b/ports/xmsh/vcpkg.json deleted file mode 100644 index fedee5f028236e..00000000000000 --- a/ports/xmsh/vcpkg.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "xmsh", - "version-string": "0.5.2", - "port-version": 2, - "description": "Reference Implementation of XMSH Library", - "homepage": "https://gitlab.com/libxmsh/xmsh", - "dependencies": [ - "nlohmann-json", - "tl-expected" - ] -} diff --git a/ports/xqilla/CMakeLists.txt b/ports/xqilla/CMakeLists.txt new file mode 100644 index 00000000000000..d2caaa2230f9c0 --- /dev/null +++ b/ports/xqilla/CMakeLists.txt @@ -0,0 +1,458 @@ +cmake_minimum_required(VERSION 3.21) +cmake_policy(VERSION 3.21) + +if (XQILLA_STATIC) + add_definitions("-DXQILLA_API=") +else() + add_definitions("-DXQILLA_APIS=") +endif() + +project(xqilla C CXX) + +add_library(xqilla +./src/exceptions/XQException.cpp +./src/exceptions/XQillaException.cpp +./src/fastxdm/FastXDMSequenceBuilder.cpp +./src/fastxdm/FastXDMNodeImpl.cpp +./src/fastxdm/FastXDMDocument.cpp +./src/fastxdm/FastXDMUpdateFactory.cpp +./src/fastxdm/FastXDMConfiguration.cpp +./src/ast/XQAttributeConstructor.cpp +./src/ast/XQOrderingChange.cpp +./src/ast/XQReturn.cpp +./src/ast/XQPredicate.cpp +./src/ast/XQNamespaceBinding.cpp +./src/ast/XQCopy.cpp +./src/ast/XQQuantified.cpp +./src/ast/NumericFunction.cpp +./src/ast/XQOperator.cpp +./src/ast/XQVariable.cpp +./src/ast/StaticAnalysis.cpp +./src/ast/XQFunctionRef.cpp +./src/ast/XQCastAs.cpp +./src/ast/XQStep.cpp +./src/ast/XQLiteral.cpp +./src/ast/XQCopyOf.cpp +./src/ast/XQElementConstructor.cpp +./src/ast/XQDocumentConstructor.cpp +./src/ast/XQTreatAs.cpp +./src/ast/XQCallTemplate.cpp +./src/ast/XQTextConstructor.cpp +./src/ast/XQNamespaceConstructor.cpp +./src/ast/XQMap.cpp +./src/ast/XQFunctionCoercion.cpp +./src/ast/XQTypeswitch.cpp +./src/ast/XQAtomize.cpp +./src/ast/XQInlineFunction.cpp +./src/ast/XQSequence.cpp +./src/ast/LetTuple.cpp +./src/ast/WhereTuple.cpp +./src/ast/XQPIConstructor.cpp +./src/ast/XQFunctionDeref.cpp +./src/ast/StaticType.cpp +./src/ast/ContextTuple.cpp +./src/ast/XQGlobalVariable.cpp +./src/ast/OrderByTuple.cpp +./src/ast/ForTuple.cpp +./src/ast/XQFunction.cpp +./src/ast/CountTuple.cpp +./src/ast/XQFunctionConversion.cpp +./src/ast/XQApplyTemplates.cpp +./src/ast/XQCommentConstructor.cpp +./src/ast/XQCastableAs.cpp +./src/ast/XQIf.cpp +./src/ast/XQContextItem.cpp +./src/ast/XQDOMConstructor.cpp +./src/ast/ASTNodeImpl.cpp +./src/ast/TupleNode.cpp +./src/ast/XQNav.cpp +./src/ast/XQEffectiveBooleanValue.cpp +./src/ast/XQDocumentOrder.cpp +./src/ast/XQFunctionCall.cpp +./src/ast/XQValidate.cpp +./src/ast/ConvertFunctionArg.cpp +./src/ast/XQPartialApply.cpp +./src/ast/XQAnalyzeString.cpp +./src/axis/NodeTest.cpp +./src/fulltext/FTContent.cpp +./src/fulltext/FTOrder.cpp +./src/fulltext/DefaultTokenStore.cpp +./src/fulltext/DefaultTokenizer.cpp +./src/fulltext/FTWords.cpp +./src/fulltext/FTOr.cpp +./src/fulltext/FTContains.cpp +./src/fulltext/FTScope.cpp +./src/fulltext/FTWindow.cpp +./src/fulltext/FTMildnot.cpp +./src/fulltext/FTAnd.cpp +./src/fulltext/FTUnaryNot.cpp +./src/fulltext/FTDistance.cpp +./src/framework/ProxyMemoryManager.cpp +./src/framework/XPath2MemoryManagerImpl.cpp +./src/framework/StringPool.cpp +./src/framework/BaseMemoryManager.cpp +./src/framework/ReferenceCounted.cpp +./src/xqc/XQillaXQCExpression.cpp +./src/xqc/XQillaXQCStaticContext.cpp +./src/xqc/XQillaXQCDynamicContext.cpp +./src/xqc/XQillaXQCImplementation.cpp +./src/xqc/XQillaXQCSequence.cpp +./src/schema/SequenceType.cpp +./src/schema/FaxppDocumentCacheImpl.cpp +./src/schema/AnyAtomicTypeDatatypeValidator.cpp +./src/schema/DocumentCacheImpl.cpp +./src/schema/SchemaValidatorFilter.cpp +./src/optimizer/Optimizer.cpp +./src/optimizer/StaticTyper.cpp +./src/optimizer/ASTVisitor.cpp +./src/optimizer/ASTReleaser.cpp +./src/optimizer/ASTCopier.cpp +./src/optimizer/QueryPathNode.cpp +./src/optimizer/QueryPathTreeGenerator.cpp +./src/optimizer/ASTToXML.cpp +./src/optimizer/PartialEvaluator.cpp +./src/xqts/TestSuiteRunner.cpp +./src/xqts/TestSuiteParser.cpp +./src/xqts/TestSuiteResultListener.cpp +./src/items/Numeric.cpp +./src/items/DatatypeFactory.cpp +./src/items/AnyAtomicType.cpp +./src/items/DateOrTimeType.cpp +./src/items/DatatypeLookup.cpp +./src/items/Timezone.cpp +./src/items/ATUntypedAtomic.cpp +./src/items/impl/ATUntypedAtomicImpl.cpp +./src/items/impl/FunctionRefImpl.cpp +./src/items/impl/ATStringOrDerivedImpl.cpp +./src/items/impl/ATDateTimeOrDerivedImpl.cpp +./src/items/impl/ATDurationOrDerivedImpl.cpp +./src/items/impl/ATAnySimpleTypeImpl.cpp +./src/items/impl/ATTimeOrDerivedImpl.cpp +./src/items/impl/ATGYearOrDerivedImpl.cpp +./src/items/impl/ATFloatOrDerivedImpl.cpp +./src/items/impl/ATGMonthOrDerivedImpl.cpp +./src/items/impl/ATGDayOrDerivedImpl.cpp +./src/items/impl/ATBooleanOrDerivedImpl.cpp +./src/items/impl/ATQNameOrDerivedImpl.cpp +./src/items/impl/ATDoubleOrDerivedImpl.cpp +./src/items/impl/ATAnyURIOrDerivedImpl.cpp +./src/items/impl/ATGYearMonthOrDerivedImpl.cpp +./src/items/impl/ATNotationOrDerivedImpl.cpp +./src/items/impl/ATHexBinaryOrDerivedImpl.cpp +./src/items/impl/ATBase64BinaryOrDerivedImpl.cpp +./src/items/impl/ATDecimalOrDerivedImpl.cpp +./src/items/impl/ATGMonthDayOrDerivedImpl.cpp +./src/items/impl/ATDateOrDerivedImpl.cpp +./src/items/Item.cpp +./src/items/Node.cpp +./src/items/ATDurationOrDerived.cpp +./src/lexer/XSLT2Lexer.cpp +./src/lexer/XQLexer.cpp +./src/lexer/XQLexer2.cpp +./src/simple-api/XQilla.cpp +./src/simple-api/XQQuery.cpp +./src/utils/UTF8Str.cpp +./src/utils/XMLChCompare.cpp +./src/utils/XStr.cpp +./src/utils/DelayedModule.cpp +./src/utils/ContextUtils.cpp +./src/utils/UnicodeTransformer.cpp +./src/utils/NumUtils.cpp +./src/utils/XPath2Utils.cpp +./src/utils/XPath2NSUtils.cpp +./src/utils/DateUtils.cpp +./src/utils/XQillaPlatformUtils.cpp +./src/mapm/mapm_mt.cpp +./src/mapm/m_apm.cpp +./src/xerces/XercesNodeImpl.cpp +./src/xerces/AncestorAxis.cpp +./src/xerces/FollowingAxis.cpp +./src/xerces/XercesURIResolver.cpp +./src/xerces/AttributeAxis.cpp +./src/xerces/NamespaceAxis.cpp +./src/xerces/DescendantOrSelfAxis.cpp +./src/xerces/XercesConfiguration.cpp +./src/xerces/PrecedingAxis.cpp +./src/xerces/ParentAxis.cpp +./src/xerces/PrecedingSiblingAxis.cpp +./src/xerces/ChildAxis.cpp +./src/xerces/DescendantAxis.cpp +./src/xerces/Axis.cpp +./src/xerces/XercesUpdateFactory.cpp +./src/xerces/AncestorOrSelfAxis.cpp +./src/xerces/XercesSequenceBuilder.cpp +./src/xerces/FollowingSiblingAxis.cpp +./src/parser/XQParser.cpp +./src/parser/QName.cpp +./src/functions/FunctionMinutesFromTime.cpp +./src/functions/FunctionWords.cpp +./src/functions/FunctionMonthFromDateTime.cpp +./src/functions/FunctionLocalNameFromQName.cpp +./src/functions/FunctionDistinctValues.cpp +./src/functions/FunctionMonthsFromDuration.cpp +./src/functions/FunctionCos.cpp +./src/functions/FunctionTrace.cpp +./src/functions/FunctionTimezoneFromDate.cpp +./src/functions/FunctionCodepointsToString.cpp +./src/functions/FunctionMinutesFromDateTime.cpp +./src/functions/FunctionYearFromDate.cpp +./src/functions/FunctionStaticBaseURI.cpp +./src/functions/BuiltInModules.cpp +./src/functions/FunctionAtan.cpp +./src/functions/FunctionCurrentDateTime.cpp +./src/functions/FunctionAdjustTimeToTimezone.cpp +./src/functions/FunctionCeiling.cpp +./src/functions/FunctionExplain.cpp +./src/functions/FunctionImplicitTimezone.cpp +./src/functions/FunctionStartsWith.cpp +./src/functions/FunctionLowerCase.cpp +./src/functions/FunctionString.cpp +./src/functions/FunctionSentences.cpp +./src/functions/FunctionYearsFromDuration.cpp +./src/functions/FunctionNamespaceURIFromQName.cpp +./src/functions/XQillaFunction.cpp +./src/functions/FunctionParseHTML.cpp +./src/functions/FunctionDayFromDate.cpp +./src/functions/FunctionId.cpp +./src/functions/FunctionEmpty.cpp +./src/functions/FunctionUnparsedText.cpp +./src/functions/FunctionAdjustDateTimeToTimezone.cpp +./src/functions/FunctionTimezoneFromTime.cpp +./src/functions/FunctionRoot.cpp +./src/functions/FunctionCount.cpp +./src/functions/FunctionPosition.cpp +./src/functions/FunctionCurrentDate.cpp +./src/functions/FunctionFunctionArity.cpp +./src/functions/EXSLTMathFunction.cpp +./src/functions/FunctionRegexGroup.cpp +./src/functions/FunctionError.cpp +./src/functions/FunctionSerializeJSON.cpp +./src/functions/FunctionTimezoneFromDateTime.cpp +./src/functions/FunctionHead.cpp +./src/functions/FunctionStringLength.cpp +./src/functions/FunctionFloor.cpp +./src/functions/FunctionResolveURI.cpp +./src/functions/FunctionLog.cpp +./src/functions/FunctionContains.cpp +./src/functions/FunctionMatches.cpp +./src/functions/FunctionMonthFromDate.cpp +./src/functions/FunctionSecondsFromTime.cpp +./src/functions/FunctionSubstring.cpp +./src/functions/FunctionDateTime.cpp +./src/functions/FunctionCollection.cpp +./src/functions/FunctionConcat.cpp +./src/functions/FunctionParseXML.cpp +./src/functions/FunctionAnalyzeString.cpp +./src/functions/FunctionTime.cpp +./src/functions/FunctionDocument.cpp +./src/functions/FunctionCompare.cpp +./src/functions/FunctionTokenize.cpp +./src/functions/FunctionSecondsFromDuration.cpp +./src/functions/FunctionSignature.cpp +./src/functions/FunctionHoursFromDateTime.cpp +./src/functions/FunctionDayFromDateTime.cpp +./src/functions/FunctionAsin.cpp +./src/functions/FunctionUpperCase.cpp +./src/functions/FunctionMinutesFromDuration.cpp +./src/functions/RegExpFunction.cpp +./src/functions/FunctionCurrentTime.cpp +./src/functions/FunctionYearFromDateTime.cpp +./src/functions/FunctionLast.cpp +./src/functions/FunctionLookup.cpp +./src/functions/FunctionDaysFromDuration.cpp +./src/functions/XQUserFunction.cpp +./src/functions/FunctionHoursFromTime.cpp +./src/functions/FunctionNilled.cpp +./src/functions/FunctionLang.cpp +./src/functions/FunctionDoc.cpp +./src/functions/FunctionParseJSON.cpp +./src/functions/FunctionFunctionName.cpp +./src/functions/FunctionEndsWith.cpp +./src/functions/FunctionDocAvailable.cpp +./src/functions/FunctionDefaultCollation.cpp +./src/functions/FunctionNormalizeUnicode.cpp +./src/functions/FunctionAbs.cpp +./src/functions/FunctionStringToCodepoints.cpp +./src/functions/FunctionPower.cpp +#./src/functions/FunctionSubstringBeforeAfter.cpp +./src/functions/FunctionUnordered.cpp +./src/functions/FunctionNodeName.cpp +./src/functions/FunctionSin.cpp +./src/functions/FunctionPrefixFromQName.cpp +./src/functions/FunctionAdjustDateToTimezone.cpp +./src/functions/FunctionQName.cpp +./src/functions/FunctionRoundHalfToEven.cpp +./src/functions/FunctionNot.cpp +./src/functions/FunctionReplace.cpp +./src/functions/FunctionBaseURI.cpp +./src/functions/FunctionExp.cpp +./src/functions/ExternalFunction.cpp +./src/functions/FunctionLocalname.cpp +./src/functions/FuncFactory.cpp +./src/functions/FunctionNamespaceUri.cpp +./src/functions/FunctionSecondsFromDateTime.cpp +./src/functions/FunctionHoursFromDuration.cpp +./src/functions/FunctionDocumentURI.cpp +./src/functions/FunctionNumber.cpp +./src/functions/FunctionRound.cpp +./src/functions/FunctionAcos.cpp +./src/functions/FunctionIdref.cpp +./src/functions/FunctionName.cpp +./src/functions/FunctionCaseFold.cpp +./src/functions/FunctionSqrt.cpp +./src/functions/FunctionTail.cpp +./src/functions/FunctionTan.cpp +./src/functions/FunctionNormalizeSpace.cpp +./src/debug/DebugHookDecorator.cpp +./src/debug/InputParser.cpp +./src/debug/TupleDebugHook.cpp +./src/debug/InteractiveDebugger.cpp +./src/debug/StackFrame.cpp +./src/debug/ASTDebugHook.cpp +./src/dom-api/impl/XQillaXMLGrammarPoolImpl.cpp +./src/dom-api/impl/XQillaExpressionImpl.cpp +./src/dom-api/impl/XPath2ResultImpl.cpp +./src/dom-api/impl/XPathNamespaceImpl.cpp +./src/dom-api/impl/XQillaDocumentImpl.cpp +./src/dom-api/impl/XQillaBuilderImpl.cpp +./src/dom-api/impl/XPathDocumentImpl.cpp +./src/dom-api/impl/XQillaNSResolverImpl.cpp +./src/dom-api/XQillaImplementation.cpp +./src/dom-api/XPath2NodeSerializer.cpp +./src/runtime/EmptyResult.cpp +./src/runtime/ResultBufferImpl.cpp +./src/runtime/ClosureResult.cpp +./src/runtime/Result.cpp +./src/runtime/SequenceResult.cpp +./src/runtime/ResultImpl.cpp +./src/runtime/Sequence.cpp +./src/runtime/ResultBuffer.cpp +./src/events/NSFixupFilter.cpp +./src/events/EventGenerator.cpp +./src/events/NoInheritFilter.cpp +./src/events/EventSerializer.cpp +./src/events/QueryPathTreeFilter.cpp +./src/events/ContentSequenceFilter.cpp +./src/context/impl/CollationImpl.cpp +./src/context/impl/ItemFactoryImpl.cpp +./src/context/impl/XQContextImpl.cpp +./src/context/impl/XQDynamicContextImpl.cpp +./src/context/impl/VarTypeStoreImpl.cpp +./src/context/impl/VarStoreImpl.cpp +./src/context/impl/VarHashEntryImpl.cpp +./src/context/impl/CodepointCollation.cpp +./src/context/UpdateFactory.cpp +./src/tools/compile-delayed-module.cpp +./src/update/UInsertAfter.cpp +./src/update/UTransform.cpp +./src/update/UInsertAsFirst.cpp +./src/update/UInsertBefore.cpp +./src/update/UInsertInto.cpp +./src/update/UReplace.cpp +./src/update/UDelete.cpp +./src/update/UInsertAsLast.cpp +./src/update/UReplaceValueOf.cpp +./src/update/URename.cpp +./src/update/PendingUpdateList.cpp +./src/update/FunctionPut.cpp +./src/update/UApplyUpdates.cpp +./src/operators/UnaryMinus.cpp +./src/operators/GeneralComp.cpp +./src/operators/Plus.cpp +./src/operators/ComparisonOperator.cpp +./src/operators/And.cpp +./src/operators/OrderComparison.cpp +./src/operators/LessThanEqual.cpp +./src/operators/Minus.cpp +./src/operators/LessThan.cpp +./src/operators/GreaterThan.cpp +./src/operators/Equals.cpp +./src/operators/NodeComparison.cpp +./src/operators/Union.cpp +./src/operators/Or.cpp +./src/operators/NotEquals.cpp +./src/operators/IntegerDivide.cpp +./src/operators/Except.cpp +./src/operators/Divide.cpp +./src/operators/GreaterThanEqual.cpp +./src/operators/Multiply.cpp +./src/operators/ArithmeticOperator.cpp +./src/operators/Mod.cpp +./src/operators/Intersect.cpp +./src/yajl/yajl_encode.c +./src/yajl/yajl.c +./src/yajl/yajl_parser.c +./src/yajl/yajl_buf.c +./src/yajl/yajl_gen.c +./src/yajl/yajl_lex.c +./src/utils/utf8proc/utf8proc.c +./src/mapm/mapm_log.c +./src/mapm/mapm_div.c +./src/mapm/mapmfmul.c +./src/mapm/mapm_add.c +./src/mapm/mapmhsin.c +./src/mapm/mapm_fft.c +./src/mapm/mapmipwr.c +./src/mapm/mapmasin.c +./src/mapm/mapm_rnd.c +./src/mapm/mapmutl2.c +./src/mapm/mapm_fam.c +./src/mapm/mapm_fpf.c +./src/mapm/mapmutil.c +./src/mapm/mapm5sin.c +./src/mapm/mapmstck.c +./src/mapm/mapm_exp.c +./src/mapm/mapm_mul.c +./src/mapm/mapmfact.c +./src/mapm/mapmgues.c +./src/mapm/mapm_flr.c +./src/mapm/mapmcbrt.c +./src/mapm/mapm_lg3.c +./src/mapm/mapm_rcp.c +./src/mapm/mapm_sin.c +./src/mapm/mapmistr.c +./src/mapm/mapmhasn.c +./src/mapm/mapmasn0.c +./src/mapm/mapmrsin.c +./src/mapm/mapm_set.c +./src/mapm/mapmsqrt.c +./src/mapm/mapm_gcd.c +./src/mapm/mapm_lg2.c +./src/mapm/mapmcnst.c +./src/mapm/mapm_pow.c +./src/mapm/mapmpwr2.c +./src/mapm/mapm_cpi.c +) + +include_directories(include) +find_package(XercesC REQUIRED) + +target_include_directories(xqilla PRIVATE "${XercesC_INCLUDE_DIRS}") +target_include_directories(xqilla PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include") + +if (NOT XQILLA_STATIC) + target_link_libraries(xqilla PUBLIC debug "${XercesC_LIBRARY_DEBUG}") + target_link_libraries(xqilla PUBLIC optimized "${XercesC_LIBRARY_RELEASE}") +endif() + +install( + TARGETS xqilla + EXPORT unofficial-xqilla + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/xqilla" + CONFIGURATIONS Release + DESTINATION include +) + +install( + EXPORT unofficial-xqilla + DESTINATION share/unofficial-xqilla + FILE unofficial-xqillaConfig.cmake + NAMESPACE unofficial::xqilla:: + CONFIGURATIONS Release +) diff --git a/ports/xqilla/fix-compare.patch b/ports/xqilla/fix-compare.patch new file mode 100644 index 00000000000000..7e2d0d39a69b49 --- /dev/null +++ b/ports/xqilla/fix-compare.patch @@ -0,0 +1,26 @@ +diff --git a/include/xqilla/ast/XQDocumentOrder.hpp b/include/xqilla/ast/XQDocumentOrder.hpp +index 81189e6..c22280a 100644 +--- a/include/xqilla/ast/XQDocumentOrder.hpp ++++ b/include/xqilla/ast/XQDocumentOrder.hpp +@@ -68,7 +68,7 @@ private: + public: + uniqueLessThanCompareFn(const DynamicContext *context) + : context_(context) {} +- bool operator()(const Node::Ptr &first, const Node::Ptr &second) ++ bool operator()(const Node::Ptr &first, const Node::Ptr &second) const + { + return first->uniqueLessThan(second, context_); + } +diff --git a/src/lexer/XQLexer.cpp b/src/lexer/XQLexer.cpp +index 69c923f..aed0465 100644 +--- a/src/lexer/XQLexer.cpp ++++ b/src/lexer/XQLexer.cpp +@@ -235,7 +235,7 @@ static void yy_flex_free YY_PROTO(( void * )); + #define YY_SKIP_YYWRAP + #define yytext_ptr yytext + +-#include ++#include "FlexLexer.h" + int yyFlexLexer::yylex() + { + LexerError( "yyFlexLexer::yylex invoked but %option yyclass used" ); diff --git a/ports/xqilla/portfile.cmake b/ports/xqilla/portfile.cmake new file mode 100644 index 00000000000000..ffc48298c81811 --- /dev/null +++ b/ports/xqilla/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://sourceforge.net/projects/xqilla/files/XQilla-2.3.4.tar.gz/download" + FILENAME "XQilla-2.3.4.tar.gz" + SHA512 f744ff883675887494780d24ecdc94afa394d3795d1544b1c598016b3f936c340ad7cd84529ac12962e3c5ce2f1be928a0cd4f9b9eb70e6645a38b0728cb1994 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES "fix-compare.patch" +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND COMPILE_OPTIONS "-DXQILLA_STATIC=static") +endif() + + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + NO_CHARSET_FLAG + OPTIONS ${COMPILE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/xqilla" RENAME copyright) diff --git a/ports/xqilla/vcpkg.json b/ports/xqilla/vcpkg.json new file mode 100644 index 00000000000000..7b7d535aab1c3d --- /dev/null +++ b/ports/xqilla/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "xqilla", + "version": "2.3.4", + "description": "XQuery and XPath 2 library", + "homepage": "http://xqilla.sourceforge.net/HomePage", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xerces-c" + ] +} diff --git a/ports/xtensor-io/portfile.cmake b/ports/xtensor-io/portfile.cmake index 97141106863bce..9deb72ec56d2f2 100644 --- a/ports/xtensor-io/portfile.cmake +++ b/ports/xtensor-io/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor-io - REF 2bc048b3f34731385f29e2f3b307103ee6d4e5ab # 0.12.8 - SHA512 d7c5c85489aea9b9d8af7ee33a43dd8ab888e7f03da8b533ace39e143f89acbae4fe88bb10253931a3cc44041e1532bd76483686f7f20c00e2850647a574349c + REF ffada938383b0f24c9e0b07cea7d5780057e1d96 # 0.13.0 + SHA512 ce5d085e500ef7043eb51538cab9a53c857983ac43e392cd65958c76fcde3ddb00161097cb70d334fa7d12af12e8109bb958b51f39afd9eeb60bb3421424058e HEAD_REF master ) diff --git a/ports/xtensor-io/vcpkg.json b/ports/xtensor-io/vcpkg.json index 78982b3b59e9d5..c09140b2b8259f 100644 --- a/ports/xtensor-io/vcpkg.json +++ b/ports/xtensor-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xtensor-io", - "version": "0.12.8", + "version": "0.13.0", "port-version": 1, "description": "xtensor plugin to read and write images, audio files, numpy (compressed) npz and HDF5", "homepage": "https://github.com/xtensor-stack/xtensor-io", diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake index a9be2459d94a0b..dfaf6fc5834af3 100644 --- a/ports/xtensor/portfile.cmake +++ b/ports/xtensor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor - REF f3c11b2d810159e7063daddeaa0764f4006e5a73 # 0.23.10 - SHA512 85d94a3e346a13f8d802260e7b182a34f83ed7adddb5c082f10fdaac995ba5b895ea20daf33ac99d3f44e9eb95fdc4ec051eb006259258c4c2ae762c5f08399f + REF 825c0fd8a465049c06ad89fa3911b342dbffcabf # 0.24.0 + SHA512 18b030efb88255108f3e2a0f5da9f082c32f2b637cb83fcabd5b579b0cff67b503d378037088c535497da09c00a5430ca87e737235b3b0b449da183925d99e68 HEAD_REF master ) @@ -14,9 +14,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tbb XTENSOR_USE_TBB ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DXTENSOR_ENABLE_ASSERT=OFF -DXTENSOR_CHECK_DIMENSION=OFF @@ -29,10 +28,10 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xtensor/vcpkg.json b/ports/xtensor/vcpkg.json index 439e46066c058d..dbd5083e5822dd 100644 --- a/ports/xtensor/vcpkg.json +++ b/ports/xtensor/vcpkg.json @@ -1,10 +1,19 @@ { "name": "xtensor", - "version": "0.23.10", + "version": "0.24.0", "description": "C++ tensors with broadcasting and lazy computing", "homepage": "https://github.com/xtensor-stack/xtensor", + "license": "BSD-3-Clause", "dependencies": [ "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "xtl" ], "features": { diff --git a/ports/xxhash/portfile.cmake b/ports/xxhash/portfile.cmake index 34979fefcaffac..03f988e82f596f 100644 --- a/ports/xxhash/portfile.cmake +++ b/ports/xxhash/portfile.cmake @@ -24,6 +24,8 @@ if("xxhsum" IN_LIST FEATURES) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_pkgconfig() + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/xxhash/vcpkg.json b/ports/xxhash/vcpkg.json index b510b54a3ab6bf..22b45b81b00d42 100644 --- a/ports/xxhash/vcpkg.json +++ b/ports/xxhash/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xxhash", "version": "0.8.1", + "port-version": 1, "description": "Extremely fast hash algorithm", "homepage": "https://github.com/Cyan4973/xxHash", "dependencies": [ diff --git a/ports/yajl/portfile.cmake b/ports/yajl/portfile.cmake index c01987dee9fe93..43783a70896e61 100644 --- a/ports/yajl/portfile.cmake +++ b/ports/yajl/portfile.cmake @@ -1,32 +1,43 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lloyd/yajl - REF 2.1.0 - SHA512 9e786d080803df80ec03a9c2f447501e6e8e433a6baf636824bc1d50ecf4f5f80d7dfb1d47958aeb0a30fe459bd0ef033d41bc6a79e1dc6e6b5eade930b19b02 + REF a0ecdde0c042b9256170f2f8890dd9451a4240aa #2.1.0 + SHA512 cf0279fdbdc21d07bc0f2d409f1dddb39fd2ad62ab9872e620f46de4753958f8c59e44ef2ee734547f0f25f9490bada8c9e97dcc1a4b14b25d3e7a7254f8e1f3 HEAD_REF master - PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake.patch + PATCHES cmake.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/yajl RENAME copyright) +if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/yajl.pc") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/yajl.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/yajl.pc") +endif() +if (EXISTS "${CURRENT_PACKAGES_DIR}/share/pkgconfig/yajl.pc") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/yajl.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/yajl.pc") +endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/pkgconfig) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/pkgconfig") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - file(GLOB SHAREDOBJECTS ${CURRENT_PACKAGES_DIR}/lib/libyajl.so* ${CURRENT_PACKAGES_DIR}/debug/lib/libyajl.so*) - file(REMOVE_RECURSE ${SHAREDOBJECTS} ${CURRENT_PACKAGES_DIR}/lib/yajl.lib ${CURRENT_PACKAGES_DIR}/debug/lib/yajl.lib) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(GLOB SHAREDOBJECTS "${CURRENT_PACKAGES_DIR}/lib/libyajl.so*" "${CURRENT_PACKAGES_DIR}/debug/lib/libyajl.so*") + file(REMOVE_RECURSE "${SHAREDOBJECTS}" "${CURRENT_PACKAGES_DIR}/lib/yajl.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/yajl.lib") else() - file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") file(REMOVE_RECURSE ${EXES} - ${CURRENT_PACKAGES_DIR}/lib/yajl_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/yajl_s.lib - ${CURRENT_PACKAGES_DIR}/lib/libyajl_s.a ${CURRENT_PACKAGES_DIR}/debug/lib/libyajl_s.a + "${CURRENT_PACKAGES_DIR}/lib/yajl_s.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/yajl_s.lib" + "${CURRENT_PACKAGES_DIR}/lib/libyajl_s.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libyajl_s.a" ) endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/yajl" RENAME copyright) diff --git a/ports/yajl/vcpkg.json b/ports/yajl/vcpkg.json index 7d05045ab23362..d031be7cea78fa 100644 --- a/ports/yajl/vcpkg.json +++ b/ports/yajl/vcpkg.json @@ -1,6 +1,14 @@ { "name": "yajl", "version-string": "2.1.0", - "port-version": 2, - "description": "Yet Another JSON Library" + "port-version": 3, + "description": "Yet Another JSON Library", + "homepage": "https://github.com/lloyd/yajl", + "license": "ISC", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/yasm-tool-helper/vcpkg.json b/ports/yasm-tool-helper/vcpkg.json index 72e1fba3bd2de2..dcc112ce379c14 100644 --- a/ports/yasm-tool-helper/vcpkg.json +++ b/ports/yasm-tool-helper/vcpkg.json @@ -1,12 +1,16 @@ { "name": "yasm-tool-helper", - "version-string": "2020-03-11", - "description": "Backfill that depends on yasm-tool:host", + "version-date": "2020-03-11", + "port-version": 1, + "description": "Backfill that depends on yasm:host", "homepage": "https://github.com/Microsoft/vcpkg", "dependencies": [ { - "name": "yasm-tool", - "host": true + "name": "yasm", + "host": true, + "features": [ + "tools" + ] } ] } diff --git a/ports/yasm-tool-helper/yasm-tool-helper.cmake.in b/ports/yasm-tool-helper/yasm-tool-helper.cmake.in index 48bd805f3bf270..8e69ef519e9b25 100644 --- a/ports/yasm-tool-helper/yasm-tool-helper.cmake.in +++ b/ports/yasm-tool-helper/yasm-tool-helper.cmake.in @@ -1 +1 @@ -include("${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/share/yasm-tool/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/share/yasm/vcpkg-port-config.cmake") diff --git a/ports/yasm-tool/portfile.cmake b/ports/yasm-tool/portfile.cmake index d4949bc9c2ff04..dba1f83f42edee 100644 --- a/ports/yasm-tool/portfile.cmake +++ b/ports/yasm-tool/portfile.cmake @@ -1,47 +1 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - -if(VCPKG_TARGET_IS_WINDOWS) - set(YASM_BUILD_BINARY ON) - set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) - set(VCPKG_LIBRARY_LINKAGE static) - - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO yasm/yasm - REF 009450c7ad4d425fa5a10ac4bd6efbd25248d823 # 1.3.0 plus bugfixes for https://github.com/yasm/yasm/issues/153 - SHA512 a542577558676d11b52981925ea6219bffe699faa1682c033b33b7534f5a0dfe9f29c56b32076b68c48f65e0aef7c451be3a3af804c52caa4d4357de4caad83c - ) - - file(INSTALL "${SOURCE_PATH}/COPYING" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) - foreach(LICENSE Artistic.txt BSD.txt GNU_GPL-2.0 GNU_LGPL-2.0) - file(COPY "${SOURCE_PATH}/${LICENSE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - endforeach() - - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DENABLE_NLS=OFF - -DYASM_BUILD_TESTS=OFF - ) - vcpkg_install_cmake() - - vcpkg_copy_tools(TOOL_NAMES yasm) - - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include") -else() - set(YASM_BUILD_BINARY OFF) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -endif() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake.in" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/yasm-tool/vcpkg.json b/ports/yasm-tool/vcpkg.json index a3552faaa69c60..e78d6b53672d35 100644 --- a/ports/yasm-tool/vcpkg.json +++ b/ports/yasm-tool/vcpkg.json @@ -1,7 +1,13 @@ { "name": "yasm-tool", - "version": "1.3.0", - "description": "A modular assembler.", - "homepage": "http://yasm.tortall.net/", - "supports": "native & !uwp" + "version-date": "2021-12-14", + "description": "Legacy port. Use port yasm instead.", + "dependencies": [ + { + "name": "yasm", + "features": [ + "tools" + ] + } + ] } diff --git a/ports/yasm/add-feature-tools.patch b/ports/yasm/add-feature-tools.patch new file mode 100644 index 00000000000000..4f4944665d9e64 --- /dev/null +++ b/ports/yasm/add-feature-tools.patch @@ -0,0 +1,10 @@ +diff --git a/frontends/CMakeLists.txt b/frontends/CMakeLists.txt +index 9858b61..b151cc3 100644 +--- a/frontends/CMakeLists.txt ++++ b/frontends/CMakeLists.txt +@@ -1,3 +1,5 @@ ++if (BUILD_TOOLS) + ADD_SUBDIRECTORY(yasm) + ADD_SUBDIRECTORY(tasm) + ADD_SUBDIRECTORY(vsyasm) ++endif() diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake index 75090b3713837d..37a891dc09e6af 100644 --- a/ports/yasm/portfile.cmake +++ b/ports/yasm/portfile.cmake @@ -1,49 +1,48 @@ -if (NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "${PORT} only supports windows") -elseif (TRIPLET_SYSTEM_ARCH MATCHES "arm") - message(FATAL_ERROR "ARM is currently not supported.") -elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - message(FATAL_ERROR "Error: UWP builds are currently not supported.") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yasm/yasm - REF v1.3.0 - SHA512 f5053e2012e0d2ce88cc1cc06e3bdb501054aed5d1f78fae40bb3e676fe2eb9843d335a612d7614d99a2b9e49dca998d57f61b0b89fac8225afa4ae60ae848f1 + REF 009450c7ad4d425fa5a10ac4bd6efbd25248d823 # 1.3.0 plus bugfixes for https://github.com/yasm/yasm/issues/153 + SHA512 a542577558676d11b52981925ea6219bffe699faa1682c033b33b7534f5a0dfe9f29c56b32076b68c48f65e0aef7c451be3a3af804c52caa4d4357de4caad83c HEAD_REF master + PATCHES add-feature-tools.patch ) -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON_PATH ${PYTHON2} DIRECTORY) -vcpkg_add_to_path("${PYTHON_PATH}") - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS ) -vcpkg_install_cmake() +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") -file(REMOVE - ${CURRENT_PACKAGES_DIR}/debug/bin/vsyasm.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/yasm.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/ytasm.exe +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DENABLE_NLS=OFF + -DYASM_BUILD_TESTS=OFF ) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vsyasm.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/vsyasm.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/yasm.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/yasm.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ytasm.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/ytasm.exe) +vcpkg_cmake_install() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_pdbs() + +if (BUILD_TOOLS) + vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm AUTO_CLEAN) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(COPY "${CURRENT_PACKAGES_DIR}/bin/yasmstd${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() +endif() 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() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +configure_file("${CURRENT_PORT_DIR}/vcpkg-port-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/yasm-tool/vcpkg-port-config.cmake.in b/ports/yasm/vcpkg-port-config.cmake.in similarity index 81% rename from ports/yasm-tool/vcpkg-port-config.cmake.in rename to ports/yasm/vcpkg-port-config.cmake.in index 5abe7520aca905..af374280554fa9 100644 --- a/ports/yasm-tool/vcpkg-port-config.cmake.in +++ b/ports/yasm/vcpkg-port-config.cmake.in @@ -11,11 +11,7 @@ function(yasm_tool_helper) message(FATAL_ERROR "Unexpected arguments to yasm_tool_helper: ${arg_UNPARSED_ARGUMENTS}") endif() - if(@YASM_BUILD_BINARY@) - set(YASM "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm-tool/yasm.exe") - else() - vcpkg_find_acquire_program(YASM) - endif() + find_program(YASM yasm PATHS "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm") if(arg_APPEND_TO_PATH) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json index 6a0176dd8ff53a..f78ff774575d80 100644 --- a/ports/yasm/vcpkg.json +++ b/ports/yasm/vcpkg.json @@ -1,8 +1,27 @@ { "name": "yasm", - "version-string": "1.3.0", - "port-version": 1, - "description": "Yasm is a complete rewrite of the NASM assembler under the “new” BSD License.", + "version": "1.3.0", + "port-version": 3, + "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.", "homepage": "https://github.com/yasm/yasm", - "supports": "windows & !uwp & !arm" + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "yasm", + "host": true + } + ], + "features": { + "tools": { + "description": "Build yasm tools" + } + } } diff --git a/ports/yato/portfile.cmake b/ports/yato/portfile.cmake index e0b7a916b6e377..7626249b6b24dd 100644 --- a/ports/yato/portfile.cmake +++ b/ports/yato/portfile.cmake @@ -1,8 +1,8 @@ -vcpkg_from_bitbucket( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO alexey_gruzdev/yato - REF v1.0 - SHA512 631b870fd2704a03d9d66ef244f4e50968ae63da4fda0c7cd1f6ce2cea2b1e8b4506b0148cd1af1e133a70fd5d9cdc9d8c054edac6141118ee3c9427e186b270 + REPO agruzdev/Yato + REF 9b5a49f6ec4169b67b9e5ffd11fdae9c238b0a3d + SHA512 41962839cd13a314a17fef5f6065d7c3ed9967832039ca31993105685d584307d00f17c1514f4acf855a71fd884a1104c2d9c6a4461be5d2d7cfdc50b1ea7bdb HEAD_REF master ) @@ -17,24 +17,15 @@ file(COPY "${SOURCE_PATH}/modules/config/yato" DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DYATO_BUILD_TESTS:BOOL=OFF -DYATO_BUILD_ACTORS:BOOL=ON -DYATO_BUILD_CONFIG:BOOL=ON - -DYATO_CONFIG_MANUAL:BOOL=ON - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/ - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/ - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/ - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/ ) -vcpkg_build_cmake() +vcpkg_cmake_build() # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/yato) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/yato/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/yato/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/yato/vcpkg.json b/ports/yato/vcpkg.json index 7a5840b6ffaaad..d854276ce54311 100644 --- a/ports/yato/vcpkg.json +++ b/ports/yato/vcpkg.json @@ -1,6 +1,13 @@ { "name": "yato", - "version-string": "1.0", - "port-version": 3, - "description": "Modern C++14 containers and utilities, actors system, typesafe config" + "version-date": "2022-03-06", + "description": "Modern C++14 containers and utilities, actors system, typesafe config", + "license": "Apache-2.0", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index e5d5ec72a6fb60..2641de82023319 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) vcpkg_add_to_path("${PYTHON2_DIR}") @@ -7,8 +5,8 @@ vcpkg_add_to_path("${PYTHON2_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.8.12 - SHA512 0B377923BDAFFACA1846AA2ABD61003BBECADFCDFC908ED3097D0AAC8F32028AC39D93FB4A9C2E2C2BFFFBDBEE80AA415875F17DE6C2EE2AE8E2B7921F788C6E + REF z3-4.8.14 + SHA512 10170516CA472258D2F9DF28CD036E43023A76A25F1E1670290C62F3890D935BF82770970054A5FD3A0F02559409E7ED4B18FB08347C040FF2F9E0918E152AAB HEAD_REF master PATCHES fix-install-path.patch ) diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index 1ad7aece5c8d0f..ba3f5ed5e46ee5 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,8 +1,8 @@ { "name": "z3", - "version": "4.8.12", - "port-version": 1, + "version": "4.8.14", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", + "license": "MIT", "supports": "!uwp" } diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index ba51367e2f5cc2..671fc2ed646c93 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -1,11 +1,12 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq REF v4.3.4 SHA512 ad828b1ab5a87983285a6b44b08240816ed1c4e2c73306ab1a851bf80df1892b5e2f92064a49fbadc1f4c75043625ace77dd25b64d5d1c2a7d1d61cc916fba0b - PATCHES fix-arm.patch + PATCHES + fix-arm.patch + zeromq-libzmq-4310-64e6d37ab8.diff # https://patch-diff.githubusercontent.com/raw/zeromq/libzmq/pull/4310.diff + zeromq-libzmq-4311-2b04e0ce47.diff # https://patch-diff.githubusercontent.com/raw/zeromq/libzmq/pull/4311.diff ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -14,8 +15,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - sodium WITH_LIBSODIUM - draft ENABLE_DRAFTS + sodium WITH_LIBSODIUM + draft ENABLE_DRAFTS websockets-sha1 ENABLE_WS ) @@ -25,7 +26,7 @@ if(VCPKG_TARGET_IS_MINGW) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DZMQ_BUILD_TESTS=OFF -DBUILD_STATIC=${BUILD_STATIC} diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index e7d469bf287bca..e3f4426db26005 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,9 +1,10 @@ { "name": "zeromq", "version": "4.3.4", - "port-version": 2, + "port-version": 5, "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", "homepage": "https://github.com/zeromq/libzmq", + "license": "LGPL-3.0-only", "supports": "!uwp", "dependencies": [ { diff --git a/ports/zeromq/zeromq-libzmq-4310-64e6d37ab8.diff b/ports/zeromq/zeromq-libzmq-4310-64e6d37ab8.diff new file mode 100644 index 00000000000000..0d839ea02b14ef --- /dev/null +++ b/ports/zeromq/zeromq-libzmq-4310-64e6d37ab8.diff @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c983c6698..21bcd414a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,6 +15,7 @@ include(CheckCSourceCompiles) + include(CheckCSourceRuns) + include(CMakeDependentOption) + include(CheckCXXSymbolExists) ++include(CheckStructHasMember) + include(CheckTypeSize) + include(FindThreads) + include(GNUInstallDirs) +@@ -495,8 +496,12 @@ endif() + + if(NOT WIN32) + set(ZMQ_HAVE_IPC 1) ++ set(ZMQ_HAVE_STRUCT_SOCKADDR_UN 1) + else() + check_include_files("winsock2.h;afunix.h" ZMQ_HAVE_IPC) ++ if(ZMQ_HAVE_IPC) ++ check_struct_has_member("struct sockaddr_un" sun_path "winsock2.h;afunix.h" ZMQ_HAVE_STRUCT_SOCKADDR_UN) ++ endif() + endif() + + # ##################### BEGIN condition_variable_t selection +diff --git a/builds/cmake/platform.hpp.in b/builds/cmake/platform.hpp.in +index 2d23e8b288..18064362fe 100644 +--- a/builds/cmake/platform.hpp.in ++++ b/builds/cmake/platform.hpp.in +@@ -59,6 +59,7 @@ + #cmakedefine ZMQ_HAVE_LIBBSD + + #cmakedefine ZMQ_HAVE_IPC ++#cmakedefine ZMQ_HAVE_STRUCT_SOCKADDR_UN + + #cmakedefine ZMQ_USE_BUILTIN_SHA1 + #cmakedefine ZMQ_USE_NSS +diff --git a/src/windows.hpp b/src/windows.hpp +index 11c7581dee..24cce83d11 100644 +--- a/src/windows.hpp ++++ b/src/windows.hpp +@@ -98,3 +98,13 @@ static inline int poll (struct pollfd *pfd, unsigned long nfds, int timeout) + #define snprintf(buffer_, count_, format_, ...) \ + _snprintf_s (buffer_, count_, _TRUNCATE, format_, __VA_ARGS__) + #endif ++ ++// Workaround missing struct sockaddr_un in afunix.h. ++// Fix #3949. ++#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_STRUCT_SOCKADDR_UN) ++struct sockaddr_un ++{ ++ ADDRESS_FAMILY sun_family; /* AF_UNIX */ ++ char sun_path[108]; /* pathname */ ++}; ++#endif diff --git a/ports/zeromq/zeromq-libzmq-4311-2b04e0ce47.diff b/ports/zeromq/zeromq-libzmq-4311-2b04e0ce47.diff new file mode 100644 index 00000000000000..52d1f50d238a31 --- /dev/null +++ b/ports/zeromq/zeromq-libzmq-4311-2b04e0ce47.diff @@ -0,0 +1,18 @@ +diff --git a/src/windows.hpp b/src/windows.hpp +index 24cce83d11..c6d625188d 100644 +--- a/src/windows.hpp ++++ b/src/windows.hpp +@@ -90,7 +90,6 @@ static inline int poll (struct pollfd *pfd, unsigned long nfds, int timeout) + #ifndef AI_NUMERICSERV + #define AI_NUMERICSERV 0x0400 + #endif +-#endif + + // In MSVC prior to v14, snprintf is not available + // The closest implementation is the _snprintf_s function +@@ -108,3 +107,5 @@ struct sockaddr_un + char sun_path[108]; /* pathname */ + }; + #endif ++ ++#endif diff --git a/ports/zkpp/portfile.cmake b/ports/zkpp/portfile.cmake index 5ec1e78af82c92..5347d7c8c243b4 100644 --- a/ports/zkpp/portfile.cmake +++ b/ports/zkpp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tgockel/zookeeper-cpp diff --git a/ports/zkpp/vcpkg.json b/ports/zkpp/vcpkg.json index 51000a32df1ff8..90453ef931ca5c 100644 --- a/ports/zkpp/vcpkg.json +++ b/ports/zkpp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "zkpp", - "version-string": "0.2.3", - "port-version": 1, + "version": "0.2.3", + "port-version": 2, "description": "A ZooKeeper client for C++.", "homepage": "https://github.com/tgockel/zookeeper-cpp", + "supports": "!windows", "dependencies": [ "zookeeper" ] diff --git a/ports/zpp-bits/portfile.cmake b/ports/zpp-bits/portfile.cmake new file mode 100644 index 00000000000000..02287e7b24bc97 --- /dev/null +++ b/ports/zpp-bits/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eyalz800/zpp_bits + REF v4.3.3 + SHA512 6534711a75d62e4244125329db436ca27bf6b8c31aa9ecb92473f4e5687aa390d9d197d1cb91ed3452363af1537ffdef4a13fe6a1c3049616576a475ba69a548 + HEAD_REF master +) + +file( + COPY "${SOURCE_PATH}/zpp_bits.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/zpp-bits/vcpkg.json b/ports/zpp-bits/vcpkg.json new file mode 100644 index 00000000000000..b75cc2d3d72734 --- /dev/null +++ b/ports/zpp-bits/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "zpp-bits", + "version": "4.3.3", + "description": "A lightweight C++20 serialization and RPC library", + "homepage": "https://github.com/eyalz800/zpp_bits", + "license": "MIT" +} diff --git a/ports/zstd/fix-c4703-error.patch b/ports/zstd/fix-c4703-error.patch deleted file mode 100644 index 9af18d74125df3..00000000000000 --- a/ports/zstd/fix-c4703-error.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/compress/zstd_lazy.c b/lib/compress/zstd_lazy.c -index 3d523e8..3dd1426 100644 ---- a/lib/compress/zstd_lazy.c -+++ b/lib/compress/zstd_lazy.c -@@ -1296,8 +1296,8 @@ size_t ZSTD_RowFindBestMatch_generic ( - size_t ddsIdx; - U32 ddsExtraAttempts; /* cctx hash tables are limited in searches, but allow extra searches into DDS */ - U32 dmsTag; -- U32* dmsRow; -- BYTE* dmsTagRow; -+ U32* dmsRow = NULL; -+ BYTE* dmsTagRow = NULL; - - if (dictMode == ZSTD_dedicatedDictSearch) { - const U32 ddsHashLog = dms->cParams.hashLog - ZSTD_LAZY_DDSS_BUCKET_LOG; diff --git a/ports/zstd/no-static-suffix.patch b/ports/zstd/no-static-suffix.patch new file mode 100644 index 00000000000000..4e61f96b87d593 --- /dev/null +++ b/ports/zstd/no-static-suffix.patch @@ -0,0 +1,13 @@ +diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt +index 8234060..765f003 100644 +--- a/build/cmake/lib/CMakeLists.txt ++++ b/build/cmake/lib/CMakeLists.txt +@@ -112,7 +112,7 @@ endif () + + # With MSVC static library needs to be renamed to avoid conflict with import library + if (MSVC OR (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW)) +- set(STATIC_LIBRARY_BASE_NAME zstd_static) ++ set(STATIC_LIBRARY_BASE_NAME zstd) + else () + set(STATIC_LIBRARY_BASE_NAME zstd) + endif () diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index af3a9d6b9c5c00..cc3aa70164e906 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -1,24 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/zstd - REF a488ba114ec17ea1054b9057c26a046fc122b3b6 #v1.5.0 - SHA512 659576d0f52d2271b6b53f638b407b873888b1cffe4f014c3149d33a961653c2fcf7ff270bc669a5647205b573ef2809907645a4c89ab6c030ad65bce15547ae + REF f4a552a3fa24d9078f84157bd40e4f1bad49c488 #v1.5.2 + SHA512 5e0343cfc06d756c3f09647df39f1c15b39707c0b9b6d343b1be8f1e99d567b52f5b9228925c2190d1600a5b54822c2a4546b2443b13f43eb9a75f97e7fa41f5 HEAD_REF dev PATCHES install_pkgpc.patch - fix-c4703-error.patch + no-static-suffix.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZSTD_BUILD_SHARED) -if(VCPKG_TARGET_IS_WINDOWS) - # Enable multithreaded mode. CMake build doesn't provide a multithreaded - # library target, but it is the default in Makefile and VS projects. - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -DZSTD_MULTITHREAD") - set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS}") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/build/cmake" OPTIONS @@ -28,40 +21,43 @@ vcpkg_cmake_configure( -DZSTD_BUILD_PROGRAMS=0 -DZSTD_BUILD_TESTS=0 -DZSTD_BUILD_CONTRIB=0 - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d) # this is against the maintainer guidelines. - # Removing it probably requires a vcpkg-cmake-wrapper.cmake to correct downstreams FindZSTD.cmake + -DZSTD_MULTITHREAD_SUPPORT=1 +) vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zstd) +vcpkg_fixup_pkgconfig() -# This enables find_package(ZSTD) and find_package(zstd) to find zstd on Linux(case sensitive filesystems) -file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-config.cmake") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfigVersion.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-config-version.cmake") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(static_suffix "_static") -else() - set(static_suffix "") +file(READ "${CURRENT_PACKAGES_DIR}/share/zstd/zstdTargets.cmake" targets) +if(targets MATCHES "-pthread") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc" " -lzstd" " -lzstd -pthread") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzstd.pc" " -lzstd" " -lzstd -pthread") + endif() endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc" "-lzstd" "-lzstd${static_suffix}") -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzstd.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzstd.pc" "-lzstd" "-lzstd${static_suffix}d") -endif() - -vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - foreach(HEADER zdict.h zstd.h zstd_errors.h) + foreach(HEADER IN ITEMS zdict.h zstd.h zstd_errors.h) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${HEADER}" "defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)" "1" ) endforeach() endif() -file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(COPY "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "ZSTD is dual licensed - see LICENSE and COPYING files\n") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(missing_target zstd::libzstd_static) + set(existing_target zstd::libzstd_shared) +else() + set(existing_target zstd::libzstd_static) + set(missing_target zstd::libzstd_shared) +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/zstd/zstdTargets-interface.cmake" " +add_library(${missing_target} IMPORTED INTERFACE) +set_target_properties(${missing_target} PROPERTIES INTERFACE_LINK_LIBRARIES ${existing_target}) +") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(READ "${SOURCE_PATH}/LICENSE" bsd) +file(READ "${SOURCE_PATH}/COPYING" gpl) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "ZSTD is dual licensed under BSD and GPLv2.\n\n${bsd}\n\n${gpl}") diff --git a/ports/zstd/usage b/ports/zstd/usage new file mode 100644 index 00000000000000..f01a2f5cfb7dcd --- /dev/null +++ b/ports/zstd/usage @@ -0,0 +1,4 @@ +The package zstd provides CMake targets: + + find_package(zstd CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,zstd::libzstd_shared,zstd::libzstd_static>) diff --git a/ports/zstd/vcpkg.json b/ports/zstd/vcpkg.json index b8cef005a2ec14..841e1c7219ec03 100644 --- a/ports/zstd/vcpkg.json +++ b/ports/zstd/vcpkg.json @@ -1,9 +1,10 @@ { "name": "zstd", - "version-semver": "1.5.0", + "version": "1.5.2", "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", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/zxing-cpp/0001-opencv4-compat.patch b/ports/zxing-cpp/0001-opencv4-compat.patch deleted file mode 100644 index 76ad1f4a0c1ad5..00000000000000 --- a/ports/zxing-cpp/0001-opencv4-compat.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ccb2ba9..5ade734 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 3.0) - - project(zxing) -- -+set(CMAKE_CXX_STANDARD 11) - option(BUILD_TESTING "Enable generation of test targets" OFF) - - set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) -diff --git a/opencv-cli/src/main.cpp b/opencv-cli/src/main.cpp -index 63b6fd3..5900c4f 100644 ---- a/opencv-cli/src/main.cpp -+++ b/opencv-cli/src/main.cpp -@@ -135,14 +135,14 @@ int main(int argc, char** argv) { - - } - -- if (!videoCapture.set(CV_CAP_PROP_FRAME_WIDTH, captureWidth)) { -+ if (!videoCapture.set(cv::CAP_PROP_FRAME_WIDTH, captureWidth)) { - - // Log - cerr << "Failed to set frame width: " << captureWidth << " (ignoring)" << endl; - - } - -- if (!videoCapture.set(CV_CAP_PROP_FRAME_HEIGHT, captureHeight)) { -+ if (!videoCapture.set(cv::CAP_PROP_FRAME_HEIGHT, captureHeight)) { - - // Log - cerr << "Failed to set frame height: " << captureHeight << " (ignoring)" << endl; -@@ -166,7 +166,7 @@ int main(int argc, char** argv) { - if (result) { - - // Convert to grayscale -- cvtColor(image, grey, CV_BGR2GRAY); -+ cvtColor(image, grey, cv::COLOR_BGR2GRAY); - - try { - diff --git a/ports/zxing-cpp/0002-improve-features.patch b/ports/zxing-cpp/0002-improve-features.patch deleted file mode 100644 index 5776c36eac36b4..00000000000000 --- a/ports/zxing-cpp/0002-improve-features.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ade734..54071bd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.0) - project(zxing) - set(CMAKE_CXX_STANDARD 11) - option(BUILD_TESTING "Enable generation of test targets" OFF) -+option(WITH_OPENCV "Build with opencv" OFF) -+option(WITH_ICONV "Build with iconv" OFF) - - set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) - -@@ -43,8 +45,8 @@ if(WIN32) - endif() - - # OpenCV classes --find_package(OpenCV) --if(OpenCV_FOUND) -+if(WITH_OPENCV) -+ find_package(OpenCV REQUIRED) - list(APPEND LIBZXING_FILES - opencv/src/zxing/MatSource.cpp - opencv/src/zxing/MatSource.h -@@ -58,10 +60,10 @@ include_directories(core/src) - add_library(libzxing ${LIBZXING_FILES}) - set_target_properties(libzxing PROPERTIES PREFIX "") - --find_package(Iconv) --if(ICONV_FOUND) -- include_directories(${ICONV_INCLUDE_DIR}) -- target_link_libraries(libzxing ${ICONV_LIBRARIES}) -+if(WITH_ICONV) -+ find_package(Iconv REQUIRED) -+ include_directories(${Iconv_INCLUDE_DIRS}) -+ target_link_libraries(libzxing ${Iconv_LIBRARIES}) - else() - add_definitions(-DNO_ICONV=1) - endif() diff --git a/ports/zxing-cpp/0003-fix-dependency-bigint.patch b/ports/zxing-cpp/0003-fix-dependency-bigint.patch deleted file mode 100644 index e1453a21d63f7e..00000000000000 --- a/ports/zxing-cpp/0003-fix-dependency-bigint.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0f172d3..4999942 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,10 +42,13 @@ include(source_files.cmake) - if(WIN32) - include_directories(core/lib/win32) - set(CMAKE_DEBUG_POSTFIX -debug) --else() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - -+# Bigint -+find_package(bigint CONFIG REQUIRED) -+ -+link_libraries(bigint::bigint) -+ - # OpenCV classes - if(WITH_OPENCV) - find_package(OpenCV REQUIRED) -diff --git a/source_files.cmake b/source_files.cmake -index db3d8d4..39abe82 100644 ---- a/source_files.cmake -+++ b/source_files.cmake -@@ -1,28 +1,4 @@ - set(LIBZXING_FILES -- core/src/bigint/BigInteger.cc -- core/src/bigint/BigInteger.cc -- core/src/bigint/BigInteger.hh -- core/src/bigint/BigInteger.hh -- core/src/bigint/BigIntegerAlgorithms.cc -- core/src/bigint/BigIntegerAlgorithms.cc -- core/src/bigint/BigIntegerAlgorithms.hh -- core/src/bigint/BigIntegerAlgorithms.hh -- core/src/bigint/BigIntegerLibrary.hh -- core/src/bigint/BigIntegerLibrary.hh -- core/src/bigint/BigIntegerUtils.cc -- core/src/bigint/BigIntegerUtils.cc -- core/src/bigint/BigIntegerUtils.hh -- core/src/bigint/BigIntegerUtils.hh -- core/src/bigint/BigUnsigned.cc -- core/src/bigint/BigUnsigned.cc -- core/src/bigint/BigUnsigned.hh -- core/src/bigint/BigUnsigned.hh -- core/src/bigint/BigUnsignedInABase.cc -- core/src/bigint/BigUnsignedInABase.cc -- core/src/bigint/BigUnsignedInABase.hh -- core/src/bigint/BigUnsignedInABase.hh -- core/src/bigint/NumberlikeArray.hh -- core/src/bigint/NumberlikeArray.hh - core/src/zxing/aztec/AztecDetectorResult.cpp - core/src/zxing/aztec/AztecDetectorResult.h - core/src/zxing/aztec/AztecReader.cpp diff --git a/ports/zxing-cpp/portfile.cmake b/ports/zxing-cpp/portfile.cmake deleted file mode 100644 index ce2a45669f7601..00000000000000 --- a/ports/zxing-cpp/portfile.cmake +++ /dev/null @@ -1,53 +0,0 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO glassechidna/zxing-cpp - REF e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 - SHA512 222be56e3937136bd699a5d259a068b354ffcd34287bc8e0e8c33b924e9760501b81c56420d8062e0a924fefe95451778781b2aaa07207b0f18ce4ec33732581 - HEAD_REF master - PATCHES - 0001-opencv4-compat.patch - 0002-improve-features.patch - 0003-fix-dependency-bigint.patch -) - -file(REMOVE ${SOURCE_PATH}/cmake/FindModules/FindIconv.cmake) -# Depends on port bigint -file(REMOVE_RECURSE ${SOURCE_PATH}/core/src/bigint) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - opencv WITH_OPENCV - iconv WITH_ICONV -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} -) - -vcpkg_install_cmake() - -vcpkg_copy_pdbs() - -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/zxing/cmake TARGET_PATH share/zxing) - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -else() - file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/zxing) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/zxing) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/zxing-cpp/vcpkg.json b/ports/zxing-cpp/vcpkg.json deleted file mode 100644 index feb43da34a559a..00000000000000 --- a/ports/zxing-cpp/vcpkg.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "zxing-cpp", - "version-string": "2020-12", - "port-version": 3, - "description": "Barcode detection and decoding library.", - "homepage": "https://github.com/glassechidna/zxing-cpp", - "dependencies": [ - "bigint" - ], - "default-features": [ - "iconv", - "opencv" - ], - "features": { - "iconv": { - "description": "Build with libiconv", - "dependencies": [ - "libiconv" - ] - }, - "opencv": { - "description": "Build with opencv", - "dependencies": [ - "opencv" - ] - } - } -} diff --git a/scripts/Get-Changelog.ps1 b/scripts/Get-Changelog.ps1 new file mode 100644 index 00000000000000..68f02957e3b6a8 --- /dev/null +++ b/scripts/Get-Changelog.ps1 @@ -0,0 +1,502 @@ +#Requires -Version 5.0 +# We are not using Powershell >= 6.0, as the only supported debugger (vscode powershell extension) breaks on complex code. See: https://github.com/PowerShell/PowerShellEditorServices/issues/1295 +# This code can be run on PowerShell Core on any platform, but it is recommend to debug this code in Windows PowerShell ISE unless debugging happens to "just work" on your machine. +# Expect the fix to be out at around the end of 2020/beginning of 2021, at which point consider upgrading this script to PowerShell 7 the next time maintenance is necessary. +# -- Griffin Downs 2020-12-15 (@grdowns) + +using namespace System.Management.Automation +using namespace System.Collections.Generic + +<# +.SYNOPSIS + Changelog generator for vcpkg. +.DESCRIPTION + The changelog generator uses GitHub's Pull Request and Files API to get + pull requests and their associated file changes over the provided date range. + Then, the data is processed into buckets which are presented to the user + as a markdown file. +.EXAMPLE + Get-Changelog +.EXAMPLE + Get-Changelog -StartDate 11/1/20 -EndDate 12/1/20 +.EXAMPLE + $cred = Get-Credential + Get-Changelog -Credentials $cred +.OUTPUTS + A "CHANGELOG.md" file in the working directory. If the file already exists, + suffix is added to the filename and a new file is created to prevent overwriting. +#> +[CmdletBinding(PositionalBinding=$True)] +Param ( + # The begin date range (inclusive) + [Parameter(Mandatory=$True, Position=0)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$StartDate, + + # The end date range (exclusive) + [Parameter(Mandatory, Position=1)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$EndDate, + + [Parameter(Mandatory=$True)] + [String]$OutFile, + + # GitHub credentials (username and PAT) + [Parameter()] + [Credential()] + [PSCredential]$Credentials +) + +Set-StrictMode -Version 2 + +if (-not $Credentials) { + $Credentials = Get-Credential -Message 'Enter GitHub Credentials (username and PAT)' + if (-not $Credentials) { + throw [System.ArgumentException]::new( + 'Cannot process command because of the missing mandatory parameter: Credentials.' + ) + } +} + +function Get-AuthHeader() { + [CmdletBinding()] + Param( + [Parameter(Mandatory=$True)] + [Credential()] + [PSCredential]$Credentials + ) + @{ Authorization = 'Basic ' + [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes( + "$($Credentials.UserName):$($Credentials.GetNetworkCredential().Password)")) } +} + +$response = Invoke-WebRequest -uri 'https://api.github.com' -Headers (Get-AuthHeader $Credentials) +if ('X-OAuth-Scopes' -notin $response.Headers.Keys) { + throw [System.ArgumentException]::new( + "Cannot validate argument on parameter 'Credentials'. Incorrect GitHub credentials" + ) +} + + +function Get-MergedPullRequests { + [CmdletBinding()] + [OutputType([Object[]])] + Param( + [Parameter(Mandatory=$True, Position=0)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$StartDate, + + # The end date range (exclusive) + [Parameter(Mandatory, Position=1)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$EndDate, + + [Parameter(Mandatory=$True)] + [Credential()] + [PSCredential]$Credentials + ) + Begin { + $RequestSplat = @{ + Uri = 'https://api.github.com/repos/Microsoft/vcpkg/pulls' + Body = @{ + state = 'closed' + sort = 'updated' + base = 'master' + per_page = 100 + direction = 'desc' + page = 1 + } + } + $Epoch = Get-Date -AsUTC + $DeltaEpochStart = ($Epoch - $StartDate).Ticks + + $ProgressSplat = @{ + Activity = "Searching for merged Pull Requests in date range: $($StartDate.ToString('yyyy-MM-dd')) - $($EndDate.ToString('yyyy-MM-dd'))" + PercentComplete = 0 + } + + Write-Progress @ProgressSplat + + $writeProgress = { + $ProgressSplat.PercentComplete = 100 * ($Epoch - $_.updated_at).Ticks / $DeltaEpochStart + Write-Progress @ProgressSplat -Status "Current item date: $($_.updated_at.ToString('yyyy-MM-dd'))" + } + } + Process { + while ($True) { + $response = Invoke-WebRequest -Headers (Get-AuthHeader $Credentials) @RequestSplat | ConvertFrom-Json + + foreach ($_ in $response) { + foreach ($x in 'created_at', 'merged_at', 'updated_at', 'closed_at') { + if ($_.$x) { $_.$x = [DateTime]::Parse($_.$x, + [System.Globalization.CultureInfo]::InvariantCulture, + [System.Globalization.DateTimeStyles]::AdjustToUniversal -bor [System.Globalization.DateTimeStyles]::AssumeUniversal) } + } + + if (-not $_.merged_at) { continue } + if ($_.updated_at -lt $StartDate) { return } + + &$WriteProgress + + if ($_.merged_at -ge $EndDate -or $_.merged_at -lt $StartDate) { continue } + + $_ + } + + $RequestSplat.Body.page++ + } + } +} + + +class PRFileMap { + [Object]$Pull + [Object[]]$Files +} + + +function Get-PullRequestFileMap { + [CmdletBinding()] + [OutputType([PRFileMap[]])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [Object]$Pull, + [Parameter(Mandatory=$True)] + [Credential()] + [PSCredential]$Credentials + ) + Begin { + $Pulls = [List[Object]]::new() + + $ProgressSplat = @{ + Activity = 'Getting Pull Request files' + PercentComplete = 0 + } + + $Count = 0 + $WriteProgress = { + $ProgressSplat.Status = 'Getting files for: #{0} ({1}/{2})' -f $_.number, $Count, $Pulls.Length + $ProgressSplat.PercentComplete = 100 * $Count / $Pulls.Length + Write-Progress @ProgressSplat + } + } + Process { + $Pulls += $Pull + } + End { + Write-Progress @ProgressSplat + $ProgressSplat += @{ Status = '' } + + $Pulls | ForEach-Object { + $Count++ + + [PRFileMap]@{ + Pull = $_ + Files = $( + $requestSplat = @{ + Uri = 'https://api.github.com/repos/Microsoft/vcpkg/pulls/{0}/files' -f $_.number + Body = @{ page = 0; per_page = 100 } + } + do { + $requestSplat.Body.page++ + + $response = Invoke-WebRequest -Headers (Get-AuthHeader $Credentials) @requestSplat | ConvertFrom-Json + + $response + } until ($response.Length -lt $requestSplat.Body.per_page) + ) + } + + &$WriteProgress + } + } +} + + +class DocumentationUpdate { + [String]$Path + [Boolean]$New + [List[Object]]$Pulls +} + + +function Select-Documentation { + [CmdletBinding()] + [OutputType([DocumentationUpdate])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [PRFileMap]$PRFileMap + ) + Begin { + $UpdatedDocumentation = @{} + } + Process { + $PRFileMap.Files | ForEach-Object { + if ($_.filename -notlike 'docs/*') { return } + + $new = $_.status -eq 'added' + if ($entry = $UpdatedDocumentation[$_.filename]) { + $entry.Pulls += $PRFileMap.Pull + $entry.New = $entry.New -or $new + } else { + $UpdatedDocumentation[$_.filename] = @{ + Pulls = [List[Object]]::new(@($PRFileMap.Pull)) + New = $new + } + } + } + } + End { + $UpdatedDocumentation.GetEnumerator() | ForEach-Object { + [DocumentationUpdate]@{ + Path = $_.Key + Pulls = $_.Value.Pulls + New = $_.Value.New + } + } + } +} + + +function Select-InfrastructurePullRequests { + [CmdletBinding()] + [OutputType([Object])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [PRFileMap]$PRFileMap + ) + Process { + switch -Wildcard ($PRFileMap.Files | Foreach-Object {$_.filename}) { + "docs/*" { continue } + "ports/*" { continue } + "versions/*" { continue } + "scripts/ci.baseline.txt" { continue } + Default { return $PRFileMap.Pull } + } + } +} + + +class Version { + [String]$Begin + [String]$End + [String]$BeginPort + [String]$EndPort +} + + +function Select-Version { + [CmdletBinding()] + [OutputType([Version])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [Object]$VersionFile + ) + Begin { + $V = [Version]@{} + } + Process { + $regex = switch ($VersionFile.filename | Split-Path -Leaf) { + 'CONTROL' { + '(?^[\+|\-]|)(?Version|[\+|\-]Port-Version):\s(?\S+)' + } + 'vcpkg.json' { + '(?^[\+|\-]|)\s*(\"(?version|version-date|version-string|version-semver)\":\s\"(?.+)\"|\"(?port-version)\":\s(?.+))' + } + Default { return } + } + + $VersionFile.Patch -split '\n' | ForEach-Object { + if ($_ -notmatch $regex) { return } + + $m = $Matches + switch -Wildcard ($m.operation + $m.field) { + 'Version*' { $V.Begin = $V.End = $m.version } + '-Version*' { $V.Begin = ($V.Begin, $m.version | Measure-Object -Minimum).Minimum } + '+Version*' { $V.End = ($V.End, $m.version | Measure-Object -Minimum).Minimum } + 'Port-Version' { $V.BeginPort = $V.EndPort = $m.version } + '-Port-Version' { $V.BeginPort = ($V.BeginPort, $m.version | Measure-Object -Minimum).Minimum } + '+Port-Version' { $V.EndPort = ($V.EndPort, $m.version | Measure-Object -Maximum).Maximum } + } + } + } + End { + if (-not $V.Begin) { $V.Begin = $V.End } + elseif (-not $V.End) { $V.End = $V.Begin } + + if (-not $V.BeginPort) { $V.BeginPort = '0' } + if (-not $V.EndPort) { $V.EndPort = '0' } + + $V + } +} + + +class PortUpdate { + [String]$Port + [Object[]]$Pulls + [Version]$Version + [Boolean]$New +} + + +function Select-UpdatedPorts { + [CmdletBinding()] + [OutputType([PortUpdate])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [PRFileMap]$PRFileMap + ) + Begin { + $ModifiedPorts = @{} + } + Process { + $PRFileMap.Files | Where-Object { + $_.filename -like 'ports/*/CONTROL' -or + $_.filename -like 'ports/*/vcpkg.json' + } | ForEach-Object { + $port = $_.filename.split('/')[1] + if ($entry = $ModifiedPorts[$port]) { + $entry.VersionFiles += $_ + if (-not $entry.Pulls.Contains($PRFileMap.Pull)) { $entry.Pulls += $PRFileMap.Pull } + } else { + $ModifiedPorts[$port] = @{ + VersionFiles = [List[Object]]::new(@($_)) + Pulls = [List[Object]]::new(@($PRFileMap.Pull)) + } + } + } + } + End { + $ModifiedPorts.GetEnumerator() | ForEach-Object { + $versionFiles = $_.Value.VersionFiles + if (-not ($versionChange = $versionFiles | Select-Version)) { return } + + function Find-File($x) { [bool]($versionFiles | Where-Object { $_.filename -like "*$x" }) } + function Find-NewFile($x) + { [bool]($versionFiles | Where-Object { $_.filename -like "*$x" -and $_.status -eq 'added' }) } + + [PortUpdate]@{ + Port = $_.Key + Pulls = $_.Value.Pulls + Version = $versionChange + New = (Find-NewFile 'CONTROL') -or (-not (Find-File 'CONTROL') -and (Find-NewFile 'vcpkg.json')) + } + } + } +} + +$MergedPRs = Get-MergedPullRequests -StartDate $StartDate -EndDate $EndDate -Credentials $Credentials +$MergedPRsSorted = $MergedPRs | Sort-Object -Property 'number' +$PRFileMaps = $MergedPRsSorted | Get-PullRequestFileMap -Credentials $Credentials + +$sortSplat = @{ Property = + @{ Expression = 'New'; Descending = $True }, @{ Expression = 'Path'; Descending = $False } } +$UpdatedDocumentation = $PRFileMaps | Select-Documentation | Sort-Object @sortSplat +$UpdatedInfrastructure = $PRFileMaps | Select-InfrastructurePullRequests +$UpdatedPorts = $PRFileMaps | Select-UpdatedPorts +$NewPorts = $UpdatedPorts | Where-Object { $_.New } +$ChangedPorts = $UpdatedPorts | Where-Object { -not $_.New } + +Write-Progress -Activity 'Selecting updates from pull request files' -Completed + +Write-Progress -Activity 'Writing changelog file' -PercentComplete -1 + +$output = @" +vcpkg ($($StartDate.ToString('yyyy.MM.dd')) - $((($EndDate).AddSeconds(-1)).ToString('yyyy.MM.dd'))) +--- +#### Total port count: +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|x86-windows|NUM| +|**x64-windows**|NUM| +|x64-windows-static|NUM| +|x64-windows-static-md|NUM| +|x64-uwp|NUM| +|arm64-windows|NUM| +|arm-uwp|NUM| +|**x64-osx**|NUM| +|**x64-linux**|NUM| + +"@ + +if ($UpdatedDocumentation) { + $output += @" +#### The following documentation has been updated: + +$(-join ($UpdatedDocumentation | ForEach-Object { + $PathWithoutDocs = ([string]$_.Path).Remove(0, 5) # 'docs/' + "- [{0}]({0}){1}`n" -f $PathWithoutDocs, $_.Path, ($(if ($_.New) { ' ***[NEW]***' } else { '' })) + + $_.Pulls | ForEach-Object { + " - [(#{0})]({1}) {2} (by @{3})`n" -f $_.number, $_.html_url, $_.title, $_.user.login + } +})) + +"@ +} + +if ($NewPorts) { + $output += @" +
+The following $($NewPorts.Length) ports have been added: + +|port|version| +|---|---| +$(-join ($NewPorts | ForEach-Object { + "|[{0}]({1})" -f $_.Port, $_.Pulls[0].html_url + + if ($_.Pulls.Length -gt 1 ) { + '' + $_.Pulls[1..($_.Pulls.Length - 1)] | ForEach-Object { + "[#{0}]({1})" -f $_.number, $_.html_url + } + '' + } + + "|{0}`n" -f $_.Version.End +})) +
+ +"@ +} + +if ($ChangedPorts) { + $output += @" +
+The following $($ChangedPorts.Length) ports have been updated: + +$(-join ($ChangedPorts | ForEach-Object { + "- {0} ``{1}#{2}``" -f $_.Port, $_.Version.Begin, $_.Version.BeginPort + ' -> ' + "``{0}#{1}```n" -f $_.Version.End, $_.Version.EndPort + + $_.Pulls | ForEach-Object { + " - [(#{0})]({1}) {2} (by @{3})`n" -f $_.number, $_.html_url, $_.title, $_.user.login + } +})) +
+ +"@ +} + +if ($UpdatedInfrastructure) { + $output += @" +
+The following additional changes have been made to vcpkg's infrastructure: + +$(-join ($UpdatedInfrastructure | ForEach-Object { + "- [(#{0})]({1}) {2} (by @{3})`n" -f $_.number, $_.html_url, $_.title, $_.user.login +})) +
+ +"@ +} + +$output += @" +-- vcpkg team vcpkg@microsoft.com $(Get-Date -UFormat "%a, %d %B %T %Z00") +"@ + +Set-Content -Value $Output -Path $OutFile + +Write-Progress -Activity 'Writing changelog file' -Completed diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index a4ac11d5679e60..4ef04aa9b3f414 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,9 +2,9 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2021-11-10' - linux-pool: 'PrLin-2021-11-10' - osx-pool: 'PrOsx-2021-07-27' + windows-pool: 'PrWin-2022-03-09-1' + linux-pool: 'PrLin-2022-03-09-1' + osx-pool: 'PrOsx-2022-02-04' jobs: - template: windows/azure-pipelines.yml @@ -52,16 +52,6 @@ jobs: - template: osx/azure-pipelines.yml parameters: poolName: $(osx-pool) - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - mode: AllPorts - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - mode: NonTensorflow -- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - - template: osx/azure-pipelines.yml - parameters: - poolName: $(osx-pool) - mode: OnlyTensorflow - jobName: x64_osx_tensorflow - template: linux/azure-pipelines.yml parameters: diff --git a/scripts/azure-pipelines/generate-skip-list.ps1 b/scripts/azure-pipelines/generate-skip-list.ps1 index 6c533595faf9c9..84b78b33878721 100755 --- a/scripts/azure-pipelines/generate-skip-list.ps1 +++ b/scripts/azure-pipelines/generate-skip-list.ps1 @@ -20,8 +20,7 @@ The path to the ci.baseline.txt file. Param( [string]$Triplet, [string]$BaselineFile, - [switch]$SkipFailures = $false, - [String[]]$AdditionalSkips = @() + [switch]$SkipFailures = $false ) $ErrorActionPreference = 'Stop' @@ -81,5 +80,4 @@ if ($SkipFailures) { $skip_list = $baselineForTriplet ` | Where-Object { $_ -match $targetRegex } ` | ForEach-Object { $_ -replace ":.*$" } -$skip_list += $AdditionalSkips [string]::Join(",", $skip_list) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 0025750ee29150..5c50454b448686 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -41,7 +41,7 @@ jobs: inputs: filePath: bootstrap-vcpkg.sh - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports for x64-linux' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' diff --git a/scripts/azure-pipelines/linux/create-image.ps1 b/scripts/azure-pipelines/linux/create-image.ps1 index 5eacd2b8c01970..d19bb673fa09bf 100644 --- a/scripts/azure-pipelines/linux/create-image.ps1 +++ b/scripts/azure-pipelines/linux/create-image.ps1 @@ -23,7 +23,7 @@ $ProtoVMName = 'PROTOTYPE' $ErrorActionPreference = 'Stop' $ProgressActivity = 'Creating Linux Image' -$TotalProgress = 9 +$TotalProgress = 11 $CurrentProgress = 1 Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking @@ -104,6 +104,22 @@ New-AzVm ` -Location $Location ` -VM $VM +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Waiting 1 minute to let Azure VM customizations be applied' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Start-Sleep -Seconds 60 + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Restarting VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Restart-AzVm -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + #################################################################################################### Write-Progress ` -Activity $ProgressActivity ` diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 4ef7c4ec712e66..d72c669cca7b86 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -3,8 +3,10 @@ # SPDX-License-Identifier: MIT # -sudo apt -y update -sudo apt -y dist-upgrade +export DEBIAN_FRONTEND=noninteractive + +apt-get -y update +apt-get -y dist-upgrade # Install common build dependencies APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \ build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \ @@ -34,7 +36,7 @@ APT_PACKAGES="$APT_PACKAGES libxcb-res0-dev" APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-mako" # Additionally required by some packages to install additional python packages -APT_PACKAGES="$APT_PACKAGES python3-pip" +APT_PACKAGES="$APT_PACKAGES python3-pip python3-venv" # Additionally required by qtwebengine APT_PACKAGES="$APT_PACKAGES nodejs" @@ -54,7 +56,7 @@ APT_PACKAGES="$APT_PACKAGES libxdamage-dev" # Additionally required/installed by Azure DevOps Scale Set Agents APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66" -sudo apt -y install $APT_PACKAGES +apt-get -y install $APT_PACKAGES # Install newer version of nasm than the apt package, required by intel-ipsec mkdir /tmp/nasm @@ -63,24 +65,24 @@ curl -O https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.gz tar -xf nasm-2.15.05.tar.gz cd nasm-2.15.05/ ./configure --prefix=/usr && make -j -sudo make install +make install cd ~ # Install the latest Haskell stack -curl -sSL https://get.haskellstack.org/ | sudo sh +curl -sSL https://get.haskellstack.org/ | sh # Install CUDA wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub -sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" -sudo apt -y update -sudo apt install -y --no-install-recommends cuda-compiler-11-3 cuda-libraries-dev-11-3 cuda-driver-dev-11-3 \ - cuda-cudart-dev-11-3 libcublas-11-3 libcurand-dev-11-3 libcudnn8-dev libnccl2 libnccl-dev +mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 +apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub +add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" +apt-get -y update +apt-get install -y --no-install-recommends cuda-compiler-11-6 cuda-libraries-dev-11-6 cuda-driver-dev-11-6 \ + cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev # Install PowerShell wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -sudo dpkg -i packages-microsoft-prod.deb -sudo apt update -sudo add-apt-repository universe -sudo apt install -y powershell +dpkg -i packages-microsoft-prod.deb +apt-get update +add-apt-repository universe +apt-get install -y powershell diff --git a/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 b/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 deleted file mode 100755 index 5264d2ecb566c3..00000000000000 --- a/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 +++ /dev/null @@ -1,68 +0,0 @@ -#!pwsh -#Requires -Version 6.0 - -<# -.SYNOPSIS -Installs the base box at the specified version from the share. - -.PARAMETER FileshareMachine -The machine which is acting as a fileshare - -.PARAMETER BoxVersion -The version of the box to add. Defaults to latest if nothing is passed. -#> -[CmdletBinding()] -Param( - [Parameter(Mandatory=$True)] - [String]$FileshareMachine, - - [Parameter()] - [String]$BoxVersion -) - -Set-StrictMode -Version 2 - -if (-not $IsMacOS) { - throw 'This script should only be run on a macOS host' -} - -$mountPoint = '/Users/vcpkg/vagrant/share' - -if (mount | grep "on $mountPoint (") { - umount $mountPoint - if (-not $?) { - Write-Error "umount $mountPoint failed with return code $LASTEXITCODE." - throw - } -} - -sshfs "fileshare@${FileshareMachine}:/Users/fileshare/share" $mountPoint -if ($LASTEXITCODE -eq 1) { - Write-Error 'sshfs returned 1. -This means that the osxfuse kernel extension was not allowed to load. -You may need to force un/reinstall osxfuse and/or sshfs with - brew uninstall osxfuse - brew uninstall sshfs - brew install osxfuse - brew install sshfs -Then, rerun this script. - -If you''ve already done that, Please open -System Preferences > Security & Privacy > General, -and allow the kernel extension to load. -Then, rerun this script. - -If you''ve already done this, you probably need to add your ssh keys to the fileshare machine.' - throw -} elseif (-not $?) { - Write-Error "sshfs failed with return code $LASTEXITCODE." - throw -} - -if (-not [String]::IsNullOrEmpty($BoxVersion)) { - $versionArgs = @("--box-version", $BoxVersion) -} else { - $versionArgs = @() -} - -vagrant box add "$mountPoint/vcpkg-boxes/macos-ci.json" @versionArgs diff --git a/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 b/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 index 1202025834d4a3..979c41a7418f67 100755 --- a/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 +++ b/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 @@ -65,8 +65,19 @@ Installing anyways." Get-RemoteFile -OutFile $pathToDmg -Uri $_.DmgUrl -Sha256 $_.Sha256 hdiutil attach $pathToDmg -mountpoint /Volumes/setup-installer - sudo installer -pkg "/Volumes/setup-installer/$($_.InstallerPath)" -target / - hdiutil detach /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 @@ -78,21 +89,6 @@ Installing anyways." } } -$Installables.Brew | ForEach-Object { - $installable = $_ - if ($null -eq (Get-Member -InputObject $installable -Name 'Kind')) { - brew install $installable.Name - } else { - switch ($installable.Kind) { - 'cask' { brew install --cask $installable.Name } - default { - Write-Error "Invalid kind: $_. Expected either empty, or 'cask'." - } - } - } -} -brew upgrade - $installedVagrantPlugins = @{} vagrant plugin list --machine-readable | ForEach-Object { $timestamp, $target, $type, $data = $_ -split ',' diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index 9d6fb40b74a4a9..9dffe7249f1eec 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -5,102 +5,30 @@ - [`vcpkg-eg-mac` VMs](#vcpkg-eg-mac-vms) - [Table of Contents](#table-of-contents) - [Basic Usage](#basic-usage) + - [Creating a new Vagrant box](#creating-a-new-vagrant-box) + - [VM Software Versions](#vm-software-versions) + - [Creating a New Azure Agent Pool](#creating-a-new-azure-agent-pool) + - [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) - - [Creating a new Vagrant box](#creating-a-new-vagrant-box) - - [VM Software Versions](#vm-software-versions) - - [(Internal) Accessing the macOS fileshare](#internal-accessing-the-macos-fileshare) + - [Troubleshooting](#troubleshooting) + - [(Internal) Accessing the macOS fileshare](#internal-accessing-the-macos-fileshare) ## Basic Usage -The simplest usage, and one which should be used for when spinning up -new VMs, and when restarting old ones, is a simple: +The most common operation here is to set up a new VM for Azure +pipelines; we try to make that operation as easy as possible. +It should take all of three steps, assuming the machine is +already set up (or read [these instructions] for how to set up a machine): -``` -$ cd ~/vagrant/vcpkg-eg-mac -$ vagrant up -``` - -Any modifications to the machines should be made in `configuration/Vagrantfile` -and `Setup-VagrantMachines.ps1`, and make sure to push any changes! - -## 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 and grab the current base box with: -```sh -$ cd vcpkg/scripts/azure-pipelines/osx -$ ./Install-Prerequisites.ps1 -Force -$ ./Get-InternalBaseBox.ps1 -FileshareMachine vcpkgmm-01.guest.corp.microsoft.com -BoxVersion 2020-09-28 -``` - -... where -BoxVersion is the version you want to use. - -Getting the base box will fail due to missing kernel modules for osxfuse, sshfs, and/or VirtualBox. -Log in to the machine, open System Preferences > Security & Privacy > General, and allow the kernel -extensions for VirtualBox and sshfs to load. Then, again: - -```sh -$ ./Get-InternalBaseBox.ps1 -FileshareMachine vcpkgmm-01.guest.corp.microsoft.com -BoxVersion 2020-09-28 -``` - -Replace `XX` with the number of -the virtual machine. Generally, that should be the same as the number -for the physical machine; i.e., vcpkgmm-04 would use 04. - -```sh - # NOTE: you may get an error about CoreCLR; see the following paragraph if you do -$ ./Setup-VagrantMachines.ps1 \ - -MachineId XX \ - -DevopsPat '' \ - -Date -$ cd ~/vagrant/vcpkg-eg-mac -$ vagrant up -``` - -If you see the following error: - -``` -Failed to initialize CoreCLR, HRESULT: 0x8007001F -``` - -You have to 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. - -### Troubleshooting - -The following are issues that we've run into: +1. [Create a new vagrant box](#creating-a-new-vagrant-box) +2. [Create a new agent pool](#creating-a-new-azure-agent-pool) +3. [Setup and run the vagrant VM](#running-the-vm) +4. Update `azure-pipelines.yml` and `azure-pipelines-osx.yml` to point to the new macOS pool. -- (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`. +[these instructions]: #setting-up-a-new-macos-machine -## Creating a new Vagrant box +### Creating a new Vagrant box Whenever we want to install updated versions of the command line tools, or of macOS, we need to create a new vagrant box. @@ -111,15 +39,17 @@ you can set up your own vagrant boxes that are the same as ours by doing the fol You'll need some prerequisites: -- vagrant - found at - - The vagrant-parallels plugin - `vagrant plugin install vagrant-parallels` -- Parallels - found at - 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. -Just follow the Parallels process for creating a macOS VM. +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`. @@ -191,39 +121,138 @@ Once you've done that, add the software versions under [VM Software Versions](#v [base-box-instructions]: https://parallels.github.io/vagrant-parallels/docs/boxes/base.html -### VM Software Versions +#### VM Software Versions -* 2020-09-28: - * macOS: 10.15.6 - * Xcode CLTs: 12 -* 2021-04-16: - * macOS: 11.2.3 - * Xcode CLTs: 12.4 +* 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 -### (Internal) Accessing the macOS fileshare +### Creating a New Azure Agent Pool -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: +When updating the macOS machines to a new version, you'll need to create +a new agent pool for the machines to join. The standard for this is to +name it `PrOsx-YYYY-MM-DD`, with `YYYY-MM-DD` the day that the process +is started. + +In order to create a new agent pool, go to the `vcpkg/public` project; +go to `Project settings`, then go to `Agent pools` under `Pipelines`. +Add a new self-hosted pool, name it as above, and make certain to check +the box for "Grant access permission to all pipelines". + +Once you've done this, you are done; you can start adding new machines +to the pool! + +### Running the VM + +First, make sure that your software is up to date: +```sh +$ cd ~/vcpkg +$ git fetch +$ git switch -d origin/master +$ ./scripts/azure-pipelines/osx/Install-Prerequisites.ps1 +``` + +as well as checking to make sure macOS is up to date. + +Then, follow the instructions for [accessing ~/vagrant/share][access-fileshare]. + +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 +``` + +[grab a PAT]: #getting-an-azure-pipelines-pat + +## Getting an Azure Pipelines PAT + +Personal Access Tokens are an important part of this process, +and they are fairly easy to generate. +On ADO, under the correct project (in vcpkg's case, "vcpkg"), +click on the "User Settings" icon, then go to "Personal access tokens". +It is the icon to the left of your user icon, in the top right corner. + +Then, create a new token, give it a name, make sure it expires quickly, +and give it a custom defined scope that includes the +"Agent pools: Read & manage" permission (you'll need to "Show all scopes" +to access this). +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 -$ mkdir vagrant/share -$ sshfs fileshare@:/Users/fileshare/share vagrant/share +$ ssh-keygen +$ cat .ssh/id_rsa.pub ``` -or you can just run +Add that SSH key to `authorized_keys` on the file share machine with the base box. +Next, install prerequisites: ```sh -$ ./Get-InternalBaseBox.ps1 +$ cd vcpkg/scripts/azure-pipelines/osx +$ ./Install-Prerequisites.ps1 -Force ``` -which will do the thing automatically. +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 the fileshare as an sshfs. +Then, you'll be able to add ~/vagrant/share as an sshfs. + +[access-fileshare]: #internal-accessing-the-macos-fileshare diff --git a/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 b/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 index 88b64594ad60de..eb978d42c4e111 100755 --- a/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 +++ b/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 @@ -92,14 +92,16 @@ if ([String]::IsNullOrEmpty($MachineId)) { } if (Test-Path '~/vagrant/vcpkg-eg-mac') { + Write-Host 'Deleting existing directories' + Push-Location '~/vagrant/vcpkg-eg-mac' - try { - Write-Host 'Deleting existing directories' - vagrant destroy -f - Remove-Item -Recurse -Force -LiteralPath '~/vagrant/vcpkg-eg-mac' | Out-Null - } finally { - Pop-Location + 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' diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index a8d94f6f647b3e..ce5c095d2fa5cb 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -5,23 +5,14 @@ parameters: - name: poolName type: string -- name: mode - type: string - values: - - 'AllPorts' - - 'NonTensorflow' - - 'OnlyTensorflow' -- name: jobName - type: string - default: x64_osx jobs: -- job: "${{ parameters.jobName }}" +- job: x64_osx pool: name: ${{ parameters.poolName }} workspace: clean: resources - timeoutInMinutes: 1440 # 1 day + timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT value: /Users/vagrant/Data @@ -33,18 +24,6 @@ jobs: - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES value: "x-azurl,$(root-url),$(sas),readwrite" - - name: PowershellExtraArguments - ${{ if eq(parameters.mode, 'AllPorts') }}: - value: '' - ${{ if eq(parameters.mode, 'NonTensorflow') }}: - value: "-AdditionalSkips @('tensorflow', 'tensorflow-cc')" - ${{ if eq(parameters.mode, 'OnlyTensorflow') }}: - value: "-OnlyTest @('tensorflow', 'tensorflow-cc')" - - name: Postfix - ${{ if eq(parameters.mode, 'OnlyTensorflow') }}: - value: '-tensorflow' - ${{ if ne(parameters.mode, 'OnlyTensorflow') }}: - value: '' steps: - bash: df -h @@ -56,11 +35,11 @@ jobs: exit 0 displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}' - task: Bash@3 - displayName: 'Build vcpkg' + displayName: 'Bootstrap vcpkg' inputs: filePath: bootstrap-vcpkg.sh - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports for x64-osx' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' @@ -70,7 +49,6 @@ jobs: -BinarySourceStub "${{ variables.X_VCPKG_BINARY_SOURCE_STUB }}" -WorkingRoot "${{ variables.WORKING_ROOT }}" -ArtifactStagingDirectory "$(Build.ArtifactStagingDirectory)" - ${{ variables.PowershellExtraArguments }} pwsh: true - bash: | df -h diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb b/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb index ed689ab7be1c17..0b2df0219e7221 100644 --- a/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb +++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb @@ -3,14 +3,14 @@ configuration = JSON.parse(File.read("#{__dir__}/vagrant-configuration.json")) server = { - :hostname => configuration['machine_name'], + :machine_name => configuration['machine_name'], :box => configuration['box_name'], :box_version => configuration['box_version'], - :ram => 12000, + :ram => 24000, :cpu => 11 } -azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/2.185.1/vsts-agent-osx-x64-2.185.1.tar.gz' +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'] @@ -18,7 +18,6 @@ Vagrant.configure('2') do |config| config.vm.box = server[:box] config.vm.box_version = server[:box_version] - config.vm.hostname = server[:hostname] config.vm.synced_folder '.', '/vagrant', disabled: true config.vm.provider 'parallels' do |prl| @@ -53,7 +52,7 @@ --work ~/Data/work \ --auth pat --token #{pat} \ --pool #{agent_pool} \ - --agent `hostname` \ + --agent #{server[:machine_name]} \ --replace \ --acceptTeeEula", privileged: false diff --git a/scripts/azure-pipelines/osx/configuration/installables.json b/scripts/azure-pipelines/osx/configuration/installables.json index 179b03f15ea197..3ae97f355a294b 100644 --- a/scripts/azure-pipelines/osx/configuration/installables.json +++ b/scripts/azure-pipelines/osx/configuration/installables.json @@ -6,18 +6,33 @@ "Name": "vagrant", "VersionCommand": [ "vagrant", "-v" ], "VersionRegex": "Vagrant (.*)", - "Version": "2.2.18", - "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.18/vagrant_2.2.18_x86_64.dmg", - "Sha256": "B4E8103AABDF29F18F592CD6DE4FA03BF182FBC192A0757B5E18156CB18FA672", + "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.1.2", - "DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.1.2/macfuse-4.1.2.dmg", - "Sha256": "9FF344DE38BAD5AC5ECA5194DA00A2BA35DD6AFDB9039133B5446168F8EDAFDB", + "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" }, { @@ -29,12 +44,10 @@ "Sha256": "F8F4F71814273EA42DBE6CD92199F7CFF418571FFD1B10C0608878D3472D2162" } ], - "Brew": [ - ], "VagrantPlugins": [ { "Name": "vagrant-parallels", - "Version": "2.2.3" + "Version": "2.2.4" } ] } diff --git a/scripts/azure-pipelines/osx/configuration/installables.schema.json b/scripts/azure-pipelines/osx/configuration/installables.schema.json index b7ec7ae801e05e..6237243c2fd6d1 100644 --- a/scripts/azure-pipelines/osx/configuration/installables.schema.json +++ b/scripts/azure-pipelines/osx/configuration/installables.schema.json @@ -9,7 +9,6 @@ }, "required": [ "Applications", - "Brew", "VagrantPlugins" ], "properties": { @@ -48,22 +47,6 @@ } } }, - "Brew": { - "type": "array", - "items": { - "type": "object", - "required": [ "Name" ], - "properties": { - "Name": { - "type": "string" - }, - "Kind": { - "type": "string", - "enum": [ "cask" ] - } - } - } - }, "VagrantPlugins": { "type": "array", "items": { diff --git a/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json b/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json index d800c257aa41bb..45917784a517bc 100644 --- a/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json +++ b/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json @@ -1,7 +1,8 @@ { - "$schema": "./vagrant-vm-configuration.schema.json", + "$schema": "./vagrant-box-configuration.schema.json", "brew": [ "autoconf", + "autoconf-archive", "automake", "bison", "gettext", @@ -13,6 +14,7 @@ "mono", "nasm", "pkg-config", + "texinfo", "yasm" ], "brew-cask": [ diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index c17010cab5569a..d0b542c57d3cf3 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -52,8 +52,6 @@ Param( [Parameter(ParameterSetName='BinarySourceStub')] $BinarySourceStub = $null, [String]$BuildReason = $null, - [String[]]$AdditionalSkips = @(), - [String[]]$OnlyTest = $null, [switch]$NoParentHashes = $false, [switch]$PassingIsPassing = $false ) @@ -141,66 +139,48 @@ if ($LASTEXITCODE -ne 0) $skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` -Triplet $Triplet ` -BaselineFile "$PSScriptRoot/../ci.baseline.txt" ` - -SkipFailures:$skipFailures ` - -AdditionalSkips $AdditionalSkips + -SkipFailures:$skipFailures -if ($null -ne $OnlyTest) +$hostArgs = @() +if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) { - $OnlyTest | % { - $portName = $_ - & "./vcpkg$executableExtension" install --triplet $Triplet @commonArgs @cachingArgs $portName - if (-not $?) + # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. + # The workaround is to pass the skip list as host-excludes as well. + $hostArgs = @("--host-exclude=$skipList") +} + +$parentHashes = @() +if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) +{ + # Prefetch tools for better output + foreach ($tool in @('cmake', 'ninja', 'git')) { + & "./vcpkg$executableExtension" fetch $tool + if ($LASTEXITCODE -ne 0) { - [System.Console]::Error.WriteLine( ` - "REGRESSION: ${portName}:$triplet. If expected, remove ${portName} from the OnlyTest list." ` - ) + throw "Failed to fetch $tool" } } - $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) - Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" + Write-Host "Determining parent hashes using HEAD~1" + $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json' + $parentHashes = @("--parent-hashes=$parentHashesFile") + & git revert -n -m 1 HEAD | Out-Null + & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" + Write-Host "Running CI using parent hashes" + & git reset --hard HEAD } -else -{ - $hostArgs = @() - if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) - { - # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. - # The workaround is to pass the skip list as host-excludes as well. - $hostArgs = @("--host-exclude=$skipList") - } - - $parentHashes = @() - if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) - { - # Prefetch tools for better output - & "./vcpkg$executableExtension" fetch cmake - & "./vcpkg$executableExtension" fetch ninja - & "./vcpkg$executableExtension" fetch git - - Write-Host "Determining parent hashes using HEAD~1" - $parentHashesFile = Join-Path $WorkingRoot 'parent-hashes.json' - $parentHashes = @("--parent-hashes=$parentHashesFile") - & git revert -n -m 1 HEAD - & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" ` - | ForEach-Object { if ($_ -match ' dependency information| determine pass') { Write-Host $_ } } - & git reset --hard HEAD - - Write-Host "Running CI using parent hashes" - } - - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @hostArgs @commonArgs @cachingArgs @parentHashes - $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) - Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" +& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @hostArgs @commonArgs @cachingArgs @parentHashes - if ($LASTEXITCODE -ne 0) - { - throw "vcpkg ci failed" - } +$failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) +Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" - & "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults ` - -triplet $Triplet ` - -baselineFile .\scripts\ci.baseline.txt ` - -passingIsPassing:$PassingIsPassing +if ($LASTEXITCODE -ne 0) +{ + throw "vcpkg ci failed" } + +& "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults ` + -triplet $Triplet ` + -baselineFile .\scripts\ci.baseline.txt ` + -passingIsPassing:$PassingIsPassing diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 60ba6fa1b80a14..de254db6476d01 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -8,7 +8,7 @@ jobs: name: ${{ parameters.poolName }} workspace: clean: resources - timeoutInMinutes: 1440 # 1 day + timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT value: D:\ @@ -62,7 +62,7 @@ jobs: PathtoPublish: '$(DiffFile)' ArtifactName: 'format.diff' - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports for ${{ parameters.triplet }}' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' diff --git a/scripts/azure-pipelines/windows/create-image.ps1 b/scripts/azure-pipelines/windows/create-image.ps1 index 21fb8c19a835a6..5d07c599454bc0 100644 --- a/scripts/azure-pipelines/windows/create-image.ps1 +++ b/scripts/azure-pipelines/windows/create-image.ps1 @@ -21,7 +21,7 @@ $VMSize = 'Standard_D32as_v4' $ProtoVMName = 'PROTOTYPE' $WindowsServerSku = '2022-datacenter-g2' $ErrorActionPreference = 'Stop' -$CudnnBaseUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-11.2-windows-x64-v8.1.1.33.zip' +$CudnnBaseUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive.zip' $ProgressActivity = 'Creating Windows Image' $TotalProgress = 18 diff --git a/scripts/azure-pipelines/windows/deploy-cuda.ps1 b/scripts/azure-pipelines/windows/deploy-cuda.ps1 index ab1cc1c54bd371..6a53c479c07bb6 100644 --- a/scripts/azure-pipelines/windows/deploy-cuda.ps1 +++ b/scripts/azure-pipelines/windows/deploy-cuda.ps1 @@ -7,17 +7,17 @@ # REPLACE WITH $CudnnUrl -$CudnnLocalZipPath = "$PSScriptRoot\cudnn-11.2-windows-x64-v8.1.1.33.zip" +$CudnnLocalZipPath = "$PSScriptRoot\cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive.zip" -$CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/11.3.0/network_installers/cuda_11.3.0_win10_network.exe' +$CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/11.6.0/network_installers/cuda_11.6.0_windows_network.exe' -$CudaFeatures = 'nvcc_11.3 cuobjdump_11.3 nvprune_11.3 cupti_11.3 memcheck_11.3 nvdisasm_11.3 nvprof_11.3 ' + ` - 'visual_studio_integration_11.3 visual_profiler_11.3 visual_profiler_11.3 cublas_11.3 cublas_dev_11.3 ' + ` - 'cudart_11.3 cufft_11.3 cufft_dev_11.3 curand_11.3 curand_dev_11.3 cusolver_11.3 cusolver_dev_11.3 ' + ` - 'cusparse_11.3 cusparse_dev_11.3 npp_11.3 npp_dev_11.3 nvrtc_11.3 nvrtc_dev_11.3 nvml_dev_11.3 ' + ` - 'occupancy_calculator_11.3 thrust_11.3 ' +$CudaFeatures = 'nvcc_11.6 cuobjdump_11.6 nvprune_11.6 cupti_11.6 memcheck_11.6 nvdisasm_11.6 nvprof_11.6 ' + ` + 'visual_studio_integration_11.6 visual_profiler_11.6 visual_profiler_11.6 cublas_11.6 cublas_dev_11.6 ' + ` + 'cudart_11.6 cufft_11.6 cufft_dev_11.6 curand_11.6 curand_dev_11.6 cusolver_11.6 cusolver_dev_11.6 ' + ` + 'cusparse_11.6 cusparse_dev_11.6 npp_11.6 npp_dev_11.6 nvrtc_11.6 nvrtc_dev_11.6 nvml_dev_11.6 ' + ` + 'occupancy_calculator_11.6 thrust_11.6 ' -$destination = "$env:ProgramFiles\NVIDIA GPU Computing Toolkit\CUDA\v11.3" +$destination = "$env:ProgramFiles\NVIDIA GPU Computing Toolkit\CUDA\v11.6" try { Write-Host 'Downloading CUDA...' diff --git a/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 b/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 index 45d8db3c10dd45..a0b32cebb7ee72 100644 --- a/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 +++ b/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 @@ -7,7 +7,7 @@ # Seems like only the HPC kit is really needed? #$oneAPIBaseUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe' -$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/17762/w_HPCKit_p_2021.2.0.2901_offline.exe' +$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe' # Possible oneAPI Base components: #intel.oneapi.win.vtune 2021.1.1-68 true Intel® VTune(TM) Profiler @@ -55,7 +55,7 @@ Function InstallInteloneAPI { Write-Host 'Extracting Intel oneAPI...to folder: ' $extractionPath $proc = Start-Process -FilePath $installerPath -ArgumentList @('-s ', '-x ', '-f ' + $extractionPath , '--log extract.log') -Wait -PassThru Write-Host 'Install Intel oneAPI...from folder: ' $extractionPath - $proc = Start-Process -FilePath $extractionPath/bootstrapper.exe -ArgumentList @('-s ', '--action install', "--components=$Components" , '--eula=accept', '--continue-with-optional-error=yes', '-p=NEED_VS2017_INTEGRATION=0', '-p=NEED_VS2019_INTEGRATION=0', '--log-dir=.') -Wait -PassThru + $proc = Start-Process -FilePath $extractionPath/bootstrapper.exe -ArgumentList @('-s ', '--action install', "--components=$Components" , '--eula=accept', '-p=NEED_VS2017_INTEGRATION=0', '-p=NEED_VS2019_INTEGRATION=0', '-p=NEED_VS2022_INTEGRATION=0', '--log-dir=.') -Wait -PassThru $exitCode = $proc.ExitCode if ($exitCode -eq 0) { Write-Host 'Installation successful!' diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index ecd8b5b41926b7..332d68f92162d9 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 0ec5ff7110688c..2567d4c11d6ed3 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -5,7 +5,7 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$VisualStudioBootstrapperUrl = 'https://aka.ms/vs/16/release/vs_enterprise.exe' +$VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/release/vs_enterprise.exe' $Workloads = @( 'Microsoft.VisualStudio.Workload.NativeDesktop', 'Microsoft.VisualStudio.Workload.Universal', @@ -14,7 +14,6 @@ $Workloads = @( 'Microsoft.VisualStudio.Component.VC.Tools.ARM64', 'Microsoft.VisualStudio.Component.VC.ATL', 'Microsoft.VisualStudio.Component.VC.ATLMFC', - 'Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre', 'Microsoft.VisualStudio.Component.Windows10SDK.18362', 'Microsoft.VisualStudio.Component.Windows10SDK.19041', 'Microsoft.Net.Component.4.8.SDK', @@ -22,8 +21,7 @@ $Workloads = @( 'Microsoft.Component.NetFX.Native', 'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset', 'Microsoft.VisualStudio.Component.VC.Llvm.Clang', - 'Microsoft.VisualStudio.Component.VC.v141.x86.x64', - 'Microsoft.VisualStudio.Component.VC.140' + 'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools' ) <# diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 3e9ec8f6b963de..7c71e7ba27a635 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.77.0", + $version = "1.78.0", $portsDir = $null ) @@ -24,14 +24,7 @@ else { # Clear this array when moving to a new boost version $portVersions = @{ #e.g. "boost-asio" = 1; - "boost" = 2; - "boost-config" = 2; - "boost-gil" = 1; - "boost-iostreams" = 1; - "boost-modular-build-helper" = 3; - "boost-odeint" = 1; - "boost-python" = 1; - "boost-process" = 2; + "boost-vcpkg-helpers" = 1; } $portData = @{ @@ -44,54 +37,72 @@ $portData = @{ } }; "boost-asio" = @{ - "dependencies" = @("openssl"); - "supports" = "!emscripten" + "features" = @{ + "ssl" = @{ + "description" = "Build with SSL support"; + "dependencies" = @(@{ "name" = "openssl"; "platform" = "!emscripten" }); + } + } }; "boost-beast" = @{ "supports" = "!emscripten" }; - "boost-fiber" = @{ "supports" = "!osx&!uwp&!arm&!emscripten" }; + "boost-fiber" = @{ + "supports" = "!osx & !uwp & !arm & !emscripten"; + "features" = @{ + "numa" = @{ + "description" = "Enable NUMA support"; + } + } + }; "boost-filesystem" = @{ "supports" = "!uwp" }; "boost-iostreams" = @{ "default-features" = @("bzip2", "lzma", "zlib", "zstd"); "supports" = "!uwp"; "features" = @{ "bzip2" = @{ + "description" = "Support bzip2 filters"; "dependencies" = @("bzip2"); - "description" = "Support bzip2 filters" }; "lzma" = @{ + "description" = "Support LZMA/xz filters"; "dependencies" = @("liblzma"); - "description" = "Support LZMA/xz filters" }; "zlib" = @{ + "description" = "Support zlib filters"; "dependencies" = @("zlib"); - "description" = "Support zlib filters" }; "zstd" = @{ + "description" = "Support zstd filters"; "dependencies" = @("zstd"); - "description" = "Support zstd filters" }; }; }; - "boost-context" = @{ "supports" = "!uwp&!emscripten" }; + "boost-context" = @{ "supports" = "!uwp & !emscripten" }; "boost-stacktrace" = @{ "supports" = "!uwp" }; - "boost-coroutine" = @{ "supports" = "!arm&!uwp&!emscripten" }; + "boost-coroutine" = @{ "supports" = "!arm & !uwp & !emscripten" }; "boost-coroutine2" = @{ "supports" = "!emscripten" }; "boost-test" = @{ "supports" = "!uwp" }; "boost-wave" = @{ "supports" = "!uwp" }; - "boost-log" = @{ "supports" = "!uwp&!emscripten" }; + "boost-log" = @{ "supports" = "!uwp & !emscripten" }; "boost-locale" = @{ - "dependencies" = @(@{ "name" = "libiconv"; "platform" = "!uwp&!windows&!mingw" }); + "dependencies" = @(@{ "name" = "libiconv"; "platform" = "!uwp & !windows & !mingw" }); "supports" = "!uwp"; "features" = @{ "icu" = @{ + "description" = "ICU backend for Boost.Locale"; "dependencies" = @("icu"); - "description" = "ICU backend for Boost.Locale" } } }; "boost-mpi" = @{ "dependencies" = @("mpi"); "supports" = "!uwp"; + "features" = @{ + "python3" = @{ + "description" = "Build Python3 bindings"; + "supports" = "!static"; + "dependencies" = @(@{ "name" = "boost-python"; "features" = @( "python3" ); "platform" = "!uwp & !emscripten & !ios & !android" }, "python3"); + } + } }; "boost-graph-parallel" = @{ "dependencies" = @("mpi"); @@ -100,8 +111,8 @@ $portData = @{ "boost-odeint" = @{ "features" = @{ "mpi" = @{ + "description" = "Support parallelization with MPI"; "dependencies" = @("boost-mpi"); - "description" = "Support parallelization with MPI" } } }; @@ -109,23 +120,24 @@ $portData = @{ "boost-process" = @{ "supports" = "!emscripten" }; "boost-python" = @{ "default-features" = @("python3"); - "supports" = "!uwp&!(arm&windows)&!emscripten"; + "supports" = "!uwp & !emscripten & !ios & !android"; "features" = @{ "python2" = @{ + "description" = "Build with Python2 support"; + "supports" = "!(arm & windows)"; "dependencies" = @("python2"); - "description" = "Build with Python2 support" }; "python3" = @{ + "description" = "Build with Python3 support"; "dependencies" = @("python3"); - "description" = "Build with Python3 support" } } }; "boost-regex" = @{ "features" = @{ "icu" = @{ + "description" = "ICU backend for Boost.Regex"; "dependencies" = @("icu"); - "description" = "ICU backend for Boost.Regex" } } } @@ -185,8 +197,13 @@ function GeneratePortManifest() { $dep_name = $dependency } $manifest["dependencies"] = $manifest["dependencies"] ` - | Where-Object { $_ -notmatch "$dep_name" } ` - | Where-Object { $_.name -notmatch "$dep_name" } + | Where-Object { + if ($_.Contains("name")) { + $_.name -notmatch "$dep_name" + } else { + $_ -notmatch "$dep_name" + } + } } } } @@ -489,7 +506,7 @@ foreach ($library in $libraries) { elseif ($_ -eq "nondet_random.hpp") { "random" } elseif ($_ -match "cregex.hpp|regex_fwd.hpp") { "regex" } elseif ($_ -eq "archive") { "serialization" } - elseif ($_ -match "^signals$|last_value.hpp|signal.hpp|signals.hpp") { "signals" } + elseif ($_ -match "last_value.hpp|signal.hpp") { "signals" } elseif ($_ -match "enable_shared_from_this.hpp|intrusive_ptr.hpp|make_shared.hpp|make_unique.hpp|pointer_cast.hpp|pointer_to_other.hpp|scoped_array.hpp|scoped_ptr.hpp|shared_array.hpp|shared_ptr.hpp|weak_ptr.hpp") { "smart_ptr" } elseif ($_ -eq "cerrno.hpp") { "system" } elseif ($_ -eq "progress.hpp") { "timer" } @@ -569,9 +586,32 @@ if ($updateServicePorts) { GeneratePortManifest ` -PortName "boost-modular-build-helper" ` -Description "Internal vcpkg port used to build Boost libraries" ` + -Dependencies @("boost-uninstall", "vcpkg-cmake") + + # Generate manifest files for boost-build + GeneratePortManifest ` + -PortName "boost-build" ` + -Homepage "https://github.com/boostorg/build" ` + -Description "Boost.Build" ` -Dependencies @("boost-uninstall") - # Update Boost version in boost-modular-build.cmake - $boost_modular_build = "$portsDir/boost-modular-build-helper/boost-modular-build.cmake" - (Get-Content -LiteralPath "$boost_modular_build") -replace "set\(BOOST_VERSION ([0-9\.]+)\)", "set(BOOST_VERSION $version)" | Set-Content -LiteralPath "$boost_modular_build" + # Update Boost version in CMake files + $files_with_boost_version = @( + "$portsDir/boost-build/portfile.cmake", + "$portsDir/boost-modular-build-helper/boost-modular-build.cmake", + "$portsDir/boost-vcpkg-helpers/portfile.cmake" + ) + $files_with_boost_version | % { + $content = Get-Content -LiteralPath $_ ` + -Encoding UTF8 ` + -Raw + $content = $content -replace ` + "set\(BOOST_VERSION [0-9\.]+\)", ` + "set(BOOST_VERSION $version)" + + Set-Content -LiteralPath $_ ` + -Value $content ` + -Encoding UTF8 ` + -NoNewline + } } diff --git a/scripts/boost/post-source-stubs/atomic.cmake b/scripts/boost/post-source-stubs/atomic.cmake index 0715d20f709a46..373b2a4eafb3aa 100644 --- a/scripts/boost/post-source-stubs/atomic.cmake +++ b/scripts/boost/post-source-stubs/atomic.cmake @@ -1,8 +1,7 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) string(REPLACE "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" - "project.load [ path.join [ path.make $(here:D) ] config/checks/architecture ]" + "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") - +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/context.cmake b/scripts/boost/post-source-stubs/context.cmake index 9ccf342337bc1a..48e4e5eecda462 100644 --- a/scripts/boost/post-source-stubs/context.cmake +++ b/scripts/boost/post-source-stubs/context.cmake @@ -2,4 +2,3 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") - diff --git a/scripts/boost/post-source-stubs/fiber.cmake b/scripts/boost/post-source-stubs/fiber.cmake index 9ccf342337bc1a..7a2f4acf51bddd 100644 --- a/scripts/boost/post-source-stubs/fiber.cmake +++ b/scripts/boost/post-source-stubs/fiber.cmake @@ -1,5 +1,4 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") +string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") - +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/json.cmake b/scripts/boost/post-source-stubs/json.cmake new file mode 100644 index 00000000000000..bea05e660cffc4 --- /dev/null +++ b/scripts/boost/post-source-stubs/json.cmake @@ -0,0 +1,4 @@ +file(READ "${SOURCE_PATH}/build/Jamfile" _contents) +string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") +file(WRITE "${SOURCE_PATH}/build/Jamfile" "${_contents}") +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/log.cmake b/scripts/boost/post-source-stubs/log.cmake index be17a0419c3ed1..cb3cb67fd63d7a 100644 --- a/scripts/boost/post-source-stubs/log.cmake +++ b/scripts/boost/post-source-stubs/log.cmake @@ -1,13 +1,12 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") +string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") string(REPLACE " @select-arch-specific-sources" "#@select-arch-specific-sources" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") file(READ ${SOURCE_PATH}/build/log-arch-config.jam _contents) string(REPLACE "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" - "project.load [ path.join [ path.make $(here:D) ] config/checks/architecture ]" + "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" _contents "${_contents}") file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}") - diff --git a/scripts/boost/post-source-stubs/nowide.cmake b/scripts/boost/post-source-stubs/nowide.cmake new file mode 100644 index 00000000000000..7a2f4acf51bddd --- /dev/null +++ b/scripts/boost/post-source-stubs/nowide.cmake @@ -0,0 +1,4 @@ +file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) +string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") +file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/test.cmake b/scripts/boost/post-source-stubs/test.cmake index b2872338d44e11..29ff6947ffd4a4 100644 --- a/scripts/boost/post-source-stubs/test.cmake +++ b/scripts/boost/post-source-stubs/test.cmake @@ -1,5 +1,4 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../predef/check/predef" "import predef/check/predef" _contents "${_contents}") +string(REPLACE "import ../../predef/check/predef" "import ../predef/check/predef" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/build/predef") - +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/predef") diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index a2a869987c6067..1d695cb3d7de07 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,9 +45,9 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2021-11-24' -if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { - & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" +$versionDate = '2022-03-09' +if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { + & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" } diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 10df7f4573df2d..5d408801541b72 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -124,23 +124,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2021-11-24" +vcpkgToolReleaseTag="2022-03-09" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="29048053a148156759476f85829dfe3f4377eb93be540d4a363446061dd04c34d7a4820bba58fada065cfc277c5a9ec5d0fc0cc978588df58a8f49a1be0254d4" + vcpkgToolReleaseSha="fc04f2db2676e9b5958c3bf2c8537f470acb1ed9e0a2b6be1145feebbb701251644dc73311fe5cc4d791272b90e3810d358ded6ca9436700a531634d405180c2" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="641a3f232c2ca38012a16779967bbc06ae47301265e28c406e8edaaf8f7379f71c27dc17fff3077a9b123fc1a9bfa138c5e6673c02ac6804db14e9df61564876" + vcpkgToolReleaseSha="0d9dc5669a389601d919893e9e742ec41e5ee09c7aaea7d2f89e8f388f6e08296dea4132f016e44dac771c8b40aabcf195dd228ade8cd0a199cde037d8fdce49" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="cfcd81ec9d15049f417a7071aec25ba52da102d855c8c4de92bfa0e4960212a85940fcde22a4a73b6bba0afa827e13cf7f25d0d51d67bd78b8b7fa8230c3306d" + vcpkgToolReleaseSha="1bc60ca03d76d75033d3cc864e96ff8f36843661c744e6bb7554ee50d5bd8dd027d5b7cdc7909801e75a72b44ac04d66dac29bb6669569c65c62f06f0064dd88" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="dde72d4317273013702a889326974a6c915522d0917766dc4228aaad8e8b157be4957a52298997e98dfa7774d43aa8eafd5932f5b9785ae7a1f7816f185e82cb" + vcpkgToolReleaseSha="409480568f161055ba1bb41fc6e9ed99e196f180731ee05422ab4ba182d6277b5a59048b1b10fe39e10c8f4cc8becd2f752fabb775b4623e6888a00af7af782f" fi # Do the download or build. diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index 28ff1ff3c5c36c..39de365d3b2afd 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -119,9 +119,9 @@ function resolve([string]$targetBinary) { if (Test-Path function:\deployOpenNI2) { deployOpenNI2 $targetBinaryDir "$g_install_root" "$_" } if (Test-Path function:\deployPluginsIfMagnum) { if ($g_is_debug) { - deployPluginsIfMagnum $targetBinaryDir (Join-Path "$g_install_root" 'bin' 'magnum-d') "$_" + deployPluginsIfMagnum $targetBinaryDir (Join-Path (Join-Path "$g_install_root" 'bin') 'magnum-d') "$_" } else { - deployPluginsIfMagnum $targetBinaryDir (Join-Path "$g_install_root" 'bin' 'magnum') "$_" + deployPluginsIfMagnum $targetBinaryDir (Join-Path (Join-Path "$g_install_root" 'bin') 'magnum') "$_" } } if (Test-Path function:\deployAzureKinectSensorSDK) { deployAzureKinectSensorSDK $targetBinaryDir "$g_install_root" "$_" } diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 2ada8cddddc1cd..3f2b63d85e5ca2 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -62,7 +62,7 @@ - <_ZVcpkgCurrentInstalledDir>$(_ZVcpkgInstalledDir)\$(VcpkgTriplet)\ + <_ZVcpkgCurrentInstalledDir>$(_ZVcpkgInstalledDir)$(VcpkgTriplet)\ <_ZVcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Debug'))">Debug <_ZVcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Release')) or '$(VcpkgConfiguration)' == 'RelWithDebInfo' or '$(VcpkgConfiguration)' == 'MinSizeRel'">Release diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b5422cb64e8624..2bee6cbe86095e 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -30,13 +30,12 @@ function(z_vcpkg_add_fatal_error ERROR) endif() endfunction() -set(Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION "3.1") +set(Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION "3.7.2") if(CMAKE_VERSION VERSION_LESS Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION) message(FATAL_ERROR "vcpkg.cmake requires at least CMake ${Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION}.") endif() -# this policy is required for this file; thus, CMake 3.1 is required. cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) +cmake_policy(VERSION 3.7.2) include(CMakeDependentOption) @@ -201,16 +200,6 @@ endfunction() # Determine whether the toolchain is loaded during a try-compile configuration get_property(Z_VCPKG_CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE) -if(CMAKE_VERSION VERSION_LESS "3.6.0") - set(Z_VCPKG_CMAKE_EMULATE_TRY_COMPILE_PLATFORM_VARIABLES ON) -else() - set(Z_VCPKG_CMAKE_EMULATE_TRY_COMPILE_PLATFORM_VARIABLES OFF) -endif() - -if(Z_VCPKG_CMAKE_IN_TRY_COMPILE AND Z_VCPKG_CMAKE_EMULATE_TRY_COMPILE_PLATFORM_VARIABLES) - include("${CMAKE_CURRENT_SOURCE_DIR}/../vcpkg.config.cmake" OPTIONAL) -endif() - if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE) include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") endif() @@ -357,18 +346,23 @@ endif() set(VCPKG_TARGET_TRIPLET "${Z_VCPKG_TARGET_TRIPLET_ARCH}-${Z_VCPKG_TARGET_TRIPLET_PLAT}" CACHE STRING "Vcpkg target triplet (ex. x86-windows)") set(Z_VCPKG_TOOLCHAIN_DIR "${CMAKE_CURRENT_LIST_DIR}") -if(NOT DEFINED Z_VCPKG_ROOT_DIR) - # Detect .vcpkg-root to figure VCPKG_ROOT_DIR - set(Z_VCPKG_ROOT_DIR_CANDIDATE "${CMAKE_CURRENT_LIST_DIR}") - while(IS_DIRECTORY "${Z_VCPKG_ROOT_DIR_CANDIDATE}" AND NOT EXISTS "${Z_VCPKG_ROOT_DIR_CANDIDATE}/.vcpkg-root") +# Detect .vcpkg-root to figure VCPKG_ROOT_DIR +set(Z_VCPKG_ROOT_DIR_CANDIDATE "${CMAKE_CURRENT_LIST_DIR}") +while(NOT DEFINED Z_VCPKG_ROOT_DIR) + if(EXISTS "${Z_VCPKG_ROOT_DIR_CANDIDATE}/.vcpkg-root") + set(Z_VCPKG_ROOT_DIR "${Z_VCPKG_ROOT_DIR_CANDIDATE}" CACHE INTERNAL "Vcpkg root directory") + elseif(IS_DIRECTORY "${Z_VCPKG_ROOT_DIR_CANDIDATE}") get_filename_component(Z_VCPKG_ROOT_DIR_TEMP "${Z_VCPKG_ROOT_DIR_CANDIDATE}" DIRECTORY) - if(Z_VCPKG_ROOT_DIR_TEMP STREQUAL Z_VCPKG_ROOT_DIR_CANDIDATE) # If unchanged, we have reached the root of the drive - else() - SET(Z_VCPKG_ROOT_DIR_CANDIDATE "${Z_VCPKG_ROOT_DIR_TEMP}") + if(Z_VCPKG_ROOT_DIR_TEMP STREQUAL Z_VCPKG_ROOT_DIR_CANDIDATE) + break() # If unchanged, we have reached the root of the drive without finding vcpkg. endif() - endwhile() - set(Z_VCPKG_ROOT_DIR "${Z_VCPKG_ROOT_DIR_CANDIDATE}" CACHE INTERNAL "Vcpkg root directory") -endif() + SET(Z_VCPKG_ROOT_DIR_CANDIDATE "${Z_VCPKG_ROOT_DIR_TEMP}") + unset(Z_VCPKG_ROOT_DIR_TEMP) + else() + break() + endif() +endwhile() +unset(Z_VCPKG_ROOT_DIR_CANDIDATE) if(NOT Z_VCPKG_ROOT_DIR) z_vcpkg_add_fatal_error("Could not find .vcpkg-root") @@ -410,6 +404,11 @@ z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_PREFIX_PATH "") z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_LIBRARY_PATH "/lib/manual-link") z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_FIND_ROOT_PATH "") +if(NOT VCPKG_PREFER_SYSTEM_LIBS) + set(CMAKE_FIND_FRAMEWORK "LAST") # we assume that frameworks are usually system-wide libs, not vcpkg-built + set(CMAKE_FIND_APPBUNDLE "LAST") # we assume that appbundles are usually system-wide libs, not vcpkg-built +endif() + # If one CMAKE_FIND_ROOT_PATH_MODE_* variables is set to ONLY, to make sure that ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET} # and ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug are searched, it is not sufficient to just add them to CMAKE_FIND_ROOT_PATH, # as CMAKE_FIND_ROOT_PATH specify "one or more directories to be prepended to all other search directories", so to make sure that @@ -510,12 +509,8 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C if(Z_VCPKG_MANIFEST_INSTALL_RESULT EQUAL 0) message(STATUS "Running vcpkg install - done") - - # file(TOUCH) added in CMake 3.12 - file(WRITE "${_VCPKG_INSTALLED_DIR}/.cmakestamp" "") set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS - "${VCPKG_MANIFEST_DIR}/vcpkg.json" - "${_VCPKG_INSTALLED_DIR}/.cmakestamp") + "${VCPKG_MANIFEST_DIR}/vcpkg.json") if(EXISTS "${VCPKG_MANIFEST_DIR}/vcpkg-configuration.json") set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${VCPKG_MANIFEST_DIR}/vcpkg-configuration.json") @@ -527,13 +522,35 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C endif() endif() -list(APPEND CMAKE_PROGRAM_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") -file(GLOB Z_VCPKG_TOOLS_DIRS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/*") -foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) - if(IS_DIRECTORY "${Z_VCPKG_TOOLS_DIR}") - list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") +option(VCPKG_SETUP_CMAKE_PROGRAM_PATH "Enable the setup of CMAKE_PROGRAM_PATH to vcpkg paths" ON) +set(VCPKG_CAN_USE_HOST_TOOLS OFF) +if(DEFINED VCPKG_HOST_TRIPLET AND NOT VCPKG_HOST_TRIPLET STREQUAL "") + set(VCPKG_CAN_USE_HOST_TOOLS ON) +endif() +cmake_dependent_option(VCPKG_USE_HOST_TOOLS "Setup CMAKE_PROGRAM_PATH to use host tools" ON "VCPKG_CAN_USE_HOST_TOOLS" OFF) +unset(VCPKG_CAN_USE_HOST_TOOLS) + +if(VCPKG_SETUP_CMAKE_PROGRAM_PATH) + set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") + if(VCPKG_USE_HOST_TOOLS) + set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools") endif() -endforeach() + list(APPEND CMAKE_PROGRAM_PATH "${tools_base_path}") + file(GLOB_RECURSE Z_VCPKG_TOOLS_DIRS LIST_DIRECTORIES true "${tools_base_path}/*") + file(GLOB_RECURSE Z_VCPKG_TOOLS_FILES LIST_DIRECTORIES false "${tools_base_path}/*") + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_FILES} "") # need at least one item for REMOVE_ITEM if CMake <= 3.19 + list(FILTER Z_VCPKG_TOOLS_DIRS EXCLUDE REGEX "/debug/") + foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) + list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") + endforeach() + unset(Z_VCPKG_TOOLS_DIRS) + unset(Z_VCPKG_TOOLS_DIR) + unset(tools_base_path) +endif() + +cmake_policy(POP) + +# Any policies applied to the below macros and functions appear to leak into consumers function(add_executable) z_vcpkg_function_arguments(ARGS) @@ -625,7 +642,7 @@ function(x_vcpkg_install_local_dependencies) if(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "^(windows|uwp)$") # Install CODE|SCRIPT allow the use of generator expressions - cmake_policy(SET CMP0087 NEW) + cmake_policy(SET CMP0087 NEW) # CMake 3.14 z_vcpkg_set_powershell_path() if(NOT IS_ABSOLUTE "${arg_DESTINATION}") @@ -797,6 +814,9 @@ macro("${VCPKG_OVERRIDE_FIND_PACKAGE_NAME}" z_vcpkg_find_package_package_name) endforeach() endmacro() +cmake_policy(PUSH) +cmake_policy(VERSION 3.7.2) + set(VCPKG_TOOLCHAIN ON) set(Z_VCPKG_UNUSED "${CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION}") set(Z_VCPKG_UNUSED "${CMAKE_EXPORT_NO_PACKAGE_REGISTRY}") @@ -806,25 +826,13 @@ set(Z_VCPKG_UNUSED "${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP}") # Propogate these values to try-compile configurations so the triplet and toolchain load if(NOT Z_VCPKG_CMAKE_IN_TRY_COMPILE) - if(Z_VCPKG_CMAKE_EMULATE_TRY_COMPILE_PLATFORM_VARIABLES) - file(TO_CMAKE_PATH "${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" Z_VCPKG_CHAINLOAD_FILE_CMAKE) - file(TO_CMAKE_PATH "${Z_VCPKG_ROOT_DIR}" Z_VCPKG_ROOT_DIR_CMAKE) - file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/vcpkg.config.cmake" - "set(VCPKG_TARGET_TRIPLET \"${VCPKG_TARGET_TRIPLET}\" CACHE STRING \"\")\n" - "set(VCPKG_TARGET_ARCHITECTURE \"${VCPKG_TARGET_ARCHITECTURE}\" CACHE STRING \"\")\n" - "set(VCPKG_APPLOCAL_DEPS \"${VCPKG_APPLOCAL_DEPS}\" CACHE STRING \"\")\n" - "set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE \"${Z_VCPKG_CHAINLOAD_FILE_CMAKE}\" CACHE STRING \"\")\n" - "set(Z_VCPKG_ROOT_DIR \"${Z_VCPKG_ROOT_DIR_CMAKE}\" CACHE STRING \"\")\n" - ) - else() - list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES - VCPKG_TARGET_TRIPLET - VCPKG_TARGET_ARCHITECTURE - VCPKG_APPLOCAL_DEPS - VCPKG_CHAINLOAD_TOOLCHAIN_FILE - Z_VCPKG_ROOT_DIR - ) - endif() + list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES + VCPKG_TARGET_TRIPLET + VCPKG_TARGET_ARCHITECTURE + VCPKG_APPLOCAL_DEPS + VCPKG_CHAINLOAD_TOOLCHAIN_FILE + Z_VCPKG_ROOT_DIR + ) endif() if(Z_VCPKG_HAS_FATAL_ERROR) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a5a8dfd1eb1ede..e416b81bc244f7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -55,9 +55,6 @@ aubio:x64-uwp=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:x64-osx=fail -blend2d:arm64-windows=fail -blend2d:arm-uwp=fail -blend2d:x64-uwp=fail blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail @@ -71,15 +68,24 @@ botan:x64-uwp=fail breakpad:arm64-windows=fail buck-yeh-bux:x64-linux=fail buck-yeh-bux-mariadb-client:x64-linux=fail -bullet3:arm64-windows=fail -bullet3:arm-uwp=fail -bullet3:x64-uwp=fail caf:arm-uwp=fail caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail c-ares:arm-uwp=fail c-ares:x64-uwp=fail + +# file conflict with dbg-macro +c-dbg-macro:x86-windows=skip +c-dbg-macro:x64-windows=skip +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:x64-osx=skip +c-dbg-macro:x64-linux=skip + casclib:arm-uwp=fail casclib:x64-uwp=fail catch-classic:arm64-windows = skip @@ -122,16 +128,20 @@ chartdir:x64-windows-static-md=fail chartdir:x64-osx=fail chmlib:arm-uwp=fail chmlib:x64-uwp=fail + +# chromium-base does not yet support VS2022 +chromium-base:x64-windows=fail +chromium-base:x64-windows-static=fail + # Chromium Base requires a recent version of Clang to be installed. chromium-base:x64-linux=skip + civetweb:arm64-windows = skip civetweb:arm-uwp = skip civetweb:x64-uwp = skip clamav:arm64-windows=fail clblas:arm64-windows=fail clockutils:x64-linux=fail -# CMake 3.4 needs libidn.so.11 (Ubuntu: libidn11) -cmake-user:x64-linux=skip cmcstl2:arm64-windows = skip cmcstl2:arm-uwp = skip cmcstl2:x64-linux = skip @@ -144,7 +154,12 @@ cmcstl2:x86-windows = skip coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail + +# there is an ICE in VS2022 with colmap in release mode +colmap:x86-windows=fail +colmap:x64-windows=fail colmap:x64-windows-static=fail + concurrencpp:x64-linux=fail constexpr-contracts:x64-linux=fail coolprop:arm-uwp=fail @@ -167,15 +182,14 @@ cpp-netlib:x64-uwp=fail cppcoro:x64-linux=fail cppcoro:arm-uwp=fail cppcoro:x64-uwp=fail +# The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support. +# This is known to work on x64-linux as of gcc 10.3.0. +cppgraphqlgen:x64-linux=fail cpuinfo:arm64-windows=fail crashpad:arm64-windows=fail crashpad:arm-uwp=fail crashpad:x64-linux=fail -crashpad:x64-uwp=fail crashpad:x86-windows=fail -crossguid:x64-osx=fail -ctemplate:arm64-windows=fail -ctemplate:arm-uwp=fail ctemplate:x64-linux=fail ctemplate:x64-osx=fail cuda:x64-osx=fail @@ -194,19 +208,8 @@ dbghelp:x64-windows-static=skip dbghelp:x64-windows-static-md=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip -dcmtk:arm-uwp=fail -dcmtk:arm64-windows=fail dcmtk:x64-uwp=fail -detours:x64-linux=fail -detours:x64-osx=fail -devicenameresolver:arm-uwp=fail -devicenameresolver:x64-linux=fail -devicenameresolver:x64-osx=fail -devicenameresolver:x64-uwp=fail devicenameresolver:x64-windows-static=fail -dimcli:arm-uwp=fail -dimcli:x64-osx=fail -dimcli:x64-uwp=fail # legacy directxsdk which conflicts with dxsdk-d3dx directxsdk:x86-windows=skip directxsdk:x64-windows=skip @@ -214,10 +217,6 @@ discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail -dlfcn-win32:arm-uwp=fail -dlfcn-win32:x64-linux=fail -dlfcn-win32:x64-osx=fail -dlfcn-win32:x64-uwp=fail dmlc:arm-uwp=fail dmlc:x64-uwp=fail dpdk:arm-uwp=fail @@ -238,10 +237,6 @@ duckx:x64-windows = skip duckx:x64-windows-static = skip duckx:x64-windows-static-md=skip duckx:x86-windows = skip -duilib:arm-uwp=fail -duilib:x64-linux=fail -duilib:x64-osx=fail -duilib:x64-uwp=fail # requires python@2 from brew, but that no longer exists # python2 EOL yay! @@ -250,10 +245,6 @@ duktape:x64-osx=skip eastl:arm-uwp=fail easyloggingpp:arm-uwp=fail easyloggingpp:x64-uwp=fail -eathread:arm64-windows=fail -eathread:arm-uwp=fail -eathread:x64-uwp=fail -eathread:x86-windows=fail ebml:arm-uwp=fail ebml:x64-uwp=fail ecsutil:arm64-windows=fail @@ -284,10 +275,6 @@ fdlibm:arm-uwp=fail fdlibm:x64-uwp=fail fftw3:arm-uwp=fail fftw3:x64-uwp=fail -fltk:arm-uwp=fail -fltk:x64-uwp=fail -fluidsynth:x64-osx=fail -fluidsynth:x64-windows-static-md=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 @@ -320,9 +307,6 @@ freeglut:x64-osx=fail # Needs /bigobj freeopcua:arm64-windows=fail freetype-gl:x64-uwp=fail -fribidi:arm64-windows=fail -fribidi:arm-uwp=fail -fribidi:x64-uwp=fail ftgl:x64-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 functions-framework-cpp:x64-uwp=fail @@ -330,12 +314,9 @@ fuzzylite:arm-uwp=fail fuzzylite:x64-linux=fail fuzzylite:x64-osx=fail fuzzylite:x64-uwp=fail -gainput:arm-uwp=fail -gainput:x64-linux=fail -gainput:x64-uwp=fail -gasol:arm64-windows=fail -gasol:arm-uwp=fail -gasol:x64-uwp=fail + +# Requires ATL for ARM64 to be installed in CI +gdal:arm64-windows=fail # gsoap does not offer stable public source downloads gsoap:x64-windows = skip @@ -359,15 +340,15 @@ gflags:arm-uwp=fail gflags:x64-uwp=fail # Conflicts with libevent -gherkin-c:arm64-windows = skip -gherkin-c:arm-uwp = skip -gherkin-c:x64-linux=fail -gherkin-c:x64-osx=fail -gherkin-c:x64-uwp = skip -gherkin-c:x64-windows = skip -gherkin-c:x64-windows-static = skip -gherkin-c:x64-windows-static-md=skip -gherkin-c:x86-windows = skip +gherkin-c:arm64-windows = skip +gherkin-c:arm-uwp = skip +gherkin-c:x64-linux = skip +gherkin-c:x64-osx = skip +gherkin-c:x64-uwp = skip +gherkin-c:x64-windows = skip +gherkin-c:x64-windows-static = skip +gherkin-c:x64-windows-static-md = skip +gherkin-c:x86-windows = skip gl3w:arm64-windows=fail gl3w:arm-uwp=fail glew:arm64-windows=fail @@ -384,6 +365,10 @@ gmmlib:x64-windows=fail gmmlib:x64-windows-static=fail gmmlib:x64-windows-static-md=fail gmmlib:x86-windows=fail + +# the msbuild for gmp:x64-uwp is broken on VS2022 due to TargetPlatformMinVersion not existing +gmp:x64-uwp=fail + google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail gppanel:x64-osx=fail @@ -404,7 +389,6 @@ gstreamer:x64-osx=fail gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail gts:x64-osx=fail -guetzli:x64-osx=fail halide:x64-windows-static=fail hdf5:arm64-windows=fail hdf5:arm-uwp=fail @@ -442,14 +426,6 @@ ijg-libjpeg:x64-uwp = skip ijg-libjpeg:x64-windows = skip ijg-libjpeg:x64-windows-static = skip ijg-libjpeg:x86-windows = skip -intel-ipsec:arm64-windows=fail -intel-ipsec:arm-uwp=fail -intel-ipsec:x64-osx=fail -intel-ipsec:x64-uwp=fail -intel-ipsec:x64-windows=fail -intel-ipsec:x64-windows-static=fail -intel-ipsec:x64-windows-static-md=fail -intel-ipsec:x86-windows=fail intel-mkl:arm64-windows=fail intel-mkl:arm-uwp=fail intel-mkl:x64-linux=fail @@ -503,13 +479,6 @@ leptonica:x64-uwp=fail leptonica:arm-uwp=fail leveldb:arm-uwp=fail leveldb:x64-uwp=fail -libbacktrace:arm64-windows=fail -libbacktrace:arm-uwp=fail -libbacktrace:x64-uwp=fail -libbacktrace:x64-windows=fail -libbacktrace:x64-windows-static=fail -libbacktrace:x64-windows-static-md=fail -libbacktrace:x86-windows=fail libaiff:x64-linux=fail libarchive:arm-uwp=fail libbf:arm64-windows=fail @@ -529,17 +498,8 @@ libcopp:arm-uwp=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-linux=fail libgpod:x64-osx=fail -cpuid:arm-uwp=fail -cpuid:x64-uwp=fail -cpuid:arm64-windows=fail libdatrie:x64-linux=fail libdatrie:x64-osx=fail -libdisasm:arm-uwp=fail -libdisasm:x64-uwp=fail -libdshowcapture:arm-uwp=fail -libdshowcapture:x64-linux=fail -libdshowcapture:x64-osx=fail -libdshowcapture:x64-uwp=fail libepoxy:arm-uwp=fail libepoxy:x64-uwp=fail libepoxy:x64-windows-static=fail @@ -554,12 +514,6 @@ libevhtp:arm64-windows=fail libevhtp:arm-uwp=fail libexif:arm-uwp=fail libexif:x64-uwp=fail -libfabric:arm-uwp=fail -libfabric:x64-linux=fail -libfabric:x64-osx=fail -libfabric:x64-uwp=fail -libfabric:x64-windows-static=fail -libfabric:x64-windows-static-md=fail libfreenect2:arm64-windows=fail libfreenect2:x64-osx=fail libgit2:arm-uwp=fail @@ -567,21 +521,12 @@ libgit2:x64-uwp=fail libgo:arm-uwp=fail libgo:x64-uwp=fail libgo:arm64-windows=fail -libgpod:arm64-windows=fail -libgpod:arm-uwp=fail -libgpod:x64-uwp=fail -libgpod:x64-windows=fail -libgpod:x64-windows-static=fail -libgpod:x64-windows-static-md=fail -libgpod:x86-windows=fail -libhdfs3:arm64-windows=fail -libhdfs3:arm-uwp=fail -libhdfs3:x64-uwp=fail -libhdfs3:x64-windows=fail -libhdfs3:x64-windows-static=fail -libhdfs3:x64-windows-static-md=fail -libhdfs3:x86-windows=fail + +# the msbuild for libgpg:x64-uwp is broken on VS2022 due to TargetPlatformMinVersion not existing +libgpg:x64-uwp=fail + libhdfs3:x64-linux=fail +libhdfs3:x64-osx=fail libhydrogen:arm64-windows=fail libics:arm-uwp=fail libics:x64-uwp=fail @@ -589,6 +534,8 @@ libigl:arm64-windows=fail libigl:arm-uwp=fail libigl:x64-uwp=fail libirecovery:x64-windows-static-md=fail +# 120 min build time for libjxl arm-uwp-rel, reason unknown +libjxl:arm-uwp=skip liblas:arm64-windows=fail liblemon:arm-uwp=fail liblemon:x64-uwp=fail @@ -700,15 +647,12 @@ libtins:arm-uwp=fail libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail libtomcrypt:arm-uwp=fail -libudis86:arm-uwp=fail -libudis86:x64-linux=fail -libudis86:x64-osx=fail -libudis86:x64-uwp=fail libui:arm-uwp=fail libui:x64-linux=fail libui:x64-uwp=fail libusb:arm-uwp=fail libusb:x64-uwp=fail +libusb:arm64-windows=fail libusbmuxd:arm-uwp=fail libusbmuxd:x64-uwp=fail libusbmuxd:x64-linux=fail @@ -717,17 +661,6 @@ libusb-win32:arm-uwp=fail libusb-win32:x64-linux=fail libusb-win32:x64-osx=fail libusb-win32:x64-uwp=fail -libuuid:arm64-windows=fail -libuuid:arm-uwp=fail - -# Causes build failures in vxl and podofo on osx -# Conflicts with Darwin kernel sdk uuid.h (has missing definitions) -libuuid:x64-osx = skip -libuuid:x64-uwp=fail -libuuid:x64-windows=fail -libuuid:x64-windows-static=fail -libuuid:x64-windows-static-md=fail -libuuid:x86-windows=fail libuv:arm-uwp=fail libuv:x64-uwp=fail libvmdk:arm-uwp=fail @@ -740,6 +673,7 @@ libvmdk:x64-windows-static-md=skip libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip +libvpx:arm-uwp=fail libwandio:x86-windows=fail libwandio:x64-windows=fail libwandio:x64-windows-static=fail @@ -747,40 +681,17 @@ libwandio:x64-windows-static-md=fail libwandio:x64-uwp=fail libwandio:arm64-windows=fail libwandio:arm-uwp=fail -libxmp-lite:x64-linux=fail -libxmp-lite:x64-osx=fail -libyuv:arm-uwp=fail -libyuv:x64-uwp=fail licensepp:arm-uwp=fail licensepp:x64-uwp=fail linenoise-ng:arm-uwp=fail linenoise-ng:x64-uwp=fail -live555:arm64-windows=fail live555:arm-uwp=fail -live555:x64-linux=fail live555:x64-osx=fail live555:x64-uwp=fail -live555:x64-windows=fail -live555:x64-windows-static=fail -live555:x64-windows-static-md=fail -live555:x86-windows=fail llgl:arm-uwp=fail llgl:x64-uwp=fail -llvm:arm64-windows=fail -llvm:arm-uwp=fail -llvm:x64-uwp=fail lmdb:arm-uwp=fail lmdb:x64-uwp=fail -# Conflict with loadpng-c -lodepng:arm64-windows = skip -lodepng:arm-uwp = skip -lodepng:x64-linux = skip -lodepng:x64-osx = skip -lodepng:x64-uwp = skip -lodepng:x64-windows = skip -lodepng:x64-windows-static = skip -lodepng:x64-windows-static-md=skip -lodepng:x86-windows = skip log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail log4cxx:arm-uwp=fail @@ -798,8 +709,6 @@ luafilesystem:arm-uwp=fail luafilesystem:x64-uwp=fail luasec:x64-windows-static=fail luasocket:arm-uwp=fail -luasocket:x64-linux=fail -luasocket:x64-osx=fail luasocket:x64-uwp=fail lzfse:arm-uwp=fail magnum:arm64-windows=skip @@ -810,15 +719,8 @@ marble:arm-uwp=fail marble:x64-linux=fail marble:x64-osx=fail marble:x86-windows=fail -marl:arm-uwp=fail -marl:x64-uwp=fail mathgl:x64-osx=fail mathgl:x64-uwp=fail -mdnsresponder:arm64-windows=fail -mdnsresponder:arm-uwp=fail -mdnsresponder:x64-linux=fail -mdnsresponder:x64-osx=fail -mdnsresponder:x64-uwp=fail mecab:arm64-windows = skip mecab:arm-uwp = skip mecab:x64-linux = skip @@ -841,18 +743,7 @@ metis:arm-uwp=fail metis:x64-uwp=fail mfl:x64-linux=skip mfl:x64-osx=skip -mhook:arm64-windows=fail -mhook:arm-uwp=fail -mhook:x64-linux=fail -mhook:x64-osx=fail -mhook:x64-uwp=fail -milerius-sfml-imgui:x64-osx=fail milerius-sfml-imgui:x64-windows-static=fail -minhook:arm64-windows=fail -minhook:arm-uwp=fail -minhook:x64-linux=fail -minhook:x64-osx=fail -minhook:x64-uwp=fail minifb:arm-uwp=fail minifb:x64-uwp=fail minisat-master-keying:arm-uwp=fail @@ -873,8 +764,6 @@ microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip # https://github.com/mlpack/mlpack/pull/2945 mlpack:x64-uwp=fail -mman:x64-linux=fail -mman:x64-osx=fail mmloader:arm64-windows=fail mmloader:arm-uwp=fail mmloader:x64-linux=fail @@ -928,8 +817,6 @@ mpir:x64-windows-static-md=skip mpir:arm64-windows=skip mpir:x64-osx=skip mpir:x64-linux=skip -mpfr:x64-osx=fail -mpfr:x64-linux=fail msix:x64-linux=fail msix:x64-osx=fail msix:x64-windows-static=fail @@ -941,9 +828,6 @@ msmpi:x64-uwp=fail munit:arm-uwp=fail munit:arm64-windows=fail munit:x64-uwp=fail -murmurhash:arm-uwp=fail -murmurhash:x64-uwp=fail -murmurhash:arm64-windows=fail nana:arm-uwp=fail nana:x64-linux=fail nana:x64-osx=fail @@ -960,12 +844,8 @@ nanorange:x64-windows=fail nanorange:x64-windows-static=fail nanorange:x64-windows-static-md=fail nanorange:x86-windows=fail -nanovg:arm-uwp=fail -nanovg:x64-uwp=fail nativefiledialog:arm-uwp=fail nativefiledialog:x64-uwp=fail -nethost:x64-uwp=fail -nethost:arm-uwp=fail ngspice:x64-windows-static=fail nng:arm-uwp=fail nng:x64-uwp=fail @@ -1084,20 +964,6 @@ openni2:x64-uwp=fail openni2:x64-windows-static=fail openscap:x64-linux=fail openscap:x64-osx=fail -openssl-unix:arm64-windows=fail -openssl-unix:arm-uwp=fail -openssl-unix:x64-uwp=fail -openssl-unix:x64-windows=fail -openssl-unix:x64-windows-static=fail -openssl-unix:x64-windows-static-md=fail -openssl-unix:x86-windows=fail -openssl-uwp:arm64-windows=fail -openssl-uwp:x64-linux=fail -openssl-uwp:x64-osx=fail -openssl-uwp:x64-windows=fail -openssl-uwp:x64-windows-static=fail -openssl-uwp:x64-windows-static-md=fail -openssl-uwp:x86-windows=fail opentracing:arm-uwp=fail opentracing:x64-uwp=fail openvpn3:x64-osx=fail @@ -1127,35 +993,11 @@ paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail pango:x64-windows-static=fail pango:x64-windows-static-md=fail -pangomm:arm64-windows=fail -pdal:x64-linux=fail -pdal:x64-osx=fail -pdal-c:x64-windows-static=fail -pdal-c:x64-windows-static-md=fail -pdcurses:arm-uwp=fail -pdcurses:x64-linux=fail -pdcurses:x64-osx=fail -pdcurses:x64-uwp=fail -pdcurses:x64-windows-static=fail -pdcurses:x64-windows-static-md=fail -pfring:arm64-windows=fail -pfring:arm-uwp=fail -pfring:x64-uwp=fail -pfring:x64-windows=fail -pfring:x64-windows-static=fail -pfring:x64-windows-static-md=fail -pfring:x86-windows=fail pfring:x64-osx=fail # pfring on Linux currently fails because its build scripts enable warnings as # errors, and warnings trigger with the Linux kernel headers in the Azure images. pfring:x64-linux=fail physx:arm64-windows=fail -piex:x64-osx=fail -pixel:x64-uwp=fail -pixel:x64-windows=fail -pixel:x64-windows-static=fail -pixel:x64-windows-static-md=fail -pixel:x86-windows=fail pixman:arm-uwp=fail platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail @@ -1177,7 +1019,6 @@ pmdk:x86-windows=fail pngwriter:arm-uwp=fail pngwriter:x64-uwp=fail popsift:x64-windows-static-md=fail -poppler:arm64-windows=fail portable-snippets:arm-uwp=fail pqp:arm-uwp=fail pqp:x64-uwp=fail @@ -1193,6 +1034,10 @@ qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail qt5-base:arm64-windows=fail + +# qtwebengine:x64-windows has an ICE in VS2022 +qtwebengine:x64-windows=fail + # Skip deprecated Qt module # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) qt5-canvas3d:x64-linux=skip @@ -1268,10 +1113,6 @@ rbdl-orb:x64-linux=skip rbdl-orb:x64-osx=skip readline:arm-uwp=fail readline:x64-uwp=fail -readline-win32:arm-uwp=fail -readline-win32:x64-linux=fail -readline-win32:x64-osx=fail -readline-win32:x64-uwp=fail realsense2:arm64-windows=fail realsense2:arm-uwp=fail realsense2:x64-uwp=fail @@ -1312,9 +1153,6 @@ rsasynccpp:x64-osx=fail rsm-binary-io:x64-linux=fail # Requires g++10 but CI compiler only has g++9 rsm-bsa:x64-linux=fail -rsocket:x64-windows=fail -rsocket:x64-windows-static=fail -rsocket:x64-windows-static-md=fail rtlsdr:x64-uwp=fail rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail @@ -1322,12 +1160,12 @@ rtlsdr:x64-linux=fail rtlsdr:x64-osx=fail rttr:arm-uwp=fail rttr:x64-uwp=fail -ryu:arm-uwp=fail -ryu:x64-uwp=fail + +# ryu does not support VS2022 yet +ryu:x64-windows=fail ryu:x64-windows-static=fail ryu:x64-windows-static-md=fail -ryu:x86-windows=fail -ryu::arm64-windows=fail + sciter:arm64-windows=fail sciter:arm-uwp=fail sciter:x64-linux=fail @@ -1339,11 +1177,6 @@ sciter:x64-windows-static-md=fail sciter:x86-windows=fail scnlib:arm-uwp=fail scnlib:x64-uwp=fail -scylla-wrapper:arm-uwp=fail -scylla-wrapper:x64-linux=fail -scylla-wrapper:x64-osx=fail -scylla-wrapper:x64-uwp=fail -scylla-wrapper:x64-windows-static=fail sdformat10:x64-windows-static-md=fail sdformat6:arm-uwp=fail sdformat6:arm64-windows=fail @@ -1356,8 +1189,6 @@ sdformat9:x64-windows-static-md=fail sdl1:arm-uwp=fail sdl1:x64-uwp=fail sdl1:x64-osx=fail -sdl2-image:arm-uwp=fail -sdl2-image:x64-uwp=fail sdl2-mixer:arm-uwp=fail sdl2-mixer:x64-uwp=fail sdl2-net:arm-uwp=fail @@ -1365,11 +1196,6 @@ sdl2-net:x64-uwp=fail # https://github.com/microsoft/vcpkg/issues/10918 seal:arm-uwp=fail seal:x64-uwp=fail -sentencepiece:arm64-windows=fail -sentencepiece:arm-uwp=fail -sentencepiece:x64-uwp=fail -sentencepiece:x64-windows=fail -sentencepiece:x86-windows=fail septag-sx:arm64-windows=fail septag-sx:arm-uwp=fail septag-sx:x64-uwp=fail @@ -1434,14 +1260,6 @@ spdk-ipsec:x64-windows=fail spdk-ipsec:x64-windows-static=fail spdk-ipsec:x64-windows-static-md=fail spdk-ipsec:x86-windows=fail -spdk-isal:arm64-windows=fail -spdk-isal:arm-uwp=fail -spdk-isal:x64-osx=fail -spdk-isal:x64-uwp=fail -spdk-isal:x64-windows=fail -spdk-isal:x64-windows-static=fail -spdk-isal:x64-windows-static-md=fail -spdk-isal:x86-windows=fail spirv-tools:arm-uwp=fail spirv-tools:x64-uwp=fail stormlib:arm-uwp=fail @@ -1453,7 +1271,6 @@ stxxl:x86-windows=skip stxxl:x64-windows=skip stxxl:x64-windows-static=skip stxxl:x64-windows-static-md=skip -symengine:arm64-windows=fail symengine:arm-uwp=fail systemc:arm64-windows=fail systemc:arm-uwp=fail @@ -1466,6 +1283,18 @@ tcl:arm64-windows=fail tcl:x64-uwp=fail telnetpp:arm-uwp=fail telnetpp:x64-uwp=fail + +# tensorflow does not support VS2022 +tensorflow:x64-windows=fail +tensorflow:x64-windows-static=fail +tensorflow:x64-windows-static-md=fail +tensorflow-cc:x64-windows=fail +tensorflow-cc:x64-windows-static=fail +tensorflow-cc:x64-windows-static-md=fail + +tensorflow:x64-osx=fail +tensorflow-cc:x64-osx=fail + theia:arm64-windows = skip theia:arm-uwp = skip theia:x64-uwp = skip @@ -1477,8 +1306,6 @@ tidy-html5:arm-uwp=fail tidy-html5:x64-uwp=fail tinkerforge:arm-uwp=fail tinkerforge:x64-uwp=fail -tinyexif:arm-uwp=fail -tinyexif:x64-uwp=fail tiny-process-library:arm-uwp=fail tiny-process-library:x64-uwp=fail tmxparser:arm64-windows=fail @@ -1495,18 +1322,6 @@ torch-th:x64-windows-static=fail tre:x64-osx=fail treehopper:x64-windows-static=fail treehopper:x64-linux=fail -turbobase64:arm64-windows=fail -turbobase64:arm-uwp=fail -turbobase64:x64-uwp=fail -turbobase64:x64-windows=fail -turbobase64:x64-windows-static=fail -turbobase64:x64-windows-static-md=fail -turbobase64:x86-windows=fail -unicorn:arm64-windows=fail -unicorn:arm-uwp=fail -unicorn:x64-linux=fail -unicorn:x64-osx=fail -unicorn:x64-uwp=fail unicorn-lib:arm-uwp=fail unicorn-lib:x64-uwp=fail unittest-cpp:arm64-windows=fail @@ -1519,12 +1334,6 @@ unixodbc:x64-windows=fail unixodbc:x64-windows-static=fail unixodbc:x64-windows-static-md=fail unixodbc:x86-windows=fail -unrar:arm64-windows=fail -unrar:arm-uwp=fail -unrar:x64-linux=fail -unrar:x64-osx=fail -unrar:x64-uwp=fail -unrar:x64-windows-static=fail urdfdom:x64-windows-static=fail usd:x86-windows=fail uthenticode:arm-uwp=fail @@ -1535,7 +1344,6 @@ v8:x64-osx=fail v8:x64-uwp=fail vectorclass:arm64-windows=fail vectorclass:arm-uwp=fail -vlpp:x64-osx=fail vulkan:arm64-windows=fail vulkan:arm-uwp=fail vulkan:x64-linux=fail @@ -1556,13 +1364,8 @@ vxl:x64-windows = skip vxl:x64-windows-static = skip vxl:x64-windows-static-md=skip vxl:x86-windows = skip -wampcc:arm64-windows=fail -wincrypt:x64-linux=fail -wincrypt:x64-osx=fail winpcap:arm64-windows = skip winpcap:arm-uwp = skip -winpcap:x64-linux=fail -winpcap:x64-osx=fail winpcap:x64-uwp = skip winpcap:x64-windows = skip winpcap:x64-windows-static = skip @@ -1570,12 +1373,6 @@ winpcap:x64-windows-static-md=skip winpcap:x86-windows = skip winreg:x64-linux=fail winreg:x64-osx=fail -winsock2:x64-linux=fail -winsock2:x64-osx=fail -wintoast:arm-uwp=fail -wintoast:x64-linux=fail -wintoast:x64-osx=fail -wintoast:x64-uwp=fail wpilib:arm64-windows=fail wpilib:x64-osx=fail wxchartdir:x64-osx=fail @@ -1592,38 +1389,12 @@ xerces-c:arm-uwp=fail xerces-c:x64-uwp=fail xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail -# The xmsh upstream repository is gone, if we find no replacement before -# 2021-01-01 we will remove the port outright. -xmsh:arm-uwp=skip -xmsh:arm64-windows=skip -xmsh:x64-linux=skip -xmsh:x64-osx=skip -xmsh:x64-uwp=skip -xmsh:x64-windows-static=skip -xmsh:x64-windows-static-md=skip -xmsh:x64-windows=skip -xmsh:x86-windows=skip yajl:arm-uwp=fail yajl:x64-uwp=fail yara:arm-uwp=fail yara:x64-uwp=fail -yasm:arm64-windows=fail -yasm:arm-uwp=fail -yasm:x64-linux=fail -yasm:x64-osx=fail -yasm:x64-uwp=fail -yato:arm64-windows=fail -yato:arm-uwp=fail -yato:x64-uwp=fail z3:arm-uwp=fail z3:x64-uwp=fail -zkpp:x86-windows=fail -zkpp:x64-windows=fail -zkpp:x64-windows-static=fail -zkpp:x64-windows-static-md=fail -zkpp:arm64-windows=fail -zkpp:x64-uwp=fail -zkpp:arm-uwp=fail # Official downloading server of CTP library is only guaranteed to be available during trading hours of China futures market # Skip CI to avoid random failures @@ -1646,9 +1417,9 @@ clapack:x64-windows-static=skip clapack:x64-windows-static-md=skip clapack:x64-windows=skip clapack:x86-windows=skip -clapack:x64-uwp=skip lapack-reference:arm64-windows=skip lapack-reference:arm-uwp=skip +lapack-reference:x64-uwp=skip # failures for x64-windows-static-md ace:x64-windows-static-md=fail @@ -1661,29 +1432,26 @@ ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail libmicrohttpd:x64-windows-static-md=fail linenoise-ng:x64-windows-static-md=fail -mmloader:x64-windows-static-md=fail netcdf-cxx4:x64-windows-static-md=fail open62541:x64-windows-static-md=fail openscap:x64-windows-static-md=fail -portmidi:x64-windows-static-md=fail quantlib:x64-windows-static-md=fail -readosm:x64-windows-static-md=fail sentencepiece:x64-windows-static-md=fail symengine:x64-windows-static-md=fail unicorn:x64-windows-static-md=fail + +# the version of v8 we have in the repo doesn't support VS2022 +v8:x86-windows=fail +v8:x64-windows=fail +v8:x64-windows-static=fail v8:x64-windows-static-md=fail + yato:x64-windows-static-md=fail zyre:x64-windows-static-md=fail usbmuxd:x64-windows-static-md=fail workflow:x64-uwp=fail workflow:arm-uwp=fail -# wangle triggers an internal compiler error -# https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1269468 -wangle:x64-windows=fail -wangle:x64-windows-static=fail -wangle:x64-windows-static-md=fail - # VS2019 version 16.9.4's project system changes where PDBs are placed in a way that breaks the # upstream build script of this port. # See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639 diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 90704ca45053e5..dcd93ed4f906c4 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -188,31 +188,31 @@ function(vcpkg_acquire_msys out_msys_root) DEPS libbz2 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-2-x86_64.pkg.tar.xz" - SHA512 d128bd1792d0f5750e6a63a24db86a791e7ee457db8c0bef68d217099be4a6eef27c85caf6ad09b0bcd5b3cdac6fc0a2b9842cc58d381a4035505906cc4803ec + URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst" + SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/msys/x86_64/patch-2.7.6-1-x86_64.pkg.tar.xz" SHA512 04d06b9d5479f129f56e8290e0afe25217ffa457ec7bed3e576df08d4a85effd80d6e0ad82bd7541043100799b608a64da3c8f535f8ea173d326da6194902e8c ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gzip-1.10-1-x86_64.pkg.tar.xz" - SHA512 2d0a60f2c384e3b9e2bed2212867c85333545e51ee0f583a33914e488e43c265ed0017cd4430a6e3dafdca99c0414b3756a4b9cc92a6f04d5566eff8b68def75 + URL "https://repo.msys2.org/msys/x86_64/gzip-1.11-1-x86_64.pkg.tar.zst" + SHA512 bcd9d7839aef5f2b73c4d39b51838e62626c201c808d512806ba0a1619aee83c7deddb0d499fd93f9815fe351d7ab656c31c9dc7ee1171d77ad6d598e04dfcbe DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/texinfo-6.7-3-x86_64.pkg.tar.zst" - SHA512 d8bcce1a338d45a8c2350af3edee1d021a76524b767d465d3f7fd9cb03c8799d9cd3454526c10e4a2b4d58f75ae26a1a8177c50079dfdb4299129e0d45b093bc + URL "https://repo.msys2.org/msys/x86_64/texinfo-6.8-3-x86_64.pkg.tar.zst" + SHA512 5cc16d3b3c3b9859fe61233fa27f2146526e2b4d6e626814d283b35bfd77bc15eb4ffaec00bde6c10df93466d9155a06854a7ecf2e0d9af746dd56c4d88d192e DEPS bash perl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/bash-4.4.023-2-x86_64.pkg.tar.xz" - SHA512 1cf2a07022113010e00e150e7004732013a793d49e7a6ac7c2be27a0b2c0ce3366150584b9974e30df042f8876a84d6a77c1a46f0607e38ebe18f8a25f51c32d + URL "https://repo.msys2.org/msys/x86_64/bash-5.1.008-1-x86_64.pkg.tar.zst" + SHA512 a2ab8c958615134dc666254baca8cb13ed773036954e458de74ffb3bfe661bb33149082d38b677024da451755098a9201ab7dd435ced6e7f6b4e94c3ae368daf DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/autoconf-2.71-1-any.pkg.tar.zst" - SHA512 c5683bdf72bb3ba28ec0cb6a211ae1f9eebc79d03f17fc8a55d78a35dc6499209936e099d3725573255a48578b71fac6b7b17afb933fd22fe1204daf50689609 + URL "https://repo.msys2.org/msys/x86_64/autoconf-2.71-3-any.pkg.tar.zst" + SHA512 f639deac9b2191c2096584cf374103bbb1e9d2476dd0ebec94b1e80da59be25b88e362ac5280487a89f0bb0ed57f99b66e314f36b7de9cda03c0974806a3a4e2 DEPS m4 perl ) z_vcpkg_acquire_msys_declare_package( @@ -221,13 +221,13 @@ function(vcpkg_acquire_msys out_msys_root) DEPS m4 perl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/diffutils-3.7-1-x86_64.pkg.tar.xz" - SHA512 0c39837a26b2111bb6310cdfe0bc14656e3d57456ad8023f59c9386634a8f1f236915c79a57348b64c508897c73ed88d8abce2b9ac512a427e9a3956939f2040 + URL "https://repo.msys2.org/msys/x86_64/diffutils-3.8-2-x86_64.pkg.tar.zst" + SHA512 ee74e457c417d6978b3185f2fb8e15c9c30ecfc316c2474d69c978e7eb2282a3bd050d68dbf43d694cb5ab6f159b0e7ca319d01f8192071d82a224dde87d69b5 DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/binutils-2.34-4-x86_64.pkg.tar.zst" - SHA512 5271288d11489879082bc1f2298bb8bedbcfcf6ee19f8a9b3b552b6a4395543d9385bb833e3c32b1560bff1b411d2be503e2c12a7201bf37b85cfacc5f5baba3 + URL "https://repo.msys2.org/msys/x86_64/binutils-2.37-5-x86_64.pkg.tar.zst" + SHA512 32129cf97b53d5f6d87b42f17643e9dfc2e41b9ab4e4dfdc10e69725a9349bb25e57e0937e7504798cae91f7a88e0f4f5814e9f6a021bb68779d023176d2f311 DEPS libiconv libintl ) z_vcpkg_acquire_msys_declare_package( @@ -236,8 +236,8 @@ function(vcpkg_acquire_msys out_msys_root) DEPS grep sed coreutils file findutils ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/file-5.39-1-x86_64.pkg.tar.zst" - SHA512 be51dd0f6143a2f34f2a3e7d412866eb12511f25daaf3a5478240537733a67d7797a3a55a8893e5638589c06bca5af20aed5ded7db0bf19fbf52b30fae08cadd + URL "https://repo.msys2.org/msys/x86_64/file-5.41-2-x86_64.pkg.tar.zst" + SHA512 124c3983608879362acea7d487bf23690f371b3cfe0355385f0e643263b2a5568abe5cebda92ef9bc534e81f850138f589e75982f36a53f509676056d71de642 DEPS gcc-libs zlib libbz2 ) z_vcpkg_acquire_msys_declare_package( @@ -246,18 +246,18 @@ function(vcpkg_acquire_msys out_msys_root) DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-2-x86_64.pkg.tar.xz" - SHA512 336f5b59eb9cf4e93b537a212509d84f72cd9b8a97bf8ac0596eff298f3c0979bdea6c605244d5913670b9d20b017e5ee327f1e606f546a88e177a03c589a636 + URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-3-x86_64.pkg.tar.zst" + SHA512 9d03e8fc5677dd1386454bd27a683667e829ad5b1b87fc0879027920b2e79b25a2d773ab2556cd29844b18dd25b26fef5a57bf89e35ca318e39443dcaf0ca3ba DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-2-x86_64.pkg.tar.xz" - SHA512 d128bd1792d0f5750e6a63a24db86a791e7ee457db8c0bef68d217099be4a6eef27c85caf6ad09b0bcd5b3cdac6fc0a2b9842cc58d381a4035505906cc4803ec + URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst" + SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-1-x86_64.pkg.tar.xz" - SHA512 1a2ae4f296954421ce36f764b9b1c77ca72fc8583c46060b817677d0ad6adc7d7e3c2bbe1ae0179afd116a3d62f28e59eae2f7c84c1c8ffb7d22d2f2b40c0cdc + URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-2-x86_64.pkg.tar.zst" + SHA512 0719e8d3683711453ff77496cad11583e877ea52806e5ea3f470444705705db20a8a9fe99987166b02c6bd240c06c7d86faa979a7bc5536c9c804d800b60b7be DEPS libiconv libintl gmp ) z_vcpkg_acquire_msys_declare_package( @@ -266,28 +266,28 @@ function(vcpkg_acquire_msys out_msys_root) DEPS libiconv libintl libpcre ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/sed-4.8-1-x86_64.pkg.tar.xz" - SHA512 b6e7ed0af9e04aba4992ee26d8616f7ac675c8137bb28558c049d50709afb571b33695ce21d01e5b7fe8e188c008dd2e8cbafc72a7e2a919c2d678506095132b + URL "https://repo.msys2.org/msys/x86_64/sed-4.8-2-x86_64.pkg.tar.zst" + SHA512 8391be777239e0bfc19dc477995ee581ea9dbb1ba34fc27f57ba9d858e7489ac9b7200479d405712b43fa88434dd597be71d161fa8c05606e7ef991711bfc4c1 DEPS libintl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libpcre-8.44-1-x86_64.pkg.tar.xz" - SHA512 e9e56386fc5cca0f3c36cee21eda91300d9a13a962ec2f52eeea00f131915daea1cfeb0e1b30704bf3cc4357d941d356e0d72192bab3006c2548e18cd96dad77 + URL "https://repo.msys2.org/msys/x86_64/libpcre-8.45-1-x86_64.pkg.tar.zst" + SHA512 b10a69380c44ea35367f310a7400eae26beacf347ddbb5da650b54924b80ffd791f12a9d70923567e5081e3c7098f042e47bcff1328d95b0b27ce63bcd762e88 DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/m4-1.4.19-1-x86_64.pkg.tar.zst" - SHA512 8f100fef907ae6668af68538cae559a531761b51bb556d345b752c698fee938a503818cbd2003722d449f6c9a080c7ddabe12dddbee4d407377ca1e96e7d08b1 + URL "https://repo.msys2.org/msys/x86_64/m4-1.4.19-2-x86_64.pkg.tar.zst" + SHA512 7471099ba7e3b47e5b019dc0e563165a8660722f2bbd337fb579e6d1832c0e7dcab0ca9297c4692b18add92c4ad49e94391c621cf38874e2ff63d4f926bac38c DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/automake-wrapper-11-1-any.pkg.tar.xz" - SHA512 0fcfc80c31fd0bda5a46c55e9100a86d2fc788a92c7e2ca4fd281e551375c62eb5b9cc9ad9338bb44a815bf0b1d1b60b882c8e68ca3ea529b442f2d03d1d3e1f + URL "https://repo.msys2.org/msys/x86_64/automake-wrapper-11-4-any.pkg.tar.zst" + SHA512 175940ebccb490c25d2c431dd025f24a7d0c930a7ee8cb81a44a4989c1d07f4b5a8134e1d05a7a1b206f8e19a2308ee198b1295e31b2e139f5d9c1c077252c94 DEPS gawk ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gawk-5.1.0-1-x86_64.pkg.tar.xz" - SHA512 4e2be747b184f27945df6fb37d52d56fd8117d2fe4b289370bcdb5b15a4cf90cbeaea98cf9e64bcbfa2c13db50d8bd14cbd719c5f31b420842da903006dbc959 + URL "https://repo.msys2.org/msys/x86_64/gawk-5.1.0-2-x86_64.pkg.tar.zst" + SHA512 d4b00e2b53ce99ddd3ee8e41c41add5ab36d26a54107acf7f5a5bf4a0033d72465cdab86f5b2eb8b7aca2cb5027a3e35cb194794c3bf563c0075ca3dbcad6987 DEPS libintl libreadline mpfr ) z_vcpkg_acquire_msys_declare_package( @@ -296,8 +296,8 @@ function(vcpkg_acquire_msys out_msys_root) DEPS gmp gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.0-1-x86_64.pkg.tar.xz" - SHA512 1389a443e775bb255d905665dd577bef7ed71d51a8c24d118097f8119c08c4dfe67505e88ddd1e9a3764dd1d50ed8b84fa34abefa797d257e90586f0cbf54de8 + URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.1-1-x86_64.pkg.tar.zst" + SHA512 c5c8009ef069d05c2209b69c8e87094b09aac4b5c3dfdbea474d8262e55d286b400f1360c6a9778fd5eb87fb76a6463c21188286a1a1919ad79153eae3c44b0f ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/msys/x86_64/xz-5.2.5-1-x86_64.pkg.tar.xz" # this seems to require immediate updating on version bumps. @@ -309,23 +309,23 @@ function(vcpkg_acquire_msys out_msys_root) SHA512 8d5c04354fdc7309e73abce679a4369c0be3dc342de51cef9d2a932b7df6a961c8cb1f7e373b1b8b2be40343a95fbd57ac29ebef63d4a2074be1d865e28ca6ad ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libreadline-8.0.004-1-x86_64.pkg.tar.xz" - SHA512 42760bddedccc8d93507c1e3a7a81595dc6392b5e4319d24a85275eb04c30eb79078e4247eb2cdd00ff3884d932639130c89bf1b559310a17fa4858062491f97 + URL "https://repo.msys2.org/msys/x86_64/libreadline-8.1.001-1-x86_64.pkg.tar.zst" + SHA512 4104eb0c18b8c06ab3bd4ba6420e3464df8293bec673c88da49e2f74cf1d583c922e9ead5691271fe593d424f92d1fd8668a3002174d756993d5b18337459bab DEPS ncurses ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/ncurses-6.2-1-x86_64.pkg.tar.xz" - SHA512 d4dc566d3dbd32e7646e328cb350689ede7eaa7008c8ed971072f8869a2986fe3935e7df1700851b52716af7ef20c49f9e6628d3163a5e9208a8872b5014eaea + URL "https://repo.msys2.org/msys/x86_64/ncurses-6.2-2-x86_64.pkg.tar.zst" + SHA512 4bf744a21ab2030ea9d65eb4d824ec5bed4532b7a489859e5e19bba11b5ba9be08613de48acb38baacfd2a7295722e4d858d7c577565f1999d2583defbbb58f2 DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.3-1-any.pkg.tar.zst" - SHA512 174e6b9d1512eb710d48cda5bb4fef2b5d9b32071f425c76ea32c48081da0281f9fde1aa185845fa68a881233937f8cfd3ebda640d55764c1d48ec50e4de3390 + URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.3-3-any.pkg.tar.zst" + SHA512 77a195a9fe8680bee55c04b8ecc0e9ee43e2d89607c745098dfac4687f4f853885cabbb005202d70e9a9cdf9facf6849cc47c6b2f25573b5af8201696d926c72 DEPS perl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-1-x86_64.pkg.tar.zst" - SHA512 600b919c7299566aa6abf9a432c166fdd81be5ed052ad4062cc54ee952ea556992e8aba25a44757965d66827dc6e98fddb492867399be3bbed44803e17367cb8 + URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-2-x86_64.pkg.tar.zst" + SHA512 ad21734c05bc7faa809bc4ba761fb41a3b448d31794d1fd3d430cf4afe05ae991aabece4ec9a25718c01cc323d507bf97530533f0a20aabc18a7a2ccc0ae02b1 DEPS libcrypt ) z_vcpkg_acquire_msys_declare_package( @@ -339,43 +339,43 @@ function(vcpkg_acquire_msys out_msys_root) DEPS libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/make-4.3-1-x86_64.pkg.tar.xz" - SHA512 7306dec7859edc27d70a24ab4b396728481484a426c5aa2f7e9fed2635b3b25548b05b7d37a161a86a8edaa5922948bee8c99b1e8a078606e69ca48a433fe321 + URL "https://repo.msys2.org/msys/x86_64/make-4.3-3-x86_64.pkg.tar.zst" + SHA512 1d991bfc2f076c8288023c7dd71c65470ad852e0744870368a4ab56644f88c7f6bbeca89dbeb7ac8b2719340cfec737a8bceae49569bbe4e75b6b8ffdcfe76f1 DEPS libintl msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 648f74c23e4f92145cdd0d45ff5285c2df34e855a9e75e5463dd6646967f8cf34a18ce357c6f498a4680e6d7b84e2d1697ba9deee84da8ea6bb14bbdb594ee22 + URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.21-1-x86_64.pkg.tar.zst" + SHA512 44444064b9860dbd3cb886812fb20ee97ab04a65616cca497be69c592d5507e7bc66bfe8dbd060a4df9c5d9bb44cb0f231584d65cb04351146d54d15852227af DEPS gettext ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gettext-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 c8c42d084c297746548963f7ec7a7df46241886f3e637e779811ee4a8fee6058f892082bb2658f6777cbffba2de4bcdfd68e846ba63c6a6552c9efb0c8c1de50 + URL "https://repo.msys2.org/msys/x86_64/gettext-0.21-1-x86_64.pkg.tar.zst" + SHA512 6ef5f4094c4a174550a898cac4f60215d22de09f7e5f72bdb297d18a6f027e6122b4a519aa8d5781f9b0201dcae14ad7910b181b1499d6d8bbeb5a35b3a08581 DEPS libintl libgettextpo libasprintf tar ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/tar-1.32-1-x86_64.pkg.tar.xz" - SHA512 379525f4b8a3f21d67d6506647aec8367724e1b4c896039f46845d9e834298280381e7261a87440925ee712794d43074f4ffb5e09e67a5195af810bbc107ad9a + URL "https://repo.msys2.org/msys/x86_64/tar-1.34-2-x86_64.pkg.tar.zst" + SHA512 127a971f5c087500ec4858697205b36ae76dba82307f1bcaaa44e746337d85d97360e46e55ef7fecbfa2a4af428ee26d804fa7d7c2b8ce6de1b86328dd14ef2d DEPS libiconv libintl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libgettextpo-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 480b782a79b0ce71ed9939ae3a6821fc2f5a63358733965c62cee027d0e6c88e255df1d62379ee47f5a7f8ffe163e554e318dba22c67dc67469b10aa3248edf7 + URL "https://repo.msys2.org/msys/x86_64/libgettextpo-0.21-1-x86_64.pkg.tar.zst" + SHA512 bb217639deadb36734bafb8db5217e654d00b93a3ef366116cc6c9b8b8951abef9a7e9b04be3fae09074cf68576f18575a0d09f3d2f344985606c1449a17222e DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libasprintf-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 a2e8027b9bbee20f8cf60851130ca2af436641b1fb66054f8deba118da7ebecb1cd188224dcf08e4c5b7cde85b412efab058afef2358e843c9de8eb128ca448c + URL "https://repo.msys2.org/msys/x86_64/libasprintf-0.21-1-x86_64.pkg.tar.zst" + SHA512 62dde7bfcfea75ea9adb463807d7c128019ffeec0fb23e73bc39f760e45483c61f4f29e89cdbfab1e317d520c83fe3b65306fbd7258fe11ea951612dbee479fe DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/findutils-4.7.0-1-x86_64.pkg.tar.xz" - SHA512 fd09a24562b196ff252f4b5de86ed977280306a8c628792930812f146fcf7355f9d87434bbabe25e6cc17d8bd028f6bc68fc02e5bea83137a49cf5cc6f509e10 + URL "https://repo.msys2.org/msys/x86_64/findutils-4.8.0-1-x86_64.pkg.tar.zst" + SHA512 74f8750636becefd3675c89957dfb8a244d2db6fec80bf352998edfef93f66d0e2a37d7f2869a79dd197acf2057ccd6aefd12c58e94154765896a432831ab49c DEPS libintl libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libintl-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 4e54c252b828c862f376d8f5a2410ee623a43d70cbb07d0b8ac20c25096f59fb3ae8dcd011d1792bec76f0b0b9411d0e184ee23707995761dc50eb76f9fc6b92 + URL "https://repo.msys2.org/msys/x86_64/libintl-0.21-1-x86_64.pkg.tar.zst" + SHA512 be0242eed25793e86e0560868f76cf06a358ffc0b2beb357e776d6c7819e545ac90f9358b17a85aa598584babe3ab4bb4544e360a28f5cec965f314178b930d1 DEPS libiconv ) z_vcpkg_acquire_msys_declare_package( @@ -384,8 +384,8 @@ function(vcpkg_acquire_msys out_msys_root) DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gcc-libs-9.3.0-1-x86_64.pkg.tar.xz" - SHA512 2816afbf45aa0ff47f94a623ad083d9421bca5284dc55683c2f1bc09ea0eadfe720afb75aafef60c2ff6384d051c4fbe2a744bb16a20acf34c04dc59b17c3d8c + URL "https://repo.msys2.org/msys/x86_64/gcc-libs-11.2.0-3-x86_64.pkg.tar.zst" + SHA512 be7bb61d1b87eafbb91cf9d0fee3270b9d5e2420c403ea394967941195d52ae248ce4ffde20af41a05310527a920269018f49487be617211a5e340486babd0f8 DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( @@ -394,38 +394,38 @@ function(vcpkg_acquire_msys out_msys_root) ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.19.0-1-any.pkg.tar.zst" - SHA512 15791fff23deda17a4452c9ca3f23210ed77ee20dcdd6e0c31d0e626a63aeb93d15ed814078729101f1cce96129b4b5e3c898396b003d794a52d7169dd027465 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.20.3-1-any.pkg.tar.zst" + SHA512 ce73d4270942f61963e8307f6bec945d14e3774455684842b8fde836b19a4e9cbf8efd0663ffb28ad872493db70fa3a4e14bd0b248c2067199f4fee94e80e77e DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openblas-0.3.10-2-any.pkg.tar.zst" - SHA512 3cf15ef191ceb303a7e40ad98aca94c56211b245617c17682379b5606a1a76e12d04fa1a83c6109e89620200a74917bcd981380c7749dda12fa8e79f0b923877 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openblas-0.3.19-1-any.pkg.tar.zst" + SHA512 0d18a93d7804d6469b8566cf4ad3a7efbdf8a4a4b05d191b23a30e107586423c6338b9f4a5ea2cc93052e6c0336dc82a43c26189c410263a6e705e6f3ebe261a DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-10.2.0-1-any.pkg.tar.zst" - SHA512 c2dee2957356fa51aae39d907d0cc07f966028b418f74a1ea7ea551ff001c175d86781f980c0cf994207794322dcd369fa122ab78b6c6d0f0ab01e39a754e780 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" + SHA512 8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.5-1-any.pkg.tar.zst" - SHA512 49bbcaa9479ff95fd21b473a1bc286886b204ec3e2e0d9466322e96a9ee07ccd8116024b54b967a87e4752057004475cac5060605e87bd5057de45efe5122a25 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.9-2-any.pkg.tar.zst" + SHA512 8a45b28b2b0471718bd1ab096958872b18ae3b25f06c30718c54d1edaf04214397330a51776f3e4eee556ac47d9e3aa5e1b211c5df0cf6be3046a6f3a79cfa7d DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-1-any.pkg.tar.xz" - SHA512 6e01b26a2144f99ca00406dbce5b8c3e928ec8a3ff77e0b741b26aaf9c927e9bea8cb1b5f38cd59118307e10dd4523a0ea2a1ea61f798f99e6d605ef1d100503 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-2-any.pkg.tar.zst" + SHA512 4f7ba44189d953d4d00e7bbf5a7697233f759c92847c074f0f2888d2a641c59ce4bd3c39617adac0ad7b53c5836e529f9ffd889f976444016976bb517e5c24a2 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.5.0-1-any.pkg.tar.zst" - SHA512 48130ff676c0235bad4648527021e597ee00aa49a4443740a134005877e2ff2ca27b30a0ac86b923192a65348b36de4e8d3f9c57d76ab42b2e21d1a92dbf7ccf + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.5.1-1-any.pkg.tar.zst" + SHA512 1204c31367f9268ffd6658be04af7687c01f984c9d6be8c7a20ee0ebde1ca9a03b766ef1aeb1fa7aaa97b88a57f7a73afa7f7a7fed9c6b895a032db11e6133bf DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.2-1-any.pkg.tar.xz" - SHA512 1cbffe0e181a3d4ceaa8f39b2a649584b2c7d689e6a057d85cb9f84edece2cf60eddc220127c7fa4f29e4aa6e8fb4f568ef9d73582d08168607135af977407e0 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.3-3-any.pkg.tar.zst" + SHA512 888c155d878651dc31c9a01455ab689d7b644cec759521b69b8399c20b6ddc77c90f3ee4ddeed8857084335335b4b30e182d826fb5b78719b704f13a1dfdbd54 DEPS mingw-w64-x86_64-libsystre ) z_vcpkg_acquire_msys_declare_package( @@ -440,33 +440,33 @@ function(vcpkg_acquire_msys out_msys_root) DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.g-1-any.pkg.tar.xz" - SHA512 81681089a19cae7dbdee1bc9d3148f03458fa7a1d2fd105be39299b3a0c91b34450bcfe2ad86622bc6819da1558d7217deb0807b4a7bed942a9a7a786fcd54a3 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.m-1-any.pkg.tar.zst" + SHA512 9471b0e5b01453f6ee5c92be6e259446c6b5be45d1da8985a4735b3e54c835d9b86286b2af126546419bf968df096442bd4f60f30efa1a901316e3c02b98525f DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20200601-1-any.pkg.tar.zst" - SHA512 21a81e1529a3ad4f6eceb3b7d4e36400712d3a690d3991131573d4aae8364965757f9b02054d93c853eb75fbb7f6173a278b122450c800b2c9a1e8017dd35e28 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20210119-1-any.pkg.tar.zst" + SHA512 5590ca116d73572eb336ad73ea5df9da34286d8ff8f6b162b38564d0057aa23b74a30858153013324516af26671046addd6bcade221e94e7b8ed5e8f886e1c58 DEPS mingw-w64-x86_64-p11-kit ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.23.20-2-any.pkg.tar.xz" - SHA512 c441c4928465a98aa53917df737b728275bc0f6e9b41e13de7c665a37d2111b46f057bb652a1d5a6c7cdf8a74ea15e365a727671b698f5bbb5a7cfd0b889935e + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.24.1-1-any.pkg.tar.zst" + SHA512 6437919cd61c8b1a59b346bbd93d960adb7f11206e8c0010311d71d0fe9aa03f950ecf08f19a5555b27f481cc0d61b88650b165ae9336ac1a1a0a9be553239b9 DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.16.0-1-any.pkg.tar.xz" - SHA512 c450cd49391b46af552a89f2f6e2c21dd5da7d40e7456b380290c514a0f06bcbd63f0f972b3c173c4237bec7b652ff22d2d330e8fdf5c888558380bd2667be64 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.18.0-1-any.pkg.tar.zst" + SHA512 2584a6e0bc2b7d145f026487951b8690e3d8e79f475a7b77f95fc27ca9a9f1887fe9303e340ba2635353c4a6f6a2f10a907dd8778e54be7506a15459f616d4a4 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.33.0-1-any.pkg.tar.zst" - SHA512 eae319f87c9849049347f132efc2ecc46e9ac1ead55542e31a3ea216932a4fa5c5bae8d468d2f050e1e22068ac9fbe9d8e1aa7612cc0110cafe6605032adeb0f + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.37.2-1-any.pkg.tar.zst" + SHA512 0f83f10b0c8f4699a6b84deb6986fcd471cb80b995561ad793e827f9dd66110d555744918ed91982aec8d9743f6064726dd5eba3e695aa9ab5381ea4f8e76dbe DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.0.004-1-any.pkg.tar.xz" - SHA512 e3fb3030a50f677697bec0da39ba2eb979dc28991ad0e29012cbf1bda82723176148510bf924b7fce7a0b79e7b078232d69e07f3fbb7d657b8ee631841730120 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.1.001-1-any.pkg.tar.zst" + SHA512 b38aef9216ea2ba7edd82ce57a48dbc913b9bdcb44b96b9800342fe097d706ba39c9d5ba08d793d2c3388722479258bb05388ae09d74a1edcaaf9002e9d71853 DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap ) z_vcpkg_acquire_msys_declare_package( @@ -475,13 +475,13 @@ function(vcpkg_acquire_msys out_msys_root) DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.10-2-any.pkg.tar.zst" - SHA512 a2d05ce3070d3a3bdf823fa5c790b124aa7493e60758e2911d3f9651899cf58328044f9b06edd82060d8a4b5efb5c4cb32085d827aecd796dbb5e42441da305f + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.11.1-2-any.pkg.tar.zst" + SHA512 15fd4e085fabe2281f33c8f36f4b1b0be132e5b100f6d4eaf54688842791aa2cf4e6d38a855f74f42be3f86c52e20044518f5843f8e9ca13c54a6ea4adb973a8 DEPS mingw-w64-x86_64-tcl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.10-1-any.pkg.tar.xz" - SHA512 c3f21588e19725598878ef13145fbe7a995c2a0c678ef0a4782e28fd64d65fe3271178369bf0c54e92123eba82f2d3da6ae2fc34acd3b20150d1e173be1c0f8f + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.11-5-any.pkg.tar.zst" + SHA512 9db75ff47260ea3652d1abf60cd44649d0e8cbe5c4d26c316b99a6edb08252fb87ed017c856f151da99bcaa0bd90c0bebae28234035b008c5bd6508511639852 DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( @@ -490,18 +490,18 @@ function(vcpkg_acquire_msys out_msys_root) DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.19.8.1-10-any.pkg.tar.zst" - SHA512 ebe948028942738918930b1f3b7aa0314ce0fb617dbd36dcfaf3980958555c7c476f2b50c21d272d01fd3b0bb87ac4f800e485a5b7f8fcc7b30aacdf76740348 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.21-3-any.pkg.tar.zst" + SHA512 38daa0edd1a2c1efdd56baeb6805d10501a57e0c8ab98942e4a16f8b021908dac315513ea85f5278adf300bce3052a44a3f8b473adb0d5d3656aa4a48fe61081 DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-10.2.0-9-any.pkg.tar.zst" - SHA512 b2952015e0b27c51219fe15d7550a349e6d73032bbe328f00d6654008c4bda28766d75ce8898d765879ec5f4815695d0f047d01811d8253ed2d433cd5c77d5a9 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst" + SHA512 2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98 DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-mpc mingw-w64-x86_64-mpfr ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.0-2-any.pkg.tar.zst" - SHA512 f094b3ec407382018b3454afa07ea82b94acf3b92c094c46ab6d27e56cd2647cf5bc4986ecb18f8a5da721fd267dceba25353822e7cac33d9107604ac5d429bc + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst" + SHA512 f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1 DEPS mingw-w64-x86_64-mpfr ) z_vcpkg_acquire_msys_declare_package( @@ -510,16 +510,16 @@ function(vcpkg_acquire_msys out_msys_root) DEPS mingw-w64-x86_64-gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.0-3-any.pkg.tar.zst" - SHA512 2736ba40bd7cac4ed12aae3d677aa0b788b161d2488976fbbae0fc6cff9ab154a09c903c1eec38ffe408a41abc62fd6106b55e17d7826b6dc10e720053685b1f + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst" + SHA512 d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.2.10-1-any.pkg.tar.zst" - SHA512 ea3069abd7b9809186d1204479a49d605797535e5d618c5c4fc068511134ef9a277facd67fc47fa9a00da2018db90291190fdb2187cb6a7bd99331a1c0c7e119 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.4.4-1-any.pkg.tar.zst" + SHA512 479e6591d06eee2686591d7232a60d4092540deb40cf0c2c418de861b1da6b21fb4be82e603dd4a3b88f5a1b1d21cdb4f016780dda8131e32be5c3dec85dfc4d ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-3-any.pkg.tar.zst" - SHA512 6d7700e218018454e406737108c40328038deb8d159b147b4159192d01fb72f8df90a81cf769c0b452fdab1f2ff110ead2e1894e3804f7e827fa2770349c63f8 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-4-any.pkg.tar.zst" + SHA512 1d7be396ef132289be0c33792c4e81dea6cb7b1eafa249fb3e8abc0b393d14e5114905c0c0262b6a7aed8f196ae4d7a10fbafd342b08ec76c9196921332747b5 ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst" @@ -531,8 +531,8 @@ function(vcpkg_acquire_msys out_msys_root) ) z_vcpkg_acquire_msys_declare_package( NAME "mingw-w64-x86_64-libwinpthread" - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - SHA512 a6969a5db1c55ba458c1a047d0a2a9d2db6cc24266ea47f740598b149a601995d2de734a0984ac5e57ee611d5982cbc03fd6fc0f498435e8d6401bf15724caad + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + SHA512 a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9 ) if(NOT Z_VCPKG_MSYS_PACKAGES STREQUAL "") diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 0754feb8e95c43..dd5b061eea07e6 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -121,9 +121,12 @@ function(vcpkg_build_make) endif() # Since includes are buildtype independent those are setup by vcpkg_configure_make - vcpkg_backup_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + vcpkg_backup_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS) foreach(buildtype IN ITEMS "debug" "release") + if (buildtype STREQUAL "debug" AND _VCPKG_MAKE_NO_DEBUG) + continue() + endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}") if("${buildtype}" STREQUAL "debug") set(short_buildtype "-dbg") @@ -142,15 +145,21 @@ function(vcpkg_build_make) z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags("${cmake_buildtype}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_STATIC_LINKER_FLAGS_${cmake_buildtype}}") + set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${cmake_buildtype}}") else() # dynamic - set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_SHARED_LINKER_FLAGS_${cmake_buildtype}}") + set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${cmake_buildtype}}") + endif() + set(LDFLAGS_${cmake_buildtype} "") + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib") + string(APPEND LDFLAGS_${cmake_buildtype} " -L${Z_VCPKG_INSTALLED}${path_suffix}/lib") + endif() + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + string(APPEND LDFLAGS_${cmake_buildtype} " -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") endif() if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") - set(LDFLAGS_${cmake_buildtype} "-L${Z_VCPKG_INSTALLED}${path_suffix}/lib -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") set(LINK_ENV_${cmake_buildtype} "$ENV{_LINK_} ${LINKER_FLAGS_${cmake_buildtype}}") else() - set(LDFLAGS_${cmake_buildtype} "-L${Z_VCPKG_INSTALLED}${path_suffix}/lib -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link ${LINKER_FLAGS_${cmake_buildtype}}") + string(APPEND LDFLAGS_${cmake_buildtype} " ${LINKER_FLAGS_${cmake_buildtype}}") endif() # Setup environment @@ -159,14 +168,20 @@ function(vcpkg_build_make) set(ENV{CXXFLAGS} "${CXXFLAGS_${cmake_buildtype}}") set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${cmake_buildtype}}") set(ENV{LDFLAGS} "${LDFLAGS_${cmake_buildtype}}") - vcpkg_host_path_list(PREPEND ENV{LIB} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") - vcpkg_host_path_list(PREPEND ENV{LIBPATH} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") - vcpkg_host_path_list(PREPEND ENV{LIBRARY_PATH} "${Z_VCPKG_INSTALLED}${path_suffix_${buildtype}}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") - #vcpkg_host_path_list(PREPEND ENV{LD_LIBRARY_PATH} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix_${buildtype}}/lib/manual-link/") - - if(LINK_ENV_${_VAR_SUFFIX}) + vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH) # LD_LIBRARY_PATH) + foreach(lib_env_var IN LISTS lib_env_vars) + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${Z_VCPKG_INSTALLED}${path_suffix}/lib") + endif() + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + endif() + endforeach() + unset(lib_env_vars) + + if(LINK_ENV_${cmake_buildtype}) set(config_link_backup "$ENV{_LINK_}") - set(ENV{_LINK_} "${LINK_ENV_${_VAR_SUFFIX}}") + set(ENV{_LINK_} "${LINK_ENV_${cmake_buildtype}}") endif() if(arg_ADD_BIN_TO_PATH) @@ -216,6 +231,8 @@ function(vcpkg_build_make) set(ENV{PATH} "${env_backup_path}") endif() endif() + + vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH) endforeach() if (arg_ENABLE_INSTALL) @@ -236,5 +253,6 @@ function(vcpkg_build_make) set(ENV{PATH} "${path_backup}") endif() - vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS) + unset(_VCPKG_MAKE_NO_DEBUG PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake index 2a251fded6108e..282e04f5f6588b 100755 --- a/scripts/cmake/vcpkg_build_nmake.cmake +++ b/scripts/cmake/vcpkg_build_nmake.cmake @@ -128,6 +128,7 @@ function(vcpkg_build_nmake) endif() vcpkg_backup_env_variables(VARS CL) + cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR NORMALIZE install_dir_native) foreach(build_type IN ITEMS debug release) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL build_type) if(build_type STREQUAL "debug") @@ -136,7 +137,7 @@ function(vcpkg_build_nmake) # Add install command and arguments set(make_opts "${make_opts_base}") if (arg_ENABLE_INSTALL) - vcpkg_list(APPEND make_opts "INSTALLDIR=${CURRENT_PACKAGES_DIR}/debug") + vcpkg_list(APPEND make_opts "INSTALLDIR=${install_dir_native}\\debug") endif() vcpkg_list(APPEND make_opts ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) set(ENV{CL} "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") @@ -147,7 +148,7 @@ function(vcpkg_build_nmake) # Add install command and arguments set(make_opts "${make_opts_base}") if (arg_ENABLE_INSTALL) - vcpkg_list(APPEND make_opts "INSTALLDIR=${CURRENT_PACKAGES_DIR}") + vcpkg_list(APPEND make_opts "INSTALLDIR=${install_dir_native}") endif() vcpkg_list(APPEND make_opts ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) diff --git a/scripts/cmake/vcpkg_check_features.cmake b/scripts/cmake/vcpkg_check_features.cmake index 7679b0d11aa547..5f4c5339b6615c 100644 --- a/scripts/cmake/vcpkg_check_features.cmake +++ b/scripts/cmake/vcpkg_check_features.cmake @@ -55,9 +55,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS secure MI_SECURE ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DMI_SEE_ASM=ON;-DMI_OVERRIDE=OFF;-DMI_SECURE=ON" ${FEATURE_OPTIONS} @@ -76,9 +75,8 @@ vcpkg_check_features( websockets CPPREST_EXCLUDE_WEBSOCKETS ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DCPPREST_EXCLUDE_BROTLI=ON;-DCPPREST_EXCLUDE_WEBSOCKETS=OFF" ${FEATURE_OPTIONS} @@ -98,9 +96,8 @@ vcpkg_check_features( cuda BUILD_GPU ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DWITH_CUDA=ON;-DBUILD_CUDA=ON;-DBUILD_GPU=ON" ${FEATURE_OPTIONS} @@ -120,9 +117,8 @@ vcpkg_check_features( tbb ROCKSDB_IGNORE_PACKAGE_TBB ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DWITH_TBB=ON;-DROCKSDB_IGNORE_PACKAGE_TBB=OFF" ${FEATURE_OPTIONS} diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index aa054222c7dedc..3e9c4378767926 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -228,11 +228,15 @@ endmacro() function(vcpkg_configure_make) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 arg - "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET" + "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;NO_DEBUG;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET" "SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES" ) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + z_vcpkg_get_cmake_vars(cmake_vars_file) debug_message("Including cmake vars from: ${cmake_vars_file}") include("${cmake_vars_file}") @@ -465,6 +469,21 @@ function(vcpkg_configure_make) endif() endif() + # Linux - cross-compiling support + if(VCPKG_TARGET_IS_LINUX) + if (requires_autoconfig AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET) + # The regex below takes the prefix from the resulting CMAKE_C_COMPILER variable eg. arm-linux-gnueabihf-gcc + # set in the common toolchains/linux.cmake + # This is used via --host as a prefix for all other bin tools as well. + # Setting the compiler directly via CC=arm-linux-gnueabihf-gcc does not work acording to: + # https://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/Specifying-Target-Triplets.html + if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*)-gcc$" AND CMAKE_MATCH_1) + set(arg_BUILD_TRIPLET "--host=${CMAKE_MATCH_1}") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) + endif() + debug_message("Using make triplet: ${arg_BUILD_TRIPLET}") + endif() + endif() + # Cleanup previous build dirs file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" @@ -773,13 +792,13 @@ function(vcpkg_configure_make) endif() set(ENV{PKG_CONFIG} "${PKGCONFIG}") - vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH) # LD_LIBRARY_PATH) foreach(lib_env_var IN LISTS lib_env_vars) if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib") vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib") endif() if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/manual-link") - vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}" "${path_suffix_${current_buildtype}}/lib/manual-link") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/manual-link") endif() endforeach() unset(lib_env_vars) @@ -851,4 +870,5 @@ function(vcpkg_configure_make) set(_VCPKG_PROJECT_SOURCE_PATH ${arg_SOURCE_PATH} PARENT_SCOPE) set(_VCPKG_PROJECT_SUBPATH ${arg_PROJECT_SUBPATH} PARENT_SCOPE) + set(_VCPKG_MAKE_NO_DEBUG ${arg_NO_DEBUG} PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 4c5d7be6410a44..e68ff652654392 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -40,45 +40,72 @@ This command supplies many common arguments to Meson. To see the full list, exam * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) #]===] -function(z_vcpkg_meson_generate_native_file additional_binaries) #https://mesonbuild.com/Native-environments.html - set(native_config "[binaries]\n") - #set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) +function(z_vcpkg_append_proglist var_to_append additional_binaries) + string(APPEND "${var_to_append}" "[binaries]\n") if(VCPKG_TARGET_IS_WINDOWS) - set(proglist MT) + set(proglist MT AR) else() set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) endif() foreach(prog IN LISTS proglist) if(VCPKG_DETECTED_CMAKE_${prog}) - string(TOLOWER "${prog}" proglower) - string(APPEND native_config "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + if(meson_${prog}) + string(APPEND "${var_to_append}" "${meson_${prog}} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + else() + string(TOLOWER "${prog}" proglower) + string(APPEND "${var_to_append}" "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + endif() endif() endforeach() set(programs C CXX RC) + set(meson_RC windres) + set(meson_CXX cpp) foreach(prog IN LISTS programs) if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) - string(REPLACE "CXX" "CPP" mesonprog "${prog}") - string(REPLACE "RC" "windres" mesonprog "${mesonprog}") # https://mesonbuild.com/Windows-module.html - string(TOLOWER "${mesonprog}" proglower) - string(APPEND native_config "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + if(meson_${prog}) + string(APPEND "${var_to_append}" "${meson_${prog}} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + else() + string(TOLOWER "${prog}" proglower) + string(APPEND "${var_to_append}" "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + endif() endif() endforeach() if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$") - string(APPEND native_config "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + string(APPEND "${var_to_append}" "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") endif() endif() if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$") - string(APPEND native_config "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + string(APPEND "${var_to_append}" "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") endif() endif() - string(APPEND native_config "cmake = '${CMAKE_COMMAND}'\n") + + get_filename_component(CMAKE_PATH "${CMAKE_COMMAND}" DIRECTORY) + vcpkg_add_to_path("${CMAKE_PATH}" PREPEND) # Make CMake invokeable for Meson + string(APPEND "${var_to_append}" "cmake = '${CMAKE_COMMAND}'\n") + + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path("${PYTHON3_DIR}") + string(APPEND "${var_to_append}" "python = '${PYTHON3}'\n") + + vcpkg_find_acquire_program(NINJA) + get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) + vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Prepend to use the correct ninja. + # string(APPEND "${var_to_append}" "ninja = '${NINJA}'\n") # This does not work due to meson issues + foreach(additional_binary IN LISTS additional_binaries) - string(APPEND native_config "${additional_binary}\n") + string(APPEND "${var_to_append}" "${additional_binary}\n") endforeach() + set("${var_to_append}" "${${var_to_append}}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_meson_generate_native_file additional_binaries) #https://mesonbuild.com/Native-environments.html + set(native_config "") + z_vcpkg_append_proglist(native_config "${additional_binaries}") string(APPEND native_config "[built-in options]\n") #https://mesonbuild.com/Builtin-options.html if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") @@ -152,6 +179,17 @@ function(z_vcpkg_meson_generate_flags_properties_string out_var config_type) set(linker_flags "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${config_type}}") endif() z_vcpkg_meson_convert_compiler_flags_to_list(linker_flags "${linker_flags}") + if(VCPKG_TARGET_IS_OSX) + # macOS - append arch and isysroot if cross-compiling + if(NOT "${VCPKG_OSX_ARCHITECTURES}" STREQUAL "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + foreach(arch IN LISTS VCPKG_OSX_ARCHITECTURES) + vcpkg_list(APPEND linker_flags -arch "${arch}") + endforeach() + endif() + if(VCPKG_DETECTED_CMAKE_OSX_SYSROOT) + vcpkg_list(APPEND linker_flags -isysroot "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") + endif() + endif() vcpkg_list(APPEND linker_flags "${libpath}") z_vcpkg_meson_convert_list_to_python_array(linker_flags ${linker_flags}) string(APPEND result "c_link_args = ${linker_flags}\n") @@ -161,8 +199,6 @@ endfunction() function(z_vcpkg_meson_generate_native_file_config config_type) #https://mesonbuild.com/Native-environments.html set(native_file "[properties]\n") #https://mesonbuild.com/Builtin-options.html - z_vcpkg_meson_generate_flags_properties_string(native_properties "${config_type}") - string(APPEND native_file "${native_properties}") #Setup CMake properties string(APPEND native_file "cmake_toolchain_file = '${SCRIPTS}/buildsystems/vcpkg.cmake'\n") string(APPEND native_file "[cmake]\n") @@ -192,6 +228,8 @@ function(z_vcpkg_meson_generate_native_file_config config_type) #https://mesonbu string(APPEND native_file "VCPKG_CRT_LINKAGE = '${VCPKG_CRT_LINKAGE}'\n") string(APPEND native_file "[built-in options]\n") + z_vcpkg_meson_generate_flags_properties_string(native_properties "${config_type}") + string(APPEND native_file "${native_properties}") if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_CRT_LINKAGE STREQUAL "static") set(crt_type mt) @@ -276,43 +314,9 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu else() message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" ) endif() - set(cross_file "[binaries]\n") - if(VCPKG_TARGET_IS_WINDOWS) - set(proglist MT) - else() - set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) - endif() - foreach(prog IN LISTS proglist) - if(VCPKG_DETECTED_CMAKE_${prog}) - string(TOLOWER "${prog}" proglower) - string(APPEND cross_file "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") - endif() - endforeach() - set(programs C CXX RC) - foreach(prog IN LISTS programs) - if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) - string(REPLACE "CXX" "CPP" mesonprog "${prog}") - string(REPLACE "RC" "windres" mesonprog "${mesonprog}") # https://mesonbuild.com/Windows-module.html - string(TOLOWER "${mesonprog}" proglower) - string(APPEND cross_file "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") - endif() - endforeach() - if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) - # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 - if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$") - string(APPEND cross_file "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") - endif() - endif() - if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) - # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 - if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$") - string(APPEND cross_file "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") - endif() - endif() - string(APPEND cross_file "cmake = '${CMAKE_COMMAND}'\n") - foreach(additional_binary IN LISTS additional_binaries) - string(APPEND cross_file "${additional_binary}\n") - endforeach() + + set(cross_file "") + z_vcpkg_append_proglist(cross_file "${additional_binaries}") string(APPEND cross_file "[properties]\n") @@ -355,9 +359,9 @@ endfunction() function(z_vcpkg_meson_generate_cross_file_config config_type) #https://mesonbuild.com/Native-environments.html set(cross_${config_type}_log "[properties]\n") #https://mesonbuild.com/Builtin-options.html + string(APPEND cross_${config_type}_log "[built-in options]\n") z_vcpkg_meson_generate_flags_properties_string(cross_properties ${config_type}) string(APPEND cross_${config_type}_log "${cross_properties}") - string(APPEND cross_${config_type}_log "[built-in options]\n") if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_CRT_LINKAGE STREQUAL "static") set(crt_type mt) @@ -391,22 +395,8 @@ function(vcpkg_configure_meson) debug_message("Including cmake vars from: ${cmake_vars_file}") include("${cmake_vars_file}") - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - vcpkg_list(APPEND arg_ADDITIONAL_NATIVE_BINARIES "python = '${PYTHON3}'") - vcpkg_list(APPEND arg_ADDITIONAL_CROSS_BINARIES "python = '${PYTHON3}'") - vcpkg_find_acquire_program(MESON) - get_filename_component(CMAKE_PATH ${CMAKE_COMMAND} DIRECTORY) - vcpkg_add_to_path("${CMAKE_PATH}") # Make CMake invokeable for Meson - - vcpkg_find_acquire_program(NINJA) - get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) - vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Need to prepend so that meson picks up the correct ninja from vcpkg .... - # vcpkg_list(APPEND arg_ADDITIONAL_NATIVE_BINARIES "ninja = '${NINJA}'") # This does not work due to meson issues ...... - vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) if(NOT vcpkg_meson_cross_file) @@ -485,16 +475,6 @@ function(vcpkg_configure_meson) set(suffix_${buildname} "rel") endif() - if(VCPKG_TARGET_IS_OSX) - vcpkg_backup_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) - - set(ENV{SDKROOT} "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") - set(VCPKG_DETECTED_CMAKE_OSX_SYSROOT "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}" PARENT_SCOPE) - - set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") - set(VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}" PARENT_SCOPE) - endif() - vcpkg_backup_env_variables(VARS INCLUDE) vcpkg_host_path_list(APPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") # configure build @@ -518,19 +498,20 @@ function(vcpkg_configure_meson) #Copy meson log files into buildtree for CI if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-${suffix_${buildtype}}.txt") + file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-${suffix_${buildtype}}.log") + endif() + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-info/intro-dependencies.json") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-info/intro-dependencies.json" DESTINATION "${CURRENT_BUILDTREES_DIR}") + file(RENAME "${CURRENT_BUILDTREES_DIR}/intro-dependencies.json" "${CURRENT_BUILDTREES_DIR}/intro-dependencies-${suffix_${buildtype}}.log") endif() if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-${suffix_${buildtype}}.txt") + file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-${suffix_${buildtype}}.log") endif() message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}} done") vcpkg_restore_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) endforeach() - if(VCPKG_TARGET_IS_OSX) - vcpkg_restore_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) - endif() vcpkg_restore_env_variables(VARS INCLUDE) endfunction() diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 405533939c9731..d9339e059fe652 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -97,7 +97,7 @@ function(z_vcpkg_download_distfile_show_proxy_and_fail error_code) " Workaround is open Windows 10 Settings App, and search for Proxy Configuration page,\n" " Change `http=address:port;https=address:port` to `address`, and fill the port number.\n" " \n" - " 3. You proxy's remote server is out of service.\n" + " 3. Your proxy's remote server is out of service.\n" " \n" " In future vcpkg releases, if you are using Windows, you no longer need to set\n" " HTTP(S)_PROXY environment variables. Vcpkg will simply apply Windows IE Proxy\n" diff --git a/scripts/cmake/vcpkg_execute_build_process.cmake b/scripts/cmake/vcpkg_execute_build_process.cmake index 914c07e0d3054a..921196cc28d13b 100644 --- a/scripts/cmake/vcpkg_execute_build_process.cmake +++ b/scripts/cmake/vcpkg_execute_build_process.cmake @@ -41,6 +41,8 @@ set(Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES "LINK : fatal error LNK1318:" "LINK : fatal error LNK1104:" "LINK : fatal error LNK1201:" + "ld terminated with signal 9" + "Killed signal terminated program" # Multiple threads using the same directory at the same time cause conflicts, will try again. "Cannot create parent directory" "Cannot write file" @@ -84,12 +86,13 @@ function(vcpkg_execute_build_process) file(READ "${log_err}" err_contents) set(all_contents "${out_contents}${err_contents}") if(all_contents MATCHES "${Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES}") - message(STATUS "Restarting Build without parallelism because memory exceeded") + message(WARNING "Please ensure your system has sufficient memory.") set(log_out "${log_prefix}-out-1.log") set(log_err "${log_prefix}-err-1.log") list(APPEND all_logs "${log_out}" "${log_err}") if(DEFINED arg_NO_PARALLEL_COMMAND) + message(STATUS "Restarting build without parallelism") execute_process( COMMAND ${arg_NO_PARALLEL_COMMAND} WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" @@ -98,6 +101,7 @@ function(vcpkg_execute_build_process) RESULT_VARIABLE error_code ) else() + message(STATUS "Restarting build") execute_process( COMMAND ${arg_COMMAND} WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" @@ -134,8 +138,6 @@ function(vcpkg_execute_build_process) break() endif() endforeach() - elseif(all_contents MATCHES "fatal error: ld terminated with signal 9 [Killed]") - message(WARNING "ld was terminated with signal 9 [killed], please ensure your system has sufficient hard disk space and memory.") endif() endif() @@ -149,6 +151,7 @@ function(vcpkg_execute_build_process) if(NOT log_size EQUAL "0") file(TO_NATIVE_PATH "${log}" native_log) string(APPEND stringified_logs " ${native_log}\n") + file(APPEND "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}" "${native_log}\n") endif() endforeach() z_vcpkg_prettify_command_line(pretty_command ${arg_COMMAND}) diff --git a/scripts/cmake/vcpkg_execute_required_process.cmake b/scripts/cmake/vcpkg_execute_required_process.cmake index 27024fecfce862..cc18c4102530a9 100644 --- a/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/scripts/cmake/vcpkg_execute_required_process.cmake @@ -120,6 +120,7 @@ Halting portfile execution. if(NOT log_size EQUAL "0") file(TO_NATIVE_PATH "${log}" native_log) string(APPEND stringified_logs " ${native_log}\n") + file(APPEND "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}" "${native_log}\n") endif() endforeach() diff --git a/scripts/cmake/vcpkg_extract_source_archive.cmake b/scripts/cmake/vcpkg_extract_source_archive.cmake index 59daac7d914b0a..e389d7a121d113 100644 --- a/scripts/cmake/vcpkg_extract_source_archive.cmake +++ b/scripts/cmake/vcpkg_extract_source_archive.cmake @@ -18,6 +18,7 @@ The latter is suggested to use for all future `vcpkg_extract_source_archive`s. vcpkg_extract_source_archive( ARCHIVE [NO_REMOVE_ONE_LEVEL] + [SKIP_PATCH_CHECK] [PATCHES ...] [SOURCE_BASE ] [BASE_DIRECTORY | WORKING_DIRECTORY ] @@ -58,6 +59,10 @@ prevent `vcpkg_extract_source_archive` from performing this transformation. If the source needs to be patched in some way, the `PATCHES` argument allows one to do this, just like other `vcpkg_from_*` functions. +Additionally, the `SKIP_PATCH_CHECK` is provided for `--head` mode - +this allows patches to fail to apply silently. +This argument should _only_ be used when installing a `--head` library, +since otherwise we want a patch failing to appply to be a hard error. `vcpkg_extract_source_archive` extracts the files to `${CURRENT_BUILDTREES_DIR}//-.clean`. @@ -221,7 +226,7 @@ function(vcpkg_extract_source_archive) endif() endif() - if (arg_Z_SKIP_PATCH_CHECK) + if (arg_SKIP_PATCH_CHECK) set(quiet_param QUIET) else() set(quiet_param "") @@ -239,4 +244,3 @@ function(vcpkg_extract_source_archive) set("${out_source_path}" "${source_path}" PARENT_SCOPE) message(STATUS "Using source at ${source_path}") endfunction() - diff --git a/scripts/cmake/vcpkg_fail_port_install.cmake b/scripts/cmake/vcpkg_fail_port_install.cmake index 2adfd28deae04d..4b760e9a0b4a6a 100644 --- a/scripts/cmake/vcpkg_fail_port_install.cmake +++ b/scripts/cmake/vcpkg_fail_port_install.cmake @@ -1,3 +1,5 @@ +# DEPRECATED: in favor of the `supports` field in [`manifest file`](manifest-files.md#supports) et al. + #[===[.md: # vcpkg_fail_port_install @@ -40,23 +42,44 @@ Library linkage for which the build should fail early. #]===] function(vcpkg_fail_port_install) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "ALWAYS" "MESSAGE" "ON_TARGET;ON_ARCH;ON_CRT_LINKAGE;ON_LIBRARY_LINKAGE") + message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_fail_port_install has been removed and all values should be moved by adding `supports` field to manifest file or directly adding `${PORT}:${FAILED_TRIPLET}=fail` to _scripts/ci.baseline.txt_.\nPlease remove `vcpkg_fail_port_install(...)`.\n") + + set(multi_args "ON_TARGET;ON_ARCH;ON_CRT_LINKAGE;ON_LIBRARY_LINKAGE") + cmake_parse_arguments(PARSE_ARGV 0 "arg" "ALWAYS" "MESSAGE" "${multi_args}") if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "vcpkg_fail_port_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() + + if(arg_ALWAYS) + vcpkg_list(SET extra_args) + foreach(arg IN LISTS multi_args) + if(DEFINED "arg_${arg}") + vcpkg_list(APPEND extra_args "${arg}" "${arg_${arg}}") + endif() + endforeach() + if(NOT "${extra_args}" STREQUAL "") + message(WARNING "vcpkg_fail_port_install set to fail both unconditionally and conditionally on ${extra_args}. This is likely to be an error.") + endif() + if(NOT DEFINED arg_MESSAGE) + message(FATAL_ERROR "vcpkg_fail_port_install(ALWAYS) was called without a specific MESSAGE.") + endif() + + message(FATAL_ERROR "${arg_MESSAGE}") + endif() + if(DEFINED arg_MESSAGE) string(APPEND arg_MESSAGE "\n") else() set(arg_MESSAGE "") endif() - set(fail_port) + set(fail_port OFF) # Target fail check if(DEFINED arg_ON_TARGET) foreach(target IN LISTS arg_ON_TARGET) string(TOUPPER "${target}" target_upper) if(VCPKG_TARGET_IS_${target_upper}) - set(fail_port TRUE) + set(fail_port ON) string(APPEND arg_MESSAGE "Target '${target}' not supported by ${PORT}!\n") endif() endforeach() @@ -66,7 +89,7 @@ function(vcpkg_fail_port_install) if(DEFINED arg_ON_ARCH) foreach(arch IN LISTS arg_ON_ARCH) if(VCPKG_TARGET_ARCHITECTURE STREQUAL arch) - set(fail_port TRUE) + set(fail_port ON) string(APPEND arg_MESSAGE "Architecture '${arch}' not supported by ${PORT}!\n") endif() endforeach() @@ -76,7 +99,7 @@ function(vcpkg_fail_port_install) if(DEFINED arg_ON_CRT_LINKAGE) foreach(crt_linkage IN LISTS arg_ON_CRT_LINKAGE) if(VCPKG_CRT_LINKAGE STREQUAL crt_linkage) - set(fail_port TRUE) + set(fail_port ON) string(APPEND arg_MESSAGE "CRT linkage '${VCPKG_CRT_LINKAGE}' not supported by ${PORT}!\n") endif() endforeach() @@ -86,13 +109,13 @@ function(vcpkg_fail_port_install) if(DEFINED arg_ON_LIBRARY_LINKAGE) foreach(library_linkage IN LISTS arg_ON_LIBRARY_LINKAGE) if(VCPKG_LIBRARY_LINKAGE STREQUAL library_linkage) - set(fail_port TRUE) + set(fail_port ON) string(APPEND arg_MESSAGE "Library linkage '${VCPKG_LIBRARY_LINKAGE}' not supported by ${PORT}!\n") endif() endforeach() endif() - if(fail_port OR arg_ALWAYS) - message(FATAL_ERROR ${arg_MESSAGE}) + if(fail_port) + message(FATAL_ERROR "${arg_MESSAGE}") endif() endfunction() diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 7769cfc9059346..c85932dc7c92e0 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -88,17 +88,19 @@ function(z_vcpkg_find_acquire_program_find_external program) if("${arg_INTERPRETER}" STREQUAL "") find_program("${program}" NAMES ${arg_NAMES}) else() - find_file(SCRIPT_${program} NAMES ${arg_NAMES}) - if(SCRIPT_${program}) - vcpkg_list(SET program_tmp ${${interpreter}} ${SCRIPT_${program}}) + find_file(SCRIPT_${arg_PROGRAM_NAME} NAMES ${arg_NAMES}) + if(SCRIPT_${arg_PROGRAM_NAME}) + vcpkg_list(SET program_tmp ${${interpreter}} ${SCRIPT_${arg_PROGRAM_NAME}}) set("${program}" "${program_tmp}" CACHE INTERNAL "") + else() + set("${program}" "" CACHE INTERNAL "") endif() - unset(SCRIPT_${program} CACHE) + unset(SCRIPT_${arg_PROGRAM_NAME} CACHE) endif() if("${version_command}" STREQUAL "") set(version_is_good ON) # can't check for the version being good, so assume it is - else() + elseif(${program}) # only do a version check if ${program} has a value z_vcpkg_find_acquire_program_version_check(version_is_good ${arg_EXACT_VERSION_MATCH} COMMAND ${${program}} ${arg_VERSION_COMMAND} @@ -245,17 +247,17 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "PYTHON3") if(CMAKE_HOST_WIN32) set(program_name python) - set(program_version 3.10.0) + set(program_version 3.10.2) 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 0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd) + set(download_sha512 d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9) 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 23d81d007698383d8dc088da532dcb86c6ceca7eb78ba5688fc2e18ee7f33f53a5632282873762293b8164556dfb15870f8ffb7abd368faba0a3d8d5d5bc6297) + set(download_sha512 e04e14f3b5e96f120a3b0d5fac07b2982b9f3394aef4591b140e84ff97c8532e1f8bf3e613bdf5aec6afeac108b975e754bf9727354bcfaa6673fc89826eac37) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) @@ -268,18 +270,22 @@ function(vcpkg_find_acquire_program program) if(CMAKE_HOST_WIN32) set(program_name python) set(program_version 2.7.18) - 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}.msi") - set(download_filename "python-${program_version}.msi") - set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) - else() - set(tool_subdirectory "python-${program_version}-x64") - set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") - set(download_filename "python-${program_version}.amd64.msi") - set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) + if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake") + include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake") + else() # Old behavior + 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}.msi") + set(download_filename "python-${program_version}.msi") + set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) + else() + set(tool_subdirectory "python-${program_version}-x64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") + set(download_filename "python-${program_version}.amd64.msi") + set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) + endif() + set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") endif() - set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") # macOS includes Python 2.7 built-in as `python` set(program_name python) @@ -347,39 +353,39 @@ function(vcpkg_find_acquire_program program) set(download_filename "nuget.5.11.0.exe") set(raw_executable ON) set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) - elseif(program STREQUAL "MESON") - set(program_version 0.58.1) + elseif(program STREQUAL "MESON") # Should always be found! set(program_name meson) set(search_names meson meson.py) set(interpreter PYTHON3) set(apt_package_name "meson") set(brew_package_name "meson") - set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) - set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}") - set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") - set(download_filename "meson-${ref}.tar.gz") - #set(paths_to_search ${DOWNLOADS}/tools/meson/meson-${program_version}) - #set(download_urls "https://github.com/mesonbuild/meson/releases/download/${program_version}/meson-${program_version}.tar.gz") - #set(download_filename "meson-${program_version}.tar.gz") - set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) - set(supported_on_unix ON) set(version_command --version) set(extra_search_args EXACT_VERSION_MATCH) + if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt") + file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version) + set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson") + else() # Old behavior + set(program_version 0.58.1) + set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) + set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}") + set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") + set(download_filename "meson-${ref}.tar.gz") + set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) + set(supported_on_unix ON) + endif() elseif(program STREQUAL "FLEX" OR program STREQUAL "BISON") if(CMAKE_HOST_WIN32) - vcpkg_list(SET sourceforge_args - REPO winflexbison - FILENAME winflexbison-2.5.16.zip - SHA512 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123 - NO_REMOVE_ONE_LEVEL - WORKING_DIRECTORY "${DOWNLOADS}/tools/winflexbison" - ) + set(program_version 2.5.25) + set(download_urls "https://github.com/lexxmark/winflexbison/releases/download/v${program_version}/win_flex_bison-${program_version}.zip") + set(download_filename "win_flex_bison-${program_version}.zip") + set(download_sha512 2a829eb05003178c89f891dd0a67add360c112e74821ff28e38feb61dac5b66e9d3d5636ff9eef055616aaf282ee8d6be9f14c6ae4577f60bdcec96cec9f364e) + set(tool_subdirectory "${program_version}") if(program STREQUAL "FLEX") set(program_name win_flex) else() set(program_name win_bison) endif() - set(paths_to_search ${DOWNLOADS}/tools/winflexbison/0a14154bff-a8cf65db07) + set(paths_to_search ${DOWNLOADS}/tools/win_flex/${program_version}) if(NOT EXISTS "${paths_to_search}/data/m4sugar/m4sugar.m4") file(REMOVE_RECURSE "${paths_to_search}") endif() @@ -493,7 +499,7 @@ function(vcpkg_find_acquire_program program) set(tool_subdirectory c3eeb6b9fa-76d69c6db5) elseif(program STREQUAL "BAZEL") set(program_name bazel) - set(program_version 4.1.0) + set(program_version 4.2.2) set(rename_binary_to "bazel") if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(supported_on_unix ON) @@ -501,19 +507,19 @@ function(vcpkg_find_acquire_program program) set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") set(download_filename "bazel-${tool_subdirectory}-x86_64") set(raw_executable ON) - set(download_sha512 50aa0894dbeedb9189a56f17baa8cecfa55c5f9c1f93a61b9ab5e10984754a400884fc9802b4979f536778e15f813a72807396b4b47694e4c05eadb841361c69) + set(download_sha512 f38619e054df78cab38278a5901b2798f2e25b5cec53358d98278002e713d225fd3df96a209b7f22a2357835a279cee8ef1768e10561b3e9fe6361f324563bb9) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(supported_on_unix ON) set(tool_subdirectory "${program_version}-darwin") set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") set(download_filename "bazel-${tool_subdirectory}-x86_64") set(raw_executable ON) - set(download_sha512 3500560c9d49d37a1ead2d2777d673c6f1874582883e141ecd5b3991005b1b6b8aab5f255c187133d771497c2a956f5c1e0dfad04dc453525634537e65b649af) + set(download_sha512 a3fd8f9d71b0669d742439200f27ee0a3891c1f248df62c841ebb2b416a47534562f429f8a08793b074e9b74f2ede3d97a7e13ac9921c7ee2dc6a2dca8b7f275) else() set(tool_subdirectory "${program_version}-windows") set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64.zip") set(download_filename "bazel-${tool_subdirectory}-x86_64.zip") - set(download_sha512 3954ab54b465d62eef397767dac7ce21d06ac8ea3e1571d0e7b1f0ea8b5c2cf44eea5d252b85a63a1e1a08dbe9a219783cc23c2888673c35e2df03edfdc9e5a7) + set(download_sha512 8a8196e242964114316232818cb81bfa19ebfd3a029ebf550a241e33b22a6e9ed636dade06411a8706c05c4e73def0bc8d7f45ff0ec5478bcc5de21b5638204d) endif() elseif(program STREQUAL "ARIA2") set(program_name aria2c) @@ -542,16 +548,16 @@ function(vcpkg_find_acquire_program program) set(version_command --version) elseif(CMAKE_HOST_WIN32) if(NOT EXISTS "${PKGCONFIG}") - set(VERSION 0.29.2-2) - set(program_version git-8.0.0.5906.c9a21571-1) + set(VERSION 0.29.2-3) + set(program_version git-9.0.0.6373.5be8fcd83-1) vcpkg_acquire_msys( PKGCONFIG_ROOT NO_DEFAULT_PACKAGES DIRECT_PACKAGES "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst" - 54f8dad3b1a36a4515db47825a3214fbd2bd82f604aec72e7fb8d79068095fda3c836fb2296acd308522d6e12ce15f69e0c26dcf4eb0681fd105d057d912cdb7 + 0c086bf306b6a18988cc982b3c3828c4d922a1b60fd24e17c3bead4e296ee6de48ce148bc6f9214af98be6a86cb39c37003d2dcb6561800fdf7d0d1028cf73a4 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${program_version}-any.pkg.tar.zst" - 2c3d9e6b2eee6a4c16fd69ddfadb6e2dc7f31156627d85845c523ac85e5c585d4cfa978659b1fe2ec823d44ef57bc2b92a6127618ff1a8d7505458b794f3f01c + c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810 ) endif() set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "") diff --git a/scripts/cmake/vcpkg_find_fortran.cmake b/scripts/cmake/vcpkg_find_fortran.cmake index c50497629277a9..0e82c7d36f6f6c 100644 --- a/scripts/cmake/vcpkg_find_fortran.cmake +++ b/scripts/cmake/vcpkg_find_fortran.cmake @@ -14,7 +14,7 @@ vcpkg_find_fortran() ```cmake vcpkg_find_fortran(fortran_args) # ... -vcpkg_configure_cmake(... +vcpkg_cmake_configure(... OPTIONS ${fortran_args} ) @@ -43,76 +43,76 @@ function(vcpkg_find_fortran out_var) set(machine_flag -m32) vcpkg_acquire_msys(msys_root DIRECT_PACKAGES - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-10.2.0-1-any.pkg.tar.zst" - ddbdaf9ea865181e16a0931b2ec88c2dcef8add34628e479c7b9de4fa2ccb22e09c7239442e58702e0acd3adabc920565e976984f2bcd90a3668bf7f48a245f1 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-10.2.0-1-any.pkg.tar.zst" - 150f355085fcf4c54e8bce8f7f08b90fea9ca7e1f32cff0a2e495faa63cf7723f4bf935f0f4ec77c8dd2ba710ceaed88694cb3da71def5e2088dd65e13c9b002 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-10.2.0-1-any.pkg.tar.zst" - 113d8b3b155ea537be8b99688d454f781d70c67c810c2643bc02b83b332d99bfbf3a7fcada6b927fda67ef02cf968d4fdf930466c5909c4338bda64f1f3f483e - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.0-1-any.pkg.tar.xz" - 37747f3f373ebff1a493f5dec099f8cd6d5abdc2254d9cd68a103ad7ba44a81a9a97ccaba76eaee427b4d67b2becb655ee2c379c2e563c8051b6708431e3c588 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - 2c3d9e6b2eee6a4c16fd69ddfadb6e2dc7f31156627d85845c523ac85e5c585d4cfa978659b1fe2ec823d44ef57bc2b92a6127618ff1a8d7505458b794f3f01c - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - e87ad4f4071c6b5bba3b13a85abf6657bb494b73c57ebe65bc5a92e2cef1d9de354e6858d1338ee72809e3dc742ba69ce090aaad4560ae1d3479a61dbebf03c6 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.1.0-1-any.pkg.tar.xz" - d236b815ec3cf569d24d96a386eca9f69a2b1e8af18e96c3f1e5a4d68a3598d32768c7fb3c92207ecffe531259822c1a421350949f2ffabd8ee813654f1af864 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.1.0-2-any.pkg.tar.zst" - caac5cb73395082b479597a73c7398bf83009dbc0051755ef15157dc34996e156d4ed7881ef703f9e92861cfcad000888c4c32e4bf38b2596c415a19aafcf893 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-10.2.0-1-any.pkg.tar.zst" - 3085e744e716301ba8e4c8a391ab09c2d51e587e0a2df5dab49f83b403a32160f8d713cf1a42c1d962885b4c6ee3b6ed36ef40de15c4be2b69dbc3f12f974c3c - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-binutils-2.34-3-any.pkg.tar.zst" - ff06b2adebe6e9b278b63ca5638ff704750a346faad1cdc40089431b0a308edb6f2a131815e0577673a19878ec1bd8d5a4fa592aa227de769496c1fd3aedbc85 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" - 120c943ce173719e48400fa18299f3458bc9db4cf18bb5a4dda8a91cc3f816510b337a92f7388077c65b50bbbeae9078793891ceaad631d780b10fde19ad3649 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" - dbb9f8258da306a3441f9882faa472c3665a67b2ea68657f3e8a1402dcfacf9787a886a3daf0eefe4946f04557bc166eb15b21c1093ad85c909002daadba1923 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-11.2.0-8-any.pkg.tar.zst" + 9337dafdeb4f5eaf41bf13441c345b999dd0561b4fc757a67b4e362c3e0afea5828cd68b35d2823c545d74ea81b2c34bd1624f97817690a2931f3a890b5273bd + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" + 3e6396eb4dcbe730bb63f4534e25b654008be49f0e113cf34cfb640dba3f67b508a6f5c78f7ab1cc57686936e709bc37a1fdbc20df5ee17fd708a21c1b844af4 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-11.2.0-8-any.pkg.tar.zst" + bdf253bb627cfc108407ea0d1f5fc643da0b229a8f7fcc346fcdf7709e0ffbf8d1f75bdea755116c6b30834d1c764496a23c0546ef1048075d312136c6ebe9d9 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.1-3-any.pkg.tar.zst" + 10787443380a89a3491596946354645899daad07bc159ffcee96243cb51637dfbc163d52751ffd14682b66be8fd65c0379c642df16132f16a80709c4af921bac + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 85980183879da0d0ea74b9ad1fdfb09e5ed9d2e2212877d47d0f621ce721566e205be0b1913a643d0a95b256441e0bafd803fa9c848a8203dffd7d72109e32c2 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.2.1-1-any.pkg.tar.zst" + f4cda83c26bf4225a8c387e0710ea086896e9c89e7863b9a2947982636664b64ffa880cbddfe6d85f8cf7cb3be18296b04874026cdf8b1b702a2820dad135ba4 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.1.0.p13-1-any.pkg.tar.zst" + 038a1cc6bb080d415b9fc19965a1f1c9419f5c42023e29c87f97b4f630c152602abb706036aa3e0f02e337e9d7ab3a43bd7b1234b3775a43ffceb348e79bac1a + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-11.2.0-8-any.pkg.tar.zst" + a6183f0fc80c2e37316b6eb60fdbdccc30b865053dad270c9c96e93cd6fdb2af28a75f981ac1de2fdc22a47494cdb54b8d41d4ecffdf1b1d3a54e85437c20dcf + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-binutils-2.37-4-any.pkg.tar.zst" + 1c2fbb8b94778c562aed01010c06c804d1cc2c446837879e4f1187470259adaecd86699b084c69e254d98201333db69a55126ea2cd0c188e55c9af849c37315a + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 495834d72313021b7553d92a897932f5efc66a0f6f79ebeec574ecd7ddd23e0eed9aacb32601007606abb10b44ba7c7c1ccf6d3437a4338839b2d7b1792327f9 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 7959ae9267306c862b8b23be2ab21498f6e7890c936feae3ec9cf5607434e87e446f7c75ff7bd975f23aa24eb1c23d6068957f6af4e8c358f5f4861db64248b8 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-2-any.pkg.tar.zst" fe48d0d3c582fee1edb178425c6daf619d86362442c729047b3c356be26491164f92be1d87950429d2faca4ed3cf76cb4aafef1af3c87b780eee85ee85a4b4c5 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-windows-default-manifest-6.4-3-any.pkg.tar.xz" 5b99abc55eaa74cf85ca64a9c91542554cb5c1098bc71effba9bd36242694cfd348503fcd3507fb9ba97486108c092c925e2f38cd744493386b3dc9ab28bc526 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-8-any.pkg.tar.zst" - 46bbf0f28d9faf047221def19e6f94b9556fc6c951cad9c4fb657fde9d15303b9cb64aad11eaa57892cde49eafb43fbe2ec6da6b612449a20ae49dc8233e945b - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zstd-1.4.5-1-any.pkg.tar.zst" - 68f431073717b59549ab0fd26be8df8afcb43f3dd85be2ffcbc7d1a629999eed924656a7fc3f50937b2e6605a5067542d016181106b7bc3408b89b268ced5d23 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-9-any.pkg.tar.zst" + 3e461e835641a2a755a42221011871f8a1ed5fa4b6b23c74db286e29bbcfa2fcd30d4a7c41216728df62c9131dbc1e554720da633ed6b2ba3d6f2b6d5d50a300 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zstd-1.5.2-1-any.pkg.tar.zst" + 8e27911a2a5884faa95e1c55058ca15f233d432ed8aa607b04a019758aa21f1357bd5de5ce8709fa47f4fbed6eb00fdfd94e7e2d82023bbc1f1653e95f439e0a ) elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") set(mingw_path mingw64) set(machine_flag -m64) vcpkg_acquire_msys(msys_root DIRECT_PACKAGES - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-10.2.0-1-any.pkg.tar.zst" - 0de02db791e978ae21577e675ee9676f741336c9a5ceb5614dbdfc793e2c1c4749b394f41362af7b069e970302fddf8c6772ebd8445fe1c360861606b1784b4d - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-10.2.0-1-any.pkg.tar.zst" - c2dee2957356fa51aae39d907d0cc07f966028b418f74a1ea7ea551ff001c175d86781f980c0cf994207794322dcd369fa122ab78b6c6d0f0ab01e39a754e780 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-10.2.0-1-any.pkg.tar.zst" - d17eff08c83d08ef020d999a2ead0d25036ada1c1bf6ed7c02bad9b56840ee5a3304acd790d86f52b83b09c1e788f0cecdf7254dc6760c3c7e478f65882cd32d - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.0-1-any.pkg.tar.xz" - 0b22b7363e27cec706eb79ee0c45b5fe7088a5ca69e0868e7366481ed2ea9b3f6623d340cebba0b5ed3d79e4dfc7cf15f53530eb260c6d4057bfc3d92eb8c7bc - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - a6969a5db1c55ba458c1a047d0a2a9d2db6cc24266ea47f740598b149a601995d2de734a0984ac5e57ee611d5982cbc03fd6fc0f498435e8d6401bf15724caad - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - 87ae090a8de855de5580f158f4007f88d6dad341429620685dc736be55b1f060487552040327a76003618e214a11c1f8e5105ca2c7abe164908121627449d679 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.1.0-1-any.pkg.tar.xz" - db075a1406690935db5780af293660385f56699881a1b2cd25ab252183643d71d646b0dadf1e34174df8f0744d51ce8b56dccd719e049efcaf9b7e08e80a7ef6 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0-2-any.pkg.tar.zst" - 14739667242b8852f0d26547eb3297899a51fd1edafc7101b4e7489273e1efb9cb8422fc067361e3c3694c2afcc6c49fc89537f9f811ad5b9b595873112ee890 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-10.2.0-1-any.pkg.tar.zst" - 7a08c7923f688ca8f06d55e1e91b9059a933ee56e27075ea073e6e58ae220310fb5f79869886a61b6987ab08993c9f962a4bfc50b6ea80473e933ce5551f3930 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.34-3-any.pkg.tar.zst" - 4efd5586c344802110ea0061867469a23571df88529d66a943f86add1287f85ef53b6a9a9b16af2cb67bd09e0760a6f290c3b04ba70c0d5861d8a9f79f0ac209 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" - 0142e4a44c59d17380a4fc7b101a2152486781621d5f9f930045b8f9c4bb2c93ea88211e7d8f8f233e0ae09595c6c8bc948ae80b9673f231e715b0d04c8a1e54 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" - b547091a45ea7df8182b627edc9a7c91a23f01c0d4e02634a590c02f24311741cad92ceb67b7e4432ffbe4266f135a5289eb3560cc90ffa5c57612c8537a1588 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-11.2.0-8-any.pkg.tar.zst" + d56483e090f86410b87526dda7774e010d0bd6beda97edcaeb1dead1128fd5ad870bc761a8a190759c48d58c2526b6975fb849f9c03a6be193741a0fd0bf2812 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" + 8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst" + 2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst" + d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + be03433e6006166e5b4794f2a01730cdb6c9f19fa96bd10a8bc50cf06ad389cbc66d44ea3eda46f53c3b2c89e2fc86aec21a372828e9527b24480c87ed88348c + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst" + f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0.p13-1-any.pkg.tar.zst" + a1425169c1570dbd736c31d50bedfab88636bf9565376e2da566be67fcc771e6c76f95895f382d81097e7c0580acb42aa49e34dec5d7a868d73a5dc6a7461c95 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-11.2.0-8-any.pkg.tar.zst" + 26ab2cab684206978a254f1e1595b1ce688e6db12e57ed1d243a5f1b3b21b314f640c7c6fe90eedccb6b9788e1886415ca3290d03b1e71f67f8a99108068336a + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.37-4-any.pkg.tar.zst" + f09ea70810fb337d7f3ec673342ab90df511e6af451e273fe88fe41a2f30bd972b79c830b61bb5388743d00a0ba7885503e143987413db5170c4befffef66303 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 63d081fedd1f70e8d58670d4d0698535a67f04c31caf02d0b23026ac23fc5064e9423d73c79854bbce41cc99dd0b70e4137af3a609e05cdd867fdcea120d356e + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 05860f2bcfacf54089b750099f9ddc52d9b4b8ae8f69028a198dfb51fab09c37a941ae551e5d361a2a11302d48bd4fa95c44131ddee4c1df5a14f28013398f63 "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst" 542ed5d898a57a79d3523458f8f3409669b411f87d0852bb566d66f75c96422433f70628314338993461bcb19d4bfac4dadd9d21390cb4d95ef0445669288658 "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-windows-default-manifest-6.4-3-any.pkg.tar.xz" 77d02121416e42ff32a702e21266ce9031b4d8fc9ecdb5dc049d92570b658b3099b65d167ca156367d17a76e53e172ca52d468e440c2cdfd14701da210ffea37 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-8-any.pkg.tar.zst" - f40dde3216185e945baf51c29bbf8d1947220593901f982c711a663bb5a303efe434a4f6cf0c885817812fdc81183bcc1a240b96c29abb24a4c83202fd15016e - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zstd-1.4.5-1-any.pkg.tar.zst" - dc2c7289fb206966829c98f6bf4389b423784415532ca3d627a22ae9d756a4fe2faf9844994b3093d814d129d20b2b79897e702aa9569978f58431ea66b55feb + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-9-any.pkg.tar.zst" + f386d3a8d8c169a62a4580af074b7fdc0760ef0fde22ef7020a349382dd374a9e946606c757d12da1c1fe68baf5e2eaf459446e653477035a63e0e20df8f4aa0 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zstd-1.5.2-1-any.pkg.tar.zst" + 38ec5ca99c5b955bf8a892a3edaf4e18572977736809b7671c554526b13cb4e53d45c5b83e37e0fb7628483ba98831b3203e3e404dac720d5b2ed95cfe4505c4 ) else() message(FATAL_ERROR "Unknown architecture '${VCPKG_TARGET_ARCHITECTURE}' for MinGW Fortran build!") diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index 0983bf7eb685fb..142cae70eb03fa 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -79,30 +79,38 @@ function(vcpkg_from_git) vcpkg_list(SET git_fetch_shallow_param --depth 1) vcpkg_list(SET extract_working_directory_param) + vcpkg_list(SET skip_patch_check_param) set(git_working_directory "${DOWNLOADS}/git-tmp") - if(VCPKG_USE_HEAD_VERSION) - if(DEFINED arg_HEAD_REF) - vcpkg_list(SET working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") - vcpkg_list(SET git_fetch_shallow_param --depth 1) - set(ref_to_use "${arg_HEAD_REF}") - set(git_working_directory "${CURRENT_BUILDTREES_DIR}/src/git-tmp") - else() - message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + set(do_download OFF) + + if(VCPKG_USE_HEAD_VERSION AND DEFINED arg_HEAD_REF) + vcpkg_list(SET working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + vcpkg_list(SET git_fetch_shallow_param --depth 1) + vcpkg_list(SET skip_patch_check_param SKIP_PATCH_CHECK) + set(ref_to_fetch "${arg_HEAD_REF}") + set(git_working_directory "${CURRENT_BUILDTREES_DIR}/src/git-tmp") + string(REPLACE "/" "_-" sanitized_ref "${arg_HEAD_REF}") + + if(NOT _VCPKG_NO_DOWNLOADS) + set(do_download ON) endif() else() if(NOT DEFINED arg_REF) message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") endif() + if(VCPKG_USE_HEAD_VERSION) + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + endif() if(DEFINED arg_FETCH_REF) - set(ref_to_use "${arg_FETCH_REF}") + set(ref_to_fetch "${arg_FETCH_REF}") vcpkg_list(SET git_fetch_shallow_param) else() - set(ref_to_use "${arg_REF}") + set(ref_to_fetch "${arg_REF}") endif() + string(REPLACE "/" "_-" sanitized_ref "${arg_REF}") endif() - string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") set(temp_archive "${DOWNLOADS}/temp/${PORT}-${sanitized_ref}.tar.gz") set(archive "${DOWNLOADS}/${PORT}-${sanitized_ref}.tar.gz") @@ -110,7 +118,11 @@ function(vcpkg_from_git) if(_VCPKG_NO_DOWNLOADS) message(FATAL_ERROR "Downloads are disabled, but '${archive}' does not exist.") endif() - message(STATUS "Fetching ${arg_URL} ${ref_to_use}...") + set(do_download ON) + endif() + + if(do_download) + message(STATUS "Fetching ${arg_URL} ${ref_to_fetch}...") find_program(GIT NAMES git git.cmd) file(MAKE_DIRECTORY "${DOWNLOADS}") # Note: git init is safe to run multiple times @@ -122,7 +134,7 @@ function(vcpkg_from_git) ) vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND "${GIT}" fetch "${arg_URL}" "${ref_to_use}" ${git_fetch_shallow_param} -n + COMMAND "${GIT}" fetch "${arg_URL}" "${ref_to_fetch}" ${git_fetch_shallow_param} -n WORKING_DIRECTORY "${git_working_directory}" LOGNAME "git-fetch-${TARGET_TRIPLET}" ) @@ -179,6 +191,7 @@ function(vcpkg_from_git) PATCHES ${arg_PATCHES} NO_REMOVE_ONE_LEVEL ${extract_working_directory_param} + ${skip_patch_check_param} ) set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index 56cfcbf6a97b76..5313db3db15123 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -123,54 +123,61 @@ function(vcpkg_from_github) set(org_name "${CMAKE_MATCH_1}") set(repo_name "${CMAKE_MATCH_2}") - set(redownload_param "") - set(working_directory_param "") - set(sha512_param "SHA512" "${arg_SHA512}") - set(ref_to_use "${arg_REF}") - if(VCPKG_USE_HEAD_VERSION) - if(DEFINED arg_HEAD_REF) - set(redownload_param "ALWAYS_REDOWNLOAD") - set(sha512_param "SKIP_SHA512") - set(working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") - set(ref_to_use "${arg_HEAD_REF}") - else() - message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") - endif() - elseif(NOT DEFINED arg_REF) + if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED arg_HEAD_REF) + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + set(VCPKG_USE_HEAD_VERSION OFF) + elseif(NOT VCPKG_USE_HEAD_VERSION AND NOT DEFINED arg_REF) message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") endif() - # avoid using either - or _, to allow both `foo/bar` and `foo-bar` to coexist - # 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") - else() - set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") - endif() - - # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. if(VCPKG_USE_HEAD_VERSION) + string(REPLACE "/" "_-" sanitized_head_ref "${arg_HEAD_REF}") vcpkg_download_distfile(archive_version URLS "${github_api_url}/repos/${org_name}/${repo_name}/git/refs/heads/${arg_HEAD_REF}" - FILENAME "${downloaded_file_name}.version" + FILENAME "${org_name}-${repo_name}-${sanitized_head_ref}.version" ${headers_param} SKIP_SHA512 ALWAYS_REDOWNLOAD ) # Parse the github refs response with regex. - # TODO: add json-pointer support to vcpkg file(READ "${archive_version}" version_contents) - if(NOT version_contents MATCHES [["sha":(\ *)"([a-f0-9]+)"]]) + string(JSON head_version + ERROR_VARIABLE head_version_err + GET "${version_contents}" + "object" + "sha" + ) + if(NOT "${head_version_err}" STREQUAL "NOTFOUND") message(FATAL_ERROR "Failed to parse API response from '${version_url}': - ${version_contents} + +Error was: ${head_version_err} ") endif() - set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) + + set(VCPKG_HEAD_VERSION "${head_version}" PARENT_SCOPE) + set(ref_to_use "${head_version}") + + vcpkg_list(SET redownload_param ALWAYS_REDOWNLOAD) + vcpkg_list(SET sha512_param SKIP_SHA512) + vcpkg_list(SET working_directory_param WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/head") + vcpkg_list(SET skip_patch_check_param SKIP_PATCH_CHECK) + else() + set(ref_to_use "${arg_REF}") + + vcpkg_list(SET redownload_param) + vcpkg_list(SET working_directory_param) + vcpkg_list(SET skip_patch_check_param) + vcpkg_list(SET sha512_param SHA512 "${arg_SHA512}") endif() + string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") + if(DEFINED arg_FILE_DISAMBIGUATOR AND NOT VCPKG_USE_HEAD_REF) + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz") + else() + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") + endif() # Try to download the file information from github vcpkg_download_distfile(archive URLS "${github_host}/${org_name}/${repo_name}/archive/${ref_to_use}.tar.gz" @@ -185,6 +192,7 @@ ${version_contents} REF "${sanitized_ref}" PATCHES ${arg_PATCHES} ${working_directory_param} + ${skip_patch_check_param} ) set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/z_vcpkg_apply_patches.cmake b/scripts/cmake/z_vcpkg_apply_patches.cmake index 64eb6aa1b6a61f..9743981c88e79d 100644 --- a/scripts/cmake/z_vcpkg_apply_patches.cmake +++ b/scripts/cmake/z_vcpkg_apply_patches.cmake @@ -57,8 +57,12 @@ function(z_vcpkg_apply_patches) ) file(WRITE "${CURRENT_BUILDTREES_DIR}/${logname}-err.log" "${error}") - if(error_code AND NOT arg_QUIET) - message(FATAL_ERROR "Applying patch failed: ${error}") + if(error_code) + if(arg_QUIET) + message(STATUS "Applying patch ${patch} - failure silenced") + else() + message(FATAL_ERROR "Applying patch failed: ${error}") + endif() endif() math(EXPR patchnum "${patchnum} + 1") diff --git a/scripts/cmake/z_vcpkg_get_cmake_vars.cmake b/scripts/cmake/z_vcpkg_get_cmake_vars.cmake index f50b1db26fe1c4..bbe88a6dbe4532 100644 --- a/scripts/cmake/z_vcpkg_get_cmake_vars.cmake +++ b/scripts/cmake/z_vcpkg_get_cmake_vars.cmake @@ -39,8 +39,15 @@ function(z_vcpkg_get_cmake_vars out_file) message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if(NOT DEFINED CACHE{Z_VCPKG_GET_CMAKE_VARS_FILE}) - set(Z_VCPKG_GET_CMAKE_VARS_FILE "${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}.cmake.log" + if(DEFINED VCPKG_BUILD_TYPE) + set(cmake_vars_file "${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}.cmake.log") + set(cache_var "Z_VCPKG_GET_CMAKE_VARS_FILE_${VCPKG_BUILD_TYPE}") + else() + set(cmake_vars_file "${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}.cmake.log") + set(cache_var Z_VCPKG_GET_CMAKE_VARS_FILE) + endif() + if(NOT DEFINED CACHE{${cache_var}}) + set(${cache_var} "${cmake_vars_file}" CACHE PATH "The file to include to access the CMake variables from a generated project.") vcpkg_configure_cmake( SOURCE_PATH "${SCRIPTS}/get_cmake_vars" @@ -58,8 +65,8 @@ function(z_vcpkg_get_cmake_vars out_file) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") string(APPEND include_string "include(\"\${CMAKE_CURRENT_LIST_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log\")\n") endif() - file(WRITE "${Z_VCPKG_GET_CMAKE_VARS_FILE}" "${include_string}") + file(WRITE "${cmake_vars_file}" "${include_string}") endif() - set("${out_file}" "${Z_VCPKG_GET_CMAKE_VARS_FILE}" PARENT_SCOPE) + set("${out_file}" "${${cache_var}}" PARENT_SCOPE) endfunction() diff --git a/scripts/detect_compiler/CONTROL b/scripts/detect_compiler/CONTROL deleted file mode 100644 index d76f041f0083ac..00000000000000 --- a/scripts/detect_compiler/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: detect-compiler -Version: 0 -Description: None diff --git a/scripts/detect_compiler/vcpkg.json b/scripts/detect_compiler/vcpkg.json new file mode 100644 index 00000000000000..64979dffe2c0db --- /dev/null +++ b/scripts/detect_compiler/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "detect-compiler", + "version": "0", + "description": "None" +} diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index b6d5f0e4154d46..23b7d64e7fada0 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -101,7 +101,10 @@ macro(_vcpkg_adjust_flags flag_var) foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) string(APPEND ${flag_var} " -arch ${arch}") endforeach() - string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}") + endif() + string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}") + if (CMAKE_OSX_DEPLOYMENT_TARGET) + string(APPEND ${flag_var} " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") endif() endif() endif() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 7cc7afcb961e63..4d11521b4fb3fc 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -139,6 +139,9 @@ if(CMD MATCHES "^BUILD$") set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}") include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake") + set(Z_VCPKG_ERROR_LOG_COLLECTION_FILE "${CURRENT_BUILDTREES_DIR}/error-logs-${TARGET_TRIPLET}.txt") + file(REMOVE "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}") + include("${CURRENT_PORT_DIR}/portfile.cmake") if(DEFINED PORT) include("${SCRIPTS}/build_info.cmake") diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 5cd363ddce5935..2ca68351a5dbea 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -29,9 +29,6 @@ # # See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "@PORT@ currently only supports Linux and Mac platforms" ON_TARGET "Windows") - vcpkg_download_distfile(ARCHIVE URLS "@URL@" FILENAME "@FILENAME@" @@ -59,19 +56,23 @@ vcpkg_extract_source_archive_ex( # tbb ROCKSDB_IGNORE_PACKAGE_TBB # ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() # # Moves all .cmake files from /debug/share/@PORT@/ to /share/@PORT@/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/@PORT@) +# # See /docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md for more details +# When you uncomment "vcpkg_cmake_config_fixup()", you need to add the following to "dependencies" vcpkg.json: +#{ +# "name": "vcpkg-cmake-config", +# "host": true +#} +# vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/@PORT@) # # Handle copyright -# file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/@PORT@ RENAME copyright) +# file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/@PORT@" RENAME copyright) diff --git a/scripts/templates/vcpkg.json.in b/scripts/templates/vcpkg.json.in index 2e217387e76ecc..15fcaa1677f423 100644 --- a/scripts/templates/vcpkg.json.in +++ b/scripts/templates/vcpkg.json.in @@ -3,7 +3,12 @@ "version-string": "", "homepage": "", "description": "", - "dependencies": [], + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "default-features": [], "features": [ diff --git a/scripts/test_ports/cmake-user/portfile.cmake b/scripts/test_ports/cmake-user/portfile.cmake index 28fb50d94c1381..34d222b6890b5b 100644 --- a/scripts/test_ports/cmake-user/portfile.cmake +++ b/scripts/test_ports/cmake-user/portfile.cmake @@ -1,38 +1,38 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) set(cmake_version OFF) -if("cmake-3-4" IN_LIST FEATURES) - set(cmake_version 3.4.3) +if("cmake-3-7" IN_LIST FEATURES) + set(cmake_version 3.7.2) string(REGEX REPLACE "([^.]*[.][^.]*).*" "\\1" cmake_major_minor "${cmake_version}") - if(HOST_TRIPLET MATCHES "^x.*-(windows|mingw)") + if(VCPKG_HOST_IS_WINDOWS) set(name "cmake-${cmake_version}-win32-x86") vcpkg_download_distfile(legacy_cmake_archive FILENAME "${name}.zip" URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.zip" "https://cmake.org/files/v${cmake_major_minor}/${name}.zip" - SHA512 c74a8f85ce04a2c0f68fd315a9a7e2fee5cc98af9e8117cca6b35a4f0942cae2d101672e5936a8bfc20289c8c82da582531495308657348a1121e3f568588bd3 + SHA512 c359a22e2e688da1513db195280d6e8987bc8d570a0c543f1b1dfc8572fe4fd6c23d951ec5d5eae640fcca3bef3ae469083511474796ade8c6319d8bc4e4b38d ) set(cmake_bin_dir "/bin") - elseif(HOST_TRIPLET MATCHES "^x.*-osx") + elseif(VCPKG_HOST_IS_OSX) set(name "cmake-${cmake_version}-Darwin-x86_64") vcpkg_download_distfile(legacy_cmake_archive FILENAME "${name}.tar.gz" - URLS "https://github.com/Kitware/CMake/releases/download/v3.4.3/${name}.tar.gz" + URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.tar.gz" "https://cmake.org/files/v${cmake_major_minor}/${name}.tar.gz" - SHA512 c3da566a19e95b8f91bf601518b9c49304b9bb8500f5a086eb2c867514176278e51dd893952b8ab54a2839ed02c898036c7985fe0bb761db9ccb988343463ea2 + SHA512 8e41608f4dd998020acf2bd1b0dab4aec37b3ea9e228f2c4a457cd1c0339d94db38a0548b4b07a9e3605f9beb11a3f6737a72813586c4ad5f730d74038a14c2b ) set(cmake_bin_dir "/CMake.app/Contents/bin") - elseif(HOST_TRIPLET MATCHES "^x.*-linux") + elseif(VCPKG_HOST_IS_LINUX) set(name "cmake-${cmake_version}-Linux-x86_64") vcpkg_download_distfile(legacy_cmake_archive FILENAME "${name}.tar.gz" - URLS "https://github.com/Kitware/CMake/releases/download/v3.4.3/${name}.tar.gz" + URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.tar.gz" "https://cmake.org/files/v${cmake_major_minor}/${name}.tar.gz" - SHA512 455b8f940ccda0ba1169d3620db67c0bf89284126386408cd28b76b66c59c4c2ea5ad8def0095166e7524f6cf5202f117a2fa49e1525f93ed711657a5d2ae988 + SHA512 459909fcfb9c74993c3d4ab9db4e31ea940515b670db44d039de611d813099895e695467cc8da24824315486e38e2f3e246aa92d6236c51103822ec8a39e3168 ) set(cmake_bin_dir "/bin") else() - message(FATAL_ERROR "Unable to test feature 'cmake-3-4' for '${HOST_TRIPLET}' host.") + message(FATAL_ERROR "Unable to test feature 'cmake-3-7' for '${HOST_TRIPLET}' host.") endif() vcpkg_extract_source_archive_ex( diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index bf8ca455bd97eb..7f6e5161ad5552 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cmake-user", - "version-date": "2021-07-24", + "version-date": "2022-02-28", "description": "Test port to verify the vcpkg toolchain in cmake user projects", "default-features": [ "ci" @@ -20,14 +20,14 @@ "name": "cmake-user", "default-features": false, "features": [ - "cmake-3-4" + "cmake-3-7" ], "platform": "x64 & (windows | linux | osx) & !uwp" } ] }, - "cmake-3-4": { - "description": "Use CMake 3.4 to build the test project" + "cmake-3-7": { + "description": "Use CMake 3.7 to build the test project" }, "find-package": { "description": "Ports to be tested via find_package($package)", diff --git a/scripts/test_ports/cmake/portfile.cmake b/scripts/test_ports/cmake/portfile.cmake index 3a74a2e65a6110..3e7276e4531c99 100644 --- a/scripts/test_ports/cmake/portfile.cmake +++ b/scripts/test_ports/cmake/portfile.cmake @@ -4,30 +4,34 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO cmake/cmake REF - b7b0fb430397bafae4a7bd80b41d474c91a3b7f3 + 8428e39ed9cddb3b7f1a6f7a58cb8617503183d2 SHA512 - 3b0de26910bceaf4bc6546255bada4c502cd0fd32f44bc28b067f347c09d028c175a3243551bbe4bb64bcf312df9ff827e8fdbcb0b34a12e1ce4a26ba0799ee2 + 4a40656efe5854bd6b893d0b2b86eed5df42992d080edb9c0cb2da2c55ad8dd489a85072b138947933d94ef5ba90c7a59f0a4460e3722d0f898ceefbbf74d226 HEAD_REF master ) set(OPTIONS) if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) - list(APPEND OPTIONS -DBUILD_CursesDialog=ON) + list(APPEND OPTIONS "-DBUILD_CursesDialog=ON") else() - list(APPEND OPTIONS -DBUILD_CursesDialog=OFF) + list(APPEND OPTIONS "-DBUILD_CursesDialog=OFF") endif() if(VCPKG_CROSSCOMPILING) - list(APPEND OPTIONS -DQt6CoreTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6CoreTools) - list(APPEND OPTIONS -DQt6WidgetsTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6WidgetsTools) - list(APPEND OPTIONS -DQt6GuiTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6GuiTools) + list(APPEND OPTIONS "-DQt6CoreTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6CoreTools") + list(APPEND OPTIONS "-DQt6WidgetsTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6WidgetsTools") + list(APPEND OPTIONS "-DQt6GuiTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6GuiTools") if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged list(APPEND OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} -DBUILD_TESTING=OFF @@ -46,7 +50,7 @@ vcpkg_configure_cmake( -DCMake_QT_MAJOR_VERSION:STRING=6 ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() if(NOT VCPKG_TARGET_IS_OSX) @@ -60,16 +64,16 @@ if(NOT VCPKG_TARGET_IS_OSX) vcpkg_copy_tools(TOOL_NAMES ${_tools} AUTO_CLEAN) else() # On OSX everything is within a CMake.app folder - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") file(RENAME "${CURRENT_PACKAGES_DIR}/CMake.app" "${CURRENT_PACKAGES_DIR}/tools/CMake.app") if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/CMake.app") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/debug) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/debug") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/CMake.app" "${CURRENT_PACKAGES_DIR}/tools/debug/CMake.app") endif() endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -configure_file(${SOURCE_PATH}/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/Copyright.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/scripts/test_ports/cmake/vcpkg.json b/scripts/test_ports/cmake/vcpkg.json index 541ea1d77bb7b2..89668baefbc692 100644 --- a/scripts/test_ports/cmake/vcpkg.json +++ b/scripts/test_ports/cmake/vcpkg.json @@ -1,8 +1,9 @@ { "name": "cmake", - "version-string": "3.20.0", + "version-string": "3.22.2", "description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.", "homepage": "https://cmake.org/", + "license": "BSD-3-Clause", "dependencies": [ "bzip2", "curl", @@ -17,6 +18,10 @@ }, "nghttp2", "qtbase", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib", "zstd" ] diff --git a/scripts/test_ports/llfio-run-tests/CONTROL b/scripts/test_ports/llfio-run-tests/CONTROL deleted file mode 100644 index eeac83f9155fec..00000000000000 --- a/scripts/test_ports/llfio-run-tests/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: llfio-run-tests -Version: 0 -Description: Ensures that LLFIO built with vcpkg version of dependencies produces working executables. -Build-Depends: llfio[run-tests], llfio[status-code,run-tests] -Supports: x64 diff --git a/scripts/test_ports/llfio-run-tests/vcpkg.json b/scripts/test_ports/llfio-run-tests/vcpkg.json new file mode 100644 index 00000000000000..32c0cf4a2ef17c --- /dev/null +++ b/scripts/test_ports/llfio-run-tests/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "llfio-run-tests", + "version-string": "0", + "port-version": 1, + "description": "Ensures that LLFIO built with vcpkg version of dependencies produces working executables.", + "supports": "x64", + "dependencies": [ + { + "name": "llfio", + "features": [ + "run-tests" + ] + }, + { + "name": "llfio", + "features": [ + "run-tests", + "status-code" + ] + } + ] +} diff --git a/scripts/test_ports/outcome-run-tests/CONTROL b/scripts/test_ports/outcome-run-tests/CONTROL deleted file mode 100644 index bc289efab9465b..00000000000000 --- a/scripts/test_ports/outcome-run-tests/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: outcome-run-tests -Version: 0 -Description: Ensures that outcome built with vcpkg version of dependencies produces working executables. -Build-Depends: outcome[run-tests] -Supports: x64 diff --git a/scripts/test_ports/outcome-run-tests/vcpkg.json b/scripts/test_ports/outcome-run-tests/vcpkg.json new file mode 100644 index 00000000000000..8a203953af182f --- /dev/null +++ b/scripts/test_ports/outcome-run-tests/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "outcome-run-tests", + "version-string": "0", + "port-version": 1, + "description": "Ensures that outcome built with vcpkg version of dependencies produces working executables.", + "supports": "x64", + "dependencies": [ + { + "name": "outcome", + "features": [ + "run-tests" + ] + } + ] +} diff --git a/scripts/test_ports/unit-test-cmake/portfile.cmake b/scripts/test_ports/unit-test-cmake/portfile.cmake index 497cb18a383b09..d506ebaf66374a 100644 --- a/scripts/test_ports/unit-test-cmake/portfile.cmake +++ b/scripts/test_ports/unit-test-cmake/portfile.cmake @@ -145,6 +145,9 @@ endif() if("function-arguments" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_function_arguments.cmake") endif() +if("merge-libs" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_cmake_config_fixup_merge.cmake") +endif() if(Z_VCPKG_UNIT_TEST_HAS_ERROR) _message(FATAL_ERROR "At least one test failed") diff --git a/scripts/test_ports/unit-test-cmake/test-z_vcpkg_cmake_config_fixup_merge.cmake b/scripts/test_ports/unit-test-cmake/test-z_vcpkg_cmake_config_fixup_merge.cmake new file mode 100644 index 00000000000000..8809af46ff577d --- /dev/null +++ b/scripts/test_ports/unit-test-cmake/test-z_vcpkg_cmake_config_fixup_merge.cmake @@ -0,0 +1,56 @@ +# z_vcpkg_cmake_config_fixup_merge( ) +set(release_libs namespace::C++_shared) +set(debug_libs namespace::C++_shared) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged "namespace::C++_shared" +) + +set(release_libs A) +set(debug_libs B) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:A>;\$<\$:B>]] +) + +set(release_libs A B) +set(debug_libs A ) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[A;\$<\$>:B>]] +) + +set(release_libs A ) +set(debug_libs A B) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[A;\$<\$:B>]] +) + +set(release_libs A C) +set(debug_libs C) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:A>;\$<\$:C>;\$<\$>:C>]] +) + +set(release_libs [[\$<\$>:A>;\$<\$:B>]]) +set(debug_libs [[\$<\$>:A>;\$<\$:B>]]) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:A>;\$<\$:B>]] +) + +set(release_libs optimized o1 debug d1) +set(debug_libs optimized o2 debug d2) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:o1>;\$<\$:d2>]] +) + +set(release_libs debug d1 optimized o1) +set(debug_libs debug d2 optimized o2) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$:d2>;\$<\$>:o1>]] +) diff --git a/scripts/test_ports/unit-test-cmake/vcpkg.json b/scripts/test_ports/unit-test-cmake/vcpkg.json index 366d1d7a93fb7c..28cacbc8f34cf8 100644 --- a/scripts/test_ports/unit-test-cmake/vcpkg.json +++ b/scripts/test_ports/unit-test-cmake/vcpkg.json @@ -18,6 +18,15 @@ "list": { "description": "Test the vcpkg_list function" }, + "merge-libs": { + "description": "Test the z_vcpkg_cmake_config_fixup_merge_lists function", + "dependencies": [ + { + "name": "vcpkg-cmake-config", + "host": true + } + ] + }, "minimum-required": { "description": "Test the vcpkg_minimum_required function" } diff --git a/scripts/test_ports/vcpkg-acquire-msys-test/CONTROL b/scripts/test_ports/vcpkg-acquire-msys-test/CONTROL deleted file mode 100644 index 47859b0769b2e9..00000000000000 --- a/scripts/test_ports/vcpkg-acquire-msys-test/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vcpkg-acquire-msys-test -Version: 0 -Description: Test port to exercise vcpkg_acquire_msys -Supports: x86 & windows diff --git a/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json b/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json new file mode 100644 index 00000000000000..808294bbc59cca --- /dev/null +++ b/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-acquire-msys-test", + "version-string": "0", + "port-version": 1, + "description": "Test port to exercise vcpkg_acquire_msys", + "supports": "x86 & windows" +} diff --git a/scripts/test_ports/vcpkg-ci-boost/portfile.cmake b/scripts/test_ports/vcpkg-ci-boost/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-boost/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json new file mode 100644 index 00000000000000..c8c19f49eb5bc9 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json @@ -0,0 +1,65 @@ +{ + "name": "vcpkg-ci-boost", + "version": "1", + "description": "Boost features testing within CI.", + "dependencies": [ + { + "name": "boost", + "default-features": false, + "features": [ + "mpi" + ] + }, + { + "name": "boost-asio", + "default-features": false, + "features": [ + "ssl" + ] + }, + { + "name": "boost-fiber", + "default-features": false, + "features": [ + "numa" + ] + }, + { + "name": "boost-locale", + "default-features": false, + "features": [ + "icu" + ] + }, + { + "name": "boost-mpi", + "default-features": false, + "features": [ + "python3" + ], + "platform": "!static" + }, + { + "name": "boost-odeint", + "default-features": false, + "features": [ + "mpi" + ] + }, + { + "name": "boost-python", + "default-features": false, + "features": [ + "python2", + "python3" + ] + }, + { + "name": "boost-regex", + "default-features": false, + "features": [ + "icu" + ] + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL b/scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL deleted file mode 100644 index 78687c423501f2..00000000000000 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: vcpkg-ci-ffmpeg -Version: 1 -Homepage: https://github.com/microsoft/vcpkg -Description: Port to force features of certain ports within CI -Build-Depends: ffmpeg[all-nonfree] diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json new file mode 100644 index 00000000000000..356aab21a25013 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "vcpkg-ci-ffmpeg", + "version-string": "1", + "port-version": 1, + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "dependencies": [ + { + "name": "ffmpeg", + "features": [ + "all-nonfree" + ] + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-llvm/portfile.cmake b/scripts/test_ports/vcpkg-ci-llvm/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-llvm/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json new file mode 100644 index 00000000000000..d04286b65641d6 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "vcpkg-ci-llvm", + "version-string": "0", + "description": "LLVM features testing within CI.", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "clang", + "enable-abi-breaking-checks", + "disable-assertions", + "disable-clang-static-analyzer", + "enable-bindings", + "enable-eh", + "enable-rtti", + "enable-terminfo", + "enable-threads", + "enable-zlib", + "lld", + "lldb", + "polly", + "target-all", + "tools", + "utils" + ] + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "flang" + ], + "platform": "!(x86 & windows)" + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json index 11041676f44054..7c404301038862 100644 --- a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json @@ -24,6 +24,7 @@ }, { "name": "opencv", + "default-features": false, "features": [ "gtk" ], @@ -31,6 +32,7 @@ }, { "name": "opencv", + "default-features": false, "features": [ "cuda", "cudnn", @@ -43,7 +45,9 @@ }, { "name": "opencv", + "default-features": false, "features": [ + "freetype", "gdcm", "ipp", "jasper", @@ -56,6 +60,14 @@ "vtk" ], "platform": "!uwp & !(windows & (arm | arm64))" + }, + { + "name": "opencv", + "default-features": false, + "features": [ + "python" + ], + "platform": "!uwp" } ] } diff --git a/scripts/test_ports/vcpkg-ci-paraview/CONTROL b/scripts/test_ports/vcpkg-ci-paraview/CONTROL deleted file mode 100644 index 1377508422d025..00000000000000 --- a/scripts/test_ports/vcpkg-ci-paraview/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: vcpkg-ci-paraview -Version: 1 -Port-Version: 2 -Homepage: https://github.com/microsoft/vcpkg -Description: Port to force features of certain ports within CI -Build-Depends: paraview[core,vtkm,tools](!(x86&windows)), paraview[core,tools](x86&windows) diff --git a/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json b/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json new file mode 100644 index 00000000000000..cc1e43306cccd8 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "vcpkg-ci-paraview", + "version-string": "1", + "port-version": 3, + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "dependencies": [ + { + "name": "paraview", + "default-features": false, + "features": [ + "tools" + ], + "platform": "x86 & windows" + }, + { + "name": "paraview", + "default-features": false, + "features": [ + "tools", + "vtkm" + ], + "platform": "!(x86 & windows)" + } + ] +} diff --git a/scripts/test_ports/vcpkg-find-acquire-program/CONTROL b/scripts/test_ports/vcpkg-find-acquire-program/CONTROL deleted file mode 100644 index 6f248be58aff52..00000000000000 --- a/scripts/test_ports/vcpkg-find-acquire-program/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vcpkg-find-acquire-program -Version: 0 -Description: Test port to exercise vcpkg_find_acquire_program -Supports: windows diff --git a/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json b/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json new file mode 100644 index 00000000000000..987003b4cf0d3c --- /dev/null +++ b/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-find-acquire-program", + "version-string": "0", + "port-version": 1, + "description": "Test port to exercise vcpkg_find_acquire_program", + "supports": "windows" +} diff --git a/scripts/test_ports/vcpkg-from-git-test/portfile.cmake b/scripts/test_ports/vcpkg-from-git-test/portfile.cmake new file mode 100644 index 00000000000000..b4c2a224329355 --- /dev/null +++ b/scripts/test_ports/vcpkg-from-git-test/portfile.cmake @@ -0,0 +1,193 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(git_remote "${CURRENT_BUILDTREES_DIR}/test-git-repo") +file(REMOVE_RECURSE "${git_remote}") + +vcpkg_find_acquire_program(GIT) +vcpkg_list(SET git_config + -c core.autocrlf=false + -c user.email=vcpkg@example.com + -c user.name=vcpkg +) + +vcpkg_list(SET git ${GIT} ${git_config}) + +vcpkg_execute_required_process( + COMMAND ${git} init "${git_remote}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "git-init" +) +vcpkg_execute_required_process( + COMMAND ${git} config uploadpack.allowReachableSHA1InWant true + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-config" +) +vcpkg_execute_required_process( + COMMAND ${git} checkout -b main + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-new-branch" +) + +file(WRITE "${git_remote}/README.txt" "first commit") +vcpkg_execute_required_process( + COMMAND ${git} add "${git_remote}/README.txt" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-add.1" +) +vcpkg_execute_required_process( + COMMAND ${git} commit -m "first commit" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-commit.1" +) +vcpkg_execute_in_download_mode( + COMMAND ${git} rev-parse HEAD + OUTPUT_VARIABLE ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_remote}" +) +if(NOT "${error_code}" EQUAL "0") + message(FATAL_ERROR "Failed to rev-parse HEAD: ${error_code}") +endif() +string(STRIP "${ref}" ref) + +file(WRITE "${git_remote}/README.txt" "second commit") +vcpkg_execute_required_process( + COMMAND ${git} add "${git_remote}/README.txt" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-add.2" +) +vcpkg_execute_required_process( + COMMAND ${git} commit -m "second commit" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-commit.2" +) +vcpkg_execute_in_download_mode( + COMMAND ${git} rev-parse HEAD + OUTPUT_VARIABLE head_ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_remote}" +) +if(NOT "${error_code}" EQUAL "0") + message(FATAL_ERROR "Failed to rev-parse HEAD: ${error_code}") +endif() +string(STRIP "${head_ref}" head_ref) + +# test regular mode +set(VCPKG_USE_HEAD_VERSION OFF) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "first commit") + message(FATAL_ERROR "Failed to checkout the first commit. Contents were: +${contents} +") +endif() + +# test regular mode with FETCH_REF +vcpkg_execute_required_process( + COMMAND ${git} config uploadpack.allowReachableSHA1InWant false + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-config" +) +set(VCPKG_USE_HEAD_VERSION OFF) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + FETCH_REF main + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "first commit") + message(FATAL_ERROR "Failed to checkout the first commit. Contents were: +${contents} +") +endif() + +vcpkg_execute_required_process( + COMMAND ${git} config uploadpack.allowReachableSHA1InWant true + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-config" +) + +# test head mode +set(VCPKG_USE_HEAD_VERSION ON) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "second commit") + message(FATAL_ERROR "Failed to checkout the HEAD commit. Contents were: +${contents} +") +endif() +if(NOT "${VCPKG_HEAD_VERSION}" STREQUAL "${head_ref}") + message(FATAL_ERROR "Failed to checkout the right HEAD commit. + Expected: ${head_ref} + Actual : ${VCPKG_HEAD_VERSION} +") +endif() + +# test head mode + no HEAD_REF -> just uses REF +set(VCPKG_USE_HEAD_VERSION ON) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "first commit") + message(FATAL_ERROR "Failed to checkout the regular commit. Contents were: +${contents} +") +endif() + +# test new head ref +file(WRITE "${git_remote}/README.txt" "third commit") +vcpkg_execute_required_process( + COMMAND ${git} add "${git_remote}/README.txt" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git.7" +) +vcpkg_execute_required_process( + COMMAND ${git} commit -m "second commit" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git.8" +) +vcpkg_execute_in_download_mode( + COMMAND ${git} rev-parse HEAD + OUTPUT_VARIABLE new_head_ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_remote}" +) +if(NOT "${error_code}" EQUAL "0") + message(FATAL_ERROR "Failed to rev-parse HEAD: ${error_code}") +endif() +string(STRIP "${new_head_ref}" new_head_ref) + +set(VCPKG_USE_HEAD_VERSION ON) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "third commit") + message(FATAL_ERROR "Failed to checkout the right HEAD commit. Contents were: +${contents} +") +endif() +if(NOT "${VCPKG_HEAD_VERSION}" STREQUAL "${new_head_ref}") + message(FATAL_ERROR "Failed to checkout the right HEAD commit. + Expected: ${new_head_ref} + Actual : ${VCPKG_HEAD_VERSION} +") +endif() diff --git a/scripts/test_ports/vcpkg-from-git-test/vcpkg.json b/scripts/test_ports/vcpkg-from-git-test/vcpkg.json new file mode 100644 index 00000000000000..609e7f3e42d891 --- /dev/null +++ b/scripts/test_ports/vcpkg-from-git-test/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "vcpkg-from-git-test", + "version": "0" +} diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index ff04cb72d83ae4..fb4e66cd6b04ac 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -2,22 +2,27 @@ set(ANDROID_CPP_FEATURES "rtti exceptions" CACHE STRING "") set(CMAKE_SYSTEM_NAME Android CACHE STRING "") set(ANDROID_TOOLCHAIN clang CACHE STRING "") set(ANDROID_NATIVE_API_LEVEL ${CMAKE_SYSTEM_VERSION} CACHE STRING "") +if(CMAKE_SYSTEM_VERSION MATCHES "^[0-9]+$") + set(ANDROID_PLATFORM android-${CMAKE_SYSTEM_VERSION} CACHE STRING "") +else() + set(ANDROID_PLATFORM ${CMAKE_SYSTEM_VERSION} CACHE STRING "") +endif() set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "") -if (VCPKG_TARGET_TRIPLET MATCHES "^arm64-android") +if (VCPKG_TARGET_TRIPLET MATCHES "arm64-android") set(ANDROID_ABI arm64-v8a CACHE STRING "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "^armv6-android") +elseif(VCPKG_TARGET_TRIPLET MATCHES "armv6-android") set(ANDROID_ABI armeabi CACHE STRING "") set(ANDROID_ARM_MODE arm CACHE STRING "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "^arm-neon-android") +elseif(VCPKG_TARGET_TRIPLET MATCHES "arm-neon-android") set(ANDROID_ABI armeabi-v7a CACHE STRING "") set(ANDROID_ARM_NEON ON CACHE BOOL "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "^arm-android") +elseif(VCPKG_TARGET_TRIPLET MATCHES "arm-android") set(ANDROID_ABI armeabi-v7a CACHE STRING "") set(ANDROID_ARM_NEON OFF CACHE BOOL "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "^x64-android") +elseif(VCPKG_TARGET_TRIPLET MATCHES "x64-android") set(ANDROID_ABI x86_64 CACHE STRING "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "^x86-android") +elseif(VCPKG_TARGET_TRIPLET MATCHES "x86-android") set(ANDROID_ABI x86 CACHE STRING "") else() message(FATAL_ERROR "Unknown ABI for target triplet ${VCPKG_TARGET_TRIPLET}") diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 2b66b76a121473..6a70c26c2a4b60 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,32 +1,32 @@ - 3.10.0 + 3.10.1 python.exe - https://www.python.org/ftp/python/3.10.0/python-3.10.0-embed-win32.zip - 0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd - python-3.10.0-embed-win32.zip + https://www.python.org/ftp/python/3.10.2/python-3.10.2-embed-win32.zip + d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9 + python-3.10.2-embed-win32.zip - 3.21.1 - cmake-3.21.1-windows-i386\bin\cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-windows-i386.zip - 3aa0e9c904bf8abfc9441c1f0fd571e613ade7bc12f36211cd9006b4a2226552815ec8b00c8ef43583769d9d90996e75d2e832b3718ac3b85d3f9fb4db1cd60a - cmake-3.21.1-windows-i386.zip + 3.22.2 + cmake-3.22.2-windows-i386\bin\cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-windows-i386.zip + 969d3d58d56d8fa3cc3acae2b949bf58abab945f70ae292ff20c9060d845dfc094c613c367a924abff47f307cc33af1467cdb9b75bb857868e38b2c7cdc72f79 + cmake-3.22.2-windows-i386.zip - 3.21.1 - cmake-3.21.1-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-macos-universal.tar.gz - 0e5d3781101d6f54d916066719a0ff27d052b40e999dfd8e1f53d8d22d99e45cad22fc28b5d2a9e810b0cc8237e640d7747aff2a2c0896571c8a69ecdd0a9e41 - cmake-3.21.1-macos-universal.tar.gz + 3.22.2 + cmake-3.22.2-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-macos-universal.tar.gz + 08104f608ecb9a5cfef38e79f0957d21e425616c0677781445492f82cbfec805113e3b5eb4bc737b707bb26a00678e7bd55e17555a5611c08b0b9b44ac5136ac + cmake-3.22.2-macos-universal.tar.gz - 3.21.1 - cmake-3.21.1-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-Linux-x86_64.tar.gz - deb24087315bcf01d2969846246564a352b6f77521df6b235f9ef525450db9c89b32dca4ad78f93a356dd5ab7b587374d49fc1a892354760715a5ef1f88e925f - cmake-3.21.1-linux-x86_64.tar.gz + 3.22.2 + cmake-3.22.2-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.tar.gz + 579e08b086f6903ef063697fca1dc2692f68a7341dd35998990b772b4221cdb5b1deecfa73bad9d46817ef09e58882b2adff9d64f959c01002c11448a878746b + cmake-3.22.2linux-x86_64.tar.gz 3.20.4 @@ -36,11 +36,11 @@ cmake-3.20.4.txz - 2.32.0.2 + 2.7.4 mingw32\bin\git.exe - https://github.com/git-for-windows/git/releases/download/v2.32.0.windows.2/PortableGit-2.32.0.2-32-bit.7z.exe - 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348 - PortableGit-2.32.0.2-32-bit.7z.exe + https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-32-bit.7z.exe + f98df16641a615bbc36c5c319c78abb780d824ff35ed5f2a095e2d5fce2acacfc7f6532c96f1c81d3d3cd8a642858cbd9de0e0e5fcde9ca11e6ad9f6598bb82f + PortableGit-2.35.1.2-32-bit.7z.exe 2.7.4 @@ -112,13 +112,20 @@ 1f3e593270d7c2a4e271fdb49c637a2de462351310ef66bba298d30f6ca23365ec6aecf2e57799a00c873267cd3f92060ecac03eb291d42903d0e0869cd17c73 QtInstallerFramework-win-x86.zip - - 19.00 + + 21.07 Files\7-Zip\7z.exe - https://www.7-zip.org/a/7z1900-x64.msi - 7837a8677a01eed9c3309923f7084bc864063ba214ee169882c5b04a7a8b198ed052c15e981860d9d7952c98f459a4fab87a72fd78e7d0303004dcb86f4324c8 - 7z1900-x64.msi + https://www.7-zip.org/a/7z2107-x64.msi + d55b44f1255d1b0e629719383a600a7e83dc6378d470096337b886ce24684d26bcc2b04f9cea39ad888179edce23ad2bd0e8e1863ddc40106c176adece8c012d + 7z2107-x64.msi + + 21.07 + 7za.exe + https://www.7-zip.org/a/7z2107-extra.7z + 648d894940bcc29951752d7a8fd18c770ee8d4fd944e17f1a52588e51ca8f58375ba48514538f2e1387786fd812bb86f75fd6bdd0892685cdcafb2989942c848 + 7z2107-extra.7z + 1.35.0 aria2-1.35.0-win-32bit-build1\aria2c.exe @@ -162,11 +169,11 @@ ninja-freebsd-1.8.2.zip - 7.2.0 + 7.2.1 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x86.zip - cd765b39559be296229f8aef4022f17f20d3bb3037944867918b3a12a901160020e250403abd15666622158eb764fa217b5e5ad9f4d6ad69906ce3c4e03a808b - PowerShell-7.2.0-win-x86.zip + https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x86.zip + f7a1d7de59c9400ee7d4f988a35daf6f52aef3206a9de9948e5f8d81b7e838301e07491b9cab417fc58f9fd2eb28773175e86a06158ae868c7ef076cc4be7882 + PowerShell-7.2.1-win-x86.zip 16.12.0 diff --git a/triplets/community/x64-linux-release.cmake b/triplets/community/x64-linux-release.cmake new file mode 100644 index 00000000000000..d7f3e2b25fa0fe --- /dev/null +++ b/triplets/community/x64-linux-release.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +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/x64-osx-release.cmake b/triplets/community/x64-osx-release.cmake new file mode 100644 index 00000000000000..64a2d07f5d61e5 --- /dev/null +++ b/triplets/community/x64-osx-release.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES x86_64) +set(VCPKG_BUILD_TYPE release) diff --git a/triplets/community/x64-windows-release.cmake b/triplets/community/x64-windows-release.cmake new file mode 100644 index 00000000000000..f6c40253a080c7 --- /dev/null +++ b/triplets/community/x64-windows-release.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_BUILD_TYPE release) diff --git a/versions/3-/3fd.json b/versions/3-/3fd.json index 2a20264ea9ae88..a4398c8dfd18cc 100644 --- a/versions/3-/3fd.json +++ b/versions/3-/3fd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b52e6aff44ca4e11335754570701f692ea14184", + "version": "2.6.3", + "port-version": 2 + }, { "git-tree": "622078647d4fff0a51a26a4ecff2ba9109e5764d", "version": "2.6.3", diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json index f699a2885f4926..49dd64b19f5274 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "d60561160384264eaf45a225dcb41beccb87ecbc", + "version-string": "21.07", + "port-version": 1 + }, + { + "git-tree": "7a951689070e40d8ff0ed20b4e18bc533ef5db1f", + "version-string": "21.07", + "port-version": 0 + }, + { + "git-tree": "54b143613df50187b48517d63796569641c4eee7", + "version-string": "19.00", + "port-version": 4 + }, { "git-tree": "c49050bcc9af0a2cbd9c572386e6a8b547ebd9f7", "version-string": "19.00", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 78a07547d7dd6d..5b24f90a969bff 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "962a81319706d17c9e90bd0b873659ec7c75178a", + "version-string": "20211102.1", + "port-version": 0 + }, { "git-tree": "10d137aa21adc696f8469d49f67b90ce0d50e1a1", "version-string": "20210324.2", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 8cd454e343c603..b9dd64ebab2a00 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "d20fc0a9eac1744ff9fb5c5427eade58234e35c9", + "version": "7.0.6", + "port-version": 3 + }, + { + "git-tree": "0ad9c09c1663f5264f5bf5dcbe1d402618973144", + "version": "7.0.6", + "port-version": 2 + }, + { + "git-tree": "cac33553b152f59e730715fcc1bae263bb037862", + "version": "7.0.6", + "port-version": 1 + }, + { + "git-tree": "c851425112d4af710db29d482e43a15ade7ee463", + "version": "7.0.6", + "port-version": 0 + }, + { + "git-tree": "2fdbe23020728d91dbae5249ed04b42b4b882a87", + "version": "7.0.5", + "port-version": 3 + }, + { + "git-tree": "1801922b3e4808edcd0b55b6a800bbb1c01687a6", + "version": "7.0.5", + "port-version": 2 + }, { "git-tree": "036533c7b1153d148040334e7195557ce41265e9", "version": "7.0.5", diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index e08320929ec621..4869266c2869cb 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "ec8c68847a3d3950cec058e76a3963fac34fd682", + "version-semver": "3.9.5", + "port-version": 8 + }, + { + "git-tree": "531d21bab7c2d9e9e2ecb1c84e6cf9f1c6173a51", + "version-semver": "3.9.5", + "port-version": 7 + }, + { + "git-tree": "0d1c131172bea536490960f632ac287b3db73edb", + "version-semver": "3.9.5", + "port-version": 6 + }, { "git-tree": "bce9f87e7df6f4e8a9c3121018ffc032e3d2603e", "version-semver": "3.9.5", diff --git a/versions/a-/akali.json b/versions/a-/akali.json index e960d28aafcfc6..210ecf510b1368 100644 --- a/versions/a-/akali.json +++ b/versions/a-/akali.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44ab167f077406e598eb19f7e48f10b638bc1547", + "version-string": "1.42", + "port-version": 3 + }, { "git-tree": "1b94b1623b0778525e405410cee7d6d069ac56ca", "version-string": "1.42", diff --git a/versions/a-/alembic.json b/versions/a-/alembic.json index b2a60245545ed4..8bebb133f7dc2e 100644 --- a/versions/a-/alembic.json +++ b/versions/a-/alembic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16bef528ef38e7426a333739878188d9ca909bc5", + "version": "1.8.3", + "port-version": 1 + }, { "git-tree": "8cb082c36da272a988b08fe0c4c638ff62cb1ad2", "version": "1.8.3", diff --git a/versions/a-/alsa.json b/versions/a-/alsa.json index 3da4e4546e5a2c..6b2fa79737dd05 100644 --- a/versions/a-/alsa.json +++ b/versions/a-/alsa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ce0c3410e25de5357b707dc0f800cf7c3a7f213", + "version": "1.2.6.1", + "port-version": 0 + }, { "git-tree": "03a04f17b2dfb480de15a07b58188b161dbe6dda", "version": "1.2.5.1", diff --git a/versions/a-/ampl-asl.json b/versions/a-/ampl-asl.json index ace12ea0ae0b4e..02f6ff768cd0f3 100644 --- a/versions/a-/ampl-asl.json +++ b/versions/a-/ampl-asl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2a88fb5c85a975bf5c5b49b6d87224b25504553d", + "version-date": "2020-11-11", + "port-version": 3 + }, + { + "git-tree": "024e7d3399beb537eb371c85181e48f4db51a4b0", + "version-string": "2020-11-11", + "port-version": 2 + }, { "git-tree": "823dcf0d7f897a92269faf1915322c012b281a2a", "version-string": "2020-11-11", diff --git a/versions/a-/ampl-mp.json b/versions/a-/ampl-mp.json index 3abf1335e44fa9..f10ce12eaa3242 100644 --- a/versions/a-/ampl-mp.json +++ b/versions/a-/ampl-mp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d52dd1ac4a69a74bb658b52be36c7457ca6049ef", + "version-string": "2020-11-11", + "port-version": 2 + }, { "git-tree": "0363f4dd57d8729a0a6bd3e1c2ca8d424fd59eda", "version-string": "2020-11-11", diff --git a/versions/a-/amqpcpp.json b/versions/a-/amqpcpp.json index c16bbb5cd01a17..ce5199977fafbd 100644 --- a/versions/a-/amqpcpp.json +++ b/versions/a-/amqpcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b071aaf9f29af43e9463bcc9a118f4553351eb16", + "version": "4.3.15", + "port-version": 1 + }, { "git-tree": "3f2e1a0132721d9cdb8515d40010eaba97ecc8de", "version": "4.3.15", diff --git a/versions/a-/anax.json b/versions/a-/anax.json index 99ff1a18737ba7..9566506ae08a53 100644 --- a/versions/a-/anax.json +++ b/versions/a-/anax.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db4b3bfeef52da822588d5bb85a4b3bf9affa80f", + "version": "2.1.0", + "port-version": 8 + }, { "git-tree": "347d15eb157a2bad09742ec97dfc417674936982", "version-string": "2.1.0", diff --git a/versions/a-/antlr4.json b/versions/a-/antlr4.json index 033e47010021e1..c256005fb66aa0 100644 --- a/versions/a-/antlr4.json +++ b/versions/a-/antlr4.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "0a3fbd320c22b3c017fe13fb4cac5fe330c0df99", + "version": "4.9.3", + "port-version": 1 + }, + { + "git-tree": "55208ea9aa8be016d24423442ffbb2e31a7390a1", + "version": "4.9.3", + "port-version": 0 + }, + { + "git-tree": "31ac3fa20b3f7944e5ac32b7ac7883f3d976dae6", + "version": "4.9.1", + "port-version": 2 + }, { "git-tree": "0b8591ea0b8692c0c2963c468ee5b9c2e260ace4", "version-string": "4.9.1", diff --git a/versions/a-/aom.json b/versions/a-/aom.json index 16639b522ef107..09f2625b8cd6e1 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "013d95ace27d59d663acada0264327bf5382308c", + "version-semver": "3.2.0", + "port-version": 2 + }, { "git-tree": "5d7bac96c35260b96135bf3ec1d456994d549eb3", "version-semver": "3.2.0", diff --git a/versions/a-/approval-tests-cpp.json b/versions/a-/approval-tests-cpp.json index b43e2a01a5805a..b2fbf56a1f89a3 100644 --- a/versions/a-/approval-tests-cpp.json +++ b/versions/a-/approval-tests-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84c554ce63a6fb5ba80ecf7b3b27bf7c577471a2", + "version": "10.12.2", + "port-version": 0 + }, { "git-tree": "af4597332ca8387f85fa3eef5c853d47d8745d23", "version": "10.12.1", diff --git a/versions/a-/apr-util.json b/versions/a-/apr-util.json index 642c2d01f6fa1d..7eaa48d2048327 100644 --- a/versions/a-/apr-util.json +++ b/versions/a-/apr-util.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d758cde4c829f6c3a66a773d517f9e9425227629", + "version": "1.6.1", + "port-version": 7 + }, + { + "git-tree": "d27be40b8f670b002604154ef5657c011b8de733", + "version": "1.6.1", + "port-version": 6 + }, { "git-tree": "dfc76280690e9d419c43ee5242466de5b4e317c2", "version-string": "1.6.1", diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 9f8ee67708735f..d1baaa28224c6e 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e73f548920cc5add8a47af9b8775a26c89050101", + "version": "1.7.0", + "port-version": 7 + }, + { + "git-tree": "bc5604f4ffbdcdaee979fccdb1fd5a85dfc7a3db", + "version": "1.7.0", + "port-version": 6 + }, { "git-tree": "3de94d87f5afac3e6800a26771517217d5113349", "version": "1.7.0", diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json index 2719543e4b4824..991bf7ddcf1556 100644 --- a/versions/a-/apsi.json +++ b/versions/a-/apsi.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "08bc0f650b7fa0ef77541eb74b90d0b9fe7fec03", + "version-semver": "0.7.0", + "port-version": 2 + }, + { + "git-tree": "c2703eaa248b72c269dd22aac1e2aca49060dfba", + "version-semver": "0.7.0", + "port-version": 1 + }, { "git-tree": "652d69df44a689fa55f1b757db46c97bcb840c13", "version-semver": "0.7.0", diff --git a/versions/a-/arcus.json b/versions/a-/arcus.json index 47d36bb4d1a79e..c7981fe70dd6fa 100644 --- a/versions/a-/arcus.json +++ b/versions/a-/arcus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1edcde9d0c4a64d780c6692b017cd30137a9ab19", + "version-semver": "4.10.0", + "port-version": 2 + }, { "git-tree": "0aeec8ed7245362e90ef531d8ecaf4ca315e85e5", "version-semver": "4.10.0", diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 381c58c27a5a5b..51a586f56ea946 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ddc4477e6ecc2d66e429e18e9ccd96367da2ce88", + "version": "10.6.2", + "port-version": 4 + }, + { + "git-tree": "88bb8282f33e16f2c59856f68ed9934ff26c7e02", + "version": "10.6.2", + "port-version": 3 + }, { "git-tree": "2a7774c182c273a8d6f350a383f4a3bcf01e308e", "version": "10.6.2", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index bae3c3e99dc910..66bc46896e2ef4 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "3d3371b4741fc81354b2033d584c48a1929373f4", + "version": "7.0.0", + "port-version": 2 + }, + { + "git-tree": "71eea8dac175d368506f19bb246b40bf4829846a", + "version": "7.0.0", + "port-version": 1 + }, + { + "git-tree": "3682e12e1b3f3aa79551877b157ff3d914cb5c90", + "version": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "b12626f29cb0ba8a049241153af0dfeca9a810d7", + "version": "6.0.1", + "port-version": 1 + }, + { + "git-tree": "a192a94717139642a1e9304cdc1ae86850398fb9", + "version": "6.0.1", + "port-version": 0 + }, + { + "git-tree": "14ddd1079e0be1f6122e93f2103be465f893b37e", + "version": "6.0.0", + "port-version": 0 + }, { "git-tree": "8a30c7d6553216924aa3a3957ceb87d0fda39592", "version": "5.0.0", diff --git a/versions/a-/ashes.json b/versions/a-/ashes.json index 0d6724fc891999..09d4352195d363 100644 --- a/versions/a-/ashes.json +++ b/versions/a-/ashes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68557018b215aba6325caf97248c62955fdef397", + "version-date": "2021-06-18", + "port-version": 1 + }, { "git-tree": "3d20e63c5d3a016d41571baefa723a23113c13c3", "version-date": "2021-06-18", diff --git a/versions/a-/asio-grpc.json b/versions/a-/asio-grpc.json index 92bbd8c9858ad5..319764cf18610c 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "895af5509d20a5f310a5fa7285bd2e8e24e75548", + "version": "1.4.0", + "port-version": 0 + }, { "git-tree": "b68efdc2a8b782df2489156675bb4a4e95c7a221", "version": "1.3.1", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index be1048231d48ba..8ff066eac8f387 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbf8b87b680829fee5a422169f3d73df4392d8cf", + "version": "1.22.1", + "port-version": 0 + }, { "git-tree": "b16ad8ba502540b3b34a29552f6937951e08e5e6", "version": "1.20.0", diff --git a/versions/a-/asiosdk.json b/versions/a-/asiosdk.json index e29848b0426c82..087591c2f33c64 100644 --- a/versions/a-/asiosdk.json +++ b/versions/a-/asiosdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "101bbdad9205db5b4249eae8b47bf8c5f73493a8", + "version": "2.3.3", + "port-version": 4 + }, { "git-tree": "870921549ca1a681fe04ba3a0c17586995c1b567", "version": "2.3.3", diff --git a/versions/a-/asmjit.json b/versions/a-/asmjit.json index 9f303a291faed8..b6222d2404edbf 100644 --- a/versions/a-/asmjit.json +++ b/versions/a-/asmjit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f67010904c0f2d7a1d79a647ea928aece3e66750", + "version-date": "2021-10-26", + "port-version": 1 + }, { "git-tree": "3ce58638bee35ef08b3ee8286c1e519b171c39bf", "version-date": "2021-10-26", diff --git a/versions/a-/atk.json b/versions/a-/atk.json index f7de501e725763..9d9460584f05ae 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15723fa24f08f04e859253b16f5cbc05529d10cf", + "version": "2.36.0", + "port-version": 2 + }, { "git-tree": "cf5656ae96a202ad1846f5cb233cc4daf4f3336d", "version": "2.36.0", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index d338170a691fad..7f0ed677405574 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd4ca61c3b3fcfbadf494e019aa13a659eeff930", + "version": "2.36.0", + "port-version": 2 + }, { "git-tree": "340ce8d9ccb6154374ecbe6bf6c9a70b83442578", "version": "2.36.0", diff --git a/versions/a-/audiofile.json b/versions/a-/audiofile.json index cc7517be6aa7a4..f928b164cc2414 100644 --- a/versions/a-/audiofile.json +++ b/versions/a-/audiofile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa276b1ad374c2ae6034445b6655518d8f9a23de", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "73a1d7555de8baaf7a1b34ca1410d7e9978bf75f", "version": "1.0.9", diff --git a/versions/a-/avisynthplus.json b/versions/a-/avisynthplus.json index c8cd5d877581bf..eeb574694dc06d 100644 --- a/versions/a-/avisynthplus.json +++ b/versions/a-/avisynthplus.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a585670d79213148e938d9f3ea7d2ccb1c784f2c", + "version-semver": "3.7.0", + "port-version": 3 + }, + { + "git-tree": "ed06319cd3b2bb9e0811743ca7f66dd9539eabef", + "version-semver": "3.7.0", + "port-version": 2 + }, { "git-tree": "747e0dd9f81ace8b2f473dc455871938d930df28", "version-semver": "3.7.0", diff --git a/versions/a-/avro-c.json b/versions/a-/avro-c.json index c1835d92a4b942..35574415d95701 100644 --- a/versions/a-/avro-c.json +++ b/versions/a-/avro-c.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7b07da3abd56565c8d2e75942aab468ece0f3115", + "version": "1.11.0", + "port-version": 3 + }, + { + "git-tree": "e36456a1ada18a8020e4bb1fffa24b0dc2edfa3e", + "version": "1.11.0", + "port-version": 2 + }, { "git-tree": "75d0ed12b643fe1ed6a175c12549e9bb0ca94a1d", "version": "1.11.0", diff --git a/versions/a-/aws-c-auth.json b/versions/a-/aws-c-auth.json index f7f624071d3925..4c5c0a437d46c9 100644 --- a/versions/a-/aws-c-auth.json +++ b/versions/a-/aws-c-auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf9b6cb3b199b8ef1dec2e0d46bcfea7c8f536a", + "version": "0.6.3", + "port-version": 2 + }, { "git-tree": "be9ae25111a5c7104d7c3769fcd581ee9f5dac7a", "version": "0.6.3", diff --git a/versions/a-/aws-c-cal.json b/versions/a-/aws-c-cal.json index 13408318284a6d..ee01b313b69f3e 100644 --- a/versions/a-/aws-c-cal.json +++ b/versions/a-/aws-c-cal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a383adb52cab94b360e30cf82c1be79a45a75875", + "version": "0.5.12", + "port-version": 2 + }, { "git-tree": "33e7566ec2dc8cbc5ce91687b8627f946cdf231d", "version": "0.5.12", diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index 0126e48d167f0d..6add7a56ce4165 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56b4972c2535a4e8991826b6c595e433b0e80bf9", + "version": "0.6.9", + "port-version": 2 + }, { "git-tree": "20a16524a9cc1079486d4efd5230562c8b9bed8a", "version": "0.6.9", diff --git a/versions/a-/aws-c-compression.json b/versions/a-/aws-c-compression.json index 92f89d18da03ba..fc988fb9603f8c 100644 --- a/versions/a-/aws-c-compression.json +++ b/versions/a-/aws-c-compression.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "107778b6c4b3c09105fcc9a08b31b252278538a4", + "version": "0.2.14", + "port-version": 2 + }, { "git-tree": "5892ebc8e23b264d832f03d4f7dfb04856dd8367", "version": "0.2.14", diff --git a/versions/a-/aws-c-event-stream.json b/versions/a-/aws-c-event-stream.json index 32b6e788540552..d92b1f859c2d61 100644 --- a/versions/a-/aws-c-event-stream.json +++ b/versions/a-/aws-c-event-stream.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a9e93d6dd8799afe5f56eeeda92793ba888691e", + "version": "0.2.7", + "port-version": 2 + }, { "git-tree": "4d0b2b6a72ae5ea454dc5378f9b3bc78320174ae", "version": "0.2.7", diff --git a/versions/a-/aws-c-http.json b/versions/a-/aws-c-http.json index f350b937022359..44db43e728a575 100644 --- a/versions/a-/aws-c-http.json +++ b/versions/a-/aws-c-http.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "845a574790e6fcd40bfc13cf0c65104d04e29350", + "version": "0.6.5", + "port-version": 2 + }, { "git-tree": "470e20b38e215a550b52c002a7cc8a7f18938bf9", "version": "0.6.5", diff --git a/versions/a-/aws-c-io.json b/versions/a-/aws-c-io.json index 38b5e2a1a295d9..1ea423119de0af 100644 --- a/versions/a-/aws-c-io.json +++ b/versions/a-/aws-c-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7456b996bdeeeeb59fb39770d797fa2966d0a951", + "version": "0.10.7", + "port-version": 2 + }, { "git-tree": "45b959b56caa21052a67c2b3d0b493a3e401288c", "version": "0.10.7", diff --git a/versions/a-/aws-c-mqtt.json b/versions/a-/aws-c-mqtt.json index 5502f58724ae76..8386463b3175b3 100644 --- a/versions/a-/aws-c-mqtt.json +++ b/versions/a-/aws-c-mqtt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "028932fcffa607cc234348c2e2df454da7c4ccad", + "version": "0.7.6", + "port-version": 3 + }, + { + "git-tree": "834a199cf4560cbdd8e6dac09074b9b5b1d57d53", + "version": "0.7.6", + "port-version": 2 + }, { "git-tree": "6dc42a5ba915723bed2997c39222b166a9f0a084", "version": "0.7.6", diff --git a/versions/a-/aws-c-s3.json b/versions/a-/aws-c-s3.json index ebee3021a12016..b556184cec95f1 100644 --- a/versions/a-/aws-c-s3.json +++ b/versions/a-/aws-c-s3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c571d95b22b5f84591bf4a115ca47c522371efce", + "version": "0.1.25", + "port-version": 2 + }, { "git-tree": "620ce24ba09dd971644750eedcbb42a8f1fc2457", "version": "0.1.25", diff --git a/versions/a-/aws-checksums.json b/versions/a-/aws-checksums.json index ca72a34b8aac86..e1682a125afba6 100644 --- a/versions/a-/aws-checksums.json +++ b/versions/a-/aws-checksums.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeda736d7deef9292db2e43dc8702b2ddb5d59b0", + "version": "0.1.11", + "port-version": 3 + }, { "git-tree": "e70b465c6b8ce012ed176b822471dd440f853267", "version": "0.1.11", diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json index 1ee9a028be5e31..fe805028eabd6a 100644 --- a/versions/a-/aws-crt-cpp.json +++ b/versions/a-/aws-crt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e542ffdad6392c75909a3235d33c2a22c939c980", + "version": "0.15.1", + "port-version": 3 + }, { "git-tree": "d96290d0c6d34f9b4129e811e3b8fd2d62a699c7", "version": "0.15.1", diff --git a/versions/a-/aws-lambda-cpp.json b/versions/a-/aws-lambda-cpp.json index 7856f5dd945072..13fa94b2e9b5d5 100644 --- a/versions/a-/aws-lambda-cpp.json +++ b/versions/a-/aws-lambda-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48030b34e22463cab36178bb50d3ce62257d6d56", + "version": "0.2.7", + "port-version": 1 + }, { "git-tree": "e9c58661b9a838e782997f03ee3af449260ece4f", "version-string": "0.2.7", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index e82e560e411952..4db798d38b4ff0 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e1d4dde6c824e40b0a0dce27f48539dfa4f64eed", + "version": "1.9.160", + "port-version": 1 + }, + { + "git-tree": "e02908481470143ae86077c24e80d493d609f379", + "version": "1.9.160", + "port-version": 0 + }, { "git-tree": "f3e8e88a0bf271817cd42083f58070df1a006603", "version": "1.9.96", diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index 65623e3a38b194..aab35215bede94 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "42be8335b113cba6ca88b9f9789b29fc7be280b4", + "version-date": "2022-01-21", + "port-version": 2 + }, + { + "git-tree": "aceee8533b4eeea6eb87371c4d37ae82859cefc7", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "1d0590ad121eefc3af9ff13f67996ca8c3e39508", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "f2f3f9c6b03d02268920eee133f660bf2fe5d946", + "version-date": "2021-09-09", + "port-version": 1 + }, { "git-tree": "6898a05e54b88637fc5a42136facc194b84e71a1", "version-date": "2021-09-09", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index f51e6c6f320473..c790d0328454ca 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73975ac66807a0477bcaa3fa75fdfaf0f74bdb06", + "version-semver": "1.4.0", + "port-version": 0 + }, { "git-tree": "b34bd865f3d3caf5b7021d5e9048d775b3e9cfb0", "version-semver": "1.3.1", diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json index 6fb04a828e6ce5..0aaefe2b384f27 100644 --- a/versions/a-/azure-identity-cpp.json +++ b/versions/a-/azure-identity-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f6de8ed7d7b299df5cee8483a4f84cb07dd57b1c", + "version-semver": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "df411f808c6dab5e59a7f378308856d803150c04", + "version-semver": "1.1.1", + "port-version": 0 + }, { "git-tree": "2742c6a31a2a3238ea97663c2b40be998c18006d", "version-semver": "1.1.0", diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json index 56fd640606232c..3953986f7d4d00 100644 --- a/versions/a-/azure-iot-sdk-c.json +++ b/versions/a-/azure-iot-sdk-c.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "80f1eb4e465fef817503af2c9599b2186d4922e6", + "version-date": "2022-01-21", + "port-version": 2 + }, + { + "git-tree": "0570fa462646f08bb3ed9a34ecb693082def3d3b", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "77b1d419b740dd9738f237a6d52b1c161e99ee9d", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "3d6dc98460c69e8690f9b20f62cf75e9e3ef7f2d", "version-date": "2021-09-09", diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index 86b1661606da7d..98ae085163d060 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "379c37baf28190bb33ccf1d512c22a21c664e41e", + "version": "1.4.1", + "port-version": 4 + }, { "git-tree": "11fbd98a9560da0ad96abf61d8731778db6e5b8b", "version": "1.4.1", diff --git a/versions/a-/azure-macro-utils-c.json b/versions/a-/azure-macro-utils-c.json index 9b9d201e11e7f2..f0dd734cb6060c 100644 --- a/versions/a-/azure-macro-utils-c.json +++ b/versions/a-/azure-macro-utils-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c90715278e5ab77af983254bdf17571bf69c55b", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "a951ed2a9b24f8778b7c2fb2ff4e6a6577ac6472", "version-string": "2020-06-17", diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json index b423c1eba4affd..caf536d42acd69 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": "bbaebc2afcade7b67f33d7d62ec680aaa0b3700d", + "version-semver": "4.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "5faeb850df56edd9f4689f69f4d64e6e51dde80b", "version-semver": "4.0.0-beta.1", diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json index 70bd3973ec8d0f..37bae1323bf9d2 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": "c977a0be18a1e5f8591268d35b0a221ef9e8f7f9", + "version-semver": "4.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "e0a2ec6fd19019aaf9f485eea66c5b660b1bc7a4", "version-semver": "4.0.0-beta.1", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 1c5fba25a27a6d..5bd0a98aba4421 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "252f2edf841eb01f271d1694f3fea34e63906eba", + "version-semver": "12.3.0", + "port-version": 0 + }, { "git-tree": "6e52659aef1c9a99271c1d590eba0d37f5e472bb", "version-semver": "12.2.1", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index 3ab70e9ed9d404..e97cad3e30deca 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "de5c104dfa95871220c17e4f8f97a99b5da33920", + "version-semver": "12.2.2", + "port-version": 0 + }, + { + "git-tree": "55a55770fa93d6e541d1540df78aefae2cf905cb", + "version-semver": "12.2.1", + "port-version": 0 + }, { "git-tree": "2ef80d68150017530cb50581cd6f5f03bc607859", "version-semver": "12.2.0", diff --git a/versions/a-/azure-storage-cpp.json b/versions/a-/azure-storage-cpp.json index 34ceb4c76da1ab..7a9f8412560b0b 100644 --- a/versions/a-/azure-storage-cpp.json +++ b/versions/a-/azure-storage-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8216ff9a5060864170113353495400e342d862ad", + "version-string": "7.5.0", + "port-version": 3 + }, { "git-tree": "242bb84480e51b70b53dbd9b126f600e1ea39ef6", "version-string": "7.5.0", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index a3472992ac248d..859384ca87ae83 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": "9a254add1b8a2c6f8d6a59760d6016af1e5c19a6", + "version-semver": "12.3.1", + "port-version": 0 + }, + { + "git-tree": "b312efdf9afad6dc09ce91eb31e19e725a8c1a7a", + "version-semver": "12.3.0", + "port-version": 0 + }, { "git-tree": "36837d18b946ad07bcb95c44450509f1d04ba4ec", "version-semver": "12.2.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index 581aeff7f022d7..19d79ba64d3af3 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69a5e9af5d75d9e2f33dbd89576297373a332048", + "version-semver": "12.2.1", + "port-version": 0 + }, { "git-tree": "b7c34584a28f09d204e8ab6cbcf23ea93e330653", "version-semver": "12.2.0", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json index f5e34cbe41105f..886d99170c8eba 100644 --- a/versions/a-/azure-storage-queues-cpp.json +++ b/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a4fe64dbaeaacf8bfff69155eea6f001ebee8e15", + "version-semver": "12.0.0-beta.4", + "port-version": 0 + }, + { + "git-tree": "863a1b7f8841d14dd89ca0f70b0f78408add806d", + "version-semver": "12.0.0-beta.3", + "port-version": 0 + }, { "git-tree": "f7e146970eabbdf793a50c5b511ea458b04f579a", "version-semver": "12.0.0-beta.2", diff --git a/versions/a-/azure-uamqp-c.json b/versions/a-/azure-uamqp-c.json index d74b7af7a8eeff..3684f27960299c 100644 --- a/versions/a-/azure-uamqp-c.json +++ b/versions/a-/azure-uamqp-c.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d7d284a159afe6ab21ce65d5e5d96dbee83339f6", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "a2c6897e3392683dcce93a846b98b2c95dc41a55", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "4748ea8df9903436ad4b2b6462ca3ffdf74465d4", "version-date": "2021-09-09", diff --git a/versions/a-/azure-uhttp-c.json b/versions/a-/azure-uhttp-c.json index 66a7e237404753..e7cf5ca1a18c8f 100644 --- a/versions/a-/azure-uhttp-c.json +++ b/versions/a-/azure-uhttp-c.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "28439985096cc9a714695d10830ceb2f54859c24", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "f614a1ac990dd4189b292fa0e6e31897ee4b7ae8", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "8dfc1d65397c35c27df08f42b2f77caf27661a9b", "version-date": "2021-09-09", diff --git a/versions/a-/azure-umqtt-c.json b/versions/a-/azure-umqtt-c.json index c877c9eaa1dd69..8933265990a138 100644 --- a/versions/a-/azure-umqtt-c.json +++ b/versions/a-/azure-umqtt-c.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5953c7aee01e5c0972a8eb97fbb763c74b60c49c", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "f5b18f17519b9de8a2ab956eebc7dff6e7bf7a05", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "2a208bf94bfaf91cc20716d7ba0caac0023324b0", "version-date": "2021-09-09", diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json index ae9d39405f8003..897c575111656e 100644 --- a/versions/b-/bddisasm.json +++ b/versions/b-/bddisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cede34b39c8ab7d83ee9f43dcb112e4d1c96104", + "version": "1.34.7", + "port-version": 1 + }, { "git-tree": "296988f2d875c4fe41506e163c5c35141c6d35f8", "version": "1.34.7", diff --git a/versions/b-/bde.json b/versions/b-/bde.json index f587a05e530024..5d27e439a963b9 100644 --- a/versions/b-/bde.json +++ b/versions/b-/bde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ce72f2854f44eee806e6e5f3e97d29897549787", + "version": "3.2.0.0", + "port-version": 5 + }, { "git-tree": "60082ad73e5c9fb9828041183b026fc15e453218", "version-string": "3.2.0.0", diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json index 642a0062397942..9268e1e6e7c7d0 100644 --- a/versions/b-/behaviortree-cpp.json +++ b/versions/b-/behaviortree-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79f662c115d97eb11ef1a08753aed0eef061d7cc", + "version": "3.5.6", + "port-version": 2 + }, { "git-tree": "96c8331bb642e665bd66a9aa82797d4db84b86fa", "version": "3.5.6", diff --git a/versions/b-/benchmark.json b/versions/b-/benchmark.json index 8832810570aa34..d75a984b843f30 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7856168d2b0dcaf058c077798ca47f767c6444f5", + "version-semver": "1.6.0", + "port-version": 1 + }, { "git-tree": "4a77547715562fcaa95568226f79af88d859d2c1", "version-semver": "1.6.0", diff --git a/versions/b-/berkeleydb.json b/versions/b-/berkeleydb.json index e21920be6a8adb..49497baa4add33 100644 --- a/versions/b-/berkeleydb.json +++ b/versions/b-/berkeleydb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "27ed2f8c5c5b6c5ba677703f69d9e83062ff6c86", + "version": "4.8.30", + "port-version": 8 + }, + { + "git-tree": "753782cd715f3780a1d3d75ef7655e92a414a440", + "version": "4.8.30", + "port-version": 7 + }, { "git-tree": "fdef7fa8068cc8b7443905db215bed2dcf378abf", "version-string": "4.8.30", diff --git a/versions/b-/bext-di.json b/versions/b-/bext-di.json index d0526b9c9d523e..c53b8f6e1d9d59 100644 --- a/versions/b-/bext-di.json +++ b/versions/b-/bext-di.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b3c494eee383a036b07453ff9b34d1be65be06d", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "a77676231f3c6c3fe9c145bfe670cfae495fb8ac", "version-string": "1.2.0", diff --git a/versions/b-/blend2d.json b/versions/b-/blend2d.json index 36a07ee20297fc..7c62a93d4e4ea8 100644 --- a/versions/b-/blend2d.json +++ b/versions/b-/blend2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "401153e8f3407e68e96c4ea60f8c71c633b08e1d", + "version-date": "2021-03-17", + "port-version": 1 + }, { "git-tree": "e322c9917356f15d6370ff8f2f0bd380d1f08661", "version-date": "2021-03-17", diff --git a/versions/b-/blitz.json b/versions/b-/blitz.json index f7d3137bef4329..bda1fc086b5dab 100644 --- a/versions/b-/blitz.json +++ b/versions/b-/blitz.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "58bca2588e7ff4935893cfebdf1d9665f95f846e", + "version-date": "2020-03-25", + "port-version": 5 + }, + { + "git-tree": "694507bc15d282e3de5160a0a221abfa381e6327", + "version-string": "2020-03-25", + "port-version": 4 + }, { "git-tree": "ddf54a36a0fa345a482b66d648778c13f0008eeb", "version-string": "2020-03-25", diff --git a/versions/b-/blosc.json b/versions/b-/blosc.json index 9f5863b6d0f31b..e0ce0f1cf28124 100644 --- a/versions/b-/blosc.json +++ b/versions/b-/blosc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a95e4b34ff47ed69f3e644405efe80b8c46aee14", + "version-string": "1.18.1", + "port-version": 4 + }, { "git-tree": "a9ae0480271a2db8d001d389b4c62af49ea50770", "version-string": "1.18.1", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index b4c6e1bc173e20..3b7ff3232e5e4c 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "47df312abbe66c9c58fd67b1deb72ec906421a68", + "version": "7.18.1", + "port-version": 5 + }, + { + "git-tree": "33d681acad2362813b5aa9e547c73741d11432d4", + "version": "7.18.1", + "port-version": 4 + }, { "git-tree": "561d297147fabda6ccd25dc8ca3de0ce854562ca", "version": "7.18.1", diff --git a/versions/b-/boolinq.json b/versions/b-/boolinq.json index 01cf3c3d4e1add..d32f7338698e6e 100644 --- a/versions/b-/boolinq.json +++ b/versions/b-/boolinq.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "540d3bb914d7910e720efb6f423d22e279b2c029", + "version": "3.0.4", + "port-version": 0 + }, + { + "git-tree": "40193511c7dc66ae28661196fa3769dfabf0ac8c", + "version": "3.0.3", + "port-version": 0 + }, { "git-tree": "86d17070137580ac517b418686329b8fbc28b147", "version": "3.0.2", diff --git a/versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json index c8562b855736a0..288b505f6ae67a 100644 --- a/versions/b-/boost-accumulators.json +++ b/versions/b-/boost-accumulators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "070cbab1861e2a57e6c39ac1a8dcf51ad9edafea", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "b24ef7a5bec0e29c8013593cd6bba58e52b19a7a", "version": "1.77.0", diff --git a/versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json index 85eb9ae2115f93..2ad310fa5509bc 100644 --- a/versions/b-/boost-algorithm.json +++ b/versions/b-/boost-algorithm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eca5eb57117afd2c43e7f00ed6908dabb254b46e", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "338f795a1e6d73ab25444f64fe7ba1d617128813", "version": "1.77.0", diff --git a/versions/b-/boost-align.json b/versions/b-/boost-align.json index 56e02d2dd827bc..a4e6a9979dc678 100644 --- a/versions/b-/boost-align.json +++ b/versions/b-/boost-align.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1733cf10f4a598f29af7380a6b8226abdeeb3f75", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "5e733503d18c7e82478961e1155a40a95af0ab42", "version": "1.77.0", diff --git a/versions/b-/boost-any.json b/versions/b-/boost-any.json index c1150ccd6cb56a..2d0d743e556afc 100644 --- a/versions/b-/boost-any.json +++ b/versions/b-/boost-any.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a28a3fd1ebf198563ae9e200dcf36f1fae3b1482", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "cf8bdfd2ce434a981620383dcc07d46c0a071ca1", "version": "1.77.0", diff --git a/versions/b-/boost-array.json b/versions/b-/boost-array.json index f14f775d7c16b1..6f804d1f46a998 100644 --- a/versions/b-/boost-array.json +++ b/versions/b-/boost-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8278959d326c44d846d660462556ab48361054f9", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "fb008cce0de1c6a34ac5222d03d7e1069d135dc4", "version": "1.77.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index 655983326cdf4e..fbc9e39a33ea46 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fcf35cb168a6a2aa56208a83fb71bfdf88672b6", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "9c5c591c857588b69354bf075019bc78ce4237bd", "version": "1.77.0", diff --git a/versions/b-/boost-assert.json b/versions/b-/boost-assert.json index 04e07585cebd69..1d6e40c26d71c2 100644 --- a/versions/b-/boost-assert.json +++ b/versions/b-/boost-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81b29f057d38140b3d812094999772d2d5263d4e", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "db6b88ce332c6752f87f8f0c098a832e23610303", "version": "1.77.0", diff --git a/versions/b-/boost-assign.json b/versions/b-/boost-assign.json index 2ba9d6427d3a45..0a00d2f35ec1fe 100644 --- a/versions/b-/boost-assign.json +++ b/versions/b-/boost-assign.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb2a0606569a77b0de8264bd55d015698f413dd7", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "c7c391576a6f9714453c28f6b73ddcb3c7439827", "version": "1.77.0", diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index b16f499384471e..b9d48b3005c8b6 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f516c90064f41a11fe7627ab6a8ac281455f55cc", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "c5f02ea8b6555b20b6cc8901bdae9e9628086640", "version": "1.77.0", diff --git a/versions/b-/boost-beast.json b/versions/b-/boost-beast.json index 58a516bcdbe6c5..6c803bf8687048 100644 --- a/versions/b-/boost-beast.json +++ b/versions/b-/boost-beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cb4b3da49532ceefefdb4465c74c3490f6c40f7", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "154d8664ca78bcee263cec7a297afe36a4877313", "version": "1.77.0", diff --git a/versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json index ff33f654cf2f13..b4115b00d0ac91 100644 --- a/versions/b-/boost-bimap.json +++ b/versions/b-/boost-bimap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d376fb04582a3ca0b6d14f991ae05965c7d0961a", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "726aaa86124fd8d1658f0813902b8bf9b27bb707", "version": "1.77.0", diff --git a/versions/b-/boost-bind.json b/versions/b-/boost-bind.json index a69492ff3b4a2d..a994e35066e7cd 100644 --- a/versions/b-/boost-bind.json +++ b/versions/b-/boost-bind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "165c77e05b1d413a600f66135276ba7e727ebc35", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "a1764edb5aaa4cf532e6e2d60d56420240dec410", "version": "1.77.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index a660f3f6370670..140b50fd32d20b 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cf970c17a4bf6d59deff7ce7e7eb98cec74b544a", + "version": "1.78.0", + "port-version": 1 + }, + { + "git-tree": "2c0d3c35e95f99911a226c3e736c0988f1139e51", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "d12d4a6f44a7356c4262b27adcda834fe893b576", "version-string": "1.77.0", diff --git a/versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json index ae3883005c1f98..ed346a5b63cf1e 100644 --- a/versions/b-/boost-callable-traits.json +++ b/versions/b-/boost-callable-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c65c1b67763ed69490e43430bc860493ccc19274", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "6c22b4049665b95038b8f5d1e1952434f1387f7c", "version": "1.77.0", diff --git a/versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json index 058f458e4ebce7..244624ebf699aa 100644 --- a/versions/b-/boost-chrono.json +++ b/versions/b-/boost-chrono.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d08ea7bd6fb471393e10507f0b6d27d045868f3e", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "f0143b4dd81e3de932ea886e69efd196452d81b3", "version": "1.77.0", diff --git a/versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json index 0de7c05daa2599..c05cb13cf5e1c0 100644 --- a/versions/b-/boost-circular-buffer.json +++ b/versions/b-/boost-circular-buffer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "239a4eff939919bbabf11914dbb656992e4e26ae", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "6352fb4c9b9e30001311015e28e712e9a2ef4a33", "version": "1.77.0", diff --git a/versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json index 11473c87d3b6de..d3da45592b3ef2 100644 --- a/versions/b-/boost-compatibility.json +++ b/versions/b-/boost-compatibility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee3bf146536f03c976c00fa704664f0576241f15", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "b2b4f365d9ee62baf2f0197bad774a679cb7449e", "version": "1.77.0", diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json index a4d2f56365da8c..85805ba2a5fd8b 100644 --- a/versions/b-/boost-compute.json +++ b/versions/b-/boost-compute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02e813bc50d95bc901ba994faff7658f1ee5664b", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "3e134e562b5a454a46bf922f7633cdf581db7795", "version": "1.77.0", diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index e116be7dc80d0a..738dc3b3115c3b 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d92ec4f75e3ca2046f7cc6bd42e394aa642dea7b", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "9bdfb3a9b14b35dc1833bc559226c7925096ff57", "version": "1.77.0", diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index 9b10718d98adf8..0da4e3e0048ace 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4958f142255c3aa14f1f39d04edcc12b6262745", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "0f7b70c02bfb43bbdc8f62bd49c8a5339a65f48c", "version": "1.77.0", diff --git a/versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json index 961198633273df..c194451b1223c3 100644 --- a/versions/b-/boost-container-hash.json +++ b/versions/b-/boost-container-hash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c9a0efa908886517e39510cffaebe78df8bac17", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "76c8d3c46db10b6774d6986822e53d1140934667", "version": "1.77.0", diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json index 99438e8de73e19..60a39b3ae937dc 100644 --- a/versions/b-/boost-container.json +++ b/versions/b-/boost-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cba0ae7cefffcca3cc1a0aec45ec07a66f6cc413", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "9af11f40e9b9fc2ebdda7e8885f9f49dea1923d7", "version": "1.77.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index 4b72fec663bd5e..e09838415f0b35 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c279fc4862dbbc9b4c685d16d1abee7200f9dff4", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "ec8ceb582e4ef9936ceb840c70b90dfb20703f1d", "version": "1.77.0", diff --git a/versions/b-/boost-contract.json b/versions/b-/boost-contract.json index d71be84fc1208d..435780a5471537 100644 --- a/versions/b-/boost-contract.json +++ b/versions/b-/boost-contract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fb4b8408822e7921fe3d07ba66184df6b5f16a6", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "c8249694c8d2dfd942dbb733f138997d00ce89c7", "version": "1.77.0", diff --git a/versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json index 40cc349771ee67..97703b69a79b1f 100644 --- a/versions/b-/boost-conversion.json +++ b/versions/b-/boost-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed01d578d9964b2be3619cd7e96c6f65dc206275", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "5b591e95244353857eaade53621ee895b1d9e0a6", "version": "1.77.0", diff --git a/versions/b-/boost-convert.json b/versions/b-/boost-convert.json index 1bdea7dfbe6551..a85859c5fbd380 100644 --- a/versions/b-/boost-convert.json +++ b/versions/b-/boost-convert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1315f49ac5c357e8a427c97dee2faa3655c70f3", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "8f01a746807fe131cfd83962df7faebd340eaef4", "version": "1.77.0", diff --git a/versions/b-/boost-core.json b/versions/b-/boost-core.json index 8c80cf3e048528..320246ca1eb9d3 100644 --- a/versions/b-/boost-core.json +++ b/versions/b-/boost-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6d811257b985253c87570f25a75957689b2b895", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "a56c8546828ee16a442a336c2385f9986f8c055f", "version": "1.77.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index ac2aa2410db041..c3215b32702b74 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d462e16750c6769375391d1e1c084999000cb324", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "a5afb95d36e4f0baa263193b00e9a1abc1f01454", "version": "1.77.0", diff --git a/versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json index de4f10b9b121b2..e5073ccf0692d5 100644 --- a/versions/b-/boost-coroutine2.json +++ b/versions/b-/boost-coroutine2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d035a00380a7bcddb6c22f69c4743af4f2122a38", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "a8142422dd258f6a24df4ef3caf54b1d48096d8e", "version": "1.77.0", diff --git a/versions/b-/boost-crc.json b/versions/b-/boost-crc.json index d887e71303fc1b..2956a402b65979 100644 --- a/versions/b-/boost-crc.json +++ b/versions/b-/boost-crc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1772d15f5d08e1f5e3a263c30869aef88a76085", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "bab49b15015caaf455e6b304a613fccacd501ada", "version": "1.77.0", diff --git a/versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json index 75e5967109583a..1792e3793dd393 100644 --- a/versions/b-/boost-date-time.json +++ b/versions/b-/boost-date-time.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76bf565e940322a7d3110edf1b18fb4bfd8a1ab0", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "e2ca710f2484af3cbeee428e063a7e4269510110", "version": "1.77.0", diff --git a/versions/b-/boost-describe.json b/versions/b-/boost-describe.json index aaa95622c65b46..46de02237184ea 100644 --- a/versions/b-/boost-describe.json +++ b/versions/b-/boost-describe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e08134869cca3b2d75247c226637b24438c489c2", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "399140a565739230fd9b805f047013bf42a2a0b6", "version": "1.77.0", diff --git a/versions/b-/boost-detail.json b/versions/b-/boost-detail.json index 2a2390bad36310..6b3a3e4e24b8ec 100644 --- a/versions/b-/boost-detail.json +++ b/versions/b-/boost-detail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61c65e46d0bf619e44cf343d734dda6987f53005", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "57dabb22a4f9dfe872c6f007c9dbae7bf0847514", "version": "1.77.0", diff --git a/versions/b-/boost-dll.json b/versions/b-/boost-dll.json index 8fef2013dd5ce1..465bbbdc61872b 100644 --- a/versions/b-/boost-dll.json +++ b/versions/b-/boost-dll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1afc8f9b224cf9a2a1846073dffd93defdb46028", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "7ca0cf6c2a9f41257ad68442240ff7ad21b7e662", "version": "1.77.0", diff --git a/versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json index 25de5316dfebc7..80126c8dd74500 100644 --- a/versions/b-/boost-dynamic-bitset.json +++ b/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e137dc4091824493eec9e6f9734caa71eb069874", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "e5b7742c115d4e4a450062e30b1542c6fe4aac5d", "version": "1.77.0", diff --git a/versions/b-/boost-endian.json b/versions/b-/boost-endian.json index 48caee343a1333..7d662844753fc8 100644 --- a/versions/b-/boost-endian.json +++ b/versions/b-/boost-endian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "87ed62b8b7fba9caadc1ffff99abede02e0598f2", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "6950c45ffb4e112920b6dd50c1cddde07b30d61d", "version": "1.77.0", diff --git a/versions/b-/boost-exception.json b/versions/b-/boost-exception.json index 831c9464149f61..e6dc6d95054715 100644 --- a/versions/b-/boost-exception.json +++ b/versions/b-/boost-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02b0e67c7d9b5e26b1bccef1fba3152fe7ead595", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "d60d712de012657effc2314a5d8781e453097129", "version": "1.77.0", diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index 14501708735ae2..f0c0bea460b1f7 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a37b52940402701703a4b91f1360b414f6afe02", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "c6fb978600b4d0ec5e62111f587f537d475c95a2", "version": "1.77.0", diff --git a/versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json index 621e9a2a025b50..833f3351cf3ec5 100644 --- a/versions/b-/boost-filesystem.json +++ b/versions/b-/boost-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7f7b3bf671f25f6234f81de59fb5dc169ea2480", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "7665f5ed27513a334df5b6051cb72d076ce626c2", "version": "1.77.0", diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json index 4f92215d8c9ddc..0b7f00a3375500 100644 --- a/versions/b-/boost-flyweight.json +++ b/versions/b-/boost-flyweight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "899fef7cf017fd090f2e96146a425e7376320a4e", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "3c927df2056a6603e5bdc20673e22692183fd92e", "version": "1.77.0", diff --git a/versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json index 14e835af722dc8..992d111476bcaa 100644 --- a/versions/b-/boost-foreach.json +++ b/versions/b-/boost-foreach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "468a08373a9339026a955a01faf3a4bc6fe0ab11", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "95983cd3eb11558e24d1f63a68a2ee944da927df", "version": "1.77.0", diff --git a/versions/b-/boost-format.json b/versions/b-/boost-format.json index 6b3d15127219bb..7b6e6ac59241b5 100644 --- a/versions/b-/boost-format.json +++ b/versions/b-/boost-format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "691157617974f33e41ef5ea7954d590a8f12be5a", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "15c6449aa221b65139b38cc6c6ef91f32e2d2b1d", "version": "1.77.0", diff --git a/versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json index c2d0dcf553d949..5a33d677fb7b98 100644 --- a/versions/b-/boost-function-types.json +++ b/versions/b-/boost-function-types.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94d4dd365c29ad1be2d148f3c4cf7857e3ac1edd", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "7675770af935fb375c0350c7a5fc561f9bc31432", "version": "1.77.0", diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index 9de524d1d9b369..6f7c0e4f5505fd 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74d9b1e1e9951fe6f6f4eeccddf8c83ff1280462", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "092af2f7e20c516fc02e8a39d8887f2301bb1fd9", "version": "1.77.0", diff --git a/versions/b-/boost-functional.json b/versions/b-/boost-functional.json index 68497a74b45c5b..5add7a0fda5ea5 100644 --- a/versions/b-/boost-functional.json +++ b/versions/b-/boost-functional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c46623f2b1557b35079a69ea27aa495f8765f26", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "26960fd1a5c5ffbb7da0d747f43a61a27d8825eb", "version": "1.77.0", diff --git a/versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json index da58b9f71b37ab..86e7f184275148 100644 --- a/versions/b-/boost-fusion.json +++ b/versions/b-/boost-fusion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7c7b4de2e38c3436c0781ccf4b56567b8c2ae61", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "e33ce42cfab1b757d73fc0c4ac7edacaefd0be58", "version": "1.77.0", diff --git a/versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json index df15e0fdad10c8..9fb480e11bb0af 100644 --- a/versions/b-/boost-geometry.json +++ b/versions/b-/boost-geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4c2fd98bc285d97c11c99f5f631481fb534efc4", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "96d1b04d567acad7c4caafc869fa7daa64968aac", "version": "1.77.0", diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index d81ef54fea3641..49e0d509d9ae6f 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "670859cf36c60562fb5036af7d087df936234c27", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "d6607eb56e9f61771dbd6915d2e5d4b3b2976a7e", "version": "1.77.0", diff --git a/versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json index e2b09a00a46e10..c13bca55ec42ea 100644 --- a/versions/b-/boost-graph-parallel.json +++ b/versions/b-/boost-graph-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "199f9b8209f287e7e9865e07b074d618c28db410", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "779ea0573b2c460496e5014b1776f8577d9a9dac", "version": "1.77.0", diff --git a/versions/b-/boost-graph.json b/versions/b-/boost-graph.json index 653b130a7444e4..d529ceb120f21b 100644 --- a/versions/b-/boost-graph.json +++ b/versions/b-/boost-graph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7b342391819ed511280f8ef46b7d52a399f2648", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "8c7974cbf961af1d5eabeb1047f2dd16e087f180", "version": "1.77.0", diff --git a/versions/b-/boost-hana.json b/versions/b-/boost-hana.json index 4a4d4721856851..4f74efb60fb434 100644 --- a/versions/b-/boost-hana.json +++ b/versions/b-/boost-hana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ff9854bbad812cd23a4c79b500aa8349fbed192", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "e24bae813978df09c5b5718b6c4d2aa87734ab2a", "version": "1.77.0", diff --git a/versions/b-/boost-heap.json b/versions/b-/boost-heap.json index 02f47838fe84ae..df68d02dfeb5d7 100644 --- a/versions/b-/boost-heap.json +++ b/versions/b-/boost-heap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76c4ec7815b1660fca1c1efd9b9c0c2f034ba4bb", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "d9947d5f31b9c87f5ce1e759e02099b1949502e4", "version": "1.77.0", diff --git a/versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json index 8419587845c96c..1bd8b80354d8ca 100644 --- a/versions/b-/boost-histogram.json +++ b/versions/b-/boost-histogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "223b95e57f20afec67e891aa7fc884e6ac492f6f", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "09522ba204485792839f58b858ac31550e14a023", "version": "1.77.0", diff --git a/versions/b-/boost-hof.json b/versions/b-/boost-hof.json index e35145444d84c2..48edaf0520846c 100644 --- a/versions/b-/boost-hof.json +++ b/versions/b-/boost-hof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "899745af9cdd07134ebe4b4223eb749b7efa5be4", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "2c22e81e06ddd812d0328854ce7302f662fca398", "version": "1.77.0", diff --git a/versions/b-/boost-icl.json b/versions/b-/boost-icl.json index a248dde081f8b9..1e6a03f0d9398d 100644 --- a/versions/b-/boost-icl.json +++ b/versions/b-/boost-icl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "074322ef21b89c54d87c0446716221c3c20544a8", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "753c4291a6d27d5c2fc377455c83df2ee9fd569a", "version": "1.77.0", diff --git a/versions/b-/boost-integer.json b/versions/b-/boost-integer.json index 9310a58f933f1d..289dd19348dfce 100644 --- a/versions/b-/boost-integer.json +++ b/versions/b-/boost-integer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18f2f923e2a8d4f026787eb8626def460dd2ab6a", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "375a2af7e2d5d620aa9f42064255c269b0c73f5a", "version": "1.77.0", diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json index 7cb7b5eda180af..ce9f23914b2296 100644 --- a/versions/b-/boost-interprocess.json +++ b/versions/b-/boost-interprocess.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "220049a8136b65045c04fc13aea3a259e8f4f2b0", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "6461c4f63a5c0f31efb213c9d1e3b9328b2e3dcc", "version": "1.77.0", diff --git a/versions/b-/boost-interval.json b/versions/b-/boost-interval.json index 277962acba2ad2..1e3b05ce246463 100644 --- a/versions/b-/boost-interval.json +++ b/versions/b-/boost-interval.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5786ba8a3bb499958bbe8ebbc58c6bb4e4c3eb91", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "e57b55cec7198cb4f448933fa2763465db0c9672", "version": "1.77.0", diff --git a/versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json index 5d825dcea16eac..4849a39d53ef04 100644 --- a/versions/b-/boost-intrusive.json +++ b/versions/b-/boost-intrusive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "351ad9aa5db5bf50ab87a390a69d5df1d2b41ab7", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "9fb49266dc300d8914a0485972738b960ccf4339", "version": "1.77.0", diff --git a/versions/b-/boost-io.json b/versions/b-/boost-io.json index cd5cec0aed2688..9c85f7cd6330da 100644 --- a/versions/b-/boost-io.json +++ b/versions/b-/boost-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33cc953c79a65bcdfdd7b55a757bf3f4ac4be4bf", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "83ec8bab1f1bbd6eb1e2883a26747c7982d5c34f", "version": "1.77.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index 490d00e1bc1cc8..526884993209e4 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "73e04423bfb004c75708458688afeeb8a1806ba5", + "version": "1.78.0", + "port-version": 2 + }, + { + "git-tree": "1e23d8d78c5a33ee92fc1ec70db8125db72032a2", + "version": "1.78.0", + "port-version": 1 + }, + { + "git-tree": "7e240f9d647c1142b5b61c9a635e3aa186756802", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "286c74896c6f2a6057bfbce333304f279bb38aac", "version": "1.77.0", diff --git a/versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json index ce0b7af1635706..d622cc5d117c75 100644 --- a/versions/b-/boost-iterator.json +++ b/versions/b-/boost-iterator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "474aefb2b63e5ea3e6794631eab47aa3d6921573", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "7bec2abc5b714c2bd975178406937ef59a73f29b", "version": "1.77.0", diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json index 02a595c9accf00..1fc302c0c81682 100644 --- a/versions/b-/boost-json.json +++ b/versions/b-/boost-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8cdadcefe4c56aadc0120b9c1a86ea6504f3cea", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "80003ce3a7bb1c08b9ac354c58085758343ca42d", "version": "1.77.0", diff --git a/versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json index 9655aa372205e6..9fa2796c616f33 100644 --- a/versions/b-/boost-lambda.json +++ b/versions/b-/boost-lambda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad7994962fa2139e8b2e67adbf505c555a57f3c6", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "56ca5b54a9913e884d79bfd72e13ac6d72acd71d", "version": "1.77.0", diff --git a/versions/b-/boost-lambda2.json b/versions/b-/boost-lambda2.json index 58b85cda00c26e..48656d120c0e84 100644 --- a/versions/b-/boost-lambda2.json +++ b/versions/b-/boost-lambda2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe85b4be83b3a88ec04a16d0704acc722502a128", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "d97e933c5109b73c577e20f53bc095224e9ca198", "version": "1.77.0", diff --git a/versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json index 7061e9bc0c6f9f..f6129e5e5c92f4 100644 --- a/versions/b-/boost-leaf.json +++ b/versions/b-/boost-leaf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c000f663b00cfc9a2566b67ea68d6fe5050a016a", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "e257e66da57763ab4e677806d04b6d67721c09df", "version": "1.77.0", diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json index a1012e927ba4f1..4d7eadfc03295e 100644 --- a/versions/b-/boost-lexical-cast.json +++ b/versions/b-/boost-lexical-cast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "984ca6d42fd857c08fa915edc02bfcecb02cc343", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "3a265d9296755adc81f3c02b273d758798903b0c", "version": "1.77.0", diff --git a/versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json index 41612a19d3f838..7a3d94c51b6dab 100644 --- a/versions/b-/boost-local-function.json +++ b/versions/b-/boost-local-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0eb3b232475da3263d0c5a9b65a6cca3d63af1f", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "61818440e17f46b0715e5b53b8c49a79dc274a27", "version": "1.77.0", diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index 3b10fee0bcbde4..d8a8d53d670aaf 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66e57914d683e3e7c9945eeefd2010b5a08b4972", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "c391246c7c5588d89f0d3fe5425a3fb3c97d7787", "version": "1.77.0", diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json index 75c947d2cbbc8a..fafb9f8fa21887 100644 --- a/versions/b-/boost-lockfree.json +++ b/versions/b-/boost-lockfree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a98fed342e79efc6194594c5bdd0a6398a7bf9c", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "6760017d0cf025254b1056309a2c32407081c4bb", "version": "1.77.0", diff --git a/versions/b-/boost-log.json b/versions/b-/boost-log.json index fd39146738c144..a967ce40d39db3 100644 --- a/versions/b-/boost-log.json +++ b/versions/b-/boost-log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66bcef44cd4e7f68677db041e84df77e350624be", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "6ab1ab88f37500f86b5c9b9222e50dc2c17da5c1", "version": "1.77.0", diff --git a/versions/b-/boost-logic.json b/versions/b-/boost-logic.json index 2cccebec6302d5..4bade7c65523e5 100644 --- a/versions/b-/boost-logic.json +++ b/versions/b-/boost-logic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5acfea5d30532cc6dccce78e0fd159a023ccb4a", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "afcc526b0a9287bc84744bf57a1a6d37a0b3b567", "version": "1.77.0", diff --git a/versions/b-/boost-math.json b/versions/b-/boost-math.json index 2cc8be73079f61..e9a8cde6e6398f 100644 --- a/versions/b-/boost-math.json +++ b/versions/b-/boost-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2fcdb4cd154efd942606b09085ec0cb7747a764", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "c3caf2df93bffdc6d72b5c4df120200abe0f6562", "version": "1.77.0", diff --git a/versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json index bfdb5098845aec..9572ffea06351e 100644 --- a/versions/b-/boost-metaparse.json +++ b/versions/b-/boost-metaparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b3d7330ddf3fd7d1f38256098f645cafd96d08a", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "4f5433852913f94917d5e6afde09d24d48421ed3", "version": "1.77.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index ef9108decadccb..e45e0fbada2b09 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6", + "version": "1.78.0", + "port-version": 2 + }, + { + "git-tree": "11b3d243931b80a098de2d6ff74587485febf646", + "version": "1.78.0", + "port-version": 1 + }, + { + "git-tree": "cb8ca019590f2915f8a4a2eef170531474c35de0", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e3edff222b218a808eca74d6891afc1693ec4774", + "version": "1.77.0", + "port-version": 6 + }, + { + "git-tree": "48cc9da813626ac4733698e65368e5581f4efb59", + "version": "1.77.0", + "port-version": 5 + }, { "git-tree": "aea8b4dbb8063db29d8ac843ef6aac35478bebaa", "version": "1.77.0", diff --git a/versions/b-/boost-move.json b/versions/b-/boost-move.json index 2063ba75059937..27252e03f73620 100644 --- a/versions/b-/boost-move.json +++ b/versions/b-/boost-move.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2b516a6391277e0c72147caf8c6677c92bff2a8", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "d912a2a9e0b705919dae22cd8af6a4467e209e4e", "version": "1.77.0", diff --git a/versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json index f0be35fcece9d0..d0f8ddd0e056d4 100644 --- a/versions/b-/boost-mp11.json +++ b/versions/b-/boost-mp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06e8d1438943e47b1b4282964a0d290461ba3387", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "f685c323f00cf309294ac9e26b554baacbe3aecf", "version": "1.77.0", diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json index 5bf38a9fc2dec6..83b6cdc5da8df1 100644 --- a/versions/b-/boost-mpi.json +++ b/versions/b-/boost-mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "752ad29481d8c40a2a16cf1d18669a410e78d150", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "25bace7adcac31b1199ae4e8b522a3bf020362e2", "version": "1.77.0", diff --git a/versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json index ef673f4feb5c3a..d9d464cacad9ff 100644 --- a/versions/b-/boost-mpl.json +++ b/versions/b-/boost-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8b09063ef7fce74a9bfc52625ea7bf285cf4a82", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "1b0bd80c486b32952b76c2b9539555cff5d2f911", "version": "1.77.0", diff --git a/versions/b-/boost-msm.json b/versions/b-/boost-msm.json index 09d01c88d5ce80..f7bc813770a16b 100644 --- a/versions/b-/boost-msm.json +++ b/versions/b-/boost-msm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce4a5ac8b3d7cabf044883d6ab34c4360b75792e", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "c2dc03df49f99f1fca480d0439fe973a1f02c96b", "version": "1.77.0", diff --git a/versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json index 5fa1f2bea25c88..bb280f54887cd1 100644 --- a/versions/b-/boost-multi-array.json +++ b/versions/b-/boost-multi-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b83337494c61a0f45310b4c298399841ac301aed", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "afcf3afccfec7dacd50795dad8c588b3f2dabbb5", "version": "1.77.0", diff --git a/versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json index 1be14c6dac1c9e..280c9655c8ece0 100644 --- a/versions/b-/boost-multi-index.json +++ b/versions/b-/boost-multi-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a7e300ddb860a345ca0b9889cbe5d5d11934090", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "e993a57f4569f76310bc8c203372ebe472395005", "version": "1.77.0", diff --git a/versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json index 2959fa9c1c624b..d69170a7cd790a 100644 --- a/versions/b-/boost-multiprecision.json +++ b/versions/b-/boost-multiprecision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2914c2dcd5cb9a604c14ca9a5e9600ac7c0ecfd9", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "58d7184ae4115f7f46671db9929708872e6aae6c", "version": "1.77.0", diff --git a/versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json index 3244ab2d7d63ec..8facc05ae26348 100644 --- a/versions/b-/boost-nowide.json +++ b/versions/b-/boost-nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c38c862892bc328c743481ee48b3abf50e66a51f", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "2fc28ef9747a6ead394ae884518c8be324dd8e33", "version": "1.77.0", diff --git a/versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json index 1d616a86e0fc48..627d7d95c9f205 100644 --- a/versions/b-/boost-numeric-conversion.json +++ b/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11dcb5d23dd6b1db7138ffe608d76134ce1e4ec5", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "78140f78c6400520bd4ce340c68236e083a504e9", "version": "1.77.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index f4aa9284bc088f..7ae02c2e9b10ab 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "069823a27c74a3a7872a0faed570b16130b4698d", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "effd1406c513ca8f20a1e2b6de0cd299be92d74e", "version": "1.77.0", diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json index e4f8ac19d25995..df05ebfd2886ba 100644 --- a/versions/b-/boost-optional.json +++ b/versions/b-/boost-optional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4171d6f66bb828d51bee3de777da9384232b6068", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "4a1ddf516bc0edc855ab4d9b8d134f338ba51a94", "version": "1.77.0", diff --git a/versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json index 9169456da791ca..dd7a8d16b0e6bd 100644 --- a/versions/b-/boost-outcome.json +++ b/versions/b-/boost-outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea24820de39876b61aa98e1d54ac9663c0355f93", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "6737734e6d10c475676e1ed16967ec7792acc7dc", "version": "1.77.0", diff --git a/versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json index 3e36eaeeaea8fb..fd8335ec47535f 100644 --- a/versions/b-/boost-parameter-python.json +++ b/versions/b-/boost-parameter-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a1cbdfec8ad70998ccfb368a3e77d8658023fed", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "5295cb4faa096633a23163b2a6409a27464a157e", "version": "1.77.0", diff --git a/versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json index 794115cda204fb..cfb5561a3209bf 100644 --- a/versions/b-/boost-parameter.json +++ b/versions/b-/boost-parameter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e11ea75fd7178b78b5a3751aa7db269c8ef222cb", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "3f480980e4e1ce4713a28bd24d728efb0bb931fa", "version": "1.77.0", diff --git a/versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json index 3c04fc39c3cf08..1adbe9da15f1c1 100644 --- a/versions/b-/boost-pfr.json +++ b/versions/b-/boost-pfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ca2c9de4c7a8553f401a9f7b9e954eb6305bc47", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "23bdfdb9c9cb19e28201088dc055b85dc44b62bf", "version": "1.77.0", diff --git a/versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json index e8742b823075be..e7bb37ca7c2762 100644 --- a/versions/b-/boost-phoenix.json +++ b/versions/b-/boost-phoenix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1812de4001c736517ca9bd780fa4b5258dfb134c", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "2926d1b537106cb231bb9f3a657f6fde6c8530f8", "version": "1.77.0", diff --git a/versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json index 3aed0d7a624683..87bbb42eb2287d 100644 --- a/versions/b-/boost-poly-collection.json +++ b/versions/b-/boost-poly-collection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a128149f5edfbf7e5c4fcbf497b29ce587a35ad", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "d57a3554e15ff1a0bf279688f487751bc5f74efb", "version": "1.77.0", diff --git a/versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json index c7f28fefc923db..ef14dc9bfb3640 100644 --- a/versions/b-/boost-polygon.json +++ b/versions/b-/boost-polygon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67a7f31ef72a1ceff351456cc7282b6f261db187", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "81ea3095d56a98f6d5b75db6568a19e48ac819bb", "version": "1.77.0", diff --git a/versions/b-/boost-pool.json b/versions/b-/boost-pool.json index c6c63d6928ad45..0eeab3a57d7d5e 100644 --- a/versions/b-/boost-pool.json +++ b/versions/b-/boost-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c0061ca841cab5b588ebae9bd1387882eec3435", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "7794803f75109db0ca64a48d2f1cbd76100b153d", "version": "1.77.0", diff --git a/versions/b-/boost-predef.json b/versions/b-/boost-predef.json index cfea8f0ef0cda5..7e40a366a6a513 100644 --- a/versions/b-/boost-predef.json +++ b/versions/b-/boost-predef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1865984507efa465dea0f7d597528cfedcef0b7e", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "a291dbfb68391a25f04944f9caa924f570b26d41", "version": "1.77.0", diff --git a/versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json index ec230e7af6f6b6..5ce1911e60c8f3 100644 --- a/versions/b-/boost-preprocessor.json +++ b/versions/b-/boost-preprocessor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e69da51c3ec0a8086ab18dbf75da11649aed5157", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "6abad213e30df5ed168164b2612dba2041c7e8c1", "version": "1.77.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index 342aecc27a7cc8..ea3ab61e8d8ad5 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "669ff76873e507b50238609e17bb0208559cd224", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "0e476269a7091861c1db7379d4e925df6d184044", "version": "1.77.0", diff --git a/versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json index a844bf6338fd2c..b9f291ecdbb9d0 100644 --- a/versions/b-/boost-program-options.json +++ b/versions/b-/boost-program-options.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a0432f928213aacc0f1a51eef24201e1f120690", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "8ba826d9a2078c4e933cb9bfd23cb9c1a0e252ac", "version": "1.77.0", diff --git a/versions/b-/boost-property-map-parallel.json b/versions/b-/boost-property-map-parallel.json index 7ea721c402434b..af221a68cfa7af 100644 --- a/versions/b-/boost-property-map-parallel.json +++ b/versions/b-/boost-property-map-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d9edadb62d7a55975cf22e01b7ee0ce74b4301a", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "32b8452f34ad6048981ab1f2a5d7c226753205b8", "version": "1.77.0", diff --git a/versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json index c5666200e3a8dd..fc1ff00c0d221f 100644 --- a/versions/b-/boost-property-map.json +++ b/versions/b-/boost-property-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c37ef13cdc33278fba6fa5c5bab30de91ce90e2", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "c866a47a5b9a770e415dc1078cc37870cd5851bf", "version": "1.77.0", diff --git a/versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json index 590c41eb6af4f3..b2ace9a66e818e 100644 --- a/versions/b-/boost-property-tree.json +++ b/versions/b-/boost-property-tree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "281dadcd5a8a6843ae829c4b653f33e7d1dbe2dd", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "959191d822cc095e02a3f6d9af5b68aeb823a0d1", "version": "1.77.0", diff --git a/versions/b-/boost-proto.json b/versions/b-/boost-proto.json index 64d5c6e3e7b10c..ca8228970541fe 100644 --- a/versions/b-/boost-proto.json +++ b/versions/b-/boost-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46fcd6f1550adf925df0d985dd5463991150a13f", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "5d33f62f1117da9bac418c4b85d1a1bd96c547a4", "version": "1.77.0", diff --git a/versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json index 342e26e7bb555d..73a43765937e76 100644 --- a/versions/b-/boost-ptr-container.json +++ b/versions/b-/boost-ptr-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81591a280761661476868c5f064461475bd10ba2", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "e954b84d951409f6445d7d49bafa66c977ed9834", "version": "1.77.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index da1303cc4fd1fe..308d3c3d34fa10 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4cbab3ca82048134b757a0689d4ab3a83a7b695", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "879991d36cfdcdb57b176b9dac08b55c3c69a9a1", "version": "1.77.0", diff --git a/versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json index 072fa2f55ae136..8596f6f2ec06f5 100644 --- a/versions/b-/boost-qvm.json +++ b/versions/b-/boost-qvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2c998753d319d94c00d3b3b3365e2a116bad23f", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "5d7b01d612075dfb3d89b799bec152785c838b84", "version": "1.77.0", diff --git a/versions/b-/boost-random.json b/versions/b-/boost-random.json index ab58ea216db09e..3b9f756a012a91 100644 --- a/versions/b-/boost-random.json +++ b/versions/b-/boost-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca9654479a3b0b92cba2e2c05fb927715b87a10c", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "3f6c3399689c43f599f3852d98325cb272e8f775", "version": "1.77.0", diff --git a/versions/b-/boost-range.json b/versions/b-/boost-range.json index a04bcd0a574992..ceff56a9a60417 100644 --- a/versions/b-/boost-range.json +++ b/versions/b-/boost-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ec82281ed52b6d4ae225abe93a18392c846cbc9", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "737f4f322e661e01459862fbe73f748390b59c3d", "version": "1.77.0", diff --git a/versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json index 8f132fe021939c..f5678705e726a0 100644 --- a/versions/b-/boost-ratio.json +++ b/versions/b-/boost-ratio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5e0af272c7df2d7994c6d98ad1d76df6b5330f7", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "724fa7b1c0e1d78a9c29595b042443090e53a8ee", "version": "1.77.0", diff --git a/versions/b-/boost-rational.json b/versions/b-/boost-rational.json index 2fae947dd3b661..b84c1db30a0470 100644 --- a/versions/b-/boost-rational.json +++ b/versions/b-/boost-rational.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a2877b20057e313af02d1307832d90f764b2dc1", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "d54d04de158ddaf33d7b8a6815532e8ee2771515", "version": "1.77.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index 9066d4b5a65a51..4071d58156c8f9 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f04cda8dcb436a4cfaa008331d05ef2d0974b698", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "c7c4497156a2c9e4f3227ee3807512630242307d", "version": "1.77.0", diff --git a/versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json index 09227552291e64..d09bdb78b020f6 100644 --- a/versions/b-/boost-safe-numerics.json +++ b/versions/b-/boost-safe-numerics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d425b6103c0c8a5824e74768d16fee276a33e99c", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "fc4fa0c3b394d848fbc83ca16bcaec15742ed3db", "version": "1.77.0", diff --git a/versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json index 622822b7f3f633..465a08b630ff36 100644 --- a/versions/b-/boost-scope-exit.json +++ b/versions/b-/boost-scope-exit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3d93cccff577045dce502c87ffcb02efb259ae8", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "33d55355e2f85c6188f1d131f386f86b8e29efc1", "version": "1.77.0", diff --git a/versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json index a762ba7e011a81..9305f3e62364ad 100644 --- a/versions/b-/boost-serialization.json +++ b/versions/b-/boost-serialization.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c51578433055196c6e74bcdf792f4092479336de", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "bdb25d2d55569534825b139f62cf29a2f7aaba6e", "version": "1.77.0", diff --git a/versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json index 633f990917f739..bbfab113a7c629 100644 --- a/versions/b-/boost-signals2.json +++ b/versions/b-/boost-signals2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3a1129bee4ba8d867758248e1b66add1a2bedb8", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "ac3a1ba310974e1653a99cccc34339f29ad43786", "version": "1.77.0", diff --git a/versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json index dfb0d402efbc0c..1fccd55269788b 100644 --- a/versions/b-/boost-smart-ptr.json +++ b/versions/b-/boost-smart-ptr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18806e0372da7b7f8b2d6a8ff4bd7bf074a690cd", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "700532550b70d03254c77f1467ab4c01a2c6e62a", "version": "1.77.0", diff --git a/versions/b-/boost-sort.json b/versions/b-/boost-sort.json index df8596da5e8426..37023d6b8261ef 100644 --- a/versions/b-/boost-sort.json +++ b/versions/b-/boost-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc0176556b8aaecb87376a59e2f711a9068dab3a", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "af8327ce79cadcc43327a0f75d79b2e5feed38b8", "version": "1.77.0", diff --git a/versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json index 098082d48a1900..9debd000305722 100644 --- a/versions/b-/boost-spirit.json +++ b/versions/b-/boost-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05502d056fb4e5569f87cd2a591ce5802f4020eb", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "bc66c5a9ccd7f7bde95426392bc7ff62189f920d", "version": "1.77.0", diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index ffa45e095739aa..1df417364f6066 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e00114d87145dd426e0816ce0e5fd0ab4a587ad9", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "8d5ffa9ca1552ad32a5c6a78c28a3e275323dc2d", "version": "1.77.0", diff --git a/versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json index b3e250803bf5dc..42cb3b6dc759a1 100644 --- a/versions/b-/boost-statechart.json +++ b/versions/b-/boost-statechart.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef8ccac6b5ef76c3b862e46b9f6cb37169e8b20a", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "044b9fc61c729216838037b6b519393e32b2fa26", "version": "1.77.0", diff --git a/versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json index 1da1c117dfd724..32ca4d27bb0019 100644 --- a/versions/b-/boost-static-assert.json +++ b/versions/b-/boost-static-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d1e3a21f0be997c400b7c60dc2ec1b1beccbe3c", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "57ca16ab3652380b32a137add7aed6a385754d75", "version": "1.77.0", diff --git a/versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json index c5953e7103af83..bd08640c6d4353 100644 --- a/versions/b-/boost-static-string.json +++ b/versions/b-/boost-static-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe40bbd1d9be4c65daee4bf8f58a6b08baea4bdb", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "8296453890169b2bf99e2b7ecf4231c7ae572903", "version": "1.77.0", diff --git a/versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json index 4d7a745979ba00..c0c2407c462eab 100644 --- a/versions/b-/boost-stl-interfaces.json +++ b/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "536059a4a77be87c1825fd1523cc29e47c86541d", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "0e127914d34e8dbaebf9f36fe800b8bc85252233", "version": "1.77.0", diff --git a/versions/b-/boost-system.json b/versions/b-/boost-system.json index 7e9741164bba29..a6aba1c1d0834f 100644 --- a/versions/b-/boost-system.json +++ b/versions/b-/boost-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eaab2373181b829bf4cb4ee298dfc9c80e98f01f", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "86ac553606d3af5cf67b96bafd1ddaf9e6c57b60", "version": "1.77.0", diff --git a/versions/b-/boost-test.json b/versions/b-/boost-test.json index f7f6df87e386f4..e1edf4f035750b 100644 --- a/versions/b-/boost-test.json +++ b/versions/b-/boost-test.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5015382ed40be617a3ec97adb17c0c1ecf3ab2d9", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "6429276e9f4fa438346cb3d41e73b9c15bff1868", "version": "1.77.0", diff --git a/versions/b-/boost-thread.json b/versions/b-/boost-thread.json index ac617602c296b8..1f4e22e272ccd2 100644 --- a/versions/b-/boost-thread.json +++ b/versions/b-/boost-thread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef371df76c2b790aae7209d2866c467bd6d339be", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "1c097a032a997463e15245272e40ea9298554f8b", "version": "1.77.0", diff --git a/versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json index 39345f00046f09..7889d4fe082650 100644 --- a/versions/b-/boost-throw-exception.json +++ b/versions/b-/boost-throw-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ab1c68ab2a41696a5f36841a66178256b8d229e", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "f0887800c8710d96015c7c1541f78265e1227963", "version": "1.77.0", diff --git a/versions/b-/boost-timer.json b/versions/b-/boost-timer.json index 2d50aeb789ff69..10b443bb4429f6 100644 --- a/versions/b-/boost-timer.json +++ b/versions/b-/boost-timer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf38eaeaceb0c989b414c6570b560e28822034fb", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "aa256b5fe2ecea8dc514e446f136bbe1100a9805", "version": "1.77.0", diff --git a/versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json index b66552312ff79c..ea1e28890847e4 100644 --- a/versions/b-/boost-tokenizer.json +++ b/versions/b-/boost-tokenizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24c6aef67afefb01d20749d7b43790efcb1dfc66", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "56a1fb828a469ba50000983860226452c264050f", "version": "1.77.0", diff --git a/versions/b-/boost-tti.json b/versions/b-/boost-tti.json index 8de66a06111cbc..3e1cc883f91ee4 100644 --- a/versions/b-/boost-tti.json +++ b/versions/b-/boost-tti.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c47f152005c71db858b015f18edf72b02f7ebf27", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "102fbb95889400677115252d4a5954a2f7edd5e1", "version": "1.77.0", diff --git a/versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json index a37d4c55a453a5..0593f929d01ae5 100644 --- a/versions/b-/boost-tuple.json +++ b/versions/b-/boost-tuple.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da0a88c5630fa116b473e02aae6651199529649e", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "35d10ab4f156848f6f08f8bc26e41b27638af55e", "version": "1.77.0", diff --git a/versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json index 2d00e539e8cc63..2d619ab0f97251 100644 --- a/versions/b-/boost-type-erasure.json +++ b/versions/b-/boost-type-erasure.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "787c75c5f25da496fb26723589ed3ea5c2c73a49", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "d98f14bce468d5ac0e5fca0f61bd6c5eef911224", "version": "1.77.0", diff --git a/versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json index 41d2c8622cb594..7dc17e63767132 100644 --- a/versions/b-/boost-type-index.json +++ b/versions/b-/boost-type-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fac6a10bb329da6cd19cfde9534ef11b3edb8623", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "b8c5d86d75e307f04c4e5548f2ff57dccdc29e40", "version": "1.77.0", diff --git a/versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json index 85a5178f72bec5..2e1aff84a0339c 100644 --- a/versions/b-/boost-type-traits.json +++ b/versions/b-/boost-type-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ce0cad0c57f4acd5da2369894a0db64b918ac41", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "7f108bb5313d004627d2b81b5e2a6d7298b091e9", "version": "1.77.0", diff --git a/versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json index f68d6561a7c685..3d5361e90515ef 100644 --- a/versions/b-/boost-typeof.json +++ b/versions/b-/boost-typeof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "478fadf37863e72ec547e1a7620da6a28cc85c7d", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "7df16df37b9fe9d5e4184dfdf928030010522f51", "version": "1.77.0", diff --git a/versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json index 813a33d10d51d3..6833fb11bcf874 100644 --- a/versions/b-/boost-ublas.json +++ b/versions/b-/boost-ublas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c6ffcc2498c1521634d070a99e02c695f069c2e", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "7261e769f15495294c4eed2d06a157979419b0a9", "version": "1.77.0", diff --git a/versions/b-/boost-uninstall.json b/versions/b-/boost-uninstall.json index 447f44ef5a1443..4beb41f50175b7 100644 --- a/versions/b-/boost-uninstall.json +++ b/versions/b-/boost-uninstall.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "996078abceb6009fb2841dd97edc5246e8bd38aa", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "1d472d1b44489c230a741cb519e893732f5d00ac", "version": "1.77.0", diff --git a/versions/b-/boost-units.json b/versions/b-/boost-units.json index 366bdf93a9c37a..c0e3151fdde40d 100644 --- a/versions/b-/boost-units.json +++ b/versions/b-/boost-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30bc337bdcbfbfb7339e8a4dd2169df60fbae249", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "696b0e8e934400879bf390ad024b231a3b32fa4c", "version": "1.77.0", diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json index 008c8e412651ed..b6148e358880bb 100644 --- a/versions/b-/boost-unordered.json +++ b/versions/b-/boost-unordered.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c55ee280fedefd69dba819a4d768d5a5e132f9b9", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "e0e056b82651533817c1ca6dce6fb6239ccdcdbb", "version": "1.77.0", diff --git a/versions/b-/boost-utility.json b/versions/b-/boost-utility.json index 7162542a7c60fe..efa7b88b578b11 100644 --- a/versions/b-/boost-utility.json +++ b/versions/b-/boost-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e39c1737260328064c10b743aba90788efc467a", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "e3589215d60cac29105fb361ef70e6d8befb8f94", "version": "1.77.0", diff --git a/versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json index c8005837128ea6..6775ec029fc94a 100644 --- a/versions/b-/boost-uuid.json +++ b/versions/b-/boost-uuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19c834dc170873080e1c6308233fd9041ae42cce", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "ce741d3c6c5770db02da8abb268bdd0b2cd0519b", "version": "1.77.0", diff --git a/versions/b-/boost-variant.json b/versions/b-/boost-variant.json index fa05a70ace6a72..cddad5a84894c8 100644 --- a/versions/b-/boost-variant.json +++ b/versions/b-/boost-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2196d2cb8c61db4cdd6285170589e079c1ff3bb", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "63d66b780f8fb2e1b7c1365fc54b23795b09279c", "version": "1.77.0", diff --git a/versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json index 12a9941867fe14..dd69437d4d3e0c 100644 --- a/versions/b-/boost-variant2.json +++ b/versions/b-/boost-variant2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30915b5f5005d9b166f4349f493b4f7314d84c17", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "7cc13c2fc5f9f303b76d9fc39da52e198bd6a998", "version": "1.77.0", diff --git a/versions/b-/boost-vcpkg-helpers.json b/versions/b-/boost-vcpkg-helpers.json index 840957fe9c044f..652b90ee89acfd 100644 --- a/versions/b-/boost-vcpkg-helpers.json +++ b/versions/b-/boost-vcpkg-helpers.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2b601d13ad505473bac3d555d9e543d981c46565", + "version": "1.78.0", + "port-version": 1 + }, + { + "git-tree": "b8003935ceb891a870f1bbef0ffd18ef4266c6f7", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "f0b625fd73edd33c92f70727a4cf068d0268379e", "version": "1.77.0", diff --git a/versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json index b6fba2a1af9934..dc92ffb0e61811 100644 --- a/versions/b-/boost-vmd.json +++ b/versions/b-/boost-vmd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d89558e11194fd019488c8e4550bc8b7debb38d4", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "65746c8cdad55d1703218a4e1eeaedd8a8cf3641", "version": "1.77.0", diff --git a/versions/b-/boost-wave.json b/versions/b-/boost-wave.json index 9ba855728fc29f..aaf5de7f45ea29 100644 --- a/versions/b-/boost-wave.json +++ b/versions/b-/boost-wave.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbf126b4e9405233ffd54018c18cf84895f59f29", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "cd8b4e8a20d59332f25b012c8379b8847b98524f", "version": "1.77.0", diff --git a/versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json index 6279226c9dc38d..154870d8b6cd5d 100644 --- a/versions/b-/boost-winapi.json +++ b/versions/b-/boost-winapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8492201c09a250964609eea910b3d37c9895d411", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "2d4c0be143dbffd619ac154ef5d8f4fe24277bbe", "version": "1.77.0", diff --git a/versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json index 36d6037e34fcc4..08d44ea45a0818 100644 --- a/versions/b-/boost-xpressive.json +++ b/versions/b-/boost-xpressive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b117a25b1705a9a21ddb41a01bc8c081121d6d95", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "bf04b7076a27d24203528b52aaf41efc83923c67", "version": "1.77.0", diff --git a/versions/b-/boost-yap.json b/versions/b-/boost-yap.json index 6fa9b8ff9e1497..6272a7bccf8843 100644 --- a/versions/b-/boost-yap.json +++ b/versions/b-/boost-yap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "692c496d822a9132dcf05c76bfee43bf7ab56c5e", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "856780f406def0087cc90b0dd0b623a65d78103e", "version": "1.77.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index d3f77c2acc4c67..8b2083ba58b5d6 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6924d40a63cbd74c48964edd069a5df1df8b615", + "version": "1.78.0", + "port-version": 0 + }, { "git-tree": "19bdc0542dd287e39768144ba2719723a7818750", "version": "1.77.0", diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json index 2d3b5ad08ce5a4..5700899dcb9552 100644 --- a/versions/b-/boringssl.json +++ b/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca35c06a32c83f385f840831a435c69231a7852a", + "version-date": "2021-06-23", + "port-version": 1 + }, { "git-tree": "aa2649d9a0296ed873aa8fb17c28f38baac51a26", "version-date": "2021-06-23", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 8e96e8fe522916..70633dbd694c49 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "2d7fe86d0a8a13ebddda0ac759f824fb9066b644", + "version": "2.18.1", + "port-version": 10 + }, + { + "git-tree": "a091e7d5a75af9eadbaa696b79e44d726deb47fe", + "version": "2.18.1", + "port-version": 9 + }, + { + "git-tree": "267c31f3759881d233529d28ec78e2a0c8d1e9b4", + "version": "2.18.1", + "port-version": 8 + }, + { + "git-tree": "dfbd885e94b11d3b8074d96c92e810a0f1a7be7a", + "version": "2.18.1", + "port-version": 7 + }, + { + "git-tree": "928c19e302d27840225477d4e4b183ca9bd76ea8", + "version": "2.18.1", + "port-version": 6 + }, + { + "git-tree": "7a800cf24fcc51e57dedfb8782753c50305880e1", + "version": "2.18.1", + "port-version": 5 + }, { "git-tree": "477e259691b81a016da459532f616b5fca230a91", "version": "2.18.1", diff --git a/versions/b-/box2d.json b/versions/b-/box2d.json index c392cefea7c5bc..408aa7cd35b223 100644 --- a/versions/b-/box2d.json +++ b/versions/b-/box2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c8a3a146971f33f497c21d6b52b756245f894e4", + "version-semver": "2.4.1", + "port-version": 2 + }, { "git-tree": "f40a0f5f20b3e546e55850df8babf2d9cd526ee8", "version-semver": "2.4.1", diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json index b60361ffe91f9b..8051dbd44e2f54 100644 --- a/versions/b-/breakpad.json +++ b/versions/b-/breakpad.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1765629f89b1d8d3020f5e4baa35116b9da02c0a", + "version-date": "2020-09-14", + "port-version": 5 + }, + { + "git-tree": "553a7799e93f9f2b4441d077b379613a796acdea", + "version-string": "2020-09-14", + "port-version": 4 + }, { "git-tree": "be41998b0a407c10ae78d605264a2c0bb7d3f3ca", "version-string": "2020-09-14", diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json index 2049b07521ea35..a7a9687b5a7965 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "bcff3231352f577720f51a99dbf9ecf0132ebcba", + "version": "0.9.7", + "port-version": 7 + }, + { + "git-tree": "f658cec9384935d01319d2725a039da7cb5e6c77", + "version-string": "0.9.7", + "port-version": 6 + }, + { + "git-tree": "eb37098c32016db48b15a29bd31b08087c7b5d0e", + "version-string": "0.9.7", + "port-version": 5 + }, + { + "git-tree": "7c6f7c8a882730bd20874fb5832081105a169c7a", + "version-string": "0.9.7", + "port-version": 4 + }, { "git-tree": "42b5a413e49655d73b772efa7642eefff429b4c1", "version-string": "0.9.7", diff --git a/versions/b-/brynet.json b/versions/b-/brynet.json index 63b0a8bf79d029..60d187b01065b7 100644 --- a/versions/b-/brynet.json +++ b/versions/b-/brynet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1700fdb373d8d3789f510b64aeee7d79859393f1", + "version-string": "1.11.1", + "port-version": 1 + }, { "git-tree": "f164bb20f8c10203d2ab57ecf5a28b5891c5259a", "version-string": "1.11.0", diff --git a/versions/b-/buck-yeh-bux-mariadb-client.json b/versions/b-/buck-yeh-bux-mariadb-client.json index f1fa95288e0162..03d2c0f5d7c029 100644 --- a/versions/b-/buck-yeh-bux-mariadb-client.json +++ b/versions/b-/buck-yeh-bux-mariadb-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67f2e3a599ef1a984f01e973c71ccd5e4c0ba956", + "version": "1.0.1", + "port-version": 1 + }, { "git-tree": "84453b40536c8c57162f627c28d4f3a148516ad8", "version": "1.0.1", diff --git a/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json index cde398a02474d4..bb8b691b833f95 100644 --- a/versions/b-/buck-yeh-bux.json +++ b/versions/b-/buck-yeh-bux.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54886a840d4c55d27047321af6de1a5a01ed888e", + "version": "1.6.3", + "port-version": 1 + }, { "git-tree": "19d56bb09ecc37268afec6a5384282e562491af4", "version": "1.6.3", diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json index 111e48e1a730a9..10ebf720efab4a 100644 --- a/versions/b-/bullet3.json +++ b/versions/b-/bullet3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d986cc96144fa3de5201d56a508f348db9b66e71", + "version": "3.17", + "port-version": 4 + }, { "git-tree": "88add55351bf89f89e584924663861c0a827bdf5", "version": "3.17", diff --git a/versions/baseline.json b/versions/baseline.json index 2e84594fe13d92..100d4446abce01 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2,27 +2,27 @@ "default": { "3fd": { "baseline": "2.6.3", - "port-version": 1 + "port-version": 2 }, "7zip": { - "baseline": "19.00", - "port-version": 3 + "baseline": "21.07", + "port-version": 1 }, "abseil": { - "baseline": "20210324.2", - "port-version": 1 + "baseline": "20211102.1", + "port-version": 0 }, "absent": { "baseline": "0.3.1", "port-version": 1 }, "ace": { - "baseline": "7.0.5", - "port-version": 1 + "baseline": "7.0.6", + "port-version": 3 }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 5 + "port-version": 8 }, "ade": { "baseline": "0.1.1f", @@ -38,7 +38,7 @@ }, "akali": { "baseline": "1.42", - "port-version": 2 + "port-version": 3 }, "alac": { "baseline": "2017-11-03-c38887c5", @@ -50,7 +50,7 @@ }, "alembic": { "baseline": "1.8.3", - "port-version": 0 + "port-version": 1 }, "aliyun-oss-c-sdk": { "baseline": "3.10.0", @@ -61,24 +61,24 @@ "port-version": 2 }, "alsa": { - "baseline": "1.2.5.1", + "baseline": "1.2.6.1", "port-version": 0 }, "ampl-asl": { "baseline": "2020-11-11", - "port-version": 1 + "port-version": 3 }, "ampl-mp": { "baseline": "2020-11-11", - "port-version": 1 + "port-version": 2 }, "amqpcpp": { "baseline": "4.3.15", - "port-version": 0 + "port-version": 1 }, "anax": { "baseline": "2.1.0", - "port-version": 7 + "port-version": 8 }, "angelscript": { "baseline": "2.35.1", @@ -89,7 +89,7 @@ "port-version": 2 }, "antlr4": { - "baseline": "4.9.1", + "baseline": "4.9.3", "port-version": 1 }, "any-lite": { @@ -102,23 +102,23 @@ }, "aom": { "baseline": "3.2.0", - "port-version": 1 + "port-version": 2 }, "approval-tests-cpp": { - "baseline": "10.12.1", + "baseline": "10.12.2", "port-version": 0 }, "apr": { "baseline": "1.7.0", - "port-version": 5 + "port-version": 7 }, "apr-util": { "baseline": "1.6.1", - "port-version": 5 + "port-version": 7 }, "apsi": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 2 }, "arb": { "baseline": "2.21.1", @@ -126,7 +126,7 @@ }, "arcus": { "baseline": "4.10.0", - "port-version": 1 + "port-version": 2 }, "argagg": { "baseline": "0.4.6", @@ -162,35 +162,35 @@ }, "armadillo": { "baseline": "10.6.2", - "port-version": 2 + "port-version": 4 }, "arrayfire": { "baseline": "3.8.0", "port-version": 0 }, "arrow": { - "baseline": "5.0.0", + "baseline": "7.0.0", "port-version": 2 }, "ashes": { "baseline": "2021-06-18", - "port-version": 0 + "port-version": 1 }, "asio": { - "baseline": "1.20.0", + "baseline": "1.22.1", "port-version": 0 }, "asio-grpc": { - "baseline": "1.3.1", + "baseline": "1.4.0", "port-version": 0 }, "asiosdk": { "baseline": "2.3.3", - "port-version": 3 + "port-version": 4 }, "asmjit": { "baseline": "2021-10-26", - "port-version": 0 + "port-version": 1 }, "assimp": { "baseline": "5.0.1", @@ -206,11 +206,11 @@ }, "atk": { "baseline": "2.36.0", - "port-version": 1 + "port-version": 2 }, "atkmm": { "baseline": "2.36.0", - "port-version": 1 + "port-version": 2 }, "atlmfc": { "baseline": "0", @@ -225,7 +225,7 @@ "port-version": 7 }, "audiofile": { - "baseline": "1.0.9", + "baseline": "1.1.0", "port-version": 0 }, "aurora": { @@ -246,11 +246,11 @@ }, "avisynthplus": { "baseline": "3.7.0", - "port-version": 1 + "port-version": 3 }, "avro-c": { "baseline": "1.11.0", - "port-version": 1 + "port-version": 3 }, "avro-cpp": { "baseline": "2021-06-01", @@ -258,90 +258,86 @@ }, "aws-c-auth": { "baseline": "0.6.3", - "port-version": 1 + "port-version": 2 }, "aws-c-cal": { "baseline": "0.5.12", - "port-version": 1 + "port-version": 2 }, "aws-c-common": { "baseline": "0.6.9", - "port-version": 1 + "port-version": 2 }, "aws-c-compression": { "baseline": "0.2.14", - "port-version": 1 + "port-version": 2 }, "aws-c-event-stream": { "baseline": "0.2.7", - "port-version": 1 + "port-version": 2 }, "aws-c-http": { "baseline": "0.6.5", - "port-version": 1 + "port-version": 2 }, "aws-c-io": { "baseline": "0.10.7", - "port-version": 1 + "port-version": 2 }, "aws-c-mqtt": { "baseline": "0.7.6", - "port-version": 1 + "port-version": 3 }, "aws-c-s3": { "baseline": "0.1.25", - "port-version": 1 + "port-version": 2 }, "aws-checksums": { "baseline": "0.1.11", - "port-version": 2 + "port-version": 3 }, "aws-crt-cpp": { "baseline": "0.15.1", - "port-version": 2 + "port-version": 3 }, "aws-lambda-cpp": { "baseline": "0.2.7", - "port-version": 0 + "port-version": 1 }, "aws-sdk-cpp": { - "baseline": "1.9.96", - "port-version": 6 + "baseline": "1.9.160", + "port-version": 1 }, "azmq": { "baseline": "2020-03-03", "port-version": 1 }, "azure-c-shared-utility": { - "baseline": "2021-09-09", - "port-version": 0 + "baseline": "2022-01-21", + "port-version": 2 }, "azure-core-cpp": { - "baseline": "1.3.1", + "baseline": "1.4.0", "port-version": 0 }, "azure-identity-cpp": { - "baseline": "1.1.0", + "baseline": "1.2.0", "port-version": 0 }, "azure-iot-sdk-c": { - "baseline": "2021-09-09", - "port-version": 0 + "baseline": "2022-01-21", + "port-version": 2 }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", - "port-version": 3 + "port-version": 4 }, "azure-macro-utils-c": { - "baseline": "2020-06-17", - "port-version": 3 - }, - "azure-security-keyvault-certificates-cpp": { - "baseline": "4.0.0-beta.1", + "baseline": "2022-01-21", "port-version": 0 }, - "azure-security-keyvault-common-cpp": { - "baseline": "4.0.0-beta.3", + "azure-security-keyvault-certificates-cpp": { + "baseline": "4.0.0-beta.2", "port-version": 0 }, "azure-security-keyvault-keys-cpp": { @@ -349,44 +345,44 @@ "port-version": 0 }, "azure-security-keyvault-secrets-cpp": { - "baseline": "4.0.0-beta.1", + "baseline": "4.0.0-beta.2", "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.2.1", + "baseline": "12.3.0", "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.2.0", + "baseline": "12.2.2", "port-version": 0 }, "azure-storage-cpp": { "baseline": "7.5.0", - "port-version": 2 + "port-version": 3 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.2.0", + "baseline": "12.3.1", "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.2.0", + "baseline": "12.2.1", "port-version": 0 }, "azure-storage-queues-cpp": { - "baseline": "12.0.0-beta.2", + "baseline": "12.0.0-beta.4", "port-version": 0 }, "azure-uamqp-c": { - "baseline": "2021-09-09", - "port-version": 0 + "baseline": "2022-01-21", + "port-version": 1 }, "azure-uhttp-c": { - "baseline": "2021-09-09", - "port-version": 0 + "baseline": "2022-01-21", + "port-version": 1 }, "azure-umqtt-c": { - "baseline": "2021-09-09", - "port-version": 0 + "baseline": "2022-01-21", + "port-version": 1 }, "b64": { "baseline": "2.0.0.1", @@ -402,11 +398,11 @@ }, "bddisasm": { "baseline": "1.34.7", - "port-version": 0 + "port-version": 1 }, "bde": { "baseline": "3.2.0.0", - "port-version": 4 + "port-version": 5 }, "bdwgc": { "baseline": "8.2.0", @@ -418,11 +414,11 @@ }, "behaviortree-cpp": { "baseline": "3.5.6", - "port-version": 1 + "port-version": 2 }, "benchmark": { "baseline": "1.6.0", - "port-version": 0 + "port-version": 1 }, "bento4": { "baseline": "1.5.1", @@ -430,11 +426,11 @@ }, "berkeleydb": { "baseline": "4.8.30", - "port-version": 6 + "port-version": 8 }, "bext-di": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "bext-sml": { "baseline": "1.1.4", @@ -498,162 +494,162 @@ }, "blend2d": { "baseline": "2021-03-17", - "port-version": 0 + "port-version": 1 }, "blitz": { "baseline": "2020-03-25", - "port-version": 3 + "port-version": 5 }, "blosc": { "baseline": "1.18.1", - "port-version": 3 + "port-version": 4 }, "boinc": { "baseline": "7.18.1", - "port-version": 3 + "port-version": 5 }, "bond": { "baseline": "9.0.3", "port-version": 3 }, "boolinq": { - "baseline": "3.0.2", + "baseline": "3.0.4", "port-version": 0 }, "boost": { - "baseline": "1.77.0", - "port-version": 2 + "baseline": "1.78.0", + "port-version": 0 }, "boost-accumulators": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-algorithm": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-align": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-any": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-array": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-asio": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-assert": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-assign": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-atomic": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-beast": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-bimap": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-bind": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-build": { - "baseline": "1.77.0", - "port-version": 0 + "baseline": "1.78.0", + "port-version": 1 }, "boost-callable-traits": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-chrono": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-circular-buffer": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-compatibility": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-compute": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-concept-check": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-config": { - "baseline": "1.77.0", - "port-version": 2 + "baseline": "1.78.0", + "port-version": 0 }, "boost-container": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-container-hash": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-context": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-contract": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-conversion": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-convert": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-core": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-coroutine": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-coroutine2": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-crc": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-date-time": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-describe": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-detail": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-di": { @@ -661,484 +657,484 @@ "port-version": 0 }, "boost-dll": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-dynamic-bitset": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-endian": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-exception": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-fiber": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-filesystem": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-flyweight": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-foreach": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-format": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-function": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-function-types": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-functional": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-fusion": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-geometry": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-gil": { - "baseline": "1.77.0", - "port-version": 1 + "baseline": "1.78.0", + "port-version": 0 }, "boost-graph": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-graph-parallel": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-hana": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-heap": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-histogram": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-hof": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-icl": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-integer": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-interprocess": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-interval": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-intrusive": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-io": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-iostreams": { - "baseline": "1.77.0", - "port-version": 1 + "baseline": "1.78.0", + "port-version": 2 }, "boost-iterator": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-json": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-lambda": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-lambda2": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-leaf": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-lexical-cast": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-local-function": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-locale": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-lockfree": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-log": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-logic": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-math": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-metaparse": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-modular-build-helper": { - "baseline": "1.77.0", - "port-version": 4 + "baseline": "1.78.0", + "port-version": 2 }, "boost-move": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-mp11": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-mpi": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-mpl": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-msm": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-multi-array": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-multi-index": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-multiprecision": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-nowide": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-numeric-conversion": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-odeint": { - "baseline": "1.77.0", - "port-version": 1 + "baseline": "1.78.0", + "port-version": 0 }, "boost-optional": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-outcome": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-parameter": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-parameter-python": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-pfr": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-phoenix": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-poly-collection": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-polygon": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-pool": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-predef": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-preprocessor": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-process": { - "baseline": "1.77.0", - "port-version": 2 + "baseline": "1.78.0", + "port-version": 0 }, "boost-program-options": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-property-map": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-property-map-parallel": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-property-tree": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-proto": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-ptr-container": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-python": { - "baseline": "1.77.0", - "port-version": 1 + "baseline": "1.78.0", + "port-version": 0 }, "boost-qvm": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-random": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-range": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-ratio": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-rational": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-regex": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-safe-numerics": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-scope-exit": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-serialization": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-signals2": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-smart-ptr": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-sort": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-spirit": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-stacktrace": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-statechart": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-static-assert": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-static-string": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-stl-interfaces": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-system": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-test": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-thread": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-throw-exception": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-timer": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-tokenizer": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-tti": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-tuple": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-type-erasure": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-type-index": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-type-traits": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-typeof": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-ublas": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-uninstall": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-units": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-unordered": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-utility": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-uuid": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-variant": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-variant2": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-vcpkg-helpers": { - "baseline": "1.77.0", - "port-version": 0 + "baseline": "1.78.0", + "port-version": 1 }, "boost-vmd": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-wave": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-winapi": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-xpressive": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boost-yap": { - "baseline": "1.77.0", + "baseline": "1.78.0", "port-version": 0 }, "boringssl": { "baseline": "2021-06-23", - "port-version": 0 + "port-version": 1 }, "botan": { "baseline": "2.18.1", - "port-version": 4 + "port-version": 10 }, "box2d": { "baseline": "2.4.1", - "port-version": 1 + "port-version": 2 }, "breakpad": { "baseline": "2020-09-14", - "port-version": 3 + "port-version": 5 }, "brigand": { "baseline": "1.3.0", @@ -1150,14 +1146,14 @@ }, "brpc": { "baseline": "0.9.7", - "port-version": 3 + "port-version": 7 }, "brunocodutra-metal": { "baseline": "2.1.3", "port-version": 0 }, "brynet": { - "baseline": "1.11.0", + "baseline": "1.11.1", "port-version": 1 }, "bshoshany-thread-pool": { @@ -1170,15 +1166,15 @@ }, "buck-yeh-bux": { "baseline": "1.6.3", - "port-version": 0 + "port-version": 1 }, "buck-yeh-bux-mariadb-client": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "bullet3": { "baseline": "3.17", - "port-version": 3 + "port-version": 4 }, "bustache": { "baseline": "1.1.0", @@ -1198,15 +1194,23 @@ }, "c-ares": { "baseline": "1.17.2", - "port-version": 1 + "port-version": 2 + }, + "c-dbg-macro": { + "baseline": "2020-02-29", + "port-version": 0 }, "c4core": { "baseline": "2021-07-18", "port-version": 1 }, + "c89stringutils": { + "baseline": "0.0.1", + "port-version": 0 + }, "caf": { - "baseline": "0.17.6", - "port-version": 2 + "baseline": "0.18.5", + "port-version": 0 }, "caffe2": { "baseline": "0.8.1", @@ -1214,27 +1218,31 @@ }, "cairo": { "baseline": "1.17.4", - "port-version": 2 + "port-version": 4 }, "cairomm": { "baseline": "1.16.0", - "port-version": 0 + "port-version": 1 }, "calceph": { - "baseline": "3.5.0", + "baseline": "3.5.1", "port-version": 0 }, "camport3": { "baseline": "1.5.3", - "port-version": 1 + "port-version": 2 }, "capnproto": { "baseline": "0.9.1", - "port-version": 1 + "port-version": 2 }, "capstone": { "baseline": "4.0.2", - "port-version": 2 + "port-version": 3 + }, + "cargs": { + "baseline": "1.0.3", + "port-version": 0 }, "cartographer": { "baseline": "1.0.0", @@ -1253,8 +1261,8 @@ "port-version": 1 }, "catch2": { - "baseline": "2.13.7", - "port-version": 2 + "baseline": "2.13.8", + "port-version": 0 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", @@ -1282,22 +1290,22 @@ }, "cello": { "baseline": "2019-07-23", - "port-version": 1 + "port-version": 2 }, "cereal": { - "baseline": "1.3.0", - "port-version": 1 + "baseline": "1.3.1", + "port-version": 0 }, "ceres": { "baseline": "2.0.0", - "port-version": 5 + "port-version": 6 }, "cfitsio": { "baseline": "3.49", - "port-version": 1 + "port-version": 2 }, "cgal": { - "baseline": "5.3", + "baseline": "5.4", "port-version": 0 }, "cgicc": { @@ -1322,15 +1330,15 @@ }, "chakracore": { "baseline": "2021-04-22", - "port-version": 0 + "port-version": 2 }, "charls": { - "baseline": "2.2.0", - "port-version": 2 + "baseline": "2.3.4", + "port-version": 0 }, "chartdir": { "baseline": "7.0.0", - "port-version": 1 + "port-version": 2 }, "check": { "baseline": "0.15.2", @@ -1350,7 +1358,7 @@ }, "chromium-base": { "baseline": "86.0.4199.1", - "port-version": 2 + "port-version": 3 }, "cimg": { "baseline": "2.9.9", @@ -1362,7 +1370,7 @@ }, "civetweb": { "baseline": "1.15", - "port-version": 0 + "port-version": 1 }, "cjson": { "baseline": "1.7.15", @@ -1370,11 +1378,11 @@ }, "clamav": { "baseline": "0.103.0", - "port-version": 2 + "port-version": 3 }, "clapack": { "baseline": "3.2.1", - "port-version": 19 + "port-version": 20 }, "clara": { "baseline": "1.1.5", @@ -1382,15 +1390,15 @@ }, "clblas": { "baseline": "2.12", - "port-version": 5 + "port-version": 6 }, "clblast": { "baseline": "1.5.2", - "port-version": 0 + "port-version": 1 }, "clfft": { "baseline": "2.12.2", - "port-version": 3 + "port-version": 4 }, "cli": { "baseline": "2.0.0", @@ -1418,7 +1426,7 @@ }, "clrng": { "baseline": "2020-12-01", - "port-version": 1 + "port-version": 3 }, "clue": { "baseline": "1.0.0", @@ -1440,17 +1448,25 @@ "baseline": "2020-08-01", "port-version": 1 }, + "cnats": { + "baseline": "3.2.0", + "port-version": 0 + }, "cnl": { "baseline": "1.1.7", "port-version": 1 }, "co": { - "baseline": "2.0.2", + "baseline": "2.0.3", "port-version": 1 }, + "cocoyaxi": { + "baseline": "2.0.3", + "port-version": 2 + }, "coin": { "baseline": "4.0.0", - "port-version": 4 + "port-version": 5 }, "coinutils": { "baseline": "2.11.4", @@ -1461,12 +1477,12 @@ "port-version": 6 }, "colmap": { - "baseline": "3.6", - "port-version": 1 + "baseline": "2022-03-14", + "port-version": 0 }, "comms": { "baseline": "3.4.0", - "port-version": 0 + "port-version": 1 }, "comms-ublox": { "baseline": "0.20.2", @@ -1474,7 +1490,7 @@ }, "commsdsl": { "baseline": "3.6.4", - "port-version": 0 + "port-version": 1 }, "compoundfilereader": { "baseline": "0.1.0", @@ -1510,7 +1526,7 @@ }, "coroutine": { "baseline": "1.5.0", - "port-version": 2 + "port-version": 4 }, "corrade": { "baseline": "2020.06", @@ -1521,12 +1537,12 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.9.7", + "baseline": "0.10.3", "port-version": 0 }, "cpp-ipc": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "cpp-jwt": { "baseline": "2021-10-18", @@ -1534,7 +1550,7 @@ }, "cpp-netlib": { "baseline": "0.13.0", - "port-version": 5 + "port-version": 6 }, "cpp-peglib": { "baseline": "0.1.0", @@ -1554,26 +1570,26 @@ }, "cppad": { "baseline": "20210000.7", - "port-version": 2 + "port-version": 3 }, "cppcms": { "baseline": "1.2.1", - "port-version": 3 + "port-version": 4 }, "cppcodec": { "baseline": "0.2", "port-version": 2 }, "cppcoro": { - "baseline": "2020-2-28", - "port-version": 2 + "baseline": "2020-02-28", + "port-version": 3 }, "cppfs": { "baseline": "1.3.0", "port-version": 1 }, "cppgraphqlgen": { - "baseline": "3.6.0", + "baseline": "4.1.1", "port-version": 0 }, "cppitertools": { @@ -1598,7 +1614,7 @@ }, "cppunit": { "baseline": "1.15.1", - "port-version": 1 + "port-version": 3 }, "cpputest": { "baseline": "2019-9-16", @@ -1608,21 +1624,25 @@ "baseline": "windows-sdk", "port-version": 0 }, + "cppxaml": { + "baseline": "0.0.16", + "port-version": 0 + }, "cppzmq": { "baseline": "4.8.1", "port-version": 0 }, "cpr": { - "baseline": "1.6.2", - "port-version": 1 + "baseline": "1.7.2", + "port-version": 0 }, "cpu-features": { "baseline": "0.6.0", - "port-version": 0 + "port-version": 1 }, "cpuid": { "baseline": "0.5.1", - "port-version": 2 + "port-version": 3 }, "cpuinfo": { "baseline": "2021-04-04", @@ -1634,11 +1654,11 @@ }, "crashpad": { "baseline": "2020-03-18", - "port-version": 1 + "port-version": 2 }, "crashrpt": { "baseline": "1.4.3", - "port-version": 1 + "port-version": 2 }, "crc32c": { "baseline": "1.1.2", @@ -1646,27 +1666,27 @@ }, "crfsuite": { "baseline": "2019-07-21", - "port-version": 1 + "port-version": 3 }, "croncpp": { "baseline": "2020-09-04", - "port-version": 2 + "port-version": 3 }, "crossguid": { "baseline": "2021-10-22", - "port-version": 1 + "port-version": 2 }, "crow": { - "baseline": "0.3.3", + "baseline": "0.3.4", "port-version": 0 }, "cryptopp": { - "baseline": "8.5.0", - "port-version": 1 + "baseline": "8.6.0", + "port-version": 0 }, "cspice": { - "baseline": "66", - "port-version": 5 + "baseline": "67", + "port-version": 2 }, "ctbignum": { "baseline": "2019-08-02", @@ -1674,7 +1694,7 @@ }, "ctemplate": { "baseline": "2020-09-14", - "port-version": 2 + "port-version": 3 }, "ctp": { "baseline": "6.6.1_P1_20210406_se", @@ -1690,7 +1710,7 @@ }, "cuda": { "baseline": "10.1", - "port-version": 8 + "port-version": 9 }, "cudnn": { "baseline": "7.6.5", @@ -1701,12 +1721,12 @@ "port-version": 7 }, "curl": { - "baseline": "7.80.0", + "baseline": "7.82.0", "port-version": 0 }, "curlpp": { "baseline": "2018-06-15", - "port-version": 6 + "port-version": 7 }, "cute-headers": { "baseline": "2019-09-20", @@ -1714,7 +1734,7 @@ }, "cutelyst2": { "baseline": "2.12.0", - "port-version": 1 + "port-version": 2 }, "cwalk": { "baseline": "1.2.6", @@ -1746,7 +1766,7 @@ }, "dartsim": { "baseline": "6.11.0", - "port-version": 2 + "port-version": 3 }, "dataframe": { "baseline": "1.19.0", @@ -1754,11 +1774,11 @@ }, "date": { "baseline": "3.0.1", - "port-version": 0 + "port-version": 1 }, "dav1d": { "baseline": "0.8.2", - "port-version": 1 + "port-version": 3 }, "daw-header-libraries": { "baseline": "1.29.7", @@ -1777,8 +1797,8 @@ "port-version": 0 }, "dbghelp": { - "baseline": "0.0", - "port-version": 1 + "baseline": "0", + "port-version": 2 }, "dbow2": { "baseline": "2019-08-05", @@ -1790,23 +1810,23 @@ }, "dcmtk": { "baseline": "3.6.6", - "port-version": 2 + "port-version": 3 }, "debug-assert": { "baseline": "1.3.3", "port-version": 0 }, "decimal-for-cpp": { - "baseline": "1.16", - "port-version": 2 + "baseline": "1.18", + "port-version": 0 }, "detours": { "baseline": "4.0.1", - "port-version": 4 + "port-version": 5 }, "devicenameresolver": { "baseline": "2016-06-26-0850d88fa6", - "port-version": 2 + "port-version": 3 }, "devil": { "baseline": "1.8.0", @@ -1814,34 +1834,34 @@ }, "dimcli": { "baseline": "5.0.2", - "port-version": 2 + "port-version": 3 }, "directx-headers": { "baseline": "1.4.9", - "port-version": 0 + "port-version": 1 }, "directxmath": { - "baseline": "jan2021", - "port-version": 1 + "baseline": "2022-01-18", + "port-version": 0 }, "directxmesh": { - "baseline": "2021-11-08", + "baseline": "2022-02-28", "port-version": 0 }, "directxsdk": { "baseline": "jun10", - "port-version": 4 + "port-version": 5 }, "directxtex": { - "baseline": "2021-11-08", + "baseline": "2022-02-28", "port-version": 0 }, "directxtk": { - "baseline": "2021-11-08", + "baseline": "2022-02-28", "port-version": 0 }, "directxtk12": { - "baseline": "2021-11-08", + "baseline": "2022-02-28", "port-version": 0 }, "dirent": { @@ -1850,7 +1870,7 @@ }, "discord-game-sdk": { "baseline": "2.5.6", - "port-version": 3 + "port-version": 4 }, "discord-rpc": { "baseline": "3.4.0", @@ -1870,27 +1890,27 @@ }, "dlfcn-win32": { "baseline": "1.1.1", - "port-version": 5 + "port-version": 6 }, "dlib": { - "baseline": "19.21", - "port-version": 6 + "baseline": "19.23", + "port-version": 0 }, "dmlc": { "baseline": "2019-08-12", - "port-version": 6 + "port-version": 7 }, "docopt": { "baseline": "2018-11-01", "port-version": 1 }, "doctest": { - "baseline": "2.4.6", + "baseline": "2.4.8", "port-version": 0 }, "double-conversion": { - "baseline": "3.1.5", - "port-version": 1 + "baseline": "3.2.0", + "port-version": 0 }, "dpdk": { "baseline": "19.02", @@ -1905,7 +1925,7 @@ "port-version": 0 }, "drogon": { - "baseline": "1.7.3", + "baseline": "1.7.5", "port-version": 0 }, "dtl": { @@ -1917,8 +1937,8 @@ "port-version": 1 }, "duilib": { - "baseline": "2019-4-28", - "port-version": 4 + "baseline": "2019-04-28", + "port-version": 5 }, "duktape": { "baseline": "2.5.0", @@ -1930,19 +1950,23 @@ }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 1 + "port-version": 2 }, "dxut": { "baseline": "11.26", - "port-version": 0 + "port-version": 1 }, "eabase": { "baseline": "2.09.12", "port-version": 2 }, + "earcut-hpp": { + "baseline": "2.2.3", + "port-version": 0 + }, "eastl": { "baseline": "3.18.00", - "port-version": 1 + "port-version": 2 }, "easycl": { "baseline": "0.3", @@ -1950,7 +1974,7 @@ }, "easyhook": { "baseline": "2.7.7097.0", - "port-version": 3 + "port-version": 5 }, "easyloggingpp": { "baseline": "9.97.0", @@ -1958,14 +1982,14 @@ }, "eathread": { "baseline": "1.32.09", - "port-version": 2 + "port-version": 3 }, "ebml": { "baseline": "1.4.2", "port-version": 0 }, "ecm": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "ecos": { @@ -1974,7 +1998,7 @@ }, "ecsutil": { "baseline": "1.0.7.15", - "port-version": 1 + "port-version": 2 }, "edlib": { "baseline": "1.2.7", @@ -1982,7 +2006,7 @@ }, "effects11": { "baseline": "11.26", - "port-version": 1 + "port-version": 2 }, "effolkronium-random": { "baseline": "1.4.0", @@ -1990,27 +2014,27 @@ }, "efsw": { "baseline": "2020-06-08", - "port-version": 2 + "port-version": 3 }, "egl-registry": { "baseline": "2021-11-23", "port-version": 0 }, "eigen3": { - "baseline": "3.3.9", + "baseline": "3.4.0", "port-version": 1 }, "elfio": { - "baseline": "3.9", + "baseline": "3.10", "port-version": 0 }, "elfutils": { - "baseline": "0.182", - "port-version": 1 + "baseline": "0.186", + "port-version": 2 }, "embree2": { "baseline": "2.17.7", - "port-version": 3 + "port-version": 4 }, "embree3": { "baseline": "3.12.2", @@ -2021,7 +2045,7 @@ "port-version": 1 }, "ensmallen": { - "baseline": "2.17.0", + "baseline": "2.18.1", "port-version": 0 }, "entityx": { @@ -2029,8 +2053,8 @@ "port-version": 3 }, "entt": { - "baseline": "3.8.0", - "port-version": 1 + "baseline": "3.9.0", + "port-version": 0 }, "epsilon": { "baseline": "0.9.2", @@ -2040,13 +2064,21 @@ "baseline": "ca7cb332011ec37", "port-version": 1 }, + "eve": { + "baseline": "2021-10-16", + "port-version": 0 + }, + "eventpp": { + "baseline": "0.1.2", + "port-version": 0 + }, "evpp": { "baseline": "0.7.0", "port-version": 5 }, "exiv2": { - "baseline": "0.27.4", - "port-version": 2 + "baseline": "0.27.5", + "port-version": 1 }, "expat": { "baseline": "2.4.1", @@ -2057,8 +2089,8 @@ "port-version": 0 }, "exprtk": { - "baseline": "2021-01-01", - "port-version": 1 + "baseline": "2022-01-01", + "port-version": 2 }, "ezc3d": { "baseline": "1.4.6", @@ -2066,18 +2098,18 @@ }, "faad2": { "baseline": "2.9.1", - "port-version": 4 + "port-version": 5 }, "fadbad": { "baseline": "2.1.0", "port-version": 1 }, "faiss": { - "baseline": "1.7.1", + "baseline": "1.7.2", "port-version": 0 }, "fakeit": { - "baseline": "2.0.9", + "baseline": "2.1.0", "port-version": 0 }, "fann": { @@ -2102,7 +2134,7 @@ }, "fastcgi": { "baseline": "2020-09-11", - "port-version": 2 + "port-version": 4 }, "fastfeat": { "baseline": "391d5e9", @@ -2122,11 +2154,11 @@ }, "fbgemm": { "baseline": "2021-03-18", - "port-version": 2 + "port-version": 3 }, "fbthrift": { - "baseline": "2021.06.14.00", - "port-version": 0 + "baseline": "2022.01.31.00", + "port-version": 1 }, "fcl": { "baseline": "0.7.0", @@ -2142,22 +2174,18 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 1 + "port-version": 10 }, "ffnvcodec": { "baseline": "11.1.5.0", - "port-version": 0 + "port-version": 1 }, "fftw3": { "baseline": "3.3.10", - "port-version": 2 + "port-version": 3 }, "fftwpp": { "baseline": "2019-12-19", - "port-version": 1 - }, - "field3d": { - "baseline": "1.7.3", "port-version": 2 }, "fixed-string": { @@ -2165,12 +2193,16 @@ "port-version": 1 }, "fizz": { - "baseline": "2021.06.14.00", - "port-version": 0 + "baseline": "2022.01.31.00", + "port-version": 1 }, "flann": { "baseline": "2019-04-07", - "port-version": 3 + "port-version": 5 + }, + "flash-runtime-extensions": { + "baseline": "2.4", + "port-version": 1 }, "flashlight-cpu": { "baseline": "0.3", @@ -2182,22 +2214,22 @@ }, "flatbuffers": { "baseline": "2.0.0", - "port-version": 2 + "port-version": 3 }, "flint": { "baseline": "2.8.0", - "port-version": 0 + "port-version": 1 }, "fltk": { - "baseline": "1.3.7", - "port-version": 0 + "baseline": "1.3.8", + "port-version": 1 }, "fluidlite": { "baseline": "2020-08-27", "port-version": 2 }, "fluidsynth": { - "baseline": "2.2.1", + "baseline": "2.2.4", "port-version": 1 }, "fmem": { @@ -2213,12 +2245,12 @@ "port-version": 4 }, "fmt": { - "baseline": "8.0.1", - "port-version": 0 + "baseline": "8.1.1", + "port-version": 1 }, "folly": { - "baseline": "2021.06.14.00", - "port-version": 3 + "baseline": "2022.01.31.00", + "port-version": 1 }, "font-chef": { "baseline": "1.1.0", @@ -2226,7 +2258,7 @@ }, "fontconfig": { "baseline": "2.13.94", - "port-version": 3 + "port-version": 5 }, "foonathan-memory": { "baseline": "2019-07-21", @@ -2240,6 +2272,10 @@ "baseline": "1.0.8", "port-version": 0 }, + "foxi": { + "baseline": "2021-12-01", + "port-version": 0 + }, "fp16": { "baseline": "2021-02-21", "port-version": 0 @@ -2258,23 +2294,23 @@ }, "freeimage": { "baseline": "3.18.0", - "port-version": 21 + "port-version": 22 }, "freeopcua": { "baseline": "20190125", "port-version": 5 }, "freerdp": { - "baseline": "2.4.0", - "port-version": 2 + "baseline": "2.5.0", + "port-version": 0 }, "freetds": { "baseline": "1.2.11", - "port-version": 1 + "port-version": 2 }, "freetype": { - "baseline": "2.11.0", - "port-version": 2 + "baseline": "2.11.1", + "port-version": 0 }, "freetype-gl": { "baseline": "2020-09-14", @@ -2286,7 +2322,7 @@ }, "fribidi": { "baseline": "1.0.11", - "port-version": 0 + "port-version": 3 }, "frozen": { "baseline": "2021-04-22", @@ -2305,16 +2341,16 @@ "port-version": 4 }, "ftxui": { - "baseline": "2021-06-17", - "port-version": 0 + "baseline": "2.0.0", + "port-version": 1 }, "function2": { "baseline": "4.2.0", "port-version": 1 }, "functions-framework-cpp": { - "baseline": "1.0.0", - "port-version": 1 + "baseline": "1.1.0", + "port-version": 0 }, "fuzzylite": { "baseline": "6.0", @@ -2330,15 +2366,15 @@ }, "g3log": { "baseline": "1.3.4", - "port-version": 1 + "port-version": 2 }, "gainput": { "baseline": "1.0.0", - "port-version": 4 + "port-version": 5 }, "gamedev-framework": { "baseline": "0.20.0", - "port-version": 1 + "port-version": 2 }, "gamenetworkingsockets": { "baseline": "1.3.0", @@ -2350,19 +2386,23 @@ }, "gasol": { "baseline": "2018-01-04", - "port-version": 1 + "port-version": 2 }, "gaussianlib": { "baseline": "2019-08-04", "port-version": 1 }, + "gazebo": { + "baseline": "2022-01-20", + "port-version": 0 + }, "gcem": { "baseline": "1.13.1", "port-version": 1 }, "gdal": { - "baseline": "3.4.0", - "port-version": 1 + "baseline": "3.4.1", + "port-version": 4 }, "gdcm": { "baseline": "3.0.7", @@ -2374,7 +2414,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.2", - "port-version": 1 + "port-version": 2 }, "gemmlowp": { "baseline": "2021-09-28", @@ -2386,11 +2426,11 @@ }, "geogram": { "baseline": "1.7.6", - "port-version": 1 + "port-version": 2 }, "geographiclib": { "baseline": "1.52", - "port-version": 1 + "port-version": 2 }, "geos": { "baseline": "3.10.0", @@ -2402,7 +2442,7 @@ }, "getdns": { "baseline": "1.7.0", - "port-version": 0 + "port-version": 2 }, "getopt": { "baseline": "0", @@ -2410,11 +2450,11 @@ }, "getopt-win32": { "baseline": "0.1", - "port-version": 1 + "port-version": 2 }, "gettext": { "baseline": "0.21", - "port-version": 7 + "port-version": 9 }, "gettimeofday": { "baseline": "2017-10-14", @@ -2430,11 +2470,11 @@ }, "gherkin-c": { "baseline": "2019-10-07", - "port-version": 2 + "port-version": 3 }, "giflib": { "baseline": "5.2.1", - "port-version": 0 + "port-version": 2 }, "ginkgo": { "baseline": "1.4.0", @@ -2446,7 +2486,7 @@ }, "gl3w": { "baseline": "2018-05-31", - "port-version": 3 + "port-version": 4 }, "glad": { "baseline": "0.1.34", @@ -2461,7 +2501,7 @@ "port-version": 0 }, "glfw3": { - "baseline": "3.3.5", + "baseline": "3.3.6", "port-version": 0 }, "gli": { @@ -2470,11 +2510,11 @@ }, "glib": { "baseline": "2.70.1", - "port-version": 0 + "port-version": 2 }, "glibmm": { "baseline": "2.68.1", - "port-version": 0 + "port-version": 2 }, "glm": { "baseline": "0.9.9.8", @@ -2506,16 +2546,24 @@ }, "gmmlib": { "baseline": "21.3.2", - "port-version": 0 + "port-version": 1 }, "gmp": { "baseline": "6.2.1", - "port-version": 7 + "port-version": 8 }, - "google-cloud-cpp": { - "baseline": "1.33.0", + "gmsh": { + "baseline": "4.9.0", "port-version": 0 }, + "gobject-introspection": { + "baseline": "1.70.0", + "port-version": 1 + }, + "google-cloud-cpp": { + "baseline": "1.38.0", + "port-version": 2 + }, "google-cloud-cpp-common": { "baseline": "alias", "port-version": 1 @@ -2530,11 +2578,11 @@ }, "gperf": { "baseline": "3.1", - "port-version": 2 + "port-version": 3 }, "gperftools": { "baseline": "2019-09-02", - "port-version": 2 + "port-version": 3 }, "gpgme": { "baseline": "1.14.0", @@ -2546,10 +2594,10 @@ }, "graphene": { "baseline": "1.10.2", - "port-version": 1 + "port-version": 2 }, "graphicsmagick": { - "baseline": "1.3.36", + "baseline": "1.3.37", "port-version": 1 }, "graphite2": { @@ -2562,7 +2610,7 @@ }, "graphviz": { "baseline": "2.49.1", - "port-version": 1 + "port-version": 2 }, "greatest": { "baseline": "1.5.0", @@ -2577,7 +2625,7 @@ "port-version": 1 }, "gsl": { - "baseline": "2.7", + "baseline": "2.7.1", "port-version": 0 }, "gsl-lite": { @@ -2586,26 +2634,30 @@ }, "gsoap": { "baseline": "2.8.112", - "port-version": 0 + "port-version": 1 }, "gst-rtsp-server": { "baseline": "1.19.2", - "port-version": 0 + "port-version": 1 }, "gstreamer": { "baseline": "1.19.2", - "port-version": 1 + "port-version": 5 }, "gtest": { "baseline": "1.11.0", "port-version": 3 }, "gtk": { - "baseline": "4.4.0", + "baseline": "4.6.0", "port-version": 0 }, "gtkmm": { - "baseline": "4.0.1", + "baseline": "4.6.0", + "port-version": 0 + }, + "gtl": { + "baseline": "1.0.0", "port-version": 0 }, "gts": { @@ -2614,7 +2666,7 @@ }, "guetzli": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "guilite": { "baseline": "2021-07-31", @@ -2630,23 +2682,23 @@ }, "h3": { "baseline": "3.7.2", - "port-version": 0 + "port-version": 1 }, "h5py-lzf": { "baseline": "2019-12-04", "port-version": 1 }, "halide": { - "baseline": "12.0.1", - "port-version": 1 + "baseline": "13.0.2", + "port-version": 0 }, "happly": { "baseline": "2021-03-19", "port-version": 0 }, "harfbuzz": { - "baseline": "3.0.0", - "port-version": 0 + "baseline": "3.2.0", + "port-version": 1 }, "hayai": { "baseline": "2019-08-10", @@ -2658,7 +2710,7 @@ }, "hdf5": { "baseline": "1.12.1", - "port-version": 1 + "port-version": 4 }, "healpix": { "baseline": "1.12.10", @@ -2670,7 +2722,7 @@ }, "hexl": { "baseline": "1.2.3", - "port-version": 0 + "port-version": 1 }, "hffix": { "baseline": "1.0.0", @@ -2681,12 +2733,12 @@ "port-version": 0 }, "hidapi": { - "baseline": "0.11.0", - "port-version": 0 + "baseline": "0.11.2", + "port-version": 1 }, "highfive": { "baseline": "2.3", - "port-version": 0 + "port-version": 2 }, "highway": { "baseline": "0.14.2", @@ -2694,11 +2746,11 @@ }, "hiredis": { "baseline": "1.0.2", - "port-version": 1 + "port-version": 3 }, "hpx": { "baseline": "1.7.1", - "port-version": 3 + "port-version": 5 }, "http-parser": { "baseline": "2.9.4", @@ -2710,11 +2762,11 @@ }, "hunspell": { "baseline": "1.7.0", - "port-version": 6 + "port-version": 8 }, "hwloc": { - "baseline": "2.5.0", - "port-version": 1 + "baseline": "2.7.0", + "port-version": 0 }, "hyperscan": { "baseline": "5.3.0", @@ -2730,7 +2782,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 16 + "port-version": 18 }, "ideviceinstaller": { "baseline": "1.1.2.23", @@ -2738,7 +2790,7 @@ }, "idevicerestore": { "baseline": "1.0.12", - "port-version": 5 + "port-version": 6 }, "if97": { "baseline": "2.1.2", @@ -2762,7 +2814,7 @@ }, "ignition-common3": { "baseline": "3.9.0", - "port-version": 1 + "port-version": 2 }, "ignition-fuel-tools1": { "baseline": "1.2.0", @@ -2778,7 +2830,7 @@ }, "ignition-math6": { "baseline": "6.6.0", - "port-version": 1 + "port-version": 2 }, "ignition-modularscripts": { "baseline": "2020-11-23", @@ -2790,11 +2842,11 @@ }, "ignition-msgs5": { "baseline": "5.3.0", - "port-version": 3 + "port-version": 4 }, "ignition-msgs6": { "baseline": "6.0.0", - "port-version": 2 + "port-version": 3 }, "ignition-plugin1": { "baseline": "1.1.0", @@ -2802,18 +2854,18 @@ }, "ignition-transport4": { "baseline": "4.0.0", - "port-version": 3 + "port-version": 5 }, "ignition-transport8": { "baseline": "8.1.0", - "port-version": 1 + "port-version": 2 }, "ignition-transport9": { "baseline": "9.0.0", - "port-version": 1 + "port-version": 3 }, "igraph": { - "baseline": "0.9.5", + "baseline": "0.9.7", "port-version": 0 }, "iir1": { @@ -2833,12 +2885,12 @@ "port-version": 1 }, "imgui": { - "baseline": "1.85", + "baseline": "1.87", "port-version": 0 }, "imgui-sfml": { "baseline": "2.4", - "port-version": 0 + "port-version": 1 }, "imguizmo": { "baseline": "1.83", @@ -2849,7 +2901,7 @@ "port-version": 0 }, "implot": { - "baseline": "0.12", + "baseline": "0.13", "port-version": 0 }, "indicators": { @@ -2858,11 +2910,11 @@ }, "influxdb-cxx": { "baseline": "0.6.7", - "port-version": 0 + "port-version": 1 }, "infoware": { "baseline": "2021-06-16", - "port-version": 0 + "port-version": 1 }, "inih": { "baseline": "51", @@ -2877,8 +2929,8 @@ "port-version": 0 }, "intel-ipsec": { - "baseline": "0.52", - "port-version": 2 + "baseline": "1.1", + "port-version": 0 }, "intel-mkl": { "baseline": "2020.0.0", @@ -2886,7 +2938,7 @@ }, "intelrdfpmathlib": { "baseline": "20U2", - "port-version": 2 + "port-version": 3 }, "io2d": { "baseline": "2020-09-14", @@ -2894,7 +2946,7 @@ }, "irrlicht": { "baseline": "1.8.4", - "port-version": 12 + "port-version": 13 }, "irrxml": { "baseline": "0", @@ -2909,24 +2961,24 @@ "port-version": 2 }, "itk": { - "baseline": "5.1.0", - "port-version": 6 + "baseline": "5.2.1", + "port-version": 1 }, "itpp": { "baseline": "4.3.1", "port-version": 8 }, "ixwebsocket": { - "baseline": "11.2.6", + "baseline": "11.3.3", "port-version": 0 }, "jack2": { "baseline": "1.9.19", - "port-version": 0 + "port-version": 1 }, "jaeger-client-cpp": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "jansson": { "baseline": "2.13.1", @@ -2934,7 +2986,7 @@ }, "jasper": { "baseline": "2.0.33", - "port-version": 0 + "port-version": 3 }, "jbig2dec": { "baseline": "0.19", @@ -2965,7 +3017,7 @@ "port-version": 2 }, "json-dto": { - "baseline": "0.2.15", + "baseline": "0.3.1", "port-version": 0 }, "json-schema-validator": { @@ -2985,7 +3037,7 @@ "port-version": 3 }, "jsoncons": { - "baseline": "0.165.0", + "baseline": "0.168.3", "port-version": 1 }, "jsoncpp": { @@ -3020,6 +3072,10 @@ "baseline": "1.0.0", "port-version": 0 }, + "kddockwidgets": { + "baseline": "1.5.0", + "port-version": 0 + }, "kealib": { "baseline": "1.4.14", "port-version": 0 @@ -3030,54 +3086,54 @@ }, "keystone": { "baseline": "0.9.2", - "port-version": 1 + "port-version": 2 }, "kf5archive": { - "baseline": "5.87.0", - "port-version": 0 + "baseline": "5.89.0", + "port-version": 1 }, "kf5attica": { - "baseline": "5.87.0", - "port-version": 0 + "baseline": "5.89.0", + "port-version": 1 }, "kf5auth": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5bookmarks": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5codecs": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5completion": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5config": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5configwidgets": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5coreaddons": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5crash": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5dbusaddons": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5declarative": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5diagram": { @@ -3085,104 +3141,104 @@ "port-version": 0 }, "kf5globalaccel": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5guiaddons": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5holidays": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5i18n": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5iconthemes": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5itemmodels": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5itemviews": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5jobwidgets": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5kcmutils": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5kio": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5newstuff": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5notifications": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5package": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5plotting": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5service": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5solid": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5sonnet": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5syntaxhighlighting": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5textwidgets": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5wallet": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5widgetsaddons": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kf5windowsystem": { - "baseline": "5.87.0", - "port-version": 0 + "baseline": "5.89.0", + "port-version": 1 }, "kf5xmlgui": { - "baseline": "5.87.0", + "baseline": "5.89.0", "port-version": 0 }, "kfr": { "baseline": "4.2.1", - "port-version": 0 + "port-version": 1 }, "kinectsdk1": { "baseline": "1.8", - "port-version": 3 + "port-version": 4 }, "kinectsdk2": { "baseline": "2.0", @@ -3198,23 +3254,23 @@ }, "knet": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "krabsetw": { "baseline": "4.1.18", - "port-version": 0 + "port-version": 1 }, "ktx": { "baseline": "4.0.0", - "port-version": 0 + "port-version": 1 }, "kubazip": { "baseline": "0.1.19", "port-version": 1 }, "kubernetes": { - "baseline": "2021-11-24", - "port-version": 0 + "baseline": "2022-01-19", + "port-version": 1 }, "kuku": { "baseline": "2.1", @@ -3226,19 +3282,19 @@ }, "kwsys": { "baseline": "2021-08-06", - "port-version": 0 + "port-version": 1 }, "lager": { - "baseline": "2021-06-17", - "port-version": 1 + "baseline": "2022-02-21", + "port-version": 0 }, "lapack": { - "baseline": "3", - "port-version": 2 + "baseline": "2022-02-22", + "port-version": 0 }, "lapack-reference": { - "baseline": "3.8.0", - "port-version": 6 + "baseline": "3.10.0", + "port-version": 0 }, "lastools": { "baseline": "2020-05-09", @@ -3253,7 +3309,7 @@ "port-version": 0 }, "lazy-importer": { - "baseline": "2021-10-23", + "baseline": "2022-02-09", "port-version": 0 }, "lcm": { @@ -3262,7 +3318,7 @@ }, "lcms": { "baseline": "2.12", - "port-version": 2 + "port-version": 3 }, "leaf": { "baseline": "0.2.2", @@ -3274,7 +3330,7 @@ }, "leptonica": { "baseline": "1.81.1", - "port-version": 0 + "port-version": 1 }, "lerc": { "baseline": "2.2", @@ -3286,11 +3342,11 @@ }, "leveldb": { "baseline": "1.22", - "port-version": 2 + "port-version": 5 }, "levmar": { "baseline": "2.6", - "port-version": 0 + "port-version": 1 }, "libaaplus": { "baseline": "2.36", @@ -3302,11 +3358,15 @@ }, "libalkimia": { "baseline": "8.1.70", - "port-version": 0 + "port-version": 1 + }, + "libao": { + "baseline": "1.2.2", + "port-version": 4 }, "libarchive": { "baseline": "3.5.2", - "port-version": 2 + "port-version": 4 }, "libass": { "baseline": "0.15.2", @@ -3314,7 +3374,7 @@ }, "libassuan": { "baseline": "2.5.3", - "port-version": 3 + "port-version": 4 }, "libatomic-ops": { "baseline": "7.7.0", @@ -3322,15 +3382,15 @@ }, "libavif": { "baseline": "0.9.2", - "port-version": 0 + "port-version": 1 }, "libb2": { "baseline": "0.98.1", - "port-version": 5 + "port-version": 6 }, "libbacktrace": { "baseline": "2021-03-14", - "port-version": 0 + "port-version": 1 }, "libbf": { "baseline": "1.0.0", @@ -3342,7 +3402,7 @@ }, "libcanberra": { "baseline": "0.30", - "port-version": 1 + "port-version": 2 }, "libcbor": { "baseline": "0.8.0", @@ -3368,9 +3428,13 @@ "baseline": "1.4.1", "port-version": 1 }, + "libcpplocate": { + "baseline": "2.3.0", + "port-version": 0 + }, "libcrafter": { "baseline": "1.0", - "port-version": 0 + "port-version": 2 }, "libcroco": { "baseline": "0.6.13", @@ -3380,21 +3444,29 @@ "baseline": "0.3", "port-version": 1 }, + "libcurl-simple-https": { + "baseline": "2022-02-14", + "port-version": 0 + }, "libdatachannel": { - "baseline": "0.15.1", - "port-version": 1 + "baseline": "0.16.4", + "port-version": 0 }, "libdatrie": { "baseline": "0.2.10", "port-version": 4 }, + "libdc1394": { + "baseline": "2.2.6", + "port-version": 0 + }, "libde265": { "baseline": "1.0.8", - "port-version": 2 + "port-version": 4 }, "libdisasm": { "baseline": "0.23", - "port-version": 8 + "port-version": 9 }, "libdivide": { "baseline": "5.0", @@ -3406,42 +3478,46 @@ }, "libdshowcapture": { "baseline": "0.6.0", - "port-version": 2 + "port-version": 3 }, "libe57": { - "baseline": "1.1.312", + "baseline": "1.1.332", "port-version": 1 }, + "libe57format": { + "baseline": "2.2.0", + "port-version": 0 + }, "libebur128": { "baseline": "1.2.6", "port-version": 0 }, "libepoxy": { "baseline": "1.5.9", - "port-version": 0 + "port-version": 1 }, "libevent": { "baseline": "2.1.12", - "port-version": 4 + "port-version": 6 }, "libevhtp": { "baseline": "1.2.18", - "port-version": 2 + "port-version": 3 }, "libexif": { "baseline": "0.6.22", - "port-version": 1 + "port-version": 2 }, "libfabric": { "baseline": "1.13.2", - "port-version": 0 + "port-version": 1 }, "libffi": { "baseline": "3.4.2", - "port-version": 2 + "port-version": 4 }, "libfido2": { - "baseline": "1.7.0", + "baseline": "1.10.0", "port-version": 0 }, "libflac": { @@ -3466,7 +3542,7 @@ }, "libgcrypt": { "baseline": "1.9.4", - "port-version": 1 + "port-version": 2 }, "libgd": { "baseline": "2.3.2", @@ -3474,27 +3550,31 @@ }, "libgeotiff": { "baseline": "1.7.0", - "port-version": 0 + "port-version": 1 }, "libgit2": { - "baseline": "1.3.0", - "port-version": 2 + "baseline": "1.4.2", + "port-version": 0 }, "libgnutls": { "baseline": "3.6.15", - "port-version": 2 + "port-version": 3 }, "libgo": { "baseline": "3.1", - "port-version": 3 + "port-version": 4 }, "libgpg-error": { "baseline": "1.42", - "port-version": 2 + "port-version": 3 + }, + "libgpiod": { + "baseline": "1.6.3", + "port-version": 0 }, "libgpod": { "baseline": "2019-08-29", - "port-version": 3 + "port-version": 4 }, "libgta": { "baseline": "1.0.8", @@ -3506,11 +3586,11 @@ }, "libgwenhywfar": { "baseline": "5.6.0", - "port-version": 0 + "port-version": 2 }, "libgxps": { "baseline": "0.3.2", - "port-version": 0 + "port-version": 1 }, "libharu": { "baseline": "2017-08-15", @@ -3518,23 +3598,23 @@ }, "libhdfs3": { "baseline": "2019-11-05", - "port-version": 1 + "port-version": 3 }, "libheif": { "baseline": "1.12.0", - "port-version": 1 + "port-version": 3 }, "libhsplasma": { "baseline": "2021.06.08", - "port-version": 0 + "port-version": 1 }, "libhv": { - "baseline": "1.2.2", - "port-version": 0 + "baseline": "1.2.4", + "port-version": 1 }, "libhydrogen": { - "baseline": "2019-08-11", - "port-version": 1 + "baseline": "2021-12-02", + "port-version": 0 }, "libical": { "baseline": "3.0.11", @@ -3542,7 +3622,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 11 + "port-version": 12 }, "libics": { "baseline": "1.6.5", @@ -3553,12 +3633,12 @@ "port-version": 0 }, "libidn2": { - "baseline": "2.3.0", - "port-version": 4 + "baseline": "2.3.1", + "port-version": 0 }, "libigl": { "baseline": "2.3.0", - "port-version": 0 + "port-version": 1 }, "libilbc": { "baseline": "3.0.3", @@ -3573,20 +3653,20 @@ "port-version": 3 }, "libjpeg-turbo": { - "baseline": "2.0.6", - "port-version": 2 + "baseline": "2.1.3", + "port-version": 1 }, "libjuice": { - "baseline": "0.9.1", + "baseline": "0.9.6", "port-version": 0 }, "libjxl": { "baseline": "0.6.1", - "port-version": 0 + "port-version": 1 }, "libkeyfinder": { - "baseline": "2.2.5", - "port-version": 1 + "baseline": "2.2.6", + "port-version": 0 }, "libkml": { "baseline": "1.3.0", @@ -3606,7 +3686,7 @@ }, "liblinear": { "baseline": "243", - "port-version": 0 + "port-version": 1 }, "liblo": { "baseline": "0.31", @@ -3618,7 +3698,7 @@ }, "liblzma": { "baseline": "5.2.5", - "port-version": 4 + "port-version": 5 }, "libmad": { "baseline": "0.15.1", @@ -3638,15 +3718,15 @@ }, "libmediainfo": { "baseline": "21.03", - "port-version": 1 + "port-version": 2 }, "libmesh": { "baseline": "1.5.0", "port-version": 2 }, "libmicrohttpd": { - "baseline": "0.9.63", - "port-version": 7 + "baseline": "0.9.75", + "port-version": 0 }, "libmikmod": { "baseline": "3.3.11.1", @@ -3654,11 +3734,11 @@ }, "libmodbus": { "baseline": "3.1.6", - "port-version": 1 + "port-version": 2 }, "libmodman": { "baseline": "2.0.1", - "port-version": 3 + "port-version": 4 }, "libmodplug": { "baseline": "0.8.9.0", @@ -3674,7 +3754,7 @@ }, "libmpeg2": { "baseline": "0.5.1", - "port-version": 1 + "port-version": 2 }, "libmspack": { "baseline": "0.10.1", @@ -3686,15 +3766,15 @@ }, "libmupdf": { "baseline": "1.19.0-rc2", - "port-version": 0 + "port-version": 1 }, "libmysql": { "baseline": "8.0.20", - "port-version": 4 + "port-version": 5 }, "libnice": { - "baseline": "0.1.15", - "port-version": 7 + "baseline": "0.1.18", + "port-version": 0 }, "libnoise": { "baseline": "1.0.0", @@ -3742,11 +3822,11 @@ }, "libosip2": { "baseline": "5.2.0", - "port-version": 1 + "port-version": 2 }, "libosmium": { "baseline": "2.17.1", - "port-version": 0 + "port-version": 1 }, "libosmscout": { "baseline": "1.1.1", @@ -3758,11 +3838,11 @@ }, "libp7client": { "baseline": "5.6", - "port-version": 1 + "port-version": 2 }, "libpcap": { "baseline": "1.10.1", - "port-version": 0 + "port-version": 1 }, "libpff": { "baseline": "2018-07-14", @@ -3774,7 +3854,7 @@ }, "libpmemobj-cpp": { "baseline": "1.13.0", - "port-version": 0 + "port-version": 1 }, "libpng": { "baseline": "1.6.37", @@ -3785,12 +3865,12 @@ "port-version": 14 }, "libpq": { - "baseline": "12.2", - "port-version": 20 + "baseline": "12.9", + "port-version": 1 }, "libpqxx": { "baseline": "7.6.0", - "port-version": 2 + "port-version": 3 }, "libprotobuf-mutator": { "baseline": "1.0", @@ -3798,11 +3878,11 @@ }, "libproxy": { "baseline": "0.4.17", - "port-version": 1 + "port-version": 2 }, "libqcow": { "baseline": "20210419", - "port-version": 1 + "port-version": 2 }, "libqglviewer": { "baseline": "2.7.2", @@ -3813,23 +3893,23 @@ "port-version": 1 }, "librabbitmq": { - "baseline": "2020-06-03", - "port-version": 1 + "baseline": "0.11.0", + "port-version": 0 }, "libraqm": { - "baseline": "0.7.0", - "port-version": 3 + "baseline": "0.9.0", + "port-version": 0 }, "libraw": { "baseline": "201903", - "port-version": 5 + "port-version": 7 }, "librdkafka": { "baseline": "1.8.2", - "port-version": 0 + "port-version": 1 }, "libressl": { - "baseline": "3.3.4", + "baseline": "3.4.2", "port-version": 0 }, "librsvg": { @@ -3838,7 +3918,7 @@ }, "librsync": { "baseline": "2.3.2", - "port-version": 0 + "port-version": 1 }, "librtmp": { "baseline": "2019-11-11", @@ -3854,11 +3934,11 @@ }, "libsass": { "baseline": "3.6.5", - "port-version": 0 + "port-version": 1 }, "libsbml": { "baseline": "5.19.0", - "port-version": 1 + "port-version": 2 }, "libsbsms": { "baseline": "2.3.0", @@ -3866,7 +3946,7 @@ }, "libsecret": { "baseline": "0.20.4", - "port-version": 0 + "port-version": 1 }, "libsercomm": { "baseline": "1.3.2", @@ -3880,9 +3960,13 @@ "baseline": "3.0.3", "port-version": 1 }, + "libslirp": { + "baseline": "4.6.1", + "port-version": 0 + }, "libsmb2": { "baseline": "2021-04-29", - "port-version": 0 + "port-version": 1 }, "libsndfile": { "baseline": "1.0.31", @@ -3890,15 +3974,15 @@ }, "libsnoretoast": { "baseline": "0.8.0", - "port-version": 1 + "port-version": 2 }, "libsodium": { "baseline": "1.0.18", - "port-version": 5 + "port-version": 6 }, "libsoundio": { "baseline": "2.0.0", - "port-version": 4 + "port-version": 6 }, "libspatialindex": { "baseline": "1.9.3", @@ -3906,11 +3990,11 @@ }, "libspatialite": { "baseline": "5.0.1", - "port-version": 1 + "port-version": 4 }, "libspnav": { "baseline": "0.2.3", - "port-version": 1 + "port-version": 2 }, "libsquish": { "baseline": "1.15", @@ -3918,19 +4002,19 @@ }, "libsrt": { "baseline": "1.4.4", - "port-version": 1 + "port-version": 2 }, "libsrtp": { "baseline": "2.4.2", - "port-version": 0 + "port-version": 1 }, "libssh": { "baseline": "0.9.6", - "port-version": 1 + "port-version": 2 }, "libssh2": { "baseline": "1.10.0", - "port-version": 0 + "port-version": 2 }, "libstemmer": { "baseline": "2017-9", @@ -3949,7 +4033,11 @@ "port-version": 3 }, "libtcod": { - "baseline": "1.19.0", + "baseline": "1.20.1", + "port-version": 0 + }, + "libtess2": { + "baseline": "2021-12-27", "port-version": 0 }, "libtheora": { @@ -3958,7 +4046,7 @@ }, "libtins": { "baseline": "4.3", - "port-version": 3 + "port-version": 6 }, "libtomcrypt": { "baseline": "1.18.2", @@ -3969,8 +4057,8 @@ "port-version": 2 }, "libtorrent": { - "baseline": "1.2.14", - "port-version": 1 + "baseline": "2.0.5", + "port-version": 0 }, "libu2f-server": { "baseline": "1.1.0", @@ -3978,7 +4066,7 @@ }, "libudis86": { "baseline": "2018-01-28-56ff6c87", - "port-version": 1 + "port-version": 2 }, "libudns": { "baseline": "0.4", @@ -3993,16 +4081,16 @@ "port-version": 1 }, "libunifex": { - "baseline": "2021-08-01", + "baseline": "2021-12-07", "port-version": 1 }, "libunistring": { "baseline": "0.9.10", - "port-version": 1 + "port-version": 2 }, "liburing": { "baseline": "2.0", - "port-version": 0 + "port-version": 2 }, "libusb": { "baseline": "1.0.24", @@ -4010,27 +4098,27 @@ }, "libusb-win32": { "baseline": "1.2.6.0", - "port-version": 7 + "port-version": 8 }, "libusbmuxd": { "baseline": "1.2.219", - "port-version": 1 + "port-version": 2 }, "libuuid": { "baseline": "1.0.3", - "port-version": 8 + "port-version": 11 }, "libuv": { - "baseline": "1.42.0", - "port-version": 2 + "baseline": "1.43.0", + "port-version": 0 }, "libuvc": { "baseline": "2020-11-24", - "port-version": 2 + "port-version": 3 }, "libvmdk": { "baseline": "20200926", - "port-version": 1 + "port-version": 2 }, "libvorbis": { "baseline": "1.3.7", @@ -4042,11 +4130,11 @@ }, "libwandio": { "baseline": "4.2.1", - "port-version": 4 + "port-version": 6 }, "libwebm": { "baseline": "1.0.0.28", - "port-version": 0 + "port-version": 1 }, "libwebp": { "baseline": "1.2.1", @@ -4054,11 +4142,11 @@ }, "libwebsockets": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 2 }, "libxdiff": { "baseline": "0.23", - "port-version": 1 + "port-version": 2 }, "libxlsxwriter": { "baseline": "1.1.4", @@ -4066,7 +4154,7 @@ }, "libxml2": { "baseline": "2.9.12", - "port-version": 4 + "port-version": 5 }, "libxmlmm": { "baseline": "0.6.0", @@ -4074,26 +4162,26 @@ }, "libxmlpp": { "baseline": "5.0.0", - "port-version": 1 + "port-version": 2 }, "libxmp-lite": { "baseline": "4.4.1", - "port-version": 7 + "port-version": 8 }, "libxslt": { "baseline": "1.1.34", - "port-version": 3 + "port-version": 4 }, "libyaml": { "baseline": "0.2.5", - "port-version": 1 + "port-version": 3 }, "libyuv": { "baseline": "2021-04-15", - "port-version": 0 + "port-version": 1 }, "libzen": { - "baseline": "0.4.38", + "baseline": "0.4.39", "port-version": 1 }, "libzip": { @@ -4106,11 +4194,11 @@ }, "licensepp": { "baseline": "2020-05-19", - "port-version": 2 + "port-version": 3 }, "lilv": { "baseline": "0.24.10", - "port-version": 0 + "port-version": 1 }, "linalg": { "baseline": "2.1", @@ -4120,12 +4208,16 @@ "baseline": "4754bee2d8eb3", "port-version": 2 }, + "lionkor-commandline": { + "baseline": "1.0.0", + "port-version": 0 + }, "live555": { - "baseline": "latest", - "port-version": 2 + "baseline": "2021-12-18", + "port-version": 0 }, "llfio": { - "baseline": "2.0-20210922", + "baseline": "2.0-20220112", "port-version": 0 }, "llgl": { @@ -4133,31 +4225,31 @@ "port-version": 2 }, "llvm": { - "baseline": "12.0.1", - "port-version": 0 + "baseline": "13.0.0", + "port-version": 3 }, "lmdb": { "baseline": "0.9.24", "port-version": 1 }, "lodepng": { - "baseline": "2020-03-15", + "baseline": "2021-12-04", "port-version": 1 }, "lodepng-c": { - "baseline": "2021-03-01", - "port-version": 1 + "baseline": "deprecated", + "port-version": 0 }, "log4cplus": { "baseline": "2.0.7", - "port-version": 0 + "port-version": 1 }, "log4cpp": { "baseline": "2.9.1", - "port-version": 6 + "port-version": 7 }, "log4cxx": { - "baseline": "0.12.0", + "baseline": "0.12.1", "port-version": 0 }, "loguru": { @@ -4169,8 +4261,8 @@ "port-version": 2 }, "lua": { - "baseline": "5.4.3", - "port-version": 3 + "baseline": "5.4.4", + "port-version": 1 }, "luabridge": { "baseline": "2.6", @@ -4182,7 +4274,7 @@ }, "luajit": { "baseline": "2.0.5", - "port-version": 4 + "port-version": 5 }, "luasec": { "baseline": "1.0.1", @@ -4190,7 +4282,7 @@ }, "luasocket": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "lv2": { "baseline": "1.18.2", @@ -4222,7 +4314,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 8 + "port-version": 9 }, "magnum-extras": { "baseline": "2020.06", @@ -4238,7 +4330,7 @@ }, "mailio": { "baseline": "0.20.0", - "port-version": 1 + "port-version": 2 }, "mapbox-geojson-cpp": { "baseline": "0.5.1", @@ -4265,15 +4357,15 @@ "port-version": 0 }, "mapnik": { - "baseline": "2021-11-15", + "baseline": "2022-01-28", "port-version": 1 }, "marble": { "baseline": "19.08.2", - "port-version": 2 + "port-version": 3 }, "marl": { - "baseline": "2021-04-25", + "baseline": "2022-03-02", "port-version": 0 }, "mathc": { @@ -4281,8 +4373,8 @@ "port-version": 1 }, "mathgl": { - "baseline": "2.4.3", - "port-version": 8 + "baseline": "2.5", + "port-version": 0 }, "matio": { "baseline": "1.5.19", @@ -4302,7 +4394,7 @@ }, "mbedtls": { "baseline": "2.24.0", - "port-version": 3 + "port-version": 4 }, "mcpp": { "baseline": "2.7.2.14", @@ -4314,7 +4406,7 @@ }, "mdnsresponder": { "baseline": "878.270.2", - "port-version": 0 + "port-version": 1 }, "mdspan": { "baseline": "2021-11-03", @@ -4329,8 +4421,8 @@ "port-version": 2 }, "mesa": { - "baseline": "21.2.0", - "port-version": 0 + "baseline": "21.2.5", + "port-version": 2 }, "meschach": { "baseline": "1.2b", @@ -4358,7 +4450,7 @@ }, "mhook": { "baseline": "2.5.1", - "port-version": 2 + "port-version": 3 }, "microsoft-signalr": { "baseline": "0.1.0-alpha3", @@ -4370,10 +4462,10 @@ }, "milerius-sfml-imgui": { "baseline": "1.1", - "port-version": 3 + "port-version": 4 }, "mimalloc": { - "baseline": "2.0.2", + "baseline": "2.0.5", "port-version": 0 }, "minc": { @@ -4382,7 +4474,7 @@ }, "minhook": { "baseline": "1.3.3", - "port-version": 2 + "port-version": 3 }, "minifb": { "baseline": "2019-08-20", @@ -4392,6 +4484,10 @@ "baseline": "2020-12-25", "port-version": 1 }, + "minio-cpp": { + "baseline": "2022-01-03", + "port-version": 0 + }, "minisat-master-keying": { "baseline": "2.3.6", "port-version": 0 @@ -4410,7 +4506,7 @@ }, "minizip": { "baseline": "1.2.11", - "port-version": 9 + "port-version": 10 }, "minizip-ng": { "baseline": "3.0.2", @@ -4422,14 +4518,14 @@ }, "mlpack": { "baseline": "3.4.1", - "port-version": 2 + "port-version": 5 }, "mman": { "baseline": "git-f5ff813", - "port-version": 4 + "port-version": 5 }, "mmloader": { - "baseline": "2020-05-15", + "baseline": "2021-12-13", "port-version": 1 }, "mmx": { @@ -4438,7 +4534,7 @@ }, "mnn": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "modp-base64": { "baseline": "2020-09-26", @@ -4450,15 +4546,15 @@ }, "mongo-cxx-driver": { "baseline": "3.6.5", - "port-version": 1 + "port-version": 2 }, "mongoose": { - "baseline": "7.1", - "port-version": 0 + "baseline": "7.5", + "port-version": 1 }, "monkeys-audio": { "baseline": "5.70", - "port-version": 1 + "port-version": 2 }, "moos-core": { "baseline": "10.4.0", @@ -4502,19 +4598,19 @@ }, "mpfr": { "baseline": "4.1.0", - "port-version": 1 + "port-version": 3 }, "mpg123": { "baseline": "1.29.2", - "port-version": 0 + "port-version": 1 }, "mpi": { "baseline": "1", "port-version": 2 }, "mpir": { - "baseline": "3.0.0", - "port-version": 10 + "baseline": "2022-03-02", + "port-version": 0 }, "mpmcqueue": { "baseline": "2019-07-26", @@ -4530,11 +4626,11 @@ }, "ms-gltf": { "baseline": "r1.9.5.4", - "port-version": 0 + "port-version": 1 }, "ms-gsl": { - "baseline": "3.1.0", - "port-version": 1 + "baseline": "4.0.0", + "port-version": 0 }, "ms-quic": { "baseline": "1.2.0", @@ -4562,7 +4658,7 @@ }, "msmpi": { "baseline": "10.1.12498", - "port-version": 2 + "port-version": 3 }, "mstch": { "baseline": "1.0.2", @@ -4574,20 +4670,24 @@ }, "munit": { "baseline": "2019-04-06", - "port-version": 3 + "port-version": 5 }, "muparser": { - "baseline": "2.3.2", + "baseline": "2.3.3", "port-version": 2 }, "murmurhash": { "baseline": "2016-01-09", - "port-version": 4 + "port-version": 5 }, - "mygui": { - "baseline": "2020-06-17", + "mvfst": { + "baseline": "0.2", "port-version": 1 }, + "mygui": { + "baseline": "3.4.1", + "port-version": 2 + }, "nameof": { "baseline": "0.10.1", "port-version": 1 @@ -4601,8 +4701,8 @@ "port-version": 1 }, "nanobench": { - "baseline": "4.3.0", - "port-version": 1 + "baseline": "4.3.6", + "port-version": 0 }, "nanodbc": { "baseline": "2.13.0", @@ -4614,7 +4714,7 @@ }, "nanogui": { "baseline": "2019-09-23", - "port-version": 2 + "port-version": 3 }, "nanomsg": { "baseline": "1.1.5", @@ -4637,19 +4737,23 @@ "port-version": 2 }, "nanovg": { - "baseline": "2019-8-30", - "port-version": 4 + "baseline": "2019-08-30", + "port-version": 5 }, "nativefiledialog": { - "baseline": "2019-08-28", - "port-version": 1 + "baseline": "2022-01-20", + "port-version": 0 + }, + "nayuki-qr-code-generator": { + "baseline": "1.7.0", + "port-version": 0 }, "nccl": { "baseline": "2.4.6", - "port-version": 1 + "port-version": 2 }, "ncurses": { - "baseline": "6.2", + "baseline": "6.3", "port-version": 1 }, "neargye-semver": { @@ -4657,7 +4761,7 @@ "port-version": 0 }, "ned14-internal-quickcpplib": { - "baseline": "0.0.0-e691a6dc", + "baseline": "0.0.0-cad832c8", "port-version": 0 }, "neon2sse": { @@ -4666,7 +4770,7 @@ }, "netcdf-c": { "baseline": "4.8.1", - "port-version": 0 + "port-version": 2 }, "netcdf-cxx4": { "baseline": "4.3.1", @@ -4674,7 +4778,7 @@ }, "nethost": { "baseline": "2019-12-21", - "port-version": 1 + "port-version": 2 }, "nettle": { "baseline": "3.6", @@ -4682,7 +4786,7 @@ }, "networkdirect-sdk": { "baseline": "2.0.1", - "port-version": 2 + "port-version": 3 }, "nghttp2": { "baseline": "1.46.0", @@ -4690,7 +4794,7 @@ }, "ngspice": { "baseline": "35", - "port-version": 0 + "port-version": 2 }, "nifly": { "baseline": "1.0.0", @@ -4705,7 +4809,7 @@ "port-version": 2 }, "nlohmann-json": { - "baseline": "3.10.4", + "baseline": "3.10.5", "port-version": 0 }, "nlopt": { @@ -4718,7 +4822,7 @@ }, "nmslib": { "baseline": "2.1.1", - "port-version": 0 + "port-version": 1 }, "nng": { "baseline": "1.5.1", @@ -4730,14 +4834,14 @@ }, "nnpack": { "baseline": "2021-02-21", - "port-version": 1 + "port-version": 2 }, "nonius": { "baseline": "2019-04-20", "port-version": 2 }, "nowide": { - "baseline": "11.1.2", + "baseline": "11.1.3", "port-version": 0 }, "nrf-ble-driver": { @@ -4752,13 +4856,17 @@ "baseline": "2019-08-10", "port-version": 1 }, + "nu-book-zxing-cpp": { + "baseline": "1.2.0", + "port-version": 0 + }, "nuklear": { "baseline": "2021-03-18", "port-version": 1 }, "numactl": { "baseline": "2.0.14", - "port-version": 0 + "port-version": 1 }, "numcpp": { "baseline": "2.6.0", @@ -4770,54 +4878,58 @@ }, "nvtt": { "baseline": "2.1.2", - "port-version": 2 + "port-version": 3 }, "oatpp": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-consul": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-curl": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-libressl": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-mbedtls": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-mongo": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-openssl": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-postgresql": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-sqlite": { - "baseline": "1.2.5", + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-ssdp": { + "baseline": "1.3.0", "port-version": 0 }, "oatpp-swagger": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-websocket": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-zlib": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "observer-ptr-lite": { @@ -4826,7 +4938,7 @@ }, "ocilib": { "baseline": "4.7.3", - "port-version": 0 + "port-version": 2 }, "octomap": { "baseline": "1.9.5", @@ -4846,7 +4958,7 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 5 + "port-version": 7 }, "ogre-next": { "baseline": "2019-10-20", @@ -4854,19 +4966,19 @@ }, "ois": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "ompl": { "baseline": "1.5.1", - "port-version": 3 + "port-version": 5 }, "omplapp": { "baseline": "1.5.1", - "port-version": 1 + "port-version": 3 }, "onednn": { "baseline": "2.4.3", - "port-version": 0 + "port-version": 1 }, "oniguruma": { "baseline": "6.9.7.1", @@ -4874,7 +4986,7 @@ }, "onnx": { "baseline": "1.10.2", - "port-version": 0 + "port-version": 1 }, "onnx-optimizer": { "baseline": "0.2.6", @@ -4882,23 +4994,23 @@ }, "onnxruntime-gpu": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "oof": { "baseline": "2021-11-23", "port-version": 0 }, "open62541": { - "baseline": "1.2.2", + "baseline": "1.2.3", "port-version": 0 }, "openal-soft": { "baseline": "1.21.1", - "port-version": 3 + "port-version": 4 }, "openblas": { - "baseline": "0.3.15", - "port-version": 1 + "baseline": "0.3.19", + "port-version": 0 }, "opencascade": { "baseline": "7.6.0", @@ -4906,19 +5018,19 @@ }, "opencc": { "baseline": "2020-04-26", - "port-version": 9 + "port-version": 10 }, "opencensus-cpp": { - "baseline": "0.4.0", - "port-version": 2 + "baseline": "2021-08-26", + "port-version": 0 }, "opencl": { "baseline": "2.2", "port-version": 8 }, "opencolorio": { - "baseline": "2.1.0", - "port-version": 0 + "baseline": "2.1.1", + "port-version": 2 }, "opencolorio-tools": { "baseline": "1.1.1", @@ -4929,32 +5041,32 @@ "port-version": 2 }, "opencv": { - "baseline": "4.5.4", + "baseline": "4.5.5", "port-version": 0 }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 8 + "port-version": 9 }, "opencv3": { "baseline": "3.4.16", - "port-version": 0 + "port-version": 4 }, "opencv4": { - "baseline": "4.5.4", + "baseline": "4.5.5", "port-version": 0 }, "opendnp3": { "baseline": "3.1.1", - "port-version": 0 + "port-version": 1 }, "openexr": { "baseline": "2.5.0", "port-version": 3 }, "opengl": { - "baseline": "0.0", - "port-version": 9 + "baseline": "2022-03-14", + "port-version": 0 }, "opengl-registry": { "baseline": "2021-11-17", @@ -4962,15 +5074,15 @@ }, "openh264": { "baseline": "2021-03-16", - "port-version": 2 + "port-version": 3 }, "openigtlink": { "baseline": "3.0", "port-version": 2 }, "openimageio": { - "baseline": "2.3.7.2", - "port-version": 4 + "baseline": "2.3.10.1", + "port-version": 2 }, "openjpeg": { "baseline": "2.4.0", @@ -4986,10 +5098,10 @@ }, "openmpi": { "baseline": "4.1.0", - "port-version": 3 + "port-version": 4 }, "openmvg": { - "baseline": "1.6", + "baseline": "2.0", "port-version": 3 }, "openmvs": { @@ -5005,8 +5117,8 @@ "port-version": 1 }, "openssl": { - "baseline": "1.1.1l", - "port-version": 4 + "baseline": "1.1.1n", + "port-version": 0 }, "openssl-unix": { "baseline": "1.1.1h", @@ -5022,18 +5134,18 @@ }, "opensubdiv": { "baseline": "3.4.3", - "port-version": 3 + "port-version": 4 }, "opentelemetry-cpp": { - "baseline": "1.0.1", - "port-version": 1 + "baseline": "1.2.0", + "port-version": 0 }, "opentracing": { "baseline": "1.6.0", - "port-version": 1 + "port-version": 2 }, "openvdb": { - "baseline": "8.1.0", + "baseline": "8.2.0", "port-version": 0 }, "openvpn3": { @@ -5042,11 +5154,15 @@ }, "openvr": { "baseline": "1.16.8", - "port-version": 1 + "port-version": 2 }, "openxr-loader": { - "baseline": "1.0.18", - "port-version": 2 + "baseline": "1.0.22", + "port-version": 1 + }, + "optimus-cpp": { + "baseline": "0.3.0", + "port-version": 0 }, "optional-bare": { "baseline": "1.1.0", @@ -5082,7 +5198,7 @@ }, "osgearth": { "baseline": "3.2", - "port-version": 1 + "port-version": 3 }, "osi": { "baseline": "0.108.6", @@ -5090,10 +5206,10 @@ }, "otl": { "baseline": "4.0.463", - "port-version": 0 + "port-version": 1 }, "outcome": { - "baseline": "2.2.2-20210922", + "baseline": "2.2.2-20211208", "port-version": 0 }, "p-ranav-csv": { @@ -5121,7 +5237,7 @@ "port-version": 0 }, "pango": { - "baseline": "1.48.10", + "baseline": "1.50.3", "port-version": 0 }, "pangolin": { @@ -5129,12 +5245,12 @@ "port-version": 2 }, "pangomm": { - "baseline": "2.48.1", - "port-version": 0 + "baseline": "2.50.0", + "port-version": 1 }, "parallel-hashmap": { - "baseline": "1.33", - "port-version": 1 + "baseline": "1.34", + "port-version": 0 }, "parallelstl": { "baseline": "20200330", @@ -5158,11 +5274,11 @@ }, "pbc": { "baseline": "0.5.14", - "port-version": 5 + "port-version": 6 }, "pcapplusplus": { "baseline": "21.11", - "port-version": 0 + "port-version": 1 }, "pcg": { "baseline": "2021-04-06", @@ -5170,7 +5286,7 @@ }, "pcl": { "baseline": "1.12.0", - "port-version": 1 + "port-version": 6 }, "pcre": { "baseline": "8.45", @@ -5178,19 +5294,19 @@ }, "pcre2": { "baseline": "10.39", - "port-version": 1 + "port-version": 2 }, "pdal": { - "baseline": "1.7.1", - "port-version": 13 + "baseline": "2.3.0", + "port-version": 0 }, "pdal-c": { - "baseline": "1.8", - "port-version": 3 + "baseline": "2.1", + "port-version": 0 }, "pdcurses": { "baseline": "3.9", - "port-version": 2 + "port-version": 3 }, "pdqsort": { "baseline": "2019-07-30", @@ -5201,7 +5317,7 @@ "port-version": 0 }, "pegtl": { - "baseline": "3.2.2", + "baseline": "3.2.5", "port-version": 0 }, "pegtl-2": { @@ -5214,7 +5330,7 @@ }, "pfring": { "baseline": "2019-10-17", - "port-version": 3 + "port-version": 4 }, "pfultz2-linq": { "baseline": "2019-05-14", @@ -5230,7 +5346,7 @@ }, "physx": { "baseline": "4.1.2", - "port-version": 0 + "port-version": 1 }, "picojson": { "baseline": "1.3.0", @@ -5242,30 +5358,34 @@ }, "piex": { "baseline": "2019-07-11", - "port-version": 1 + "port-version": 2 }, "pistache": { "baseline": "2021-03-31", - "port-version": 2 + "port-version": 3 }, "pixel": { - "baseline": "0.3", - "port-version": 3 + "baseline": "2022-03-15", + "port-version": 0 }, "pixman": { "baseline": "0.40.0", - "port-version": 0 + "port-version": 2 }, "pkgconf": { "baseline": "1.8.0", - "port-version": 0 + "port-version": 2 }, "platform-folders": { "baseline": "4.1.0", "port-version": 0 }, "plf-colony": { - "baseline": "6.28", + "baseline": "6.33", + "port-version": 0 + }, + "plf-hive": { + "baseline": "2021-12-11", "port-version": 0 }, "plf-list": { @@ -5286,7 +5406,7 @@ }, "plibsys": { "baseline": "0.0.4", - "port-version": 5 + "port-version": 6 }, "plog": { "baseline": "1.1.5", @@ -5294,7 +5414,7 @@ }, "plplot": { "baseline": "5.13.0", - "port-version": 14 + "port-version": 15 }, "plustache": { "baseline": "0.4.0", @@ -5302,7 +5422,7 @@ }, "pmdk": { "baseline": "1.11.0", - "port-version": 0 + "port-version": 1 }, "pngpp": { "baseline": "0.2.10", @@ -5313,8 +5433,8 @@ "port-version": 3 }, "poco": { - "baseline": "1.11.0", - "port-version": 1 + "baseline": "1.11.1", + "port-version": 0 }, "podofo": { "baseline": "0.9.7", @@ -5333,8 +5453,8 @@ "port-version": 10 }, "polyhook2": { - "baseline": "2021-05-09", - "port-version": 1 + "baseline": "2022-03-01", + "port-version": 0 }, "polymorphic-value": { "baseline": "1.3.0", @@ -5345,12 +5465,12 @@ "port-version": 4 }, "poppler": { - "baseline": "20.12.1", - "port-version": 6 + "baseline": "22.2.0", + "port-version": 0 }, "popsift": { "baseline": "0.9", - "port-version": 2 + "port-version": 3 }, "portable-snippets": { "baseline": "2019-09-20", @@ -5358,15 +5478,15 @@ }, "portaudio": { "baseline": "19.7", - "port-version": 2 + "port-version": 3 }, "portmidi": { - "baseline": "0.234", - "port-version": 3 + "baseline": "2.0.2", + "port-version": 1 }, "portsmf": { "baseline": "0.238", - "port-version": 0 + "port-version": 1 }, "ppconsul": { "baseline": "0.5", @@ -5386,15 +5506,15 @@ }, "presentmon": { "baseline": "1.7.0", - "port-version": 0 + "port-version": 1 }, "proj": { - "baseline": "0", - "port-version": 1 + "baseline": "9.0.0", + "port-version": 0 }, "proj4": { - "baseline": "8.0.0", - "port-version": 0 + "baseline": "8.9.9", + "port-version": 1 }, "prometheus-cpp": { "baseline": "1.0.0", @@ -5405,7 +5525,7 @@ "port-version": 0 }, "protobuf": { - "baseline": "3.18.0", + "baseline": "3.19.4", "port-version": 0 }, "protobuf-c": { @@ -5418,10 +5538,10 @@ }, "protozero": { "baseline": "1.7.0", - "port-version": 0 + "port-version": 1 }, "proxygen": { - "baseline": "2021.06.14.00", + "baseline": "2022.01.31.00", "port-version": 0 }, "psimd": { @@ -5430,7 +5550,7 @@ }, "ptex": { "baseline": "2.3.2", - "port-version": 3 + "port-version": 4 }, "pthread": { "baseline": "3.0.0", @@ -5453,8 +5573,8 @@ "port-version": 1 }, "pybind11": { - "baseline": "2.8.1", - "port-version": 0 + "baseline": "2.9.1", + "port-version": 1 }, "pystring": { "baseline": "1.1.3", @@ -5462,218 +5582,222 @@ }, "python2": { "baseline": "2.7.18", - "port-version": 1 + "port-version": 4 }, "python3": { - "baseline": "3.10.0", - "port-version": 3 + "baseline": "3.10.2", + "port-version": 1 }, "qca": { - "baseline": "2.3.1", - "port-version": 5 + "baseline": "2.3.4", + "port-version": 2 }, "qcustomplot": { "baseline": "2.0.1", "port-version": 5 }, + "qhttpengine": { + "baseline": "1.0.2", + "port-version": 0 + }, "qhull": { "baseline": "8.0.2", - "port-version": 2 + "port-version": 3 }, "qnnpack": { "baseline": "2021-02-26", - "port-version": 0 + "port-version": 1 }, "qpid-proton": { "baseline": "0.32.0", - "port-version": 2 + "port-version": 3 }, "qscintilla": { "baseline": "2.12.0", "port-version": 1 }, "qt": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qt-advanced-docking-system": { - "baseline": "3.6.3", - "port-version": 2 + "baseline": "3.8.0", + "port-version": 0 }, "qt5": { - "baseline": "5.15.2", + "baseline": "5.15.3", "port-version": 1 }, "qt5-3d": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-base": { - "baseline": "5.15.2", - "port-version": 16 + "baseline": "5.15.3", + "port-version": 1 }, "qt5-canvas3d": { "baseline": "0", "port-version": 1 }, "qt5-charts": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-location": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-modularscripts": { "baseline": "deprecated", "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-script": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.2", - "port-version": 3 + "baseline": "5.15.3", + "port-version": 1 }, "qt5-webglplugin": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.2", + "baseline": "5.15.3", "port-version": 1 }, "qt5-x11extras": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5compat": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qt6betablock": { @@ -5681,75 +5805,91 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.2.1", + "baseline": "6.2.3", + "port-version": 0 + }, + "qtapplicationmanager": { + "baseline": "6.2.3", "port-version": 0 }, "qtbase": { - "baseline": "6.2.1", - "port-version": 1 + "baseline": "6.2.3", + "port-version": 0 }, "qtcharts": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtcoap": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.2.1", + "baseline": "6.2.3", + "port-version": 0 + }, + "qtdeviceutilities": { + "baseline": "6.2.3", "port-version": 0 }, "qtdoc": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtimageformats": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, + "qtinterfaceframework": { + "baseline": "6.2.3", + "port-version": 2 + }, "qtkeychain": { "baseline": "0.13.2", - "port-version": 0 + "port-version": 1 }, "qtkeychain-qt6": { "baseline": "0.13.2", "port-version": 0 }, "qtlocation": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtlottie": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtmqtt": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtopcua": { - "baseline": "6.2.1", + "baseline": "6.2.3", + "port-version": 0 + }, + "qtpositioning": { + "baseline": "6.2.3", "port-version": 0 }, "qtquick3d": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtquickcontrols2": { @@ -5757,67 +5897,67 @@ "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtscxml": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtsensors": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtserialbus": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtserialport": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtshadertools": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtsvg": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qttools": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qttranslations": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtwayland": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtwebengine": { - "baseline": "6.2.1", - "port-version": 0 + "baseline": "6.2.3", + "port-version": 1 }, "qtwebsockets": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "qtwebview": { - "baseline": "6.2.1", + "baseline": "6.2.3", "port-version": 0 }, "quadtree": { @@ -5825,7 +5965,7 @@ "port-version": 1 }, "quantlib": { - "baseline": "1.24", + "baseline": "1.25", "port-version": 0 }, "quaternions": { @@ -5834,7 +5974,7 @@ }, "quazip": { "baseline": "1.1", - "port-version": 0 + "port-version": 1 }, "quickfast": { "baseline": "1.5", @@ -5846,7 +5986,7 @@ }, "quill": { "baseline": "1.6.3", - "port-version": 3 + "port-version": 4 }, "quirc": { "baseline": "1.1", @@ -5854,15 +5994,11 @@ }, "qwt": { "baseline": "6.2.0", - "port-version": 1 - }, - "qwt-qt6": { - "baseline": "6.2.0", - "port-version": 0 + "port-version": 2 }, "qwtw": { "baseline": "3.1.0", - "port-version": 1 + "port-version": 2 }, "rabit": { "baseline": "0.1", @@ -5872,21 +6008,25 @@ "baseline": "6.10", "port-version": 4 }, + "randomstr": { + "baseline": "2022-02-03", + "port-version": 0 + }, "rang": { "baseline": "3.2", "port-version": 0 }, "range-v3": { - "baseline": "0.11.0", - "port-version": 1 + "baseline": "2021-11-02", + "port-version": 0 }, "range-v3-vs2015": { "baseline": "20151130-vcpkg5", "port-version": 1 }, "rapidcheck": { - "baseline": "2020-08-25", - "port-version": 1 + "baseline": "2021-12-20", + "port-version": 0 }, "rapidcsv": { "baseline": "8.53", @@ -5910,7 +6050,7 @@ }, "raylib": { "baseline": "4.0.0", - "port-version": 0 + "port-version": 3 }, "rbdl": { "baseline": "2.6.0", @@ -5930,19 +6070,27 @@ }, "readline": { "baseline": "0", + "port-version": 3 + }, + "readline-osx": { + "baseline": "2020-01-04", + "port-version": 0 + }, + "readline-unix": { + "baseline": "8.1", "port-version": 1 }, "readline-win32": { "baseline": "5.0", - "port-version": 3 + "port-version": 4 }, "readosm": { "baseline": "1.1.0a", - "port-version": 1 + "port-version": 2 }, "realsense2": { - "baseline": "2.49.0", - "port-version": 3 + "baseline": "2.50.0", + "port-version": 0 }, "recast": { "baseline": "1.5.1", @@ -5953,7 +6101,7 @@ "port-version": 1 }, "refl-cpp": { - "baseline": "0.12.1", + "baseline": "0.12.2", "port-version": 0 }, "refprop-headers": { @@ -5962,11 +6110,11 @@ }, "replxx": { "baseline": "0.0.4", - "port-version": 0 + "port-version": 1 }, "reproc": { "baseline": "14.2.4", - "port-version": 0 + "port-version": 1 }, "rest-rpc": { "baseline": "0.07", @@ -5981,8 +6129,8 @@ "port-version": 1 }, "restclient-cpp": { - "baseline": "0.5.2", - "port-version": 1 + "baseline": "2022-02-09", + "port-version": 0 }, "restinio": { "baseline": "0.6.14", @@ -5994,7 +6142,11 @@ }, "rhash": { "baseline": "1.4.0", - "port-version": 1 + "port-version": 2 + }, + "rhasheq": { + "baseline": "0.0.1", + "port-version": 0 }, "riffcpp": { "baseline": "2.2.4", @@ -6005,7 +6157,7 @@ "port-version": 0 }, "rmlui": { - "baseline": "4.2", + "baseline": "4.3", "port-version": 0 }, "roaring": { @@ -6013,7 +6165,7 @@ "port-version": 3 }, "robin-hood-hashing": { - "baseline": "3.11.3", + "baseline": "3.11.5", "port-version": 0 }, "robin-map": { @@ -6021,7 +6173,7 @@ "port-version": 1 }, "rocksdb": { - "baseline": "6.26.1", + "baseline": "6.27.3", "port-version": 0 }, "rpclib": { @@ -6032,45 +6184,41 @@ "baseline": "1.1.4", "port-version": 1 }, - "rs-core-lib": { - "baseline": "2020-09-14", - "port-version": 1 - }, "rsasynccpp": { "baseline": "0.0.7", - "port-version": 0 + "port-version": 1 }, "rsm-binary-io": { "baseline": "2.0.4", - "port-version": 0 + "port-version": 1 }, "rsm-bsa": { - "baseline": "4.0.0", + "baseline": "4.0.2", "port-version": 0 }, "rsm-mmio": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "rsocket": { - "baseline": "2020.05.04.00", - "port-version": 2 + "baseline": "2021.08.30.00", + "port-version": 1 }, "rtabmap": { "baseline": "0.20.13", - "port-version": 1 + "port-version": 3 }, "rtaudio": { - "baseline": "2021-08-15", - "port-version": 2 + "baseline": "2021-11-16", + "port-version": 0 }, "rtlsdr": { "baseline": "2020-04-16", - "port-version": 2 + "port-version": 3 }, "rtmidi": { "baseline": "4.0.0", - "port-version": 3 + "port-version": 4 }, "rttr": { "baseline": "0.9.6", @@ -6086,7 +6234,7 @@ }, "rxspencer": { "baseline": "3.9.0", - "port-version": 0 + "port-version": 1 }, "ryml": { "baseline": "2021-07-24", @@ -6094,10 +6242,14 @@ }, "ryu": { "baseline": "2.0", - "port-version": 5 + "port-version": 6 + }, + "s2geometry": { + "baseline": "0.9.0", + "port-version": 1 }, "s2n": { - "baseline": "1.1.1", + "baseline": "1.3.5", "port-version": 0 }, "safeint": { @@ -6105,7 +6257,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre18", + "baseline": "0.9.0-pre20", "port-version": 0 }, "sais": { @@ -6122,11 +6274,11 @@ }, "sbp": { "baseline": "3.4.10", - "port-version": 0 + "port-version": 1 }, "scintilla": { "baseline": "4.4.6", - "port-version": 0 + "port-version": 1 }, "sciplot": { "baseline": "0.2.2", @@ -6137,12 +6289,12 @@ "port-version": 0 }, "sciter-js": { - "baseline": "4.4.8.16", + "baseline": "4.4.8.31", "port-version": 0 }, "scnlib": { - "baseline": "0.4", - "port-version": 1 + "baseline": "1.0", + "port-version": 0 }, "scottt-debugbreak": { "baseline": "1.0", @@ -6150,31 +6302,31 @@ }, "scylla-wrapper": { "baseline": "2018-08-26-16e6f435", - "port-version": 1 + "port-version": 2 }, "sdformat10": { "baseline": "10.0.0", - "port-version": 1 + "port-version": 2 }, "sdformat6": { "baseline": "6.2.0", - "port-version": 4 + "port-version": 6 }, "sdformat9": { "baseline": "9.4.0", - "port-version": 1 + "port-version": 5 }, "sdl1": { "baseline": "1.2.15", - "port-version": 14 + "port-version": 15 }, "sdl1-net": { "baseline": "1.2.8", "port-version": 4 }, "sdl2": { - "baseline": "2.0.16", - "port-version": 3 + "baseline": "2.0.20", + "port-version": 0 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -6182,11 +6334,11 @@ }, "sdl2-image": { "baseline": "2.0.5", - "port-version": 3 + "port-version": 4 }, "sdl2-mixer": { "baseline": "2.0.4", - "port-version": 14 + "port-version": 16 }, "sdl2-net": { "baseline": "2.0.1", @@ -6202,7 +6354,7 @@ }, "seal": { "baseline": "3.7.2", - "port-version": 0 + "port-version": 2 }, "secp256k1": { "baseline": "2017-19-10", @@ -6214,11 +6366,11 @@ }, "sentencepiece": { "baseline": "0.1.96", - "port-version": 0 + "port-version": 1 }, "sentry-native": { - "baseline": "0.4.12", - "port-version": 2 + "baseline": "0.4.15", + "port-version": 0 }, "septag-sx": { "baseline": "2019-05-07", @@ -6232,6 +6384,10 @@ "baseline": "0.30.4", "port-version": 0 }, + "serdepp": { + "baseline": "0.1.4", + "port-version": 0 + }, "sf2cute": { "baseline": "0.2.0", "port-version": 2 @@ -6242,7 +6398,7 @@ }, "sfml": { "baseline": "2.5.1", - "port-version": 10 + "port-version": 12 }, "sfsexp": { "baseline": "1.3.1", @@ -6250,10 +6406,10 @@ }, "shaderc": { "baseline": "2021.1", - "port-version": 1 + "port-version": 2 }, "shaderwriter": { - "baseline": "1.1.0", + "baseline": "2.1.0", "port-version": 0 }, "shapelib": { @@ -6262,7 +6418,7 @@ }, "shiva": { "baseline": "1.0", - "port-version": 4 + "port-version": 5 }, "shiva-sfml": { "baseline": "1.0", @@ -6270,7 +6426,7 @@ }, "shogun": { "baseline": "6.1.4", - "port-version": 6 + "port-version": 7 }, "signalrclient": { "baseline": "1.0.0-beta1-9", @@ -6282,7 +6438,11 @@ }, "simage": { "baseline": "1.8.1", - "port-version": 3 + "port-version": 4 + }, + "simbody": { + "baseline": "2022-01-04", + "port-version": 1 }, "simde": { "baseline": "0.7.2", @@ -6308,25 +6468,29 @@ "baseline": "2021-10-31", "port-version": 0 }, + "skcrypter": { + "baseline": "2021-12-03", + "port-version": 0 + }, "skia": { "baseline": "2020-05-18", - "port-version": 6 + "port-version": 8 }, "skyr-url": { "baseline": "1.13.0", - "port-version": 1 + "port-version": 2 }, "sleef": { "baseline": "3.5.1", - "port-version": 0 + "port-version": 1 }, "sleepy-discord": { - "baseline": "2021-07-07", - "port-version": 1 + "baseline": "2022-02-05", + "port-version": 0 }, "slikenet": { "baseline": "2021-06-07", - "port-version": 0 + "port-version": 1 }, "sltbench": { "baseline": "2.4.0", @@ -6349,11 +6513,11 @@ "port-version": 1 }, "so5extra": { - "baseline": "1.4.1.1", + "baseline": "1.5.0", "port-version": 0 }, "sobjectizer": { - "baseline": "5.7.2.6", + "baseline": "5.7.3", "port-version": 0 }, "soci": { @@ -6365,20 +6529,20 @@ "port-version": 0 }, "sockpp": { - "baseline": "0.7", - "port-version": 1 + "baseline": "2022-01-24", + "port-version": 0 }, "soem": { "baseline": "1.4.0", - "port-version": 2 + "port-version": 3 }, "soil": { "baseline": "2021-04-22", - "port-version": 0 + "port-version": 1 }, "soil2": { "baseline": "2021-05-01", - "port-version": 0 + "port-version": 1 }, "sokol": { "baseline": "2019-09-09", @@ -6393,12 +6557,12 @@ "port-version": 1 }, "sophus": { - "baseline": "1.0.0", - "port-version": 7 + "baseline": "2021-09-14", + "port-version": 0 }, "soqt": { "baseline": "1.6.0", - "port-version": 3 + "port-version": 4 }, "sord": { "baseline": "0.16.4", @@ -6406,7 +6570,7 @@ }, "soundtouch": { "baseline": "2.3.1", - "port-version": 1 + "port-version": 2 }, "soxr": { "baseline": "0.1.3", @@ -6429,8 +6593,8 @@ "port-version": 2 }, "spatialite-tools": { - "baseline": "5.0.0", - "port-version": 4 + "baseline": "5.0.1", + "port-version": 1 }, "spdk": { "baseline": "19.01.1", @@ -6446,7 +6610,7 @@ }, "spdk-isal": { "baseline": "20181006", - "port-version": 1 + "port-version": 2 }, "spdlog": { "baseline": "1.9.2", @@ -6458,11 +6622,11 @@ }, "speex": { "baseline": "1.2.0", - "port-version": 9 + "port-version": 11 }, "speexdsp": { "baseline": "1.2.0", - "port-version": 6 + "port-version": 7 }, "spirit-po": { "baseline": "1.1.2", @@ -6476,6 +6640,10 @@ "baseline": "2021-03-25", "port-version": 0 }, + "spirv-reflect": { + "baseline": "2021-12-31", + "port-version": 0 + }, "spirv-tools": { "baseline": "2021.1", "port-version": 0 @@ -6493,7 +6661,7 @@ "port-version": 1 }, "sqlcipher": { - "baseline": "4.4.3", + "baseline": "4.5.1", "port-version": 0 }, "sqlite-modern-cpp": { @@ -6501,12 +6669,12 @@ "port-version": 1 }, "sqlite-orm": { - "baseline": "1.7", + "baseline": "1.7.1", "port-version": 0 }, "sqlite3": { - "baseline": "3.37.0", - "port-version": 0 + "baseline": "3.37.2", + "port-version": 1 }, "sqlitecpp": { "baseline": "3.1.1", @@ -6541,11 +6709,11 @@ "port-version": 0 }, "starlink-ast": { - "baseline": "9.2.4", - "port-version": 2 + "baseline": "9.2.7", + "port-version": 1 }, "status-code": { - "baseline": "1.0.0-ab3cd821", + "baseline": "1.0.0-20211208", "port-version": 1 }, "status-value-lite": { @@ -6598,7 +6766,7 @@ }, "superlu": { "baseline": "2020-01-07", - "port-version": 4 + "port-version": 5 }, "symengine": { "baseline": "0.7.0", @@ -6622,7 +6790,7 @@ }, "taglib": { "baseline": "1.12.0", - "port-version": 0 + "port-version": 2 }, "taocpp-json": { "baseline": "2020-09-14", @@ -6633,12 +6801,16 @@ "port-version": 1 }, "taskflow": { - "baseline": "3.2.0", + "baseline": "3.3.0", "port-version": 0 }, "tbb": { "baseline": "2020_U3", - "port-version": 6 + "port-version": 8 + }, + "tcb-span": { + "baseline": "2021-12-15", + "port-version": 0 }, "tcl": { "baseline": "core-9-0-a1", @@ -6649,28 +6821,28 @@ "port-version": 4 }, "teemo": { - "baseline": "2.3", - "port-version": 0 + "baseline": "2.6", + "port-version": 1 }, "telnetpp": { "baseline": "2.1.2", "port-version": 1 }, "tensorflow": { - "baseline": "2.6.0", - "port-version": 0 + "baseline": "2.7.0", + "port-version": 2 }, "tensorflow-cc": { - "baseline": "2.6.0", - "port-version": 0 + "baseline": "2.7.0", + "port-version": 2 }, "tensorflow-common": { - "baseline": "2.6.0", - "port-version": 0 + "baseline": "2.7.0", + "port-version": 2 }, "tensorpipe": { "baseline": "2021-04-26", - "port-version": 0 + "port-version": 1 }, "termcolor": { "baseline": "2.0.0", @@ -6678,11 +6850,11 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 8 + "port-version": 10 }, "tfhe": { "baseline": "1.0.1", - "port-version": 2 + "port-version": 3 }, "tgbot-cpp": { "baseline": "1.2.1", @@ -6694,11 +6866,11 @@ }, "tgui": { "baseline": "2021-04-19", - "port-version": 2 + "port-version": 3 }, "theia": { "baseline": "0.8", - "port-version": 5 + "port-version": 6 }, "think-cell-range": { "baseline": "498839d", @@ -6718,15 +6890,15 @@ }, "tidy-html5": { "baseline": "5.7.28", - "port-version": 4 + "port-version": 5 }, "tiff": { "baseline": "4.3.0", - "port-version": 2 + "port-version": 6 }, "tinkerforge": { "baseline": "2.1.25", - "port-version": 1 + "port-version": 2 }, "tiny-aes-c": { "baseline": "2019-07-31", @@ -6757,8 +6929,8 @@ "port-version": 1 }, "tinyexif": { - "baseline": "1.0.2", - "port-version": 7 + "baseline": "2022-02-15", + "port-version": 0 }, "tinyexpr": { "baseline": "2020-09-25", @@ -6770,7 +6942,7 @@ }, "tinyfiledialogs": { "baseline": "3.8.8", - "port-version": 3 + "port-version": 4 }, "tinygltf": { "baseline": "2.5.0", @@ -6828,13 +7000,17 @@ "baseline": "1.0.0", "port-version": 2 }, + "tl-ranges": { + "baseline": "2021-12-02", + "port-version": 0 + }, "tlx": { "baseline": "0.5.20191212", "port-version": 2 }, "tmx": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "tmxlite": { "baseline": "1.3.0", @@ -6849,23 +7025,27 @@ "port-version": 0 }, "tomlplusplus": { - "baseline": "2.5.0", - "port-version": 2 + "baseline": "3.0.1", + "port-version": 0 }, "tool-meson": { - "baseline": "0.58.1", + "baseline": "2022-01-21", "port-version": 0 }, "torch-th": { "baseline": "2019-04-19", "port-version": 3 }, + "tracy": { + "baseline": "0.7.8", + "port-version": 2 + }, "transwarp": { "baseline": "2.2.2", "port-version": 0 }, "trantor": { - "baseline": "1.5.3", + "baseline": "1.5.5", "port-version": 0 }, "tre": { @@ -6882,6 +7062,10 @@ }, "triangle": { "baseline": "1.6", + "port-version": 2 + }, + "triton": { + "baseline": "0.9", "port-version": 1 }, "trompeloeil": { @@ -6902,15 +7086,15 @@ }, "ttauri": { "baseline": "0.5.0", - "port-version": 0 + "port-version": 1 }, "turbobase64": { "baseline": "2020-01-12", - "port-version": 1 + "port-version": 2 }, "tvision": { "baseline": "2021-08-10", - "port-version": 0 + "port-version": 1 }, "tweeny": { "baseline": "3.2.0", @@ -6926,19 +7110,19 @@ }, "uchardet": { "baseline": "2021-09-03", - "port-version": 1 + "port-version": 2 }, "umock-c": { - "baseline": "2020-06-17", - "port-version": 2 + "baseline": "2022-01-21", + "port-version": 0 }, "unicorn": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "unicorn-lib": { - "baseline": "2020-03-02", - "port-version": 2 + "baseline": "2022-01-24", + "port-version": 0 }, "units": { "baseline": "2.3.1", @@ -6950,7 +7134,7 @@ }, "unixodbc": { "baseline": "2.3.9", - "port-version": 0 + "port-version": 1 }, "unqlite": { "baseline": "1.1.9", @@ -6958,7 +7142,7 @@ }, "unrar": { "baseline": "5.8.1", - "port-version": 1 + "port-version": 3 }, "upb": { "baseline": "2021-10-19", @@ -6966,7 +7150,7 @@ }, "urdfdom": { "baseline": "1.0.4", - "port-version": 4 + "port-version": 5 }, "urdfdom-headers": { "baseline": "1.0.5", @@ -6974,11 +7158,11 @@ }, "urho3d": { "baseline": "2021-03-01", - "port-version": 1 + "port-version": 2 }, "uriparser": { - "baseline": "0.9.5", - "port-version": 1 + "baseline": "0.9.6", + "port-version": 0 }, "usbmuxd": { "baseline": "1.2.235", @@ -6986,7 +7170,7 @@ }, "usd": { "baseline": "20.08", - "port-version": 1 + "port-version": 2 }, "usockets": { "baseline": "0.8.1", @@ -6997,7 +7181,7 @@ "port-version": 1 }, "utf8h": { - "baseline": "2021-10-21", + "baseline": "2021-11-18", "port-version": 0 }, "utf8proc": { @@ -7018,10 +7202,10 @@ }, "uthenticode": { "baseline": "1.0.6", - "port-version": 0 + "port-version": 1 }, "uvatlas": { - "baseline": "2021-11-08", + "baseline": "2022-02-28", "port-version": 0 }, "uvw": { @@ -7029,16 +7213,16 @@ "port-version": 1 }, "uwebsockets": { - "baseline": "20.8.0", + "baseline": "20.11.0", "port-version": 0 }, "v-hacd": { "baseline": "3.2.0", - "port-version": 2 + "port-version": 3 }, "v8": { "baseline": "9.1.269.39", - "port-version": 1 + "port-version": 3 }, "valijson": { "baseline": "0.6", @@ -7050,7 +7234,7 @@ }, "vamp-sdk": { "baseline": "2.10", - "port-version": 1 + "port-version": 2 }, "variant-lite": { "baseline": "2.0.0", @@ -7058,55 +7242,71 @@ }, "vc": { "baseline": "1.4.2", - "port-version": 1 + "port-version": 2 }, "vcglib": { "baseline": "1.0.1", "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2021-09-13", + "baseline": "2022-01-19", "port-version": 0 }, "vcpkg-cmake-config": { - "baseline": "2021-11-01", + "baseline": "2022-02-06", "port-version": 0 }, "vcpkg-gfortran": { "baseline": "3", - "port-version": 1 + "port-version": 2 }, "vcpkg-gn": { "baseline": "2021-11-16", - "port-version": 0 + "port-version": 1 }, "vcpkg-pkgconfig-get-modules": { - "baseline": "2021-04-02", - "port-version": 1 + "baseline": "2022-02-10", + "port-version": 0 }, "vcpkg-qmake": { "baseline": "2021-10-23", "port-version": 0 }, + "vcpkg-tool-lessmsi": { + "baseline": "1.10.0", + "port-version": 0 + }, + "vcpkg-tool-meson": { + "baseline": "0.60.2", + "port-version": 2 + }, "vcpkg-tool-nodejs": { "baseline": "14.17.4", "port-version": 0 }, + "vcpkg-tool-python2": { + "baseline": "2.7.18", + "port-version": 0 + }, "vectorclass": { "baseline": "2.00.01", - "port-version": 1 + "port-version": 2 }, "visit-struct": { "baseline": "1.0", "port-version": 2 }, + "vk-bootstrap": { + "baseline": "0.5", + "port-version": 0 + }, "vlfeat": { "baseline": "2020-07-10", "port-version": 1 }, "vlpp": { "baseline": "0.11.0.0", - "port-version": 1 + "port-version": 2 }, "volk": { "baseline": "2019-09-26", @@ -7118,7 +7318,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 5 + "port-version": 10 }, "vtk-dicom": { "baseline": "0.8.12", @@ -7133,12 +7333,12 @@ "port-version": 2 }, "vulkan-headers": { - "baseline": "1.2.184", + "baseline": "1.2.203", "port-version": 0 }, "vulkan-hpp": { - "baseline": "1.2.184", - "port-version": 1 + "baseline": "1.2.203", + "port-version": 0 }, "vulkan-memory-allocator": { "baseline": "2021-07-07", @@ -7150,10 +7350,10 @@ }, "wampcc": { "baseline": "2019-09-04", - "port-version": 2 + "port-version": 3 }, "wangle": { - "baseline": "2021.06.14.00", + "baseline": "2022.01.31.00", "port-version": 0 }, "wavelib": { @@ -7162,7 +7362,7 @@ }, "wavpack": { "baseline": "5.4.0", - "port-version": 0 + "port-version": 1 }, "websocketpp": { "baseline": "0.8.2", @@ -7177,8 +7377,8 @@ "port-version": 1 }, "wil": { - "baseline": "2021-08-03", - "port-version": 1 + "baseline": "2021-12-25", + "port-version": 0 }, "wildmidi": { "baseline": "0.4.4", @@ -7186,7 +7386,7 @@ }, "wincrypt": { "baseline": "0.0", - "port-version": 3 + "port-version": 4 }, "winlamb": { "baseline": "2020-10-15", @@ -7194,23 +7394,27 @@ }, "winpcap": { "baseline": "4.1.3", - "port-version": 6 + "port-version": 8 }, "winpty": { "baseline": "0.4.3", "port-version": 0 }, "winreg": { - "baseline": "4.1.2", + "baseline": "5.0.0", "port-version": 0 }, "winsock2": { "baseline": "0.0", - "port-version": 3 + "port-version": 4 + }, + "winsparkle": { + "baseline": "0.7.0", + "port-version": 0 }, "wintoast": { "baseline": "1.2.0", - "port-version": 1 + "port-version": 2 }, "woff2": { "baseline": "1.0.2", @@ -7226,19 +7430,19 @@ }, "wpilib": { "baseline": "2020.3.2", - "port-version": 1 + "port-version": 2 }, "wren": { "baseline": "2019-07-01", "port-version": 1 }, "wt": { - "baseline": "4.5.0", - "port-version": 2 + "baseline": "4.6.1", + "port-version": 0 }, "wtl": { "baseline": "10.0.10320", - "port-version": 1 + "port-version": 2 }, "wxchartdir": { "baseline": "1.0.0", @@ -7246,15 +7450,15 @@ }, "wxwidgets": { "baseline": "3.1.5", - "port-version": 3 + "port-version": 7 }, "x-plane": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "x264": { "baseline": "164-5db6aa6cab1b146", - "port-version": 1 + "port-version": 4 }, "x265": { "baseline": "3.4", @@ -7266,15 +7470,15 @@ }, "xaudio2redist": { "baseline": "1.2.8", - "port-version": 0 + "port-version": 1 }, "xbyak": { "baseline": "6.00", - "port-version": 0 + "port-version": 1 }, "xerces-c": { "baseline": "3.2.3", - "port-version": 3 + "port-version": 4 }, "xeus": { "baseline": "0.24.3", @@ -7296,10 +7500,6 @@ "baseline": "1.2.32", "port-version": 0 }, - "xmsh": { - "baseline": "0.5.2", - "port-version": 2 - }, "xnnpack": { "baseline": "2021-05-17", "port-version": 1 @@ -7312,12 +7512,16 @@ "baseline": "0.8.1", "port-version": 1 }, + "xqilla": { + "baseline": "2.3.4", + "port-version": 0 + }, "xsimd": { "baseline": "8.0.3", "port-version": 0 }, "xtensor": { - "baseline": "0.23.10", + "baseline": "0.24.0", "port-version": 0 }, "xtensor-blas": { @@ -7329,7 +7533,7 @@ "port-version": 2 }, "xtensor-io": { - "baseline": "0.12.8", + "baseline": "0.13.0", "port-version": 1 }, "xtl": { @@ -7338,11 +7542,11 @@ }, "xxhash": { "baseline": "0.8.1", - "port-version": 0 + "port-version": 1 }, "yajl": { "baseline": "2.1.0", - "port-version": 2 + "port-version": 3 }, "yaml-cpp": { "baseline": "0.7.0", @@ -7358,19 +7562,19 @@ }, "yasm": { "baseline": "1.3.0", - "port-version": 1 + "port-version": 3 }, "yasm-tool": { - "baseline": "1.3.0", + "baseline": "2021-12-14", "port-version": 0 }, "yasm-tool-helper": { "baseline": "2020-03-11", - "port-version": 0 + "port-version": 1 }, "yato": { - "baseline": "1.0", - "port-version": 3 + "baseline": "2022-03-06", + "port-version": 0 }, "yoga": { "baseline": "1.19.0", @@ -7385,8 +7589,8 @@ "port-version": 0 }, "z3": { - "baseline": "4.8.12", - "port-version": 1 + "baseline": "4.8.14", + "port-version": 0 }, "z85": { "baseline": "1.0", @@ -7394,7 +7598,7 @@ }, "zeromq": { "baseline": "4.3.4", - "port-version": 2 + "port-version": 5 }, "zfp": { "baseline": "0.5.5", @@ -7402,7 +7606,7 @@ }, "zkpp": { "baseline": "0.2.3", - "port-version": 1 + "port-version": 2 }, "zlib": { "baseline": "1.2.11", @@ -7420,12 +7624,16 @@ "baseline": "1.0.3", "port-version": 1 }, + "zpp-bits": { + "baseline": "4.3.3", + "port-version": 0 + }, "zserge-webview": { "baseline": "2019-04-27", "port-version": 3 }, "zstd": { - "baseline": "1.5.0", + "baseline": "1.5.2", "port-version": 1 }, "zstr": { @@ -7436,10 +7644,6 @@ "baseline": "2021-04-23", "port-version": 0 }, - "zxing-cpp": { - "baseline": "2020-12", - "port-version": 3 - }, "zydis": { "baseline": "3.2.1", "port-version": 0 diff --git a/versions/c-/c-ares.json b/versions/c-/c-ares.json index 59b8c1d2d54c24..31f663728e978b 100644 --- a/versions/c-/c-ares.json +++ b/versions/c-/c-ares.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c97dd38d470b96784d2aa4484d04afca77e2c60", + "version-semver": "1.17.2", + "port-version": 2 + }, { "git-tree": "d434c999ea00b87bfbee3d79ddc6fc1b6f12d7fe", "version-semver": "1.17.2", diff --git a/versions/c-/c-dbg-macro.json b/versions/c-/c-dbg-macro.json new file mode 100644 index 00000000000000..3bacd629b90bd1 --- /dev/null +++ b/versions/c-/c-dbg-macro.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c6819bcf6380a622775dfa3cebbcaf44ef745710", + "version-date": "2020-02-29", + "port-version": 0 + } + ] +} diff --git a/versions/c-/c89stringutils.json b/versions/c-/c89stringutils.json new file mode 100644 index 00000000000000..7d7aa3a41460ed --- /dev/null +++ b/versions/c-/c89stringutils.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9c5dcb3c6cf4442e2fdcb4cdea39f512db0ead54", + "version": "0.0.1", + "port-version": 0 + } + ] +} diff --git a/versions/c-/caf.json b/versions/c-/caf.json index c92bc3b28e9ca0..7e81e9e8fc9dd2 100644 --- a/versions/c-/caf.json +++ b/versions/c-/caf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f4b297fc5ad4bd021fa9d72787b27e69a558237", + "version": "0.18.5", + "port-version": 0 + }, { "git-tree": "d520e997ef25f386431e32cb6bec32ba12a78339", "version-string": "0.17.6", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 60935f639e22a4..4d52ec12077d9e 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c024050e140b5174c6ef3094bad3cb2d6a710f82", + "version": "1.17.4", + "port-version": 4 + }, + { + "git-tree": "d8bed1ec84c641aad98858b6fb1151b09273227e", + "version": "1.17.4", + "port-version": 3 + }, { "git-tree": "96aa6adbfefae2d4f2e3d79e012876b1d4a40b93", "version": "1.17.4", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index d56ab293ba059c..8b828b0c228e0b 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6cf38af57700ebdb1933bd3e4f4c0580de8aaab9", + "version": "1.16.0", + "port-version": 1 + }, { "git-tree": "0e16b66d1552c1cbda240f8a11d65895c607e6b5", "version": "1.16.0", diff --git a/versions/c-/calceph.json b/versions/c-/calceph.json index d415cc1bda3926..8e60196c269ec3 100644 --- a/versions/c-/calceph.json +++ b/versions/c-/calceph.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "98f9a949826498f0929b5745fff07fb9747b82fa", + "version": "3.5.1", + "port-version": 0 + }, + { + "git-tree": "f9919835108077ed1a077ef023b60903f52df42c", + "version": "3.5.0", + "port-version": 2 + }, + { + "git-tree": "48bd1ecc8648d44291fbaf0a11f5f12aa017c077", + "version": "3.5.0", + "port-version": 1 + }, { "git-tree": "d2665db7558ef66aa086f95b155e61b15bd56848", "version": "3.5.0", diff --git a/versions/c-/camport3.json b/versions/c-/camport3.json index 6de0f201fb54b5..3ad3ae220f7e76 100644 --- a/versions/c-/camport3.json +++ b/versions/c-/camport3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed31882bd5119a95ef69ba8323e0f4575ee5dc6d", + "version-string": "1.5.3", + "port-version": 2 + }, { "git-tree": "da6cb57213a9c5e3e4877a1c2278524f6228a80b", "version-string": "1.5.3", diff --git a/versions/c-/capnproto.json b/versions/c-/capnproto.json index cf51d2af2b9fe6..7916de0c00fb71 100644 --- a/versions/c-/capnproto.json +++ b/versions/c-/capnproto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17b054432f141c746019130d2b689d4fd4919938", + "version": "0.9.1", + "port-version": 2 + }, { "git-tree": "129b6b745372d94f313df0989ad6a8980d7eaef7", "version": "0.9.1", diff --git a/versions/c-/capstone.json b/versions/c-/capstone.json index bcd224fa77aa3d..6c1661c28de3d0 100644 --- a/versions/c-/capstone.json +++ b/versions/c-/capstone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5250715402bf0c970792dafe6947aa810adde0f1", + "version": "4.0.2", + "port-version": 3 + }, { "git-tree": "465e527988f09c855e156cff45b7ee6dfbe1d303", "version": "4.0.2", diff --git a/versions/c-/cargs.json b/versions/c-/cargs.json new file mode 100644 index 00000000000000..b25f1fc0fdc126 --- /dev/null +++ b/versions/c-/cargs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "afa520193b882259b02bd2f8646982d340374d2d", + "version": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 91244eb3971c78..d08a8d2f18159c 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b58473cdc953ae1d09f30f0ba1e641c6cc34719f", + "version-semver": "2.13.8", + "port-version": 0 + }, { "git-tree": "0660c4bbbe5bb0f8a605f956ae7d16f055e0e8c3", "version-semver": "2.13.7", diff --git a/versions/c-/cello.json b/versions/c-/cello.json index 1151051309026c..de140e58f25a32 100644 --- a/versions/c-/cello.json +++ b/versions/c-/cello.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a281b67048d19f8136aaa8e0198b1db5dec5c4dd", + "version-date": "2019-07-23", + "port-version": 2 + }, { "git-tree": "45d476438561ae8c8e7a8eb7871faadb1379e874", "version-string": "2019-07-23", diff --git a/versions/c-/cereal.json b/versions/c-/cereal.json index e74d7fc264dcb0..46847d295f3d90 100644 --- a/versions/c-/cereal.json +++ b/versions/c-/cereal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e292069bec2c118568ea23a3db965037a9e38790", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "7229804bbf716bbefe8052d650fc94687b6dae42", "version-string": "1.3.0", diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index b2284cd17c9e0e..30107ef846e4c0 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af54888fc010404793ba51c862147575c09a988b", + "version-semver": "2.0.0", + "port-version": 6 + }, { "git-tree": "07f2aa6906e97637ae7a4ed6dcfce6867eb1a049", "version-semver": "2.0.0", diff --git a/versions/c-/cfitsio.json b/versions/c-/cfitsio.json index adf8116dd3323e..42b71d6faf9889 100644 --- a/versions/c-/cfitsio.json +++ b/versions/c-/cfitsio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc1418de4f14dd9c1a7e9c9ebc8d8015e1769935", + "version": "3.49", + "port-version": 2 + }, { "git-tree": "0ed894cb8efbfd277570991a78f29b70e4e931cd", "version": "3.49", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index f434901701ed53..13b6b7272217a3 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0acdd574cd028b7ca4acd762f01938492c6d4719", + "version": "5.4", + "port-version": 0 + }, + { + "git-tree": "da69aec4c03275e85108ebc2dc2d512057d6ac32", + "version": "5.3.1", + "port-version": 0 + }, { "git-tree": "9c46ed672d5f8a2791349c1af1b44ed7dfcb6dd6", "version": "5.3", diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index 66253a2e8381ac..58aa5f895dc100 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "614248322cae7f18cd412cc90848a9f140ec9f60", + "version-date": "2021-04-22", + "port-version": 2 + }, + { + "git-tree": "8ce7ea484830cdf24c8af45ebad35ba10e76f61c", + "version-date": "2021-04-22", + "port-version": 1 + }, { "git-tree": "0aa775c085b114b0ec67ea23ee99ece252d9e498", "version-string": "2021-04-22", diff --git a/versions/c-/charls.json b/versions/c-/charls.json index e2f9510e0f455e..c2785ce7a87ca9 100644 --- a/versions/c-/charls.json +++ b/versions/c-/charls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb6273d01bce3793f42709b833ac47ff0afe71a6", + "version": "2.3.4", + "port-version": 0 + }, { "git-tree": "215d96df3e02eb0bfaae991586f4b64fd03c6cf2", "version-string": "2.2.0", diff --git a/versions/c-/chartdir.json b/versions/c-/chartdir.json index 13afedbde2ad4d..5121b6e16acdf4 100644 --- a/versions/c-/chartdir.json +++ b/versions/c-/chartdir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe0cf0c045f1092f18faa48f70b6b23d66e6298e", + "version": "7.0.0", + "port-version": 2 + }, { "git-tree": "fc56555cd56d261127f985f6208cb23258dcb262", "version": "7.0.0", diff --git a/versions/c-/chromium-base.json b/versions/c-/chromium-base.json index d109033d439cfe..74ed1896208618 100644 --- a/versions/c-/chromium-base.json +++ b/versions/c-/chromium-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36e6dbafdea0e90a8717907171efa375d2580d8b", + "version-string": "86.0.4199.1", + "port-version": 3 + }, { "git-tree": "e0ee4950d82a3613501a9647b688a451be6b187c", "version-string": "86.0.4199.1", diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json index 8c5b7c8e3068f7..d3c12485555410 100644 --- a/versions/c-/civetweb.json +++ b/versions/c-/civetweb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e09fcaf964728e71394be1fc43d018fcde2e355", + "version": "1.15", + "port-version": 1 + }, { "git-tree": "536e2167b093981486715537c12a52d0696b3840", "version": "1.15", diff --git a/versions/c-/clamav.json b/versions/c-/clamav.json index 6038414f131c12..645312b20e6142 100644 --- a/versions/c-/clamav.json +++ b/versions/c-/clamav.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36dda0d43469bb23e4d56b170e40261b810509f1", + "version-semver": "0.103.0", + "port-version": 3 + }, { "git-tree": "5580f5bf0e6812edc0e114f55b3377117b5aa6ff", "version-semver": "0.103.0", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index f0700bc5a0ffa4..421ccf45a63691 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fd47cedfcd13b7c3a339c7acf4b89c14caea8d5", + "version": "3.2.1", + "port-version": 20 + }, { "git-tree": "bedf61cf9cf765a2c823e1f2427a16af6d8a711e", "version-string": "3.2.1", diff --git a/versions/c-/clblas.json b/versions/c-/clblas.json index edd860f87243b4..7b8c3594f75eb2 100644 --- a/versions/c-/clblas.json +++ b/versions/c-/clblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a94b503ed4a4a74fa316ac65c363968092a0b026", + "version": "2.12", + "port-version": 6 + }, { "git-tree": "0972ab18d9864a174d8c9acb7cf1add27c6a4ce2", "version-string": "2.12", diff --git a/versions/c-/clblast.json b/versions/c-/clblast.json index c73b728261a2eb..d6f21f9022ef18 100644 --- a/versions/c-/clblast.json +++ b/versions/c-/clblast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e85773ea54da7675b468d6fd479871899667aa3a", + "version": "1.5.2", + "port-version": 1 + }, { "git-tree": "1908d2071402d3175fd77f272005be69ff02abbf", "version": "1.5.2", diff --git a/versions/c-/clfft.json b/versions/c-/clfft.json index 95a6affc4cbc51..d1c9665e0e447f 100644 --- a/versions/c-/clfft.json +++ b/versions/c-/clfft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdb3022cd3081e404b7c49ceaa5bd03ad0dc64f4", + "version": "2.12.2", + "port-version": 4 + }, { "git-tree": "14ad34cc8ef68a5583c4f5f0b54f3c9a57ee2bc0", "version-string": "2.12.2", diff --git a/versions/c-/clrng.json b/versions/c-/clrng.json index df9003660e0029..8fc6655362fc10 100644 --- a/versions/c-/clrng.json +++ b/versions/c-/clrng.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7cc0e3574395caa55371315638a94981a178f2bf", + "version-date": "2020-12-01", + "port-version": 3 + }, + { + "git-tree": "9e9072006facf085465f2bcc8291a3a90508c46a", + "version-date": "2020-12-01", + "port-version": 2 + }, { "git-tree": "1b8475c5bb62206bf9ebdd82ba3f04467aee6e95", "version-string": "2020-12-01", diff --git a/versions/c-/cnats.json b/versions/c-/cnats.json new file mode 100644 index 00000000000000..60faf07f088ef5 --- /dev/null +++ b/versions/c-/cnats.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ab962ebd7a13f87db7aea528cd4d5725b4fde292", + "version": "3.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/c-/co.json b/versions/c-/co.json index b11d5ac76b2f75..f5291d2e2abe18 100644 --- a/versions/c-/co.json +++ b/versions/c-/co.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "569af78fe06ff14cd71ec70f14915d06344ed62b", + "version-semver": "2.0.3", + "port-version": 1 + }, + { + "git-tree": "812bf72c24739504b6ddc3d3c4d941981ff3a032", + "version-semver": "2.0.3", + "port-version": 0 + }, { "git-tree": "b2b668ad241e0a4453f7a4f0a7c0b35e8c922e3b", "version-semver": "2.0.2", diff --git a/versions/c-/cocoyaxi.json b/versions/c-/cocoyaxi.json new file mode 100644 index 00000000000000..55eaafec097b0d --- /dev/null +++ b/versions/c-/cocoyaxi.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "991d1f948e96ec46e60f5d6925a825d63599eb44", + "version-semver": "2.0.3", + "port-version": 2 + }, + { + "git-tree": "5d874995d9ab680be3c0bb8d18ceebfd9485f1bd", + "version-semver": "2.0.3", + "port-version": 1 + } + ] +} diff --git a/versions/c-/coin.json b/versions/c-/coin.json index 6a52852b545626..006d2f924da567 100644 --- a/versions/c-/coin.json +++ b/versions/c-/coin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e974f1b74758c3af03beefadef6f060437a2af69", + "version-string": "4.0.0", + "port-version": 5 + }, { "git-tree": "e5bf7296f7f3b3655c946280754bbbfbbbf9db2a", "version-string": "4.0.0", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 026bb17632f2fd..3f00dddf1029a8 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "bf74fe8bdad103c3212e029ac7e736c759be2aa8", + "version-date": "2022-03-14", + "port-version": 0 + }, + { + "git-tree": "81329023ad5f9b2bd27554d2d8a97f8e63aef708", + "version-string": "3.7", + "port-version": 0 + }, + { + "git-tree": "7d3a2a8f71b464856f91f3b8b7e2362ec27d6487", + "version-string": "3.6", + "port-version": 2 + }, { "git-tree": "1f88c10f0bc3819bae7c197375bba335106726f1", "version-string": "3.6", diff --git a/versions/c-/comms.json b/versions/c-/comms.json index 5a0c6228f21f16..3584605796ad4d 100644 --- a/versions/c-/comms.json +++ b/versions/c-/comms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "377ae2ef208c319a5b1360f6dbce38ddae897466", + "version-semver": "3.4.0", + "port-version": 1 + }, { "git-tree": "05c5eff9612ccbb544cdcbc8f453e12394956ed8", "version-semver": "3.4.0", diff --git a/versions/c-/commsdsl.json b/versions/c-/commsdsl.json index 8096dfd07c351b..44b2e25937444d 100644 --- a/versions/c-/commsdsl.json +++ b/versions/c-/commsdsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dc397dcd2267999f4c8d34fabd9a7e2dcf48ced", + "version-semver": "3.6.4", + "port-version": 1 + }, { "git-tree": "0e714012afcd0c56b2b55f6ab18b0092f6cd0066", "version-semver": "3.6.4", diff --git a/versions/c-/coroutine.json b/versions/c-/coroutine.json index 3bb9ab69b7c838..9f4f3905a3bae2 100644 --- a/versions/c-/coroutine.json +++ b/versions/c-/coroutine.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c1ce0f42bbf3898d3421a3c7b6494f69853385f5", + "version": "1.5.0", + "port-version": 4 + }, + { + "git-tree": "d6cef429d17c011260cd718a2738ec7282098866", + "version": "1.5.0", + "port-version": 3 + }, { "git-tree": "14f8ad97489e980329f98d4c95146dafb32cedb9", "version-string": "1.5.0", diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index 230748b4ad3b6b..3f00794b6cb3ff 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55de9c78120ee08fc96d9a6badab8e1d137ab36a", + "version": "0.10.3", + "port-version": 0 + }, { "git-tree": "bfee573e08d3e240e345491ca8e9df1d4f86b05c", "version": "0.9.7", diff --git a/versions/c-/cpp-ipc.json b/versions/c-/cpp-ipc.json index 97dce1abedddd6..edac286d38c971 100644 --- a/versions/c-/cpp-ipc.json +++ b/versions/c-/cpp-ipc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86a57c4fce501c6a9bcde5728ea6787b7425176a", + "version": "1.0.1", + "port-version": 1 + }, { "git-tree": "28482723c3bf4c785828c44d7df79bb901404afd", "version": "1.0.1", diff --git a/versions/c-/cpp-netlib.json b/versions/c-/cpp-netlib.json index 56e9912661d79b..448a858494ed30 100644 --- a/versions/c-/cpp-netlib.json +++ b/versions/c-/cpp-netlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49ff4ae830f2e1ae9141ea3155c6d962ca1c7946", + "version-string": "0.13.0", + "port-version": 6 + }, { "git-tree": "28abab182be22ac70207027a6a7e206416bd28b0", "version-string": "0.13.0", diff --git a/versions/c-/cppad.json b/versions/c-/cppad.json index 38aadae7bedb11..ace126b5f9ca27 100644 --- a/versions/c-/cppad.json +++ b/versions/c-/cppad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e05a071cbc00d0343c57c70c2b0b043d570f8627", + "version-string": "20210000.7", + "port-version": 3 + }, { "git-tree": "5ec54e982dd160ae43272613536a53de6884d6d4", "version-string": "20210000.7", diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index ade141096f52c2..b476ab5426ee59 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05ef150cab0e8f56bd4f06b41baa9125d94e3451", + "version-string": "1.2.1", + "port-version": 4 + }, { "git-tree": "9582485ed72df7ad43d20b3680e13eaeb76f76e7", "version-string": "1.2.1", diff --git a/versions/c-/cppcoro.json b/versions/c-/cppcoro.json index daf5da05e52067..5febcb385298ae 100644 --- a/versions/c-/cppcoro.json +++ b/versions/c-/cppcoro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76350a224261bfe57c726e6f3a022d925cb26606", + "version-date": "2020-02-28", + "port-version": 3 + }, { "git-tree": "a9788359b921d309c2982f3f190ac9cb8583f28a", "version-string": "2020-2-28", diff --git a/versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json index ecfb828ecd560f..fff6678603f6fe 100644 --- a/versions/c-/cppgraphqlgen.json +++ b/versions/c-/cppgraphqlgen.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "95b14163e5e6caf3ae1795167c8ea9503c7a8153", + "version-semver": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "23ec5f0002e33dd6c76bab436dec806cfde33235", + "version-semver": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "6f5eb4a891a143e9d56a8e4791fb87da321a561c", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "0c1dadfa4133064be08120a65fd9e2ed3a339bb8", "version-semver": "3.6.0", diff --git a/versions/c-/cppunit.json b/versions/c-/cppunit.json index 181fce503f9a38..46d182a4b940f0 100644 --- a/versions/c-/cppunit.json +++ b/versions/c-/cppunit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "671d125960c9cce11a92b65b8bdfba73f85b09b5", + "version": "1.15.1", + "port-version": 3 + }, + { + "git-tree": "5a65f009e556f249711d69ed679c2b570d9e79db", + "version": "1.15.1", + "port-version": 2 + }, { "git-tree": "1384ee0101801f599b23f167aee7cfc733536022", "version": "1.15.1", diff --git a/versions/c-/cppxaml.json b/versions/c-/cppxaml.json new file mode 100644 index 00000000000000..94f9a1ec7730e6 --- /dev/null +++ b/versions/c-/cppxaml.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "57d825ac962df4a92481b82161ea7b7088929a82", + "version": "0.0.16", + "port-version": 0 + } + ] +} diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 62211198125bfc..f272c9fa5e8faa 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ada43417fa0d4613e92e3daafc717b83079d7959", + "version-semver": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "5adb33b62335c55231d3cd37e302c3487721a1d8", + "version-semver": "1.7.0", + "port-version": 0 + }, { "git-tree": "bc224c4615958fa1105b29a9d973555fda345de8", "version-semver": "1.6.2", diff --git a/versions/c-/cpu-features.json b/versions/c-/cpu-features.json index 3d96d9efb6942d..4a9fbc9fc0a7e2 100644 --- a/versions/c-/cpu-features.json +++ b/versions/c-/cpu-features.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7df362e53cec246374da4f3d192bb1d4bb71b2b9", + "version": "0.6.0", + "port-version": 1 + }, { "git-tree": "1e64c7ac2673d19f18e8bc447b14e3ae7f842c81", "version": "0.6.0", diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json index 658b88edbc9566..097f9d93f739ac 100644 --- a/versions/c-/cpuid.json +++ b/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa97f1bac97c79fa1595ed1a4b141c209fc375e8", + "version": "0.5.1", + "port-version": 3 + }, { "git-tree": "ad9738f7afc11f1fa0cea524f4d79dd6cc644e7c", "version": "0.5.1", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 8551c961a5a09d..6a57a61610372b 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88ee612aa949155b1e363bb710578811d3283033", + "version-date": "2020-03-18", + "port-version": 2 + }, { "git-tree": "1968933546b1d1a71dbe8869f68f13d014fcb943", "version-string": "2020-03-18", diff --git a/versions/c-/crashrpt.json b/versions/c-/crashrpt.json index 633efbaa4d5e66..55c72bc511dea9 100644 --- a/versions/c-/crashrpt.json +++ b/versions/c-/crashrpt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "896d96ee0613edabd92048142803845fa11baa68", + "version": "1.4.3", + "port-version": 2 + }, { "git-tree": "ad55102e0d167bb457349e5b2b4cec75efc45a91", "version": "1.4.3", diff --git a/versions/c-/crfsuite.json b/versions/c-/crfsuite.json index 60419940740417..0458068996234f 100644 --- a/versions/c-/crfsuite.json +++ b/versions/c-/crfsuite.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b74e8dd91be02cf5bbbd6f6387d66468fe579e8e", + "version-date": "2019-07-21", + "port-version": 3 + }, + { + "git-tree": "973286d78761d5a06d7188a21df0e15124dbf610", + "version-date": "2019-07-21", + "port-version": 2 + }, { "git-tree": "65bc9733064d028bb4f2960d824862263f74bfde", "version-date": "2019-07-21", diff --git a/versions/c-/croncpp.json b/versions/c-/croncpp.json index f1feb4ca48847a..99f598042fc628 100644 --- a/versions/c-/croncpp.json +++ b/versions/c-/croncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fb4aefe39d2d695cb5cc89a4f3c92e4229605f5", + "version-date": "2020-09-04", + "port-version": 3 + }, { "git-tree": "79f67dcb192287955f663db8cc36f73455f78990", "version-string": "2020-09-04", diff --git a/versions/c-/crossguid.json b/versions/c-/crossguid.json index dcffc082f74b3e..ce2ce308a90300 100644 --- a/versions/c-/crossguid.json +++ b/versions/c-/crossguid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93714099ddf83b2f3437a080c8acc08ff74cbe37", + "version-date": "2021-10-22", + "port-version": 2 + }, { "git-tree": "4e53633ff35a2bcfb9076aee3e0d740406e788d3", "version-date": "2021-10-22", diff --git a/versions/c-/crow.json b/versions/c-/crow.json index 2a3174ddd2a319..15360d025d2e98 100644 --- a/versions/c-/crow.json +++ b/versions/c-/crow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e3e9d55fe174a7a7fc05c8afdac245eea49a654", + "version": "0.3.4", + "port-version": 0 + }, { "git-tree": "a843201119b89aaf74f30b1b74e1309b71ce0310", "version": "0.3.3", diff --git a/versions/c-/cryptopp.json b/versions/c-/cryptopp.json index 56bb041ddbb988..879c3d14c7264e 100644 --- a/versions/c-/cryptopp.json +++ b/versions/c-/cryptopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d47535ac1767600626347e025079450a909c6ba", + "version": "8.6.0", + "port-version": 0 + }, { "git-tree": "2092d648b56a683bcd8b3e72f4adc3a966956c17", "version-string": "8.5.0", diff --git a/versions/c-/cspice.json b/versions/c-/cspice.json index 6586f30ebfaf08..9cb27a05fe4b5f 100644 --- a/versions/c-/cspice.json +++ b/versions/c-/cspice.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "1da82692c98d788552288f73818983fc3b561b7b", + "version": "67", + "port-version": 2 + }, + { + "git-tree": "2ad682ffd7b5b7cb6316fd77dc99dda7e6100731", + "version": "67", + "port-version": 1 + }, + { + "git-tree": "1c8f251f7712ff12e7b94d059a56eff69915fb43", + "version-string": "67", + "port-version": 0 + }, { "git-tree": "2b03824386796440e0b529f4e29413686f0fc5d5", "version-string": "66", diff --git a/versions/c-/ctemplate.json b/versions/c-/ctemplate.json index d9e9f8ecb4b78a..231ef80ca605da 100644 --- a/versions/c-/ctemplate.json +++ b/versions/c-/ctemplate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0cd0a34b622b661af41d0f829ad22e406cd6c7f", + "version-date": "2020-09-14", + "port-version": 3 + }, { "git-tree": "491ab782407b38835b9a555dc77e6d3af485fdae", "version-date": "2020-09-14", diff --git a/versions/c-/cuda.json b/versions/c-/cuda.json index 12a4ed37052bab..464080212fcb99 100644 --- a/versions/c-/cuda.json +++ b/versions/c-/cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7895738a8a164beddfb53c4c69352b202d8e13e9", + "version-string": "10.1", + "port-version": 9 + }, { "git-tree": "43b8008115ab934b4cf1b36c38bb02ed845712bd", "version-string": "10.1", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index a73767ce63da89..8828352aa56c30 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "203696f71dd43fa55a1b1104570135bebf869819", + "version": "7.82.0", + "port-version": 0 + }, + { + "git-tree": "30162d8bfeb7628fb397969fc95e379705a52509", + "version": "7.81.0", + "port-version": 0 + }, { "git-tree": "8e13da05c975cb6f5bed6cf3b8054a817a00b45d", "version": "7.80.0", diff --git a/versions/c-/curlpp.json b/versions/c-/curlpp.json index 33f166cd3ded0e..1398ea703b426d 100644 --- a/versions/c-/curlpp.json +++ b/versions/c-/curlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebde1c1d303f750ce06e530295a820787878e6cd", + "version-date": "2018-06-15", + "port-version": 7 + }, { "git-tree": "a4cea77cfb3429b1ea778167d06c39a691b97e13", "version-date": "2018-06-15", diff --git a/versions/c-/cutelyst2.json b/versions/c-/cutelyst2.json index 5fd0104ed44085..f8b3f1ef904ffa 100644 --- a/versions/c-/cutelyst2.json +++ b/versions/c-/cutelyst2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b172ddad5af65084452d225b55de761bcf4b8592", + "version": "2.12.0", + "port-version": 2 + }, { "git-tree": "1ad13c203a854aeb411f66b4f8e083882d7415cd", "version-string": "2.12.0", diff --git a/versions/d-/dartsim.json b/versions/d-/dartsim.json index 1989a58caf78d7..bea457455c3730 100644 --- a/versions/d-/dartsim.json +++ b/versions/d-/dartsim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b816d852610f6ef105eedc49bcbe6ae4881f759", + "version": "6.11.0", + "port-version": 3 + }, { "git-tree": "f7fc216f598684b22949d55f2d573137965a4d2d", "version": "6.11.0", diff --git a/versions/d-/date.json b/versions/d-/date.json index c5d967f1b70046..61c6c4941d1f1d 100644 --- a/versions/d-/date.json +++ b/versions/d-/date.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e281c60aee492a2be56e78ce6a53cb5db927b1dc", + "version": "3.0.1", + "port-version": 1 + }, { "git-tree": "8d9a771765181237930138b7c4809babbd814cfb", "version": "3.0.1", diff --git a/versions/d-/dav1d.json b/versions/d-/dav1d.json index 0871da5a96258c..064c5d579d6540 100644 --- a/versions/d-/dav1d.json +++ b/versions/d-/dav1d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d92dfe48dbd557d90d9c216bc5a5a4b9435939c1", + "version-semver": "0.8.2", + "port-version": 3 + }, + { + "git-tree": "d0d3738c56710defd998cb619b649ddf6e43e017", + "version-semver": "0.8.2", + "port-version": 2 + }, { "git-tree": "d06178194bfa123b40c146ad161200d3e491f48b", "version-semver": "0.8.2", diff --git a/versions/d-/dbghelp.json b/versions/d-/dbghelp.json index b279a5b45744c2..064c04c4af2aef 100644 --- a/versions/d-/dbghelp.json +++ b/versions/d-/dbghelp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c90a3ad39f6dc1e0558acf89de26f220d0fd0c1f", + "version": "0", + "port-version": 2 + }, { "git-tree": "70109bd0d38dce02dc4ee2258fc40a2df72559f8", "version-string": "0.0", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index 98820308ec2379..a75be29323c158 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce25087f7df7d83c796eee09b4457e7aa70848ad", + "version": "3.6.6", + "port-version": 3 + }, { "git-tree": "24716759e4aa3fb67b014163ae3be95ad88120b6", "version-string": "3.6.6", diff --git a/versions/d-/decimal-for-cpp.json b/versions/d-/decimal-for-cpp.json index 9bc9ed12fca49a..2923eaa7d02ecf 100644 --- a/versions/d-/decimal-for-cpp.json +++ b/versions/d-/decimal-for-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6b418fe87e9affcbb4605d4aeb10e5e6883b239", + "version-string": "1.18", + "port-version": 0 + }, { "git-tree": "0279d4ae637ef0b7380ad1193282a5f76b4d27f3", "version-string": "1.16", diff --git a/versions/d-/detours.json b/versions/d-/detours.json index d5b7471a31a528..b868ac038c5fd5 100644 --- a/versions/d-/detours.json +++ b/versions/d-/detours.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9dc31719cf3c251f0530bf8ddb5c6131590386da", + "version": "4.0.1", + "port-version": 5 + }, { "git-tree": "5399f9185e9e7d815bf3c8380e745b5be77c2258", "version-string": "4.0.1", diff --git a/versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json index f8eebb52fca416..fe2447d1b9f9fb 100644 --- a/versions/d-/devicenameresolver.json +++ b/versions/d-/devicenameresolver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a87ff3bcc7e455cf7b73ca36ff4e7ac0c54faba1", + "version-string": "2016-06-26-0850d88fa6", + "port-version": 3 + }, { "git-tree": "1c24f08a86eef969a65c6acdd123edfe704c4c0c", "version-string": "2016-06-26-0850d88fa6", diff --git a/versions/d-/dimcli.json b/versions/d-/dimcli.json index f6e8eab856ef3a..f50b0395353a2c 100644 --- a/versions/d-/dimcli.json +++ b/versions/d-/dimcli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d3878991b69b5ed78b2d82c56c5d3a707e13eb0", + "version-semver": "5.0.2", + "port-version": 3 + }, { "git-tree": "9901ca1f1a121a702d4fb4c73ad6a482adff6c3f", "version-semver": "5.0.2", diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json index 6e1917dd919b66..7f8bb1812bf07a 100644 --- a/versions/d-/directx-headers.json +++ b/versions/d-/directx-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9da93d00966da04931e1eab14be7bb4fc8998d5", + "version": "1.4.9", + "port-version": 1 + }, { "git-tree": "bf1d2dfc334ecb42998d443147a2acd5eb88e312", "version": "1.4.9", diff --git a/versions/d-/directxmath.json b/versions/d-/directxmath.json index 44477eae718b15..0bd805c40d8bf5 100644 --- a/versions/d-/directxmath.json +++ b/versions/d-/directxmath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebf69755284c5ea16a26b4dbfa4534af962c96a0", + "version-date": "2022-01-18", + "port-version": 0 + }, { "git-tree": "d02145b6ed0cbe882bfb75291f832a11ab0582ce", "version-string": "jan2021", diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index 168e5a42c4739d..d22dbc28242776 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "aef77bf208f6e95c682fd8d41590c5b0516f1f0f", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "a8cbbe307c2ac5a241a6ec4b1e76e121a1ffb2db", + "version-date": "2021-11-08", + "port-version": 1 + }, { "git-tree": "3680e7acf9764cc28152bc39b02497d4a7c13797", "version-date": "2021-11-08", diff --git a/versions/d-/directxsdk.json b/versions/d-/directxsdk.json index c40d1fad2adb82..8beece35ad5ddc 100644 --- a/versions/d-/directxsdk.json +++ b/versions/d-/directxsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bed733174eb790455d8da61a3df3d89a631365d", + "version-string": "jun10", + "port-version": 5 + }, { "git-tree": "440a5b43febdcc709d9ae1d768371c0b184ca92e", "version-string": "jun10", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index c383fe172fe79e..613d5345c2b74f 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "424610ae5719fee5f738756146719d13d1483879", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "ec03f6fb3941d00726655dae315f09b6eb47d9ce", + "version-date": "2021-11-08", + "port-version": 1 + }, { "git-tree": "5c53206e385754a983e7f7c4ed208cc12f2cee44", "version-date": "2021-11-08", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index f90e634954c9e8..347b73c7e84381 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "64937ca8d8ec8cc57bfdea9fea74bd39cd0ea507", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "34ecf07435420320f41c8aa7405926dc300359b2", + "version-date": "2021-11-08", + "port-version": 1 + }, { "git-tree": "57d691bc395a321a33bf9ed67cdafe438ab28a1f", "version-date": "2021-11-08", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index 90580fd3a96ee2..a7f248db1a4f61 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e324f5499354e15e49fa1c591ab864b114518e74", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "2019efd91b858e5075651d1ebbfa45dc1961aa2d", + "version-date": "2021-11-08", + "port-version": 1 + }, { "git-tree": "538dfbadce1c413fae24e65d900ab30ca5ff6877", "version-date": "2021-11-08", diff --git a/versions/d-/discord-game-sdk.json b/versions/d-/discord-game-sdk.json index d1768f1706d256..636bbfe88ea787 100644 --- a/versions/d-/discord-game-sdk.json +++ b/versions/d-/discord-game-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "792eac2fec1f5fbeff9cd819c73a08b8eefabb14", + "version": "2.5.6", + "port-version": 4 + }, { "git-tree": "4ddd26248ed26eb2676c96330e8ae5a0c3f82a3d", "version": "2.5.6", diff --git a/versions/d-/dlfcn-win32.json b/versions/d-/dlfcn-win32.json index df182c5859b404..f3208fac6c871a 100644 --- a/versions/d-/dlfcn-win32.json +++ b/versions/d-/dlfcn-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ae0dd5fc5f29e2299690404410ce7129ec5c035", + "version": "1.1.1", + "port-version": 6 + }, { "git-tree": "37cc87e9f214e146c81fff2a8aa5ae018622674d", "version-string": "1.1.1", diff --git a/versions/d-/dlib.json b/versions/d-/dlib.json index bc4a094ae6df12..a1af91a2234c1a 100644 --- a/versions/d-/dlib.json +++ b/versions/d-/dlib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "825d6117ba43320dd5969535320b8be3144ea9de", + "version": "19.23", + "port-version": 0 + }, + { + "git-tree": "c92510c697bca717ad070d4462e44a4c26735b91", + "version": "19.22", + "port-version": 0 + }, { "git-tree": "971541b525e72e4ca19c0e20d7ddf7ce1cd2ee83", "version": "19.21", diff --git a/versions/d-/dmlc.json b/versions/d-/dmlc.json index 97a0362d2bdb11..72b091b613a27f 100644 --- a/versions/d-/dmlc.json +++ b/versions/d-/dmlc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d1ce501d0c9ed32e6de5f73290635b259f67364", + "version-date": "2019-08-12", + "port-version": 7 + }, { "git-tree": "47d5b971d74b762c6c52e676d5c1c082ee462c0e", "version-date": "2019-08-12", diff --git a/versions/d-/doctest.json b/versions/d-/doctest.json index d413559fa0a8ed..f2afaf04b548b8 100644 --- a/versions/d-/doctest.json +++ b/versions/d-/doctest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74d6364092a4086dd36a0d54a3d16e3cc24fe478", + "version": "2.4.8", + "port-version": 0 + }, { "git-tree": "15aee759d06d6b4a61bc3fec3ecd1fbfac7c1d05", "version": "2.4.6", diff --git a/versions/d-/double-conversion.json b/versions/d-/double-conversion.json index c6d5973e87ae14..133306d2c51814 100644 --- a/versions/d-/double-conversion.json +++ b/versions/d-/double-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b85d7877f614063165639f251200a65e8d5c9ba5", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "d28a31601897003105b70c847d82a82cd5b5355a", "version-string": "3.1.5", diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index a93a78ef7eb33b..7e0e9d97fe6c0b 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "a66c2bb4632ab86589f1cabed26607d510ae2eba", + "version-semver": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "b7be1868461c479ff45609e892bc5de9adf42258", + "version-semver": "1.7.4", + "port-version": 2 + }, + { + "git-tree": "e5e1c950e966613f9b867570346f9458bff71826", + "version-semver": "1.7.4", + "port-version": 1 + }, + { + "git-tree": "275d55a78bb61a79f0d66cd4f71e6b5892566666", + "version-semver": "1.7.4", + "port-version": 0 + }, { "git-tree": "35877feed401993a073b537fbd89f8b55b5be6d1", "version-semver": "1.7.3", diff --git a/versions/d-/duilib.json b/versions/d-/duilib.json index efe7ebaf06ba94..3b6ebdde120cbd 100644 --- a/versions/d-/duilib.json +++ b/versions/d-/duilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36c7ba26c4af9fabce94dfb4a2ffe87b7b7467c0", + "version-date": "2019-04-28", + "port-version": 5 + }, { "git-tree": "c23619497c06f6d2e22dae79e731c2a7da51208c", "version-string": "2019-4-28", diff --git a/versions/d-/dxsdk-d3dx.json b/versions/d-/dxsdk-d3dx.json index f6594d45f62cf9..564fde24f417de 100644 --- a/versions/d-/dxsdk-d3dx.json +++ b/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f16a0560a2beb7205ed033b5ac2e5d5d2223161", + "version": "9.29.952.8", + "port-version": 2 + }, { "git-tree": "81aeb21cd027336b00f758ece5371f0c4930be2e", "version": "9.29.952.8", diff --git a/versions/d-/dxut.json b/versions/d-/dxut.json index ef3b7c69c04849..3ce7912d854411 100644 --- a/versions/d-/dxut.json +++ b/versions/d-/dxut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8f2fd1c9674e75aee3d139934b3980a47b3d0eb", + "version": "11.26", + "port-version": 1 + }, { "git-tree": "098b30a228f1d71cfa5b0e21a4c9bf9ade3774e6", "version": "11.26", diff --git a/versions/e-/earcut-hpp.json b/versions/e-/earcut-hpp.json new file mode 100644 index 00000000000000..41b661439a6f67 --- /dev/null +++ b/versions/e-/earcut-hpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "89c9c15fcd180f5e17b02290430dfe7019dc830c", + "version": "2.2.3", + "port-version": 0 + } + ] +} diff --git a/versions/e-/eastl.json b/versions/e-/eastl.json index 7a67948716fa29..a62180cf88363c 100644 --- a/versions/e-/eastl.json +++ b/versions/e-/eastl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa2de2990c3b1e6e008e1cafea8ad82c765278fb", + "version-string": "3.18.00", + "port-version": 2 + }, { "git-tree": "41bc58f85c73fb0dec5374fc0c9b84ffc401555c", "version-string": "3.18.00", diff --git a/versions/e-/easyhook.json b/versions/e-/easyhook.json index c914ec2956e6da..4c770cc0e6c663 100644 --- a/versions/e-/easyhook.json +++ b/versions/e-/easyhook.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "71b209c038081c700231ebc3be136c6976f22c4b", + "version": "2.7.7097.0", + "port-version": 5 + }, + { + "git-tree": "54eb13c17af41e5e869503410d13f67e6886c8ff", + "version": "2.7.7097.0", + "port-version": 4 + }, { "git-tree": "6fefce9309d25f4fdd8675a3168cbfd049f9b863", "version": "2.7.7097.0", diff --git a/versions/e-/eathread.json b/versions/e-/eathread.json index b9ee874827df12..4568b724d3b451 100644 --- a/versions/e-/eathread.json +++ b/versions/e-/eathread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "341734fa50c34beff0593368922f71829fb0ff19", + "version-string": "1.32.09", + "port-version": 3 + }, { "git-tree": "273dda3270d68ca1c465bb093cba07e71bd6a62f", "version-string": "1.32.09", diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json index 405ac37d505291..dada9a3c91e752 100644 --- a/versions/e-/ecm.json +++ b/versions/e-/ecm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "563a564f43f7e1c096cd7819531a6eece87ddcde", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "4cd5223b0a590ec5f428aa83cd4e0d3f486ad273", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "326da23f3132279545c12d753b9f7f22712fe95f", "version": "5.87.0", diff --git a/versions/e-/ecsutil.json b/versions/e-/ecsutil.json index 65def84ff23eba..61d35945c0096a 100644 --- a/versions/e-/ecsutil.json +++ b/versions/e-/ecsutil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93fbfca024b36b2424e521b4426efa8d40028291", + "version-string": "1.0.7.15", + "port-version": 2 + }, { "git-tree": "7fb65a14c061886745af3a158b7f2bc8b71184fc", "version-string": "1.0.7.15", diff --git a/versions/e-/effects11.json b/versions/e-/effects11.json index 4850d41d5c1966..8389d07440a1c6 100644 --- a/versions/e-/effects11.json +++ b/versions/e-/effects11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2c6305e1ca4352d853c035f29d1d7daa3e47444", + "version": "11.26", + "port-version": 2 + }, { "git-tree": "ed264ec7ce47f6c0ad48933d3ced950b4841726f", "version": "11.26", diff --git a/versions/e-/efsw.json b/versions/e-/efsw.json index c58cd1f6db35ae..e33826cd97ed4e 100644 --- a/versions/e-/efsw.json +++ b/versions/e-/efsw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ebed2c2027b2500f01aa9f755df88098810826e", + "version-date": "2020-06-08", + "port-version": 3 + }, { "git-tree": "67bb6e4495d7a98abb97ef8da9d7486508974042", "version-string": "2020-06-08", diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 37649711cfff52..9b886bc0c6fc08 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4b40326590314e1f3a08c75e83a42d0738040b68", + "version": "3.4.0", + "port-version": 1 + }, + { + "git-tree": "0475ed327bda734cad0acd35978cde9379bc8619", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "2b845a54aa220fa4099e97be4031cb63634665e3", "version-string": "3.3.9", diff --git a/versions/e-/elfio.json b/versions/e-/elfio.json index fb92088639bf54..01d0d53b603e47 100644 --- a/versions/e-/elfio.json +++ b/versions/e-/elfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76c8087deffd555757001f6c2dcf33f59901290f", + "version": "3.10", + "port-version": 0 + }, { "git-tree": "4c3c450c25f313eba1565d93542dbe2caa17aec4", "version": "3.9", diff --git a/versions/e-/elfutils.json b/versions/e-/elfutils.json index 6c9d614b27222a..2bd68e50f658c7 100644 --- a/versions/e-/elfutils.json +++ b/versions/e-/elfutils.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "03e8299432623718bf6b58a61d19d408b6c8828c", + "version": "0.186", + "port-version": 2 + }, + { + "git-tree": "1e219cc99d3cfb41ba24f835240acf510a62bc3c", + "version-string": "0.186", + "port-version": 1 + }, + { + "git-tree": "18162722eb91e8a24f6ce1ba945a8a2e1af90896", + "version-string": "0.186", + "port-version": 0 + }, + { + "git-tree": "9aa4fefa61893cd4b37c0f1a2f16ab255ab0c4bf", + "version-string": "0.182", + "port-version": 2 + }, { "git-tree": "aa738c679581e92da4ec8a1662171ac5608e3744", "version-string": "0.182", diff --git a/versions/e-/embree2.json b/versions/e-/embree2.json index 668cfc9cc572c1..6b45901ef323ab 100644 --- a/versions/e-/embree2.json +++ b/versions/e-/embree2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59aae2cf542f2420880b312e4e5071c6afcd5aaa", + "version-semver": "2.17.7", + "port-version": 4 + }, { "git-tree": "b4048eb6da97d8a23b849a1b5fba7ba93f9c33bf", "version-semver": "2.17.7", diff --git a/versions/e-/ensmallen.json b/versions/e-/ensmallen.json index 0f5add203fe078..b0948965ae4eb2 100644 --- a/versions/e-/ensmallen.json +++ b/versions/e-/ensmallen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed0e9e790165bbba1a04b3a8fb6b89c67e1b64f8", + "version-semver": "2.18.1", + "port-version": 0 + }, { "git-tree": "98fdc863799d6cadd208a558f158894df03fdcaf", "version-semver": "2.17.0", diff --git a/versions/e-/entt.json b/versions/e-/entt.json index 629e3aef7e83e4..ab23301a9a3ee4 100644 --- a/versions/e-/entt.json +++ b/versions/e-/entt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74ad1980650c2f8ecb6369b8b981711f96f7bd08", + "version": "3.9.0", + "port-version": 0 + }, { "git-tree": "c1b20a18637e66b31dcda3a46341bf10548b78e8", "version": "3.8.0", diff --git a/versions/e-/eve.json b/versions/e-/eve.json new file mode 100644 index 00000000000000..8b4b6b2b3bce18 --- /dev/null +++ b/versions/e-/eve.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "95251169868c628e8099f89d14671ef946fd918d", + "version-date": "2021-10-16", + "port-version": 0 + } + ] +} diff --git a/versions/e-/eventpp.json b/versions/e-/eventpp.json new file mode 100644 index 00000000000000..4b723916d6f96c --- /dev/null +++ b/versions/e-/eventpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3f11cacc8b5a6f9f2951992d29cee39e52ef601f", + "version-semver": "0.1.2", + "port-version": 0 + } + ] +} diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index b98e6e654c75c5..383a243504e377 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5e7341b739d7b05fbb40492158b01b8fa9fcdb74", + "version": "0.27.5", + "port-version": 1 + }, + { + "git-tree": "65e38e497c48c6e2fc463997ce9998e6af9f56b5", + "version": "0.27.5", + "port-version": 0 + }, { "git-tree": "4ce7841080b34ab8f91006430e9a40e0d9bfba96", "version": "0.27.4", diff --git a/versions/e-/exprtk.json b/versions/e-/exprtk.json index 0dd368f44ef3a1..473d7ccab0a64b 100644 --- a/versions/e-/exprtk.json +++ b/versions/e-/exprtk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f643b034afeb28a7e39b6556eb78594aa49181a4", + "version-date": "2022-01-01", + "port-version": 2 + }, + { + "git-tree": "2cf53dbae59a6b96821ac0407d0bb9a87dd2561c", + "version-date": "2021-01-01", + "port-version": 2 + }, { "git-tree": "f43789e8da0899715ef1d0544880baa13ce38d64", "version-string": "2021-01-01", diff --git a/versions/f-/faad2.json b/versions/f-/faad2.json index 18db5fc847ec47..40a3d2c83487bc 100644 --- a/versions/f-/faad2.json +++ b/versions/f-/faad2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67b420585d5f99b7dec259912abd2d7edcfb9492", + "version": "2.9.1", + "port-version": 5 + }, { "git-tree": "a1ec8e5247412b2ba6584c63307f88fe91d12251", "version": "2.9.1", diff --git a/versions/f-/faiss.json b/versions/f-/faiss.json index 8e9e24bd9581b5..58721b0dfe53a3 100644 --- a/versions/f-/faiss.json +++ b/versions/f-/faiss.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1f9afe2148c0cfa76354882e136af60bab695061", + "version-semver": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "efbc0f9d771826b57c327d3a008ee4bff6bdbda1", + "version-semver": "1.7.1", + "port-version": 1 + }, { "git-tree": "7c8e333f76263e7ca027e52fdf1d14b025be234c", "version-semver": "1.7.1", diff --git a/versions/f-/fakeit.json b/versions/f-/fakeit.json index c849a4fd32abac..328716091de5c4 100644 --- a/versions/f-/fakeit.json +++ b/versions/f-/fakeit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e69fbaa4aed8ea6adf901929dd369ead884b9977", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "c7be74886e3d0e180a2abc712c1f95f26f6f3c67", "version": "2.0.9", diff --git a/versions/f-/fastcgi.json b/versions/f-/fastcgi.json index 13622e826fa8a9..3f2460989a7982 100644 --- a/versions/f-/fastcgi.json +++ b/versions/f-/fastcgi.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8a8f47edb8fc80608665c48ace9195e2334c3b6e", + "version-date": "2020-09-11", + "port-version": 4 + }, + { + "git-tree": "b3d35715764de0b692fb70742856d39b75bb625d", + "version-date": "2020-09-11", + "port-version": 3 + }, { "git-tree": "f99bded0b957390244bb1c1327dd84dbd5a43634", "version-date": "2020-09-11", diff --git a/versions/f-/fbgemm.json b/versions/f-/fbgemm.json index 2308259e2dce2f..1fcf80162d2f7c 100644 --- a/versions/f-/fbgemm.json +++ b/versions/f-/fbgemm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89489c3afc56789dd2a8344dc89455723ec0eec3", + "version-date": "2021-03-18", + "port-version": 3 + }, { "git-tree": "8707b988ad38aae04720ce3494ef09603bd67954", "version-date": "2021-03-18", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index e6231a686d009c..3d7727e53c1fa7 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "bf1148604c897c7727621feb13713eac7e782497", + "version-string": "2022.01.31.00", + "port-version": 1 + }, + { + "git-tree": "f92f736e3c525d5ac52b546eae1e0b9cf880b382", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "3b06c9c143910647d74c5688610fc294bc493849", + "version-string": "2021.06.14.00", + "port-version": 1 + }, { "git-tree": "f57f144d8d7fe3db4534798d827e2e217f6e9b35", "version-string": "2021.06.14.00", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 053d53caa61ca4..0ca67085003988 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,50 @@ { "versions": [ + { + "git-tree": "d525f98e7146a1fd731febe7c472232142d62821", + "version": "4.4.1", + "port-version": 10 + }, + { + "git-tree": "558575c9b18b2ff734d48fe175e61f5a11c02ce4", + "version": "4.4.1", + "port-version": 9 + }, + { + "git-tree": "03b7a2329bc927de9637d45738c23e607e4f4387", + "version": "4.4.1", + "port-version": 8 + }, + { + "git-tree": "8b692478001452049ea19d32ec199f58c5de3a77", + "version": "4.4.1", + "port-version": 7 + }, + { + "git-tree": "f81278fe4661e442e3bd6ea274af6b397e4e3ff5", + "version": "4.4.1", + "port-version": 6 + }, + { + "git-tree": "9e9f11b54d40824604dc895ac7f9f0a39dc21486", + "version": "4.4.1", + "port-version": 5 + }, + { + "git-tree": "d7e12377ceb86caf3720807cb4be9f0f51c93798", + "version": "4.4.1", + "port-version": 4 + }, + { + "git-tree": "00480edd2a451f2a3a55452779f524709ee52585", + "version": "4.4.1", + "port-version": 3 + }, + { + "git-tree": "7576aa6e0cfa9b2e58abe51484cab6fd16337465", + "version": "4.4.1", + "port-version": 2 + }, { "git-tree": "c73820dc30c5ade90b5ae3da082420669b78d953", "version": "4.4.1", diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index c249b192e93062..dc6a492f982925 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f49e200522747c711e28db563004ce1f5a2f816", + "version": "11.1.5.0", + "port-version": 1 + }, { "git-tree": "b86f38b94c28605c5f3b2bc060b8e43e26e0ad42", "version": "11.1.5.0", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index ecf57550990fb0..27f1fec620b346 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bd307eb2dafcd4938d16fc484fbbb731228f4c3", + "version": "3.3.10", + "port-version": 3 + }, { "git-tree": "3cd11b90c63cec797697dc3235ae1e22e4a509fc", "version": "3.3.10", diff --git a/versions/f-/fftwpp.json b/versions/f-/fftwpp.json index 5427eaba1d2d48..696a59c994cb89 100644 --- a/versions/f-/fftwpp.json +++ b/versions/f-/fftwpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7eb11bd6344e0d4db5a9e510a980ec2fedfdf90", + "version-date": "2019-12-19", + "port-version": 2 + }, { "git-tree": "d9b689681032352f667f7335feed82d0260fe5bf", "version-string": "2019-12-19", diff --git a/versions/f-/field3d.json b/versions/f-/field3d.json index 380afc32399615..e26752a6bc1546 100644 --- a/versions/f-/field3d.json +++ b/versions/f-/field3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "272cb43e1adfe3c332af92658966a37ab59b8a53", + "version": "1.7.3", + "port-version": 3 + }, { "git-tree": "54a68f2c7d892d5876ff65ad373907bdcfc1b17e", "version-string": "1.7.3", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 076a17f99ede8e..13c383d1583429 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "57fdd6342f89ccc3569b1a3416be67cd8dd7b59d", + "version-string": "2022.01.31.00", + "port-version": 1 + }, + { + "git-tree": "14651559e385107d92830b5464007f7b49a1ce4c", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "8472de52ae8a7914ab4c87e23be8250ae497a0aa", + "version-string": "2021.06.14.00", + "port-version": 1 + }, { "git-tree": "522047f79c1dde2cfbc509a21b4f1faf910efb12", "version-string": "2021.06.14.00", diff --git a/versions/f-/flann.json b/versions/f-/flann.json index 19f01d96b347cf..71d955c8c67541 100644 --- a/versions/f-/flann.json +++ b/versions/f-/flann.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b31eace0fd51c64ee799affea9ef2127dab68a25", + "version-date": "2019-04-07", + "port-version": 5 + }, + { + "git-tree": "9ceb0dabb980c9cdfb5d9cf1a23e66ec90e75285", + "version-date": "2019-04-07", + "port-version": 4 + }, { "git-tree": "7677f18c73aa0d5216af138b2fba9bcea56e3f1b", "version-date": "2019-04-07", diff --git a/versions/f-/flash-runtime-extensions.json b/versions/f-/flash-runtime-extensions.json new file mode 100644 index 00000000000000..c2f0d09cc4d0d7 --- /dev/null +++ b/versions/f-/flash-runtime-extensions.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ae5a85fa619355c266c5232762456120280d4046", + "version": "2.4", + "port-version": 1 + }, + { + "git-tree": "39452440462486913d797009f7e4676d95f1ad7b", + "version": "2.4", + "port-version": 0 + } + ] +} diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index f6805b6df702c0..6e2a73e54bdcd7 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8713fce3bc50837e44d958ddc745471619c511c4", + "version": "2.0.0", + "port-version": 3 + }, { "git-tree": "65234b189b0389dfa2f89f58f33e56037a03b519", "version-string": "2.0.0", diff --git a/versions/f-/flint.json b/versions/f-/flint.json index 266b67e6534e45..ea685f8d13c5d6 100644 --- a/versions/f-/flint.json +++ b/versions/f-/flint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26e57956bebf9fb602b989791e663db8cd4f686b", + "version-semver": "2.8.0", + "port-version": 1 + }, { "git-tree": "270de68a6011ec21e64b76b4db6c99e9fd76930a", "version-semver": "2.8.0", diff --git a/versions/f-/fltk.json b/versions/f-/fltk.json index 4786b8b8c35d27..07d0695eeeaddf 100644 --- a/versions/f-/fltk.json +++ b/versions/f-/fltk.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "86da5d186aa27c3a6a9a9903eaa2806edde44bd8", + "version": "1.3.8", + "port-version": 1 + }, + { + "git-tree": "0a6f2dbd574e17da82e99414a644fca8f8efce52", + "version": "1.3.8", + "port-version": 0 + }, + { + "git-tree": "3acdb7ac34f79b7fdf7ac043ad12b5568de92309", + "version": "1.3.7", + "port-version": 1 + }, { "git-tree": "3fff1ed0fe94c6d45ad15d6cb6f575537880f1f6", "version": "1.3.7", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index d129246ee45859..09153fa1a04dbe 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5ffab5df62c9846a6daa5acbd13fd6966594ed77", + "version": "2.2.4", + "port-version": 1 + }, + { + "git-tree": "58a7811a7b66e82115753272bd70dda10075217b", + "version": "2.2.4", + "port-version": 0 + }, { "git-tree": "d9e09f93f0880db415faf7f65f4dd483a5b2882a", "version": "2.2.1", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 563687b9ed0529..c016f90d17241c 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "602d9743b7957c9e82a06d0e81d58637c6df5222", + "version": "8.1.1", + "port-version": 1 + }, + { + "git-tree": "9748716da169977423d02b3c3f0de7b7f274e34e", + "version": "8.1.1", + "port-version": 0 + }, + { + "git-tree": "3aa440d7c335eb584170ae5fdf4eea6a17c900ee", + "version": "8.1.0", + "port-version": 0 + }, { "git-tree": "105214e3085a1404bca0fa89e7d80aa016e8cacb", "version-semver": "8.0.1", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 689c82a265ba9b..112c1639c645f7 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "10d3306d94114d0916a4691c131e233c08dc9090", + "version-string": "2022.01.31.00", + "port-version": 1 + }, + { + "git-tree": "b6f74d739ff2aef400ac83919bd9753eb1cc647f", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "c31f74183da180ea71937f3c5b6ac0c8a3619b1b", + "version-string": "2021.06.14.00", + "port-version": 4 + }, { "git-tree": "8bba15fddadde6b40f2984f6928aa24a50aa2b47", "version-string": "2021.06.14.00", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 858b1f630c768a..c5d5a8d137b37b 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2f32046747209c234e60dc297b48d5bdc7ee4494", + "version": "2.13.94", + "port-version": 5 + }, + { + "git-tree": "41142efe19b6591f0de47857a32fecdb8bbfc717", + "version": "2.13.94", + "port-version": 4 + }, { "git-tree": "6b0bf8a5aa81b6f10909b6d303be77553ca26011", "version": "2.13.94", diff --git a/versions/f-/foxi.json b/versions/f-/foxi.json new file mode 100644 index 00000000000000..f1c10f5bf3ddd6 --- /dev/null +++ b/versions/f-/foxi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b01a376dbabc364856cd79e1099cd703e9d46053", + "version-date": "2021-12-01", + "port-version": 0 + } + ] +} diff --git a/versions/f-/freeimage.json b/versions/f-/freeimage.json index bc867ec11d2651..8c6c1586b18fc4 100644 --- a/versions/f-/freeimage.json +++ b/versions/f-/freeimage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bad6f331c05331144e8bad4a2ef63d4c594cd5a", + "version": "3.18.0", + "port-version": 22 + }, { "git-tree": "7d0f28dd10d54f1f11d09875fbfafd1579e948c4", "version": "3.18.0", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index f3ee664014b452..9864e5a11e78f9 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8f786583b737855616d84a5177491deaf7d367a0", + "version": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "e2fdb84a883ddea3d2dd68e8cc1faea98e991e83", + "version": "2.4.0", + "port-version": 3 + }, { "git-tree": "ff0fd25e52b0e89c620968aa07fca66a086957c7", "version": "2.4.0", diff --git a/versions/f-/freetds.json b/versions/f-/freetds.json index cb6828f879e92c..19513003f0a784 100644 --- a/versions/f-/freetds.json +++ b/versions/f-/freetds.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3cbd323de7835a0dc5239e8b51b20f783121bdb", + "version": "1.2.11", + "port-version": 2 + }, { "git-tree": "78236f0bd404616850bc174e84bb6736cc197d73", "version-string": "1.2.11", diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json index 55c9b9b2f703ec..44e5af5bd0ed34 100644 --- a/versions/f-/freetype.json +++ b/versions/f-/freetype.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dadbf4b6e5f5670bf49489e26de326be6a72f962", + "version-semver": "2.11.1", + "port-version": 0 + }, { "git-tree": "9d21ff9f7071d83c1e04eca8cae21b99438400d8", "version-semver": "2.11.0", diff --git a/versions/f-/fribidi.json b/versions/f-/fribidi.json index 86abb9f8683bd8..b291a97776ef4d 100644 --- a/versions/f-/fribidi.json +++ b/versions/f-/fribidi.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "038a02d8e9a403f61bd3d45ce0f6f626a67d72f3", + "version": "1.0.11", + "port-version": 3 + }, + { + "git-tree": "134c67f3f8db520442ed5bea02262f14d647f7ce", + "version": "1.0.11", + "port-version": 2 + }, + { + "git-tree": "1555ac8e52ae978d26277e842322241a3da9c8ae", + "version": "1.0.11", + "port-version": 1 + }, { "git-tree": "0e040a494c14a4fade7878bf200a0463abc21e96", "version": "1.0.11", diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index 329be420782cad..f270229352d8c7 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f84934653f0ae5ca32279726f41dae1b2f6a4fb5", + "version-semver": "2.0.0", + "port-version": 1 + }, + { + "git-tree": "92b9696ab8e0f19cca9e5bf161719700aecdb425", + "version-date": "2021-10-17", + "port-version": 1 + }, + { + "git-tree": "e98623fd181fa1ad4b0ec07053dc140066dfb66f", + "version-date": "2021-10-17", + "port-version": 0 + }, { "git-tree": "d7dd27584c015a37dd3266255530e889b16aebcf", "version-date": "2021-06-17", diff --git a/versions/f-/functions-framework-cpp.json b/versions/f-/functions-framework-cpp.json index b275187ef7ec8c..5de6dc2606f99e 100644 --- a/versions/f-/functions-framework-cpp.json +++ b/versions/f-/functions-framework-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9e0ac94b09059d2a341c6f1614f8d9146732ed2", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "45f93916767e8d79db63cc94b8274f98ee1bef1c", "version": "1.0.0", diff --git a/versions/g-/g3log.json b/versions/g-/g3log.json index cf39075dc884fd..3451c7667c8907 100644 --- a/versions/g-/g3log.json +++ b/versions/g-/g3log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b97c6fdba216caec4a83323a693a871cb57968fd", + "version": "1.3.4", + "port-version": 2 + }, { "git-tree": "37d239e8b61380aeb3bc6bbeaa2a91649787b34a", "version": "1.3.4", diff --git a/versions/g-/gainput.json b/versions/g-/gainput.json index cbe403aa62a0f7..9ce5b1b0ce044c 100644 --- a/versions/g-/gainput.json +++ b/versions/g-/gainput.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6edb146db254b1cec192c12f335bef0e54455770", + "version": "1.0.0", + "port-version": 5 + }, { "git-tree": "8751b5a093ee68d0273600efc1ecfcd23056aa47", "version-string": "1.0.0", diff --git a/versions/g-/gamedev-framework.json b/versions/g-/gamedev-framework.json index 624ae044402b47..13f04015a26deb 100644 --- a/versions/g-/gamedev-framework.json +++ b/versions/g-/gamedev-framework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4dbeca9676a469cb84eb1cfc731ae9bbc9110447", + "version-semver": "0.20.0", + "port-version": 2 + }, { "git-tree": "a9771cd4f7093f5d34a78d3e2417707185444910", "version-semver": "0.20.0", diff --git a/versions/g-/gasol.json b/versions/g-/gasol.json index 4318cd2e704666..f9e5c97d4e0669 100644 --- a/versions/g-/gasol.json +++ b/versions/g-/gasol.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50bd4cd06666ebc284bb8d8157057c5a451bc11d", + "version-date": "2018-01-04", + "port-version": 2 + }, { "git-tree": "2425692b7bd94282d858e19c2a1360c274cb3e4c", "version-string": "2018-01-04", diff --git a/versions/g-/gazebo.json b/versions/g-/gazebo.json new file mode 100644 index 00000000000000..78d9fcac424a3d --- /dev/null +++ b/versions/g-/gazebo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "983e90284c8c0073e0193750a412eb4df01accdc", + "version-date": "2022-01-20", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 677ba947743fd6..ec6f7ea3683064 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,55 @@ { "versions": [ + { + "git-tree": "daeafe53684ed8335d3bf77deeffa3424b26120d", + "version-semver": "3.4.1", + "port-version": 4 + }, + { + "git-tree": "a8c88697265b7f88d7576c24c57456da86500b19", + "version-semver": "3.4.1", + "port-version": 3 + }, + { + "git-tree": "e90ac12366dec86dcacf5a66562e48f80254b3c5", + "version-semver": "3.4.1", + "port-version": 2 + }, + { + "git-tree": "b3bff053bc6f972c2c19f88047f2a5ae53f21746", + "version-semver": "3.4.1", + "port-version": 1 + }, + { + "git-tree": "a905d07fce3cebd0d1b52809cbdf1e37cce60cf3", + "version-semver": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "db90242c9a7b428c65415a64e83c149965dd7ceb", + "version-semver": "3.4.0", + "port-version": 6 + }, + { + "git-tree": "519ec20e4d9e0fc541320ca88b51521180c570da", + "version-semver": "3.4.0", + "port-version": 5 + }, + { + "git-tree": "78bf53bfc83afb261c9eaa60cf2ef9487031b4b1", + "version-semver": "3.4.0", + "port-version": 4 + }, + { + "git-tree": "164700a47428c2ded10ee9dc8e28fb189fca0f94", + "version-semver": "3.4.0", + "port-version": 3 + }, + { + "git-tree": "f0f7e3cd7a86246d31f892678b2e06d01c455c5b", + "version-semver": "3.4.0", + "port-version": 2 + }, { "git-tree": "d5580a73ced0a55c4659874d1755239c76e9168c", "version-semver": "3.4.0", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index efc409eaf5498e..d431dc9220e33c 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6274b79c119e29062eaaa6ad99271fe868f0288", + "version": "2.42.2", + "port-version": 2 + }, { "git-tree": "f90cd0dd11fd312fe803519706f422a9207336d0", "version": "2.42.2", diff --git a/versions/g-/geogram.json b/versions/g-/geogram.json index 0c7d105d61b8f2..9ee01d4bcf10f1 100644 --- a/versions/g-/geogram.json +++ b/versions/g-/geogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d68db6c8078b7598e5bed6550a911f791ae63ab3", + "version": "1.7.6", + "port-version": 2 + }, { "git-tree": "d6d9b9c3652ebbfd846a225ba06a1867e0a6ba25", "version": "1.7.6", diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json index 120c03144d7ec0..75c6083df8492e 100644 --- a/versions/g-/geographiclib.json +++ b/versions/g-/geographiclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "907cce8f399c32730fa20954780e16187bb28bd0", + "version": "1.52", + "port-version": 2 + }, { "git-tree": "7ffcb729874bc667cba2368b92d64dc04effb73c", "version": "1.52", diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json index 091ad9b1939a55..ce816523669d26 100644 --- a/versions/g-/getdns.json +++ b/versions/g-/getdns.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "877301bc39a398579f0f3f13725afcd4bcd797c4", + "version": "1.7.0", + "port-version": 2 + }, + { + "git-tree": "3fc05946f698399983a44d1c9a173df743c7bacf", + "version": "1.7.0", + "port-version": 1 + }, { "git-tree": "fd966770afa413f4502ba69f0c2e0a860b08f967", "version": "1.7.0", diff --git a/versions/g-/getopt-win32.json b/versions/g-/getopt-win32.json index 8906842077d45a..3f3316afbfabab 100644 --- a/versions/g-/getopt-win32.json +++ b/versions/g-/getopt-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93d03f637c26f2efa154dfd7c3efb02074cf5eda", + "version-string": "0.1", + "port-version": 2 + }, { "git-tree": "d4b235f13a89dbec23f09caa05c7b71c176cfab8", "version-string": "0.1", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index b93c98ee93d27d..22712c19d602ff 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5bf45743516e2ae999eb14017370828e237ad533", + "version": "0.21", + "port-version": 9 + }, + { + "git-tree": "d1dc6ee2684911bfcb6f63c498413a118c235ba5", + "version": "0.21", + "port-version": 8 + }, { "git-tree": "f843c5eedf82612df5fef2bfadfe4df8426301a6", "version": "0.21", diff --git a/versions/g-/gherkin-c.json b/versions/g-/gherkin-c.json index a274ee39da2469..71207c43204f93 100644 --- a/versions/g-/gherkin-c.json +++ b/versions/g-/gherkin-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb7cfa3a82651ab27840177189e5dc7938bf1241", + "version-date": "2019-10-07", + "port-version": 3 + }, { "git-tree": "e59a73d00ecbf68ae14b61beec141128d8f94612", "version-string": "2019-10-07", diff --git a/versions/g-/giflib.json b/versions/g-/giflib.json index 8c2fdd37c994c0..e9456f42e36ac8 100644 --- a/versions/g-/giflib.json +++ b/versions/g-/giflib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5b5833304ba0e1be5ff125f265d1f2e1098a93cb", + "version": "5.2.1", + "port-version": 2 + }, + { + "git-tree": "14178ec83d76a40e314adcf9bba75b63e99bc56d", + "version": "5.2.1", + "port-version": 1 + }, { "git-tree": "7cfc37d67d8662dd5fa5bf698a61ebbd657060cc", "version": "5.2.1", diff --git a/versions/g-/gl3w.json b/versions/g-/gl3w.json index a718bca62bd5d1..a5cb2544dca59d 100644 --- a/versions/g-/gl3w.json +++ b/versions/g-/gl3w.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "618626b6f1118dc2c80fa7bd2aae497c0d83b7c1", + "version-date": "2018-05-31", + "port-version": 4 + }, { "git-tree": "bbd82479631534cfe954646d63d29734c3b7728f", "version-date": "2018-05-31", diff --git a/versions/g-/glfw3.json b/versions/g-/glfw3.json index cd5908a984a0be..a199bb4ee5650b 100644 --- a/versions/g-/glfw3.json +++ b/versions/g-/glfw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a41aae4fb04023a3a94bf3aa66196b0aee2cc8e", + "version-semver": "3.3.6", + "port-version": 0 + }, { "git-tree": "90c6416669c2154f54d3f65e3a2afb8f75ab2aaa", "version-semver": "3.3.5", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 6efc32a794f94b..6ec585aeeeb5a7 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "83e2d36acbf39c01a33df90c4e65fee0221008aa", + "version": "2.70.1", + "port-version": 2 + }, + { + "git-tree": "52cb59030261a49d5afb22e2f95e5f9d24548532", + "version": "2.70.1", + "port-version": 1 + }, { "git-tree": "21a2facd76ae194ca1880c497122f7785750f912", "version": "2.70.1", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index f6c30ddb9e4236..bc474973e5eeec 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dd76481f04a2d3747dcd2c5eef0333ce5c6d61e5", + "version": "2.68.1", + "port-version": 2 + }, + { + "git-tree": "f0db0bb27bb35a57f5d72b56f5d080545dde76ba", + "version": "2.68.1", + "port-version": 1 + }, { "git-tree": "e43bb60b861fbd9469297581a968e3a647537b4d", "version": "2.68.1", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 312611485261a5..080c80f8f9e9ec 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -10,6 +10,11 @@ "version": "11.5.0", "port-version": 0 }, + { + "git-tree": "a7d9b6a3d936d273c6b1966eb3b8fe8cb1ba28d1", + "version-string": "2019-03-05", + "port-version": 3 + }, { "git-tree": "29f2d736c8273c412c4fcf0fd50da379d1ec9a0b", "version-string": "2019-03-05", diff --git a/versions/g-/gmmlib.json b/versions/g-/gmmlib.json index dac45e5eec1af1..4f40f75e7c94be 100644 --- a/versions/g-/gmmlib.json +++ b/versions/g-/gmmlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7dbf37aa324f038b12f99d697da82299d3ec9a0", + "version": "21.3.2", + "port-version": 1 + }, { "git-tree": "5b69783d8bdff160371ecc494af42d6ec8d8ffa0", "version": "21.3.2", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 52dbc389f06f3d..85c94f62f43b64 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d09c9addf60d381cabe4c565cb59b27f5b2bdc7", + "version-string": "6.2.1", + "port-version": 8 + }, { "git-tree": "5d207c0d8a6481f96f2277fd3245f2a80456a706", "version-string": "6.2.1", diff --git a/versions/g-/gmsh.json b/versions/g-/gmsh.json new file mode 100644 index 00000000000000..1b357c663e8528 --- /dev/null +++ b/versions/g-/gmsh.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d01377e2003c3ea5ef7a6b9fb215a086e5f75eed", + "version": "4.9.0", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json new file mode 100644 index 00000000000000..16c0cbb1dfbc45 --- /dev/null +++ b/versions/g-/gobject-introspection.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a39c3bd1142fd69e6dba29cf3bd4c7e93b049406", + "version": "1.70.0", + "port-version": 1 + }, + { + "git-tree": "5f162cfae947901b4110ea23cb5163699a079cfe", + "version": "1.70.0", + "port-version": 0 + } + ] +} diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 5e4e1739ad5f0a..860a02692d973c 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,60 @@ { "versions": [ + { + "git-tree": "a22f467e483356f9ce6b6d8502385d447c28912a", + "version": "1.38.0", + "port-version": 2 + }, + { + "git-tree": "284b1c6a7a7ac2d2d878aa68766b7db3c6775314", + "version": "1.38.0", + "port-version": 1 + }, + { + "git-tree": "f67a7068dcb56bb2a97b03a6960d522b71eb28f5", + "version": "1.38.0", + "port-version": 0 + }, + { + "git-tree": "b986c9bce793574d2a4936c1b23e705aa8b29abc", + "version": "1.37.0", + "port-version": 0 + }, + { + "git-tree": "15cf3b112010a1f5c8ec0948f135a5e1863a2246", + "version": "1.36.0", + "port-version": 1 + }, + { + "git-tree": "7b5a4cd75e98700c970afb3b0f6de808bc954ef3", + "version": "1.36.0", + "port-version": 0 + }, + { + "git-tree": "cb69d19a2e45c9dae1a8caa1ee5898b4344cb7f1", + "version": "1.35.0", + "port-version": 2 + }, + { + "git-tree": "5df9e36ebb6dd75abc2a5ff3aebdd61719739e8e", + "version": "1.35.0", + "port-version": 1 + }, + { + "git-tree": "171fbf69839919f9cbd18e7d1d3c4375920c4ae5", + "version": "1.35.0", + "port-version": 0 + }, + { + "git-tree": "3a3519f9f0fc9833e8f4dd815aea69b385ea6885", + "version": "1.34.1", + "port-version": 0 + }, + { + "git-tree": "d0975c563a68cf3d45c97c420e3e83af83620127", + "version": "1.34.0", + "port-version": 0 + }, { "git-tree": "3c272f2136618359a7e387fdc45a434e25e4ce85", "version": "1.33.0", diff --git a/versions/g-/gperf.json b/versions/g-/gperf.json index 173f43225a742e..addff5181f260b 100644 --- a/versions/g-/gperf.json +++ b/versions/g-/gperf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15455ef99f1ce92d079d047e90fc486c098c6b18", + "version": "3.1", + "port-version": 3 + }, { "git-tree": "b8854df263b141671e3463bb19ca258cf0c641d2", "version-string": "3.1", diff --git a/versions/g-/gperftools.json b/versions/g-/gperftools.json index 1f2a5a93258447..426994d614f97f 100644 --- a/versions/g-/gperftools.json +++ b/versions/g-/gperftools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc4a899d2089a6a683a2cbc8fc5ab6dae3fc45de", + "version-date": "2019-09-02", + "port-version": 3 + }, { "git-tree": "7bf526ef5e6a6a1dfb5fa4cb6941e415b64b94b3", "version-date": "2019-09-02", diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 2a1efbf32a4a3a..9a023fe39a2d73 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35d8f02c154c44312abd824ba408d52855dbf138", + "version": "1.10.2", + "port-version": 2 + }, { "git-tree": "1cd3ae48053d2f9b26c2ee6e2e01a413ea6bd0d2", "version": "1.10.2", diff --git a/versions/g-/graphicsmagick.json b/versions/g-/graphicsmagick.json index a370d7b85fa61d..696ce14ce59dbd 100644 --- a/versions/g-/graphicsmagick.json +++ b/versions/g-/graphicsmagick.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c6ed21bf630e77483e7df659e7fd65eeefc6b543", + "version": "1.3.37", + "port-version": 1 + }, + { + "git-tree": "4b45ceaa24dce170b8bf9ae142f628162a32e448", + "version": "1.3.37", + "port-version": 0 + }, { "git-tree": "a6c8562f7ec58b04278fb8985f9c7bbd5143158e", "version-string": "1.3.36", diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json index 32fd45fe604ccc..1c479d139c7a0b 100644 --- a/versions/g-/graphviz.json +++ b/versions/g-/graphviz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "912ac6a1578bd9cf23c20ed7f3bc85c25058c872", + "version-semver": "2.49.1", + "port-version": 2 + }, { "git-tree": "61316edc3deb64749cf84f70f5b0dbd669c06a9e", "version-semver": "2.49.1", diff --git a/versions/g-/gsl.json b/versions/g-/gsl.json index 864c4d49189015..635882c89c4272 100644 --- a/versions/g-/gsl.json +++ b/versions/g-/gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc3b20f09d0d6131faaa2dc0448d60676af96672", + "version": "2.7.1", + "port-version": 0 + }, { "git-tree": "535ee015f7dee11404cf4a708a7f7f45e1b74383", "version": "2.7", diff --git a/versions/g-/gsoap.json b/versions/g-/gsoap.json index a81153c336d6b7..ec7cae019e5293 100644 --- a/versions/g-/gsoap.json +++ b/versions/g-/gsoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fa5f6d124e48e4c9c80949c5b8e9c6d40dc2e43", + "version": "2.8.112", + "port-version": 1 + }, { "git-tree": "3f3950a7c522535f3095358a298f7af276894a94", "version": "2.8.112", diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index e16a6ef93b8b40..695937996b7e7a 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d769d57cd8c5c732146992a174266c11e7ef52ec", + "version": "1.19.2", + "port-version": 1 + }, { "git-tree": "0c628b2e09422aa3c82fc3d06757cdef559e9ce4", "version": "1.19.2", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index c4906802ae6d42..4accf168ca7504 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "0524a22dbda0c09201b9c677b6f72dbce870d6df", + "version": "1.19.2", + "port-version": 5 + }, + { + "git-tree": "78cacf62a38c4cfc4e399720463bef9312f115dc", + "version": "1.19.2", + "port-version": 4 + }, + { + "git-tree": "25482001e85b34b144a67fc9cc86127f9e8c89ea", + "version": "1.19.2", + "port-version": 3 + }, + { + "git-tree": "ec9fdf057bbec637e21db3a56297439e420106d4", + "version": "1.19.2", + "port-version": 2 + }, { "git-tree": "9e1e058b933a63ff71eeaa2a7a59fa713d0ba51b", "version": "1.19.2", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 1d536e8805b247..9d944fe71b29c8 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ae837c3a08bb71e486641d8b4464c132dbf54464", + "version": "4.6.0", + "port-version": 0 + }, + { + "git-tree": "a7d9e7cccb1be0a50b7b9cfa961adc93bca948fa", + "version": "4.4.0", + "port-version": 1 + }, { "git-tree": "1248de2309515809a0a6d6f4a1cdb48f0aca304e", "version": "4.4.0", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index d97dfd1612857c..ef30294f4e9e46 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "f39d8f061ae7242baf2b1b78b76253b2ee21c936", + "version": "4.6.0", + "port-version": 0 + }, + { + "git-tree": "8e30c6169ae3b7778ba17649312e6fc064fe1b43", + "version": "4.4.0", + "port-version": 1 + }, + { + "git-tree": "9d316a91086b6f8ccd32e422abc4dd5083eb22c2", + "version": "4.4.0", + "port-version": 0 + }, + { + "git-tree": "1c78f4d8d6a4375808cd69668375088c5b578e65", + "version": "4.0.1", + "port-version": 1 + }, { "git-tree": "14e153bf596fcdfa4376218e20d2a140f33bae8e", "version": "4.0.1", diff --git a/versions/g-/gtl.json b/versions/g-/gtl.json new file mode 100644 index 00000000000000..5776144adfa1b4 --- /dev/null +++ b/versions/g-/gtl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "52665bb6e7f0bbe30ffabc59521a937072ecc9e2", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/g-/guetzli.json b/versions/g-/guetzli.json index dd15734c63ce17..49eb0255c1446e 100644 --- a/versions/g-/guetzli.json +++ b/versions/g-/guetzli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7da0a5fa0b5bdb568edcbde81b314c3f7089cb0", + "version-date": "2020-09-14", + "port-version": 2 + }, { "git-tree": "2adfb6dcd5eab92b258f45aaf4a494bed18eb687", "version-string": "2020-09-14", diff --git a/versions/h-/h3.json b/versions/h-/h3.json index f886f11668c797..7fe6fd9f187636 100644 --- a/versions/h-/h3.json +++ b/versions/h-/h3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "582bd670eb802209ca1dddca0067252e0736ea03", + "version-semver": "3.7.2", + "port-version": 1 + }, { "git-tree": "6c441a2da3a894cd1f1ec177c4b73abf2686f5b2", "version-semver": "3.7.2", diff --git a/versions/h-/halide.json b/versions/h-/halide.json index 8a2628d869f258..c313ea05b6b22d 100644 --- a/versions/h-/halide.json +++ b/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92aa2ed7a51a38dfb53cdcb2f4b9c54f58030d52", + "version": "13.0.2", + "port-version": 0 + }, { "git-tree": "512cb4dd40ca40afbf0c6a35f7bdc595589a0b10", "version": "12.0.1", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 84a3c02af7913b..e8b32f499d3398 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b2c918c04e1ecf5b6a591911cea03f7093ab6933", + "version-semver": "3.2.0", + "port-version": 1 + }, + { + "git-tree": "a504ad46b9acfebdf6cc5e32bd0057d045f39115", + "version-semver": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "151b8dba4351ec70354a0cc1485e5eb720df5f75", + "version-semver": "3.0.0", + "port-version": 1 + }, { "git-tree": "ec7e9e00eba714984a7c4b22b5c51ce0fe1c4e08", "version-semver": "3.0.0", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index 8ac9d72b84d6bd..a82c072f61ac9c 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1000a70aefebfdd856715d265c3421c80157b773", + "version": "1.12.1", + "port-version": 4 + }, + { + "git-tree": "c12760535a18d9f3ac5497103dc76a961bac991e", + "version": "1.12.1", + "port-version": 3 + }, { "git-tree": "b3c8c63454b3e098a9e03ea654eef206769e31c1", "version": "1.12.1", diff --git a/versions/h-/hexl.json b/versions/h-/hexl.json index c1ade71589681f..cc0d88ede1e983 100644 --- a/versions/h-/hexl.json +++ b/versions/h-/hexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c345ad60bfec1af5f712c6076de5d58ec497d889", + "version": "1.2.3", + "port-version": 1 + }, { "git-tree": "b79e9b07e9389a78ab2d421cc45940e52948d956", "version": "1.2.3", diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index 6bbe71ea2fc53b..51df67bed981c3 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "145fcc6e2c3aa564666793d494a6b90c1323e0ac", + "version-semver": "0.11.2", + "port-version": 1 + }, + { + "git-tree": "afa485fda08f51ccd3fbf54327ba44aa11b8cb32", + "version-semver": "0.11.2", + "port-version": 0 + }, { "git-tree": "2540911a0c10b731ac15a04c6f9c5153003c19fd", "version-semver": "0.11.0", diff --git a/versions/h-/highfive.json b/versions/h-/highfive.json index 20b9367497c515..eaf02f1bab75a4 100644 --- a/versions/h-/highfive.json +++ b/versions/h-/highfive.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b1ecca066cce62dd0fbdf760151ee0c3ccc70b81", + "version": "2.3", + "port-version": 2 + }, + { + "git-tree": "e2f9f257e00960a16a162c1f279406f48528db5a", + "version": "2.3", + "port-version": 1 + }, { "git-tree": "76c01340920e595af976269dec82132f192a4705", "version": "2.3", diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json index fb3ee3693dbed9..36c7df6bef130f 100644 --- a/versions/h-/hiredis.json +++ b/versions/h-/hiredis.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4eafe5d23a2d906153cc8821c14092f2a9d3ef8a", + "version": "1.0.2", + "port-version": 3 + }, + { + "git-tree": "b651b36e6488f1eaaafc33d15d73d94751919f03", + "version": "1.0.2", + "port-version": 2 + }, { "git-tree": "0c7e16c5c3a9f612e1b46f96be41389b8ba11e6a", "version": "1.0.2", diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index f0af19d84023d0..2bf34abecc8d43 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "48d153f2932b01257af5a799676268abdfb35fac", + "version-semver": "1.7.1", + "port-version": 5 + }, + { + "git-tree": "815641d6119376c546119a841f6c035e8f27b8da", + "version-semver": "1.7.1", + "port-version": 4 + }, { "git-tree": "ca0e813d228cd5ea6e5c05ae81e7e89e825783d0", "version-semver": "1.7.1", diff --git a/versions/h-/hunspell.json b/versions/h-/hunspell.json index daa3f12a13468f..7477d316120ba7 100644 --- a/versions/h-/hunspell.json +++ b/versions/h-/hunspell.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9beac8cd192fb54839925b083fa72e611d7bcfee", + "version": "1.7.0", + "port-version": 8 + }, + { + "git-tree": "a7db92584496fe08ac10f8f32556ca89e14018aa", + "version": "1.7.0", + "port-version": 7 + }, { "git-tree": "459909cbf52806ce8df547bed3265d7d5c4abfc2", "version": "1.7.0", diff --git a/versions/h-/hwloc.json b/versions/h-/hwloc.json index 4907125a4a4912..f3f40d96a4f869 100644 --- a/versions/h-/hwloc.json +++ b/versions/h-/hwloc.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "22d2c0f63d27b10b032eb6cb3bd07055300fc961", + "version": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "fda6ebfe17a601d067ee6809571bedbedb590eef", + "version": "2.5.0", + "port-version": 3 + }, + { + "git-tree": "4d5dc3e908e5a9e750ea228042e013e6b8a6fd77", + "version": "2.5.0", + "port-version": 2 + }, { "git-tree": "bb188ce07f5e0b88685f5c6740c52c8f45636878", "version": "2.5.0", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index a3dce8c551f9c1..2218ab8e55bc7e 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "789755812260e6c4759e305d1591938513023c07", + "version": "69.1", + "port-version": 18 + }, + { + "git-tree": "0dc7426123d7307c353c40d63f74682f2faaabf1", + "version": "69.1", + "port-version": 17 + }, { "git-tree": "042eb68cba932ed45a95883c733406331cbaad6c", "version": "69.1", diff --git a/versions/i-/idevicerestore.json b/versions/i-/idevicerestore.json index 6eb9e529366341..90f22b214c94c5 100644 --- a/versions/i-/idevicerestore.json +++ b/versions/i-/idevicerestore.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "020019d72f9fa90089c2f406edb5938294f2dc3d", + "version-string": "1.0.12", + "port-version": 6 + }, { "git-tree": "4ba1b8951ed8c7f3ac7ba2b786c58e44ad322a86", "version-string": "1.0.12", diff --git a/versions/i-/ignition-common3.json b/versions/i-/ignition-common3.json index f0c55442621f17..ccad732b957dbe 100644 --- a/versions/i-/ignition-common3.json +++ b/versions/i-/ignition-common3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee01029f1822c107fb6654c440aad50f5e5b97d3", + "version-string": "3.9.0", + "port-version": 2 + }, { "git-tree": "f576cb30e5369daf724e9465dd29ef496f327283", "version-string": "3.9.0", diff --git a/versions/i-/ignition-math6.json b/versions/i-/ignition-math6.json index f536515f87b524..a1220d2ba439b2 100644 --- a/versions/i-/ignition-math6.json +++ b/versions/i-/ignition-math6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fda0a4d654c39cd30c400919981ea71675f696f", + "version-string": "6.6.0", + "port-version": 2 + }, { "git-tree": "20a34c6dd45c4cb0a5638ded5eb9b2dd8113a0ba", "version-string": "6.6.0", diff --git a/versions/i-/ignition-msgs5.json b/versions/i-/ignition-msgs5.json index 4665750430b636..a2fcd4fd20982e 100644 --- a/versions/i-/ignition-msgs5.json +++ b/versions/i-/ignition-msgs5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a77594480a911b7648ca1ad24a575b826ddc2a9a", + "version": "5.3.0", + "port-version": 4 + }, { "git-tree": "4a9266bfbd56f0c547a7c02e8a416315ae226bf3", "version-string": "5.3.0", diff --git a/versions/i-/ignition-msgs6.json b/versions/i-/ignition-msgs6.json index 2c500d46f6eee7..4d1447919c95d8 100644 --- a/versions/i-/ignition-msgs6.json +++ b/versions/i-/ignition-msgs6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99d4ba95339db124ba068ea2b7fe9cf53d648da3", + "version": "6.0.0", + "port-version": 3 + }, { "git-tree": "60d1f5a0cdcb7c9fcf7c5dc92f29d1d56a83fc67", "version-string": "6.0.0", diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json index 0492b7b390d23a..916bf8f0664631 100644 --- a/versions/i-/ignition-transport4.json +++ b/versions/i-/ignition-transport4.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "17d4c446fb99c9510ee2324a03529b6fb1119a41", + "version": "4.0.0", + "port-version": 5 + }, + { + "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f", + "version-string": "4.0.0", + "port-version": 4 + }, { "git-tree": "1df4d0fec30b796611ef0840f4b74a7008d6c1fb", "version-string": "4.0.0", diff --git a/versions/i-/ignition-transport8.json b/versions/i-/ignition-transport8.json index 5f68e579d69dba..c731867f20c6f8 100644 --- a/versions/i-/ignition-transport8.json +++ b/versions/i-/ignition-transport8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10fb9c7619753767ea31b84db43272712730f32c", + "version-string": "8.1.0", + "port-version": 2 + }, { "git-tree": "0841028ca6e8959f60f38c082d998b84dc273910", "version-string": "8.1.0", diff --git a/versions/i-/ignition-transport9.json b/versions/i-/ignition-transport9.json index ced65c2b3541b4..b121adedc90263 100644 --- a/versions/i-/ignition-transport9.json +++ b/versions/i-/ignition-transport9.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "abbc50866e79bb1566460eb88135358ed740268d", + "version": "9.0.0", + "port-version": 3 + }, + { + "git-tree": "0829d67a63010fca7f587ca7370db716570aa969", + "version-string": "9.0.0", + "port-version": 2 + }, { "git-tree": "263d88cb08544cb6fc3ff459c24a12832c0fdcb0", "version-string": "9.0.0", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index 1bf767e4597da2..c133b0da6c54de 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3ebbe45814d64c35e654ecb39cf5acf9401c793a", + "version": "0.9.7", + "port-version": 0 + }, + { + "git-tree": "75f0a463ec9ebb92fdc9f67f3da0a849cae3f4e2", + "version": "0.9.6", + "port-version": 0 + }, { "git-tree": "e1ad33d42918b67a81d068be60950b488829811f", "version": "0.9.5", diff --git a/versions/i-/imgui-sfml.json b/versions/i-/imgui-sfml.json index 22476de960bc8e..d97501fde9a45a 100644 --- a/versions/i-/imgui-sfml.json +++ b/versions/i-/imgui-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a40fbdee68d1f6157c8b5e0784fb701b290d0cc", + "version": "2.4", + "port-version": 1 + }, { "git-tree": "c81a9d0362c06279990e889cb56f9ebf71bde380", "version": "2.4", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 9f0a13f236f4b1..0804d5120f2a80 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b9a40068f3905099cc5cb247f1b488d0e27dfd7f", + "version": "1.87", + "port-version": 0 + }, + { + "git-tree": "afdf40a53f1f7d77248d9cdeb3f629698d0a72c5", + "version": "1.86", + "port-version": 0 + }, { "git-tree": "9ae62261d966705924645bc3a057fe748c24d290", "version": "1.85", diff --git a/versions/i-/implot.json b/versions/i-/implot.json index a25aff5b1a7e12..06745561704fcb 100644 --- a/versions/i-/implot.json +++ b/versions/i-/implot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6166fdfe50da875e98426577b0fd64e8c26c924c", + "version": "0.13", + "port-version": 0 + }, { "git-tree": "ab3bc9b82bfc7fbd1808cc55559ed58b648ed964", "version": "0.12", diff --git a/versions/i-/influxdb-cxx.json b/versions/i-/influxdb-cxx.json index d4e9ce4c0ed7c9..310b08ecbdf2af 100644 --- a/versions/i-/influxdb-cxx.json +++ b/versions/i-/influxdb-cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9403a6547a2dbd42b86d686c2ecd7a3e7344f13a", + "version": "0.6.7", + "port-version": 1 + }, { "git-tree": "ddcc844c034b136efc1bd9946e37fb98617acd88", "version": "0.6.7", diff --git a/versions/i-/infoware.json b/versions/i-/infoware.json index 1f9a2257ea0dff..7c148d6b7332f6 100644 --- a/versions/i-/infoware.json +++ b/versions/i-/infoware.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5501ab1b5d5391ca168856f073f6a46d5ea83268", + "version-date": "2021-06-16", + "port-version": 1 + }, { "git-tree": "9c278f55bb9b202c251c0414d877a4a238b57214", "version-date": "2021-06-16", diff --git a/versions/i-/intel-ipsec.json b/versions/i-/intel-ipsec.json index 81e930bb57a082..87784442835754 100644 --- a/versions/i-/intel-ipsec.json +++ b/versions/i-/intel-ipsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd3b71153cb4510e0de7475975f85bbbe41e9747", + "version": "1.1", + "port-version": 0 + }, { "git-tree": "39c4caebc1d5e618dcc455c9b7accb7fb2693f39", "version-string": "0.52", diff --git a/versions/i-/intelrdfpmathlib.json b/versions/i-/intelrdfpmathlib.json index f1dd031cf43fe0..0795294158b376 100644 --- a/versions/i-/intelrdfpmathlib.json +++ b/versions/i-/intelrdfpmathlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b105f0256b4fccc53e7653a732dc65459e1d8562", + "version-string": "20U2", + "port-version": 3 + }, { "git-tree": "089f42e2cae01699241dca4ebe6bbae95300d0f7", "version-string": "20U2", diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index c3173156908aba..39261a9dff7b71 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a824dffa239fccbb9b780c9926c91f1a25d000df", + "version-string": "1.8.4", + "port-version": 13 + }, { "git-tree": "fd24be00084e5387a0ae764c42621977340ec74b", "version-string": "1.8.4", diff --git a/versions/i-/itk.json b/versions/i-/itk.json index aad8b36d01ecae..e723245764939a 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "292c97cb7b593c84d77628fbe7f6e91ea0f43902", + "version": "5.2.1", + "port-version": 1 + }, + { + "git-tree": "8d67caa9e2fb41246a3baebbfaccc8f0aff51223", + "version": "5.2.1", + "port-version": 0 + }, + { + "git-tree": "ce0e8cb19f661a4bb4aabde6b87b7bca5025be9e", + "version-semver": "5.1.0", + "port-version": 7 + }, { "git-tree": "250af7e974af49d5e1c1f64c5ca1c1e3a1fbc5f6", "version-semver": "5.1.0", diff --git a/versions/i-/ixwebsocket.json b/versions/i-/ixwebsocket.json index fdc16164fda477..7db4ef058a5afb 100644 --- a/versions/i-/ixwebsocket.json +++ b/versions/i-/ixwebsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59a791c16bb7cf163c801d50013cafd8ae9b94a7", + "version-semver": "11.3.3", + "port-version": 0 + }, { "git-tree": "23fff75b15231882eb9461ff479a9f6edba3a450", "version-semver": "11.2.6", diff --git a/versions/j-/jack2.json b/versions/j-/jack2.json index 4d9d856947cd08..057fecc057b1f0 100644 --- a/versions/j-/jack2.json +++ b/versions/j-/jack2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5494181c269f8b65a26fd702664bfde1a3f2e3f", + "version-semver": "1.9.19", + "port-version": 1 + }, { "git-tree": "408805b50757c6f3e5585ca5fddf17df005dfb58", "version-semver": "1.9.19", diff --git a/versions/j-/jaeger-client-cpp.json b/versions/j-/jaeger-client-cpp.json index ecd406ae536e39..aa48ff58108575 100644 --- a/versions/j-/jaeger-client-cpp.json +++ b/versions/j-/jaeger-client-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a329e81cae8c0e9f5dc9c0f9921c3a1e2db706d", + "version-semver": "0.7.0", + "port-version": 1 + }, { "git-tree": "7b0bbe0b96ee8a4f4bffc825ada7b9c713468307", "version-semver": "0.7.0", diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json index cb4bc78cf31da1..00ce7cf1ef970b 100644 --- a/versions/j-/jasper.json +++ b/versions/j-/jasper.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "caf8b5e479138be21f8a7782806e9ef5c1dcdb37", + "version": "2.0.33", + "port-version": 3 + }, + { + "git-tree": "59d44227795e2e5e31a0f3e327832e4013b1e255", + "version": "2.0.33", + "port-version": 2 + }, + { + "git-tree": "6fc7475e9c22dafb473c98e00136e89c03ad8f5b", + "version": "2.0.33", + "port-version": 1 + }, { "git-tree": "c00bfcf7f17b8ba6db6ee5e62ac379902bbba96f", "version": "2.0.33", diff --git a/versions/j-/json-dto.json b/versions/j-/json-dto.json index 75e06e7fd046a2..80ba6b3a8efe92 100644 --- a/versions/j-/json-dto.json +++ b/versions/j-/json-dto.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "39f955915ba68ad247df8963e6427bd3c0f3479a", + "version": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "87cb384a3c0b77cf96d77ea95e22f1e9051cb19d", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "83c0ba869841555aeff8eb4954efcc64ae25a755", "version": "0.2.15", diff --git a/versions/j-/jsoncons.json b/versions/j-/jsoncons.json index b95f7df74f906b..8ef14f5069fe54 100644 --- a/versions/j-/jsoncons.json +++ b/versions/j-/jsoncons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee0a71fa7021ce4daf9c225529489e7e1da7f10a", + "version-string": "0.168.3", + "port-version": 1 + }, { "git-tree": "ace7d792691e3fadf81394f348f0dce587aa5293", "version-string": "0.165.0", diff --git a/versions/k-/kddockwidgets.json b/versions/k-/kddockwidgets.json new file mode 100644 index 00000000000000..7f30424266e26d --- /dev/null +++ b/versions/k-/kddockwidgets.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5b5e511f49b28d447aafde193422e3b7961a4e62", + "version": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/versions/k-/keystone.json b/versions/k-/keystone.json index 7f8c71f6fbf6e0..68b76c7cae81b4 100644 --- a/versions/k-/keystone.json +++ b/versions/k-/keystone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0094b1730f5973d7c3661eec95eb009d1d272b9", + "version-semver": "0.9.2", + "port-version": 2 + }, { "git-tree": "34865a7cf3fbcf4f104e8b136862aa8acc1a7ca7", "version-semver": "0.9.2", diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json index 34ff2aa5d4d2df..ab9038bb760e84 100644 --- a/versions/k-/kf5archive.json +++ b/versions/k-/kf5archive.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2eafcdc8cb04d2ec80f9beb89254ca4f74616a07", + "version": "5.89.0", + "port-version": 1 + }, + { + "git-tree": "55574a9d2677a48ae7f69740641f5fdbc5b0e068", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "ac6edcd19fdca524303279786a9b5672a3a05c36", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "c0df48850c0ede4ccb1d73dbe45f433b625120c8", "version": "5.87.0", diff --git a/versions/k-/kf5attica.json b/versions/k-/kf5attica.json index 9bb2f8a3ad49f0..65f356aeeb4281 100644 --- a/versions/k-/kf5attica.json +++ b/versions/k-/kf5attica.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "1ef9b989e525f13878a113dcd3ac801efe6d3b7b", + "version": "5.89.0", + "port-version": 1 + }, + { + "git-tree": "7d2b92c0e01ddccefac1907485d8d515a4e9a682", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "503565f7fa61ae49645a58970967409963928a70", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "dd65de5bb02fc6ad70fd3d2a9988d8b8aa2c69f3", "version": "5.87.0", diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json index 74a602ac7bd5b6..e965941bd32082 100644 --- a/versions/k-/kf5auth.json +++ b/versions/k-/kf5auth.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e2f603c61a444935527c7c0a3e6f3871dc8de3df", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "9703f64179e4ae9387400c5e5a003c796c4de920", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "d7e4ebe7498963bfde116470731abb72cf9032df", "version": "5.87.0", diff --git a/versions/k-/kf5bookmarks.json b/versions/k-/kf5bookmarks.json index 8abe9e88c5de18..35c965c0a88ba4 100644 --- a/versions/k-/kf5bookmarks.json +++ b/versions/k-/kf5bookmarks.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4d1a01a9c81b7126f63ac11f2729498f93d56903", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "c37b551cf242aad93b0d8e335358df3caf51f2b3", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "d7a2e1993eaad2402f76f743f224231d8fff7e57", "version": "5.87.0", diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json index 88c7c3d72cf2ae..05b772b73895fa 100644 --- a/versions/k-/kf5codecs.json +++ b/versions/k-/kf5codecs.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "689fa05db3db3ea404ccec181b0a8bba8e614562", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "707f03a5be73f39f93010cf6c7445722555d3d85", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "6b03af23a2842634523f2a2958d54b2a9aed8c7b", "version": "5.87.0", diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json index 2359c285890a55..c7674970547040 100644 --- a/versions/k-/kf5completion.json +++ b/versions/k-/kf5completion.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "883845542162455b20188292bdf1cbcad36615ef", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "36d73d2ef882b596ba4735efff2327e24c4192a0", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "6c8a057cc04ac61bafd18e9d3ef44d08eb10e656", "version": "5.87.0", diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index b7fb14396f7541..7f60f58102afb3 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b8cf3131bfc3810be865d269b9873e08b36ed0ca", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "b61e44190301d0de14095a1c3022bd484680e315", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "c856c763f07600a010fc88a2ba55ea041ad885e9", "version": "5.87.0", diff --git a/versions/k-/kf5configwidgets.json b/versions/k-/kf5configwidgets.json index e88145c518a8de..9a78dc93180b4f 100644 --- a/versions/k-/kf5configwidgets.json +++ b/versions/k-/kf5configwidgets.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "321b0a6c4261d5a3bcf760d5010e388b6297e3d5", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "6d32f1ae808824f97ae385668b430dbec9bbafcc", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "3d64286e19596a3518c2afee2cc882e770dc3ffe", "version": "5.87.0", diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index 95429d5c351df5..f89e710d9efa48 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6431d962993955c520f26f0c6d28f4cdaf5cfdea", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "d1d07dcbee5c9b56c7109f5a7bfb66eea766570f", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "6a08b92d70eb4ad61dc64f207618f1725f133d4b", "version": "5.87.0", diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json index 3c6e6dfcf16682..6c4dc8cc924f0c 100644 --- a/versions/k-/kf5crash.json +++ b/versions/k-/kf5crash.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "09f21ea5657354bd2e6a725f7c6b9e8e6b47af68", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "1e7f3c7f919bd8f77fd51c51fef599019c784db3", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "cc52d0bb515ffa68e8bcc9a209bc91da339639ac", "version": "5.87.0", diff --git a/versions/k-/kf5dbusaddons.json b/versions/k-/kf5dbusaddons.json index 9eda8feafe3a28..236a730e656bce 100644 --- a/versions/k-/kf5dbusaddons.json +++ b/versions/k-/kf5dbusaddons.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "86fe61a2bf5e56705d1c90e61f355a08328d2886", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "59f07d9d616712ace1051e0b9bfb60429685932a", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "0f61c24cff36aac302c3a9e98b5e10e66d87b405", "version": "5.87.0", diff --git a/versions/k-/kf5declarative.json b/versions/k-/kf5declarative.json index 0e3a1cc7e58531..6892e7ecf58d49 100644 --- a/versions/k-/kf5declarative.json +++ b/versions/k-/kf5declarative.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0e7f25daab01ec329e68aafcb705359e9c341bee", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "ca1926847cdb48836c8ee9cbca02178d0df38384", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "bd3486c169cd99bdc70fb5ee7e65ba3f76591e1f", "version": "5.87.0", diff --git a/versions/k-/kf5globalaccel.json b/versions/k-/kf5globalaccel.json index 328f2b34339947..96495715516251 100644 --- a/versions/k-/kf5globalaccel.json +++ b/versions/k-/kf5globalaccel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "186e5eaf6182ee6c12a1543aad61a2d317dbe90b", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "65f39c2fb121a2604a848e219bc50d8a0a11e4ee", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "f6d75bafebb665646fc7b714e3f0bba8e968c90a", "version": "5.87.0", diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json index 5f4896502da142..5b8edfdee9e210 100644 --- a/versions/k-/kf5guiaddons.json +++ b/versions/k-/kf5guiaddons.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1d532e40b86e82f54d1cec8ea0752168dac149b0", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "cac4485ad81812b3ecb5b73b2ded808e2b4d01f8", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "e5051bdd704585046c184dcc90fd096ef082b82a", "version": "5.87.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index f1f9ac5d97d236..82a72f220e5c53 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "91ecdfa6bebbaf14e316af8763d3a355eb2d5108", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "1de63f997d7e1f2a5986d980bde5f79b5dc9dfcc", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "50c5f3ea401e44a4318747aefa0c299350be6508", "version": "5.87.0", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 3f421f46859233..81f997bcd2d9c7 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "714138715b9030eceab63caba6085c4c9cd2e6d5", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "e215c70cf4c900ca8510ae07c4f3cd65587f35e8", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "7d6f42ae158c14ab6b17cd305ac42d6ea3e03af8", "version": "5.87.0", diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json index 9661bcb5ecbcb8..bc60ee1346e6b5 100644 --- a/versions/k-/kf5iconthemes.json +++ b/versions/k-/kf5iconthemes.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6ff2f989294b0c0487ff5049498efb10571334eb", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "815937b5586d05475d7291f270b14359197f3e04", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "de7e7e740b10c51da3916a4cbefde630941df428", "version": "5.87.0", diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json index b7c770bca00356..e55f871fd10a95 100644 --- a/versions/k-/kf5itemmodels.json +++ b/versions/k-/kf5itemmodels.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a97d6d3556bddd30d108f13e831789b8cc9c1de9", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "4cdd3b6ba6e4699193512aeebb851dddcf0da092", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "68d9be4e09a64f981bb76751ec94319548ad0dc4", "version": "5.87.0", diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json index 1fee8d4245bdd4..22853ab6c9a7fd 100644 --- a/versions/k-/kf5itemviews.json +++ b/versions/k-/kf5itemviews.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8cdccbe27ce997559f69d74f6267c3cbfd294e1e", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "f9f8bdd3d499bbec3575a898e162127c9ab32fba", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "39e2e18585caf414701168720ab9dc72d58d6b73", "version": "5.87.0", diff --git a/versions/k-/kf5jobwidgets.json b/versions/k-/kf5jobwidgets.json index f8a25bfc442d21..18cf0763e166ce 100644 --- a/versions/k-/kf5jobwidgets.json +++ b/versions/k-/kf5jobwidgets.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f608e47e7f8135de9e7c172bc168e8a444801e66", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "70eee0ea3cb787f5b956923a31002843c14b56aa", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "46a78abf10e4dce004e27810c02da64f3a261489", "version": "5.87.0", diff --git a/versions/k-/kf5kcmutils.json b/versions/k-/kf5kcmutils.json index 97ee675a0ed1eb..9671fe9550966f 100644 --- a/versions/k-/kf5kcmutils.json +++ b/versions/k-/kf5kcmutils.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e57e3f3eda8ac0230b4f7e7bb31abd02c766398c", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "25d48af54dcfad173913cb5c3d2032105b3ef915", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "d29b1c0e6b679becc34e23677a223555053962de", "version": "5.87.0", diff --git a/versions/k-/kf5kio.json b/versions/k-/kf5kio.json index f2afc6f60ff3a4..b868ba249f49d5 100644 --- a/versions/k-/kf5kio.json +++ b/versions/k-/kf5kio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "644d4ef87d5683404a3b034195c07a982fc45979", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "20edff8d66b9094cb80eb228a29cef566aad3538", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "6dc045a5011291de6e3aad07e60bca2a9699837c", "version": "5.87.0", diff --git a/versions/k-/kf5newstuff.json b/versions/k-/kf5newstuff.json index 6f7c1c91d4b8c8..368f1e2bc6411d 100644 --- a/versions/k-/kf5newstuff.json +++ b/versions/k-/kf5newstuff.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7295ad1e62fd07e6aa74fb1d4fe0562e4f6b5ecb", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "a9b4c5ce1b701619de83591e564e2bbeec14e471", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "b817dc1cfc5ca745cb053b7d17ce8569f818b215", "version": "5.87.0", diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json index 43e07995258d6a..4916ba0c550a74 100644 --- a/versions/k-/kf5notifications.json +++ b/versions/k-/kf5notifications.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "86baef519df4a14115be8d39ddac5b3c9df751cb", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "fd7593fd4f8ad80faf6d2111ffffe16bf0dd76d1", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "74334d5a13ce5263f6b60510a6193d0453136c93", "version": "5.87.0", diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 2503b85bf35765..1dbec4e0b1cd5a 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0c7ba772f4a36a4bec3f1a573c124cc812cce788", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "32c1d3baa7c7050b78d08f06abbca8791b048622", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "06ff2bf277b3038d9b5cd77cefbba6dbb537424d", "version": "5.87.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 0013b2416c65f4..a5fd11df74079b 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "18344c8d460769664a1644a9c0bbca283766b2aa", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "9cafd336220df951a4e0054d8b7f469a6408b161", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "f16da3cc6b411acfff5935c7127ac2fe89cb4b0c", "version": "5.87.0", diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index 41fffba0766e15..bf52e5fb23b83a 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8c834b6365035b2fcdd1996f3105456474f1b8a7", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "ca748c2c5f5b929cd099c699342bfe887581386a", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "674b9360b44ffc393f9e757443a68ce96c2ed006", "version": "5.87.0", diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json index d085a125896768..5fe748f913ba5b 100644 --- a/versions/k-/kf5solid.json +++ b/versions/k-/kf5solid.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "769197391a9b8b1f614405d61e05361915dffdc2", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "7f02dd0891311813d9efad69bbdd2e9dc918a470", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "db2ba98a0de225239023a9673c7faa4346fbdfd7", "version": "5.87.0", diff --git a/versions/k-/kf5sonnet.json b/versions/k-/kf5sonnet.json index 7676ba44e5614f..1e8eb71d052d81 100644 --- a/versions/k-/kf5sonnet.json +++ b/versions/k-/kf5sonnet.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4befb84624256110ee9b61eef7b2a38bed809274", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "460773f08b8524e7534b6f94a37a7488988e00a8", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "54ce5e9ca8c725a2d8a40779ec92a5c35dc2ecf6", "version": "5.87.0", diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index 27046ecdd4a1b2..2354bb6ee09d32 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "604681b0df59a2cc8cf1d69d8a355a9eecf59328", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "2ca26437f934ea26968d1dc10871a31be10a460e", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "2f3ed58701fe534cf44b9d777a64f7d146b882d6", "version": "5.87.0", diff --git a/versions/k-/kf5textwidgets.json b/versions/k-/kf5textwidgets.json index 68c316b901e5c3..fb59ad5cd49d81 100644 --- a/versions/k-/kf5textwidgets.json +++ b/versions/k-/kf5textwidgets.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5010e707b462a2d020694963f2e6d9affdea6db2", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "3307e348e202593b08cd227f68d7ca7fd57ffcfa", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "c37441cf5c99af758ae0d4b6a604bdc59ac5db5c", "version": "5.87.0", diff --git a/versions/k-/kf5wallet.json b/versions/k-/kf5wallet.json index f2cc162ef7f551..879900175b59b2 100644 --- a/versions/k-/kf5wallet.json +++ b/versions/k-/kf5wallet.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7cdf30cbdbee449144de7e7f145e7e91ebd3aecb", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "949ceec510758be184c8ed99a4409920e6b0aaa7", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "30362e63081e49a908e3f9bd866e45813f8e86be", "version": "5.87.0", diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json index 4a5b74e2562ff6..d274e7fe555c10 100644 --- a/versions/k-/kf5widgetsaddons.json +++ b/versions/k-/kf5widgetsaddons.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "82e07e830a46ae869835ac36c61a1c4ea05542d3", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "d7fb921418e65921e96e81147d9f7f830b471ab5", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "f1fc662a11109567098e9cd2f50331c9b9809786", "version": "5.87.0", diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json index 02afbff3ee56c9..cb45d7f7505fce 100644 --- a/versions/k-/kf5windowsystem.json +++ b/versions/k-/kf5windowsystem.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "a15cfdf8b903d0aca25ec242187172a32f15d210", + "version": "5.89.0", + "port-version": 1 + }, + { + "git-tree": "7d201f83e6272c570a9662ac56ca67bffe2fe0e8", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "9e617f8991e09cd526860b7a312330098cbcbb54", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "b6387279ae7d002232405241fd46c46f8cf74fb0", "version": "5.87.0", diff --git a/versions/k-/kf5xmlgui.json b/versions/k-/kf5xmlgui.json index abbc9a7b902921..358cc452a86461 100644 --- a/versions/k-/kf5xmlgui.json +++ b/versions/k-/kf5xmlgui.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ef8256a376b36bf9971b1788e88f4332146a1558", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "b6f435038615c416b7893e2e0524c1c486daccf5", + "version": "5.88.0", + "port-version": 0 + }, { "git-tree": "4d9dc85c5875657bed4598a47ade638dff13a5e0", "version": "5.87.0", diff --git a/versions/k-/kfr.json b/versions/k-/kfr.json index 00a6e7aa49fb14..863c2a4f91f0af 100644 --- a/versions/k-/kfr.json +++ b/versions/k-/kfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76c0a2397fec739067cac1a9970c113ed47341b1", + "version-semver": "4.2.1", + "port-version": 1 + }, { "git-tree": "3c67a5df3f480154a5f3472c58952566b55b688c", "version-semver": "4.2.1", diff --git a/versions/k-/kinectsdk1.json b/versions/k-/kinectsdk1.json index 6ddfc2b1251193..263c425735568d 100644 --- a/versions/k-/kinectsdk1.json +++ b/versions/k-/kinectsdk1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d49f0532a6e9776666ef3960a9b267f32ff3cfc4", + "version": "1.8", + "port-version": 4 + }, { "git-tree": "b48f4bf28923981e5a8ad549daa4dc8ee64dac83", "version-string": "1.8", diff --git a/versions/k-/knet.json b/versions/k-/knet.json index cb0f8496bc6c44..37388ca012e6e3 100644 --- a/versions/k-/knet.json +++ b/versions/k-/knet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76216c380a8db7e28debacd7faafce6be6c2d705", + "version": "1.1.0", + "port-version": 1 + }, { "git-tree": "6d45707ca4c853c0c0bcd076b98fab73c605d906", "version": "1.1.0", diff --git a/versions/k-/krabsetw.json b/versions/k-/krabsetw.json index 703e3ecf76d438..101a631282aee3 100644 --- a/versions/k-/krabsetw.json +++ b/versions/k-/krabsetw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1f3fa7092c3cb91e5891fcf8f0923dd1f604887", + "version": "4.1.18", + "port-version": 1 + }, { "git-tree": "eafa1dce01b80f2483c3dd6b74b17b4d5b8bb215", "version-string": "4.1.18", diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json index 21db2789d2a52d..ca6326340b5337 100644 --- a/versions/k-/ktx.json +++ b/versions/k-/ktx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d554178c6665e285b8a480dabe83fcf72aa5514", + "version": "4.0.0", + "port-version": 1 + }, { "git-tree": "bb7f4de2ff7141cda0da61c7a0419559fc30c53a", "version": "4.0.0", diff --git a/versions/k-/kubernetes.json b/versions/k-/kubernetes.json index bf2d687ae81de3..4aaef02399f072 100644 --- a/versions/k-/kubernetes.json +++ b/versions/k-/kubernetes.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "81d419c292d699e92444e7629e01b1d1cf0ba762", + "version-date": "2022-01-19", + "port-version": 1 + }, + { + "git-tree": "0f41209b8d9dd8477bf2bb9ea91234c3680f1ee5", + "version-date": "2022-01-19", + "port-version": 0 + }, { "git-tree": "df271a1aba7a2a955fc65e213e3a7c61a81e61b5", "version-date": "2021-11-24", diff --git a/versions/k-/kwsys.json b/versions/k-/kwsys.json index fd3fb9fa7a6304..a1db6c21180ace 100644 --- a/versions/k-/kwsys.json +++ b/versions/k-/kwsys.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e898afb7fa1cdf9f1d72b64467a04fded7b2082", + "version-date": "2021-08-06", + "port-version": 1 + }, { "git-tree": "376ae3a199ad4fdaad235b6e01b92ed217388550", "version-date": "2021-08-06", diff --git a/versions/l-/lager.json b/versions/l-/lager.json index 1fd9e7d2fb652c..7da3ee095e2789 100644 --- a/versions/l-/lager.json +++ b/versions/l-/lager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dd0744209e866c731522176fdcdf056fcbb853f", + "version-date": "2022-02-21", + "port-version": 0 + }, { "git-tree": "c65b1f179b9d6fe4048cf44f3186de7a0332742f", "version-date": "2021-06-17", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 99d6f8a7cf3d92..999e4f135ff049 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14b5e3ab7315ce36951f759c6254712ed41cc0af", + "version": "3.10.0", + "port-version": 0 + }, { "git-tree": "10799c7ec42f8369179ba7a8e927235596cb8bb7", "version-semver": "3.8.0", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index a4c33261715d60..5803b592258a71 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a9c5b51e3480db058719db223df981e0e679819", + "version-date": "2022-02-22", + "port-version": 0 + }, { "git-tree": "e52f9dc39357e3e7224273a21c0efaf275f15ae6", "version-string": "3", diff --git a/versions/l-/lazy-importer.json b/versions/l-/lazy-importer.json index 2885cce7a1e3be..85591f3cb07c31 100644 --- a/versions/l-/lazy-importer.json +++ b/versions/l-/lazy-importer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba952940f6531135428e3827d0610d3596b683cb", + "version-date": "2022-02-09", + "port-version": 0 + }, { "git-tree": "3dba7a5ee217d732847b9906ba01f8571733cc35", "version-date": "2021-10-23", diff --git a/versions/l-/lcms.json b/versions/l-/lcms.json index 02e5a2edae2bbd..5253e422477eb0 100644 --- a/versions/l-/lcms.json +++ b/versions/l-/lcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e1b890660ea5d2a869407a0714d4385e949b4d6", + "version": "2.12", + "port-version": 3 + }, { "git-tree": "27ea0f07f8132e37a1e265ee54216eb0abc185dd", "version": "2.12", diff --git a/versions/l-/leptonica.json b/versions/l-/leptonica.json index 6e1143686b29a9..4ee606ff8613af 100644 --- a/versions/l-/leptonica.json +++ b/versions/l-/leptonica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "677775654e1914afaf5791361e9de3fac4762edc", + "version": "1.81.1", + "port-version": 1 + }, { "git-tree": "215a8a32b41e1561998ac840c3c35404707186a2", "version": "1.81.1", diff --git a/versions/l-/leveldb.json b/versions/l-/leveldb.json index b119457f96a2a5..9abb3c3416f96a 100644 --- a/versions/l-/leveldb.json +++ b/versions/l-/leveldb.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2ca11f66c6efa417b28755759b6c67670524f532", + "version": "1.22", + "port-version": 5 + }, + { + "git-tree": "c41d96d2e0f6f6301e2370bc00fa7390cdd94330", + "version-string": "1.22", + "port-version": 4 + }, + { + "git-tree": "55e42f74e1f541143900887a64661c8c8e4ea713", + "version-string": "1.22", + "port-version": 3 + }, { "git-tree": "d94e4685c15581a8e5740ee6061d8b608645fd31", "version-string": "1.22", diff --git a/versions/l-/levmar.json b/versions/l-/levmar.json index 78c1e74387764b..d7490901a35b2c 100644 --- a/versions/l-/levmar.json +++ b/versions/l-/levmar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a869430352021a5fcecdd780a25e5ee0a4d769f5", + "version": "2.6", + "port-version": 1 + }, { "git-tree": "cbd0d2a467f781175f1900ca6857ddff74ab1cc5", "version-string": "2.6", diff --git a/versions/l-/libalkimia.json b/versions/l-/libalkimia.json index 4b64a7e12973ef..2bd6b715ea2aeb 100644 --- a/versions/l-/libalkimia.json +++ b/versions/l-/libalkimia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09e0633aca7ce1433e7cd6542404a12f90bf1de1", + "version": "8.1.70", + "port-version": 1 + }, { "git-tree": "6cf107a0e18ea3b0238500ece6257e212a6ddd2b", "version": "8.1.70", diff --git a/versions/l-/libao.json b/versions/l-/libao.json new file mode 100644 index 00000000000000..e5186e1ae4eeb6 --- /dev/null +++ b/versions/l-/libao.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "11240d91b73e6a968da37b8053a8a64a6d9ea55f", + "version": "1.2.2", + "port-version": 4 + }, + { + "git-tree": "931d3ed363323bdc4de00c91165f3a09e23fb6b1", + "version": "1.2.2", + "port-version": 3 + }, + { + "git-tree": "3ce3e18f2bb49577bbf0e0341cd0e5eb425e47bc", + "version": "1.2.2", + "port-version": 2 + } + ] +} diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json index cd9e96f7632457..e104add83c1fee 100644 --- a/versions/l-/libarchive.json +++ b/versions/l-/libarchive.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "96ba668589b8400bcc1164b98fc5dcecf3af923e", + "version-semver": "3.5.2", + "port-version": 4 + }, + { + "git-tree": "2408bfca781ee9e5add6e674043e5f8ccca73a1b", + "version-semver": "3.5.2", + "port-version": 3 + }, { "git-tree": "d79d7deb863644fb2bd6570d17cfa88386fc4156", "version-semver": "3.5.2", diff --git a/versions/l-/libassuan.json b/versions/l-/libassuan.json index fb13a824ebf72b..7d3acd0e407f85 100644 --- a/versions/l-/libassuan.json +++ b/versions/l-/libassuan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf0ffd2dfbb239d338524fc0ea59311a869144c0", + "version": "2.5.3", + "port-version": 4 + }, { "git-tree": "4ff2ab79b12dcb656fa6286fdbfdff01b11b5b15", "version": "2.5.3", diff --git a/versions/l-/libavif.json b/versions/l-/libavif.json index a9442d829b47c6..4bcdf7f29daa57 100644 --- a/versions/l-/libavif.json +++ b/versions/l-/libavif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a160f6cf67dc99a095c98a9a7260b7a5fd110b7b", + "version-semver": "0.9.2", + "port-version": 1 + }, { "git-tree": "7e78225af6d76356499d029ed6cb0d55fa20629a", "version-semver": "0.9.2", diff --git a/versions/l-/libb2.json b/versions/l-/libb2.json index 084a1ee4c8bbee..b26edd252d9648 100644 --- a/versions/l-/libb2.json +++ b/versions/l-/libb2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c113e12089453e4e2cf2bbf67ad1f0b80a133a8", + "version": "0.98.1", + "port-version": 6 + }, { "git-tree": "0419d2f293a094dc4cdca1111daea2a6425a137b", "version": "0.98.1", diff --git a/versions/l-/libbacktrace.json b/versions/l-/libbacktrace.json index 252be58df8d087..7204869c5acfe2 100644 --- a/versions/l-/libbacktrace.json +++ b/versions/l-/libbacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9544b83bfa32d57ce62d9193a427a246b71f685", + "version-date": "2021-03-14", + "port-version": 1 + }, { "git-tree": "8772967fbaa6b8840266c0d04a6daccc78b44c3d", "version-date": "2021-03-14", diff --git a/versions/l-/libcanberra.json b/versions/l-/libcanberra.json index 6a3eb68e9469d8..70262ca3e17957 100644 --- a/versions/l-/libcanberra.json +++ b/versions/l-/libcanberra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30f433bae08d825ed5c8050194b7dd6a3009bf9a", + "version": "0.30", + "port-version": 2 + }, { "git-tree": "18398f54e696bb43cf68dc7efc3e32304487057e", "version": "0.30", diff --git a/versions/l-/libcpplocate.json b/versions/l-/libcpplocate.json new file mode 100644 index 00000000000000..ae128c72087af7 --- /dev/null +++ b/versions/l-/libcpplocate.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5f15b69e558a8774ebbc5bde4f5ddf70da27611c", + "version-semver": "2.3.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libcrafter.json b/versions/l-/libcrafter.json index 54a6f19a85f313..098d07d841a542 100644 --- a/versions/l-/libcrafter.json +++ b/versions/l-/libcrafter.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0ecb9324842496e1b30a3aec8dbda993e7881612", + "version": "1.0", + "port-version": 2 + }, + { + "git-tree": "f8fd06400911305144ebbecfd5f4ab627cf40743", + "version": "1.0", + "port-version": 1 + }, { "git-tree": "2d64cfcfa4f2d76c110499477112db136cca34ca", "version": "1.0", diff --git a/versions/l-/libcurl-simple-https.json b/versions/l-/libcurl-simple-https.json new file mode 100644 index 00000000000000..3c91befa83a63d --- /dev/null +++ b/versions/l-/libcurl-simple-https.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6b22a1dafa22c05f8eed41236534a247a28c23d0", + "version-date": "2022-02-14", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index b5cd817fb9156d..2027825e4a7276 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a9f98aa660deca99a714ae3fc0e7a356c5d74cc8", + "version-semver": "0.16.4", + "port-version": 0 + }, + { + "git-tree": "d688c15b940166a1d8ecf701cafb7a060a7abd48", + "version-semver": "0.16.0", + "port-version": 0 + }, { "git-tree": "4ef71c270b3ea4205b878248ade5e50c03fd54b4", "version-semver": "0.15.1", diff --git a/versions/l-/libdc1394.json b/versions/l-/libdc1394.json new file mode 100644 index 00000000000000..4e630d646eb94c --- /dev/null +++ b/versions/l-/libdc1394.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "709fb395bf34f777acced25c12d6fd76d90f0100", + "version": "2.2.6", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index 594b27c401d002..19996e838cd39a 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f69d985ecdaa897d5efd10422f739d450373e26d", + "version": "1.0.8", + "port-version": 4 + }, + { + "git-tree": "83f4bc2d067f213063ca93d6f1514d3f7278452c", + "version-string": "1.0.8", + "port-version": 3 + }, { "git-tree": "81ba07f30c6c2a068f8b9f017e437d0062920e4a", "version-string": "1.0.8", diff --git a/versions/l-/libdisasm.json b/versions/l-/libdisasm.json index 5f2e114fde40ff..62593ea3038f3a 100644 --- a/versions/l-/libdisasm.json +++ b/versions/l-/libdisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab983230ac21cfc3d2849abfa70551755ffcb5f8", + "version-string": "0.23", + "port-version": 9 + }, { "git-tree": "a15a1eeb7daa3d47d553ba0b14a151462377c41f", "version-string": "0.23", diff --git a/versions/l-/libdshowcapture.json b/versions/l-/libdshowcapture.json index e7353417503445..7cb7815ef05413 100644 --- a/versions/l-/libdshowcapture.json +++ b/versions/l-/libdshowcapture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc1b7753ef4b7e6fc6d6390bc86fe5186ca45a92", + "version": "0.6.0", + "port-version": 3 + }, { "git-tree": "3573e5e73ce2e61477815f452a5d2cd4a96ec0c7", "version-string": "0.6.0", diff --git a/versions/l-/libe57.json b/versions/l-/libe57.json index e21d6930bf7c4d..0371207eac8941 100644 --- a/versions/l-/libe57.json +++ b/versions/l-/libe57.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e38a82bc97129e317606207d234101aefe7dcb17", + "version-semver": "1.1.332", + "port-version": 1 + }, { "git-tree": "ed9a20551a07f8dbcb637af8394653c326e95aac", "version-semver": "1.1.312", diff --git a/versions/l-/libe57format.json b/versions/l-/libe57format.json new file mode 100644 index 00000000000000..52e292de13c1cd --- /dev/null +++ b/versions/l-/libe57format.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "49edc5b7628b3ce80320347ed3284237b50ac162", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libepoxy.json b/versions/l-/libepoxy.json index 7af49b945ea4cc..e24c9a7c9e8bec 100644 --- a/versions/l-/libepoxy.json +++ b/versions/l-/libepoxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76fed10554d79f7163b7a0e6928fd03b37284989", + "version-semver": "1.5.9", + "port-version": 1 + }, { "git-tree": "6441c5ae7e331cdd952258f9806972ca7d173c8b", "version-semver": "1.5.9", diff --git a/versions/l-/libevent.json b/versions/l-/libevent.json index 308325b018202a..91ff598864fdb5 100644 --- a/versions/l-/libevent.json +++ b/versions/l-/libevent.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c1fbaddea4a9b98b61cba0d785441115c161d24f", + "version": "2.1.12", + "port-version": 6 + }, + { + "git-tree": "4c3a73b8448f16fa69e497ef6f1df41a261a9b54", + "version": "2.1.12", + "port-version": 5 + }, { "git-tree": "0405b56180d4920314ae69183ed5184a6017f7a9", "version": "2.1.12", diff --git a/versions/l-/libevhtp.json b/versions/l-/libevhtp.json index a28699da2dccb8..9df827724c96fb 100644 --- a/versions/l-/libevhtp.json +++ b/versions/l-/libevhtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2180aafd93f4089a276e9a5de9fe2d28d8e0f88d", + "version": "1.2.18", + "port-version": 3 + }, { "git-tree": "c28b6abc864cbfff6270358471bf9e97fd063710", "version-string": "1.2.18", diff --git a/versions/l-/libexif.json b/versions/l-/libexif.json index 972e3bcf9889cc..838a142b564e6c 100644 --- a/versions/l-/libexif.json +++ b/versions/l-/libexif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbe71aeb850791354309f2c953bf117ddc64f97a", + "version": "0.6.22", + "port-version": 2 + }, { "git-tree": "b068504fa067776d51b304e0c28e23532957c4b6", "version-string": "0.6.22", diff --git a/versions/l-/libfabric.json b/versions/l-/libfabric.json index dc53985c20459a..f12f77fad18d01 100644 --- a/versions/l-/libfabric.json +++ b/versions/l-/libfabric.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0a766bd1f01a742dcc12e13bafd741b94d7a3c0", + "version-semver": "1.13.2", + "port-version": 1 + }, { "git-tree": "f2ab311b282b282a5b10a3b52938c08efcdd1fc2", "version-semver": "1.13.2", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index 5454fe15be112d..f69e9547616907 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05f73f7c0bbd49045d312d90683a01405f5ffd83", + "version": "3.4.2", + "port-version": 4 + }, { "git-tree": "8fbd8bfde2d551ad1be625223a92997704469a8e", "version": "3.4.2", diff --git a/versions/l-/libfido2.json b/versions/l-/libfido2.json index df4a488ab372ad..a58e394b56a55e 100644 --- a/versions/l-/libfido2.json +++ b/versions/l-/libfido2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d3dc297cbc4c116910b6cb793bc3b5a06834e00", + "version": "1.10.0", + "port-version": 0 + }, { "git-tree": "170a0bcbc2f58e140205858db504ecfe7ade1a9f", "version": "1.7.0", diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json index 2fdabaf875078e..cee2cf03ba7e6e 100644 --- a/versions/l-/libgcrypt.json +++ b/versions/l-/libgcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c0737adf68a0ada3ed976e4acf201b4cbeb9dfe", + "version": "1.9.4", + "port-version": 2 + }, { "git-tree": "e850fdb19fd41c8270ea52dfa3dbe346b23e25f5", "version": "1.9.4", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index a7ca72e9aa9a0c..dbe169b3498f3a 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91982f7018b13638993efc70c14bf0996105f0bc", + "version": "1.7.0", + "port-version": 1 + }, { "git-tree": "f68bbf7c0472548573a69d1e41801edb1179c028", "version": "1.7.0", diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index 6eeb5426acfe3b..170466619c5b3f 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e036ca61d2e12b110c920cadf92f0aa4f39cac9b", + "version-semver": "1.4.2", + "port-version": 0 + }, { "git-tree": "37f2b6e92b60481a4db74de9da17385706d7d2e9", "version-semver": "1.3.0", diff --git a/versions/l-/libgnutls.json b/versions/l-/libgnutls.json index fd09cc37043157..7e42855838404b 100644 --- a/versions/l-/libgnutls.json +++ b/versions/l-/libgnutls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f041c07b59c7ac2389ac1fd6d8a175466bb648b7", + "version": "3.6.15", + "port-version": 3 + }, { "git-tree": "c03a1c452fa39d1b6d884aa3ef12c0c98a11f0a3", "version": "3.6.15", diff --git a/versions/l-/libgo.json b/versions/l-/libgo.json index 0b0b0d40f2d1bb..f8921f77ac6125 100644 --- a/versions/l-/libgo.json +++ b/versions/l-/libgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b50450a394cd5b4e882d353439c3dae6cc0564f2", + "version": "3.1", + "port-version": 4 + }, { "git-tree": "120510985335ea4bd1b8a91982d0f95842e43ba3", "version": "3.1", diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json index 9d75dd02f4f995..7b6379058fd517 100644 --- a/versions/l-/libgpg-error.json +++ b/versions/l-/libgpg-error.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ced42ca6160e2283326366e1c1132fe50acfb97", + "version": "1.42", + "port-version": 3 + }, { "git-tree": "f6c78e927a70ff136576abd61f1125861824bfd2", "version": "1.42", diff --git a/versions/l-/libgpiod.json b/versions/l-/libgpiod.json new file mode 100644 index 00000000000000..8737d8f5d0f017 --- /dev/null +++ b/versions/l-/libgpiod.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9a8b2a2d891f2435ff9ce3fbcea0bd870327bad0", + "version": "1.6.3", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libgpod.json b/versions/l-/libgpod.json index 09cdc08bd65a7f..04c205a2bb747e 100644 --- a/versions/l-/libgpod.json +++ b/versions/l-/libgpod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7006c4e3b96b2f99797857f8fee4496871940eff", + "version-date": "2019-08-29", + "port-version": 4 + }, { "git-tree": "5adfcf9af0bb6d32ba1d2f28df12216795406115", "version-date": "2019-08-29", diff --git a/versions/l-/libgwenhywfar.json b/versions/l-/libgwenhywfar.json index 1983969253d0ac..2fe59146912a9c 100644 --- a/versions/l-/libgwenhywfar.json +++ b/versions/l-/libgwenhywfar.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0aa4c84df4c2b05214574c2dbd524dfee2b694f8", + "version-semver": "5.6.0", + "port-version": 2 + }, + { + "git-tree": "279d1ba6d5ca2068bcd117050cb0f3c464b2cb8f", + "version-semver": "5.6.0", + "port-version": 1 + }, { "git-tree": "5be9e6060d67e8aad23d1de86effb0ce52605ec4", "version-semver": "5.6.0", diff --git a/versions/l-/libgxps.json b/versions/l-/libgxps.json index 05fc8f2dd22e3b..ef93cc3ff6cfe3 100644 --- a/versions/l-/libgxps.json +++ b/versions/l-/libgxps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc4e4576421dec679fb4a7c09497cbc13f99df00", + "version": "0.3.2", + "port-version": 1 + }, { "git-tree": "aa14ea859cee510d9c738fbdb5a1955531aabb87", "version": "0.3.2", diff --git a/versions/l-/libhdfs3.json b/versions/l-/libhdfs3.json index 452e12406481f4..3e3ad9c3172e35 100644 --- a/versions/l-/libhdfs3.json +++ b/versions/l-/libhdfs3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b672d2e93109f3909140f7315703ab2ea010d808", + "version-date": "2019-11-05", + "port-version": 3 + }, + { + "git-tree": "440244ba92f1f0b67d7246f707df2545f477f3f4", + "version-string": "2019-11-05", + "port-version": 2 + }, { "git-tree": "21db40c50744011ba13568f8e3a72dd97de84ea9", "version-string": "2019-11-05", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index f899442759cc4c..437397e9a737e8 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9638a1f823a06ad68484b408f5640ac2204b5262", + "version": "1.12.0", + "port-version": 3 + }, + { + "git-tree": "73b2b4b29035aa22da5ccd0c4c46dbb6e5516424", + "version": "1.12.0", + "port-version": 2 + }, { "git-tree": "738b6fc8b77a7fa90cd5966358dc3be684a832c1", "version": "1.12.0", diff --git a/versions/l-/libhsplasma.json b/versions/l-/libhsplasma.json index 43e6b79a5bfedf..146287506c0a87 100644 --- a/versions/l-/libhsplasma.json +++ b/versions/l-/libhsplasma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e9aee8fff86881286f825d1efa9afd1d4f013c6", + "version-string": "2021.06.08", + "port-version": 1 + }, { "git-tree": "9ffbd25ec776fbae40999d98a50d927180b560b5", "version-string": "2021.06.08", diff --git a/versions/l-/libhv.json b/versions/l-/libhv.json index ad084ec2c57427..f2f0d3cb7015a5 100644 --- a/versions/l-/libhv.json +++ b/versions/l-/libhv.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b5953fb3634520fafd04507d0a7266e92c87a129", + "version": "1.2.4", + "port-version": 1 + }, + { + "git-tree": "9867c0ba3cb7de25db2dd22fdd5633de7faae440", + "version": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "83c3744dfa329eb88671faee8c3839c1b5f3901e", + "version": "1.2.2", + "port-version": 1 + }, { "git-tree": "49dd8455e873417e8c6e336cdac63bc40cae8342", "version": "1.2.2", diff --git a/versions/l-/libhydrogen.json b/versions/l-/libhydrogen.json index 087518ac50b139..b6e8a73ad28a4f 100644 --- a/versions/l-/libhydrogen.json +++ b/versions/l-/libhydrogen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5de7dac51afd6d1575a5a74f6a562b2affc1717", + "version-date": "2021-12-02", + "port-version": 0 + }, { "git-tree": "9e4266b1fa81e86fcbf1968800e7df473b472fc1", "version-string": "2019-08-11", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index 9423b2719d2fcf..4ea73baa6a3c6e 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3942643a4d682982e61b60611394e4315dfc42a1", + "version": "1.16", + "port-version": 12 + }, { "git-tree": "f82980bff6c23bcccd043300679ebf8afa3e0a22", "version": "1.16", diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json index 47fb7c9c677a87..1917ca6b991ce6 100644 --- a/versions/l-/libidn2.json +++ b/versions/l-/libidn2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "639f3ae3abc9b7265de12b29bfefb49a683e0b53", + "version": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "b1eb568bf3bdf3fdb6e04b69f62f0347f2dff2ed", + "version": "2.3.0", + "port-version": 5 + }, { "git-tree": "a73dca27190e239f6ff09db7124b885a23d732e4", "version": "2.3.0", diff --git a/versions/l-/libigl.json b/versions/l-/libigl.json index 6498ecd346afe4..17a22a4f486017 100644 --- a/versions/l-/libigl.json +++ b/versions/l-/libigl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4de37a62b3d7349f427f26ad38b8fe1f386d09d", + "version": "2.3.0", + "port-version": 1 + }, { "git-tree": "6ddb181a509d6897a3e29b7a1a696af1db2e044f", "version": "2.3.0", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 5314666f427224..64cd6ea781538c 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "7373af20f73237f0453fb02a1ba097e5f710d2f5", + "version": "2.1.3", + "port-version": 1 + }, + { + "git-tree": "987bbe2533672eff1aaf160f0f36c818a1f986ee", + "version": "2.1.3", + "port-version": 0 + }, + { + "git-tree": "b37f789a1bb562a1469e0c30cf195c641ab824a6", + "version": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "1f10cf90b5807f4b4b98cc82786236002e85b9ac", + "version": "2.0.6", + "port-version": 3 + }, { "git-tree": "48423df98f8715a1f33c2abdfcfc0c0bf5cc5f92", "version": "2.0.6", diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index 78d57ea555b599..a08e49635edd06 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f544d762be0d7f9016b47f865843d0e575535166", + "version": "0.9.6", + "port-version": 0 + }, { "git-tree": "564ac624cbbabb45356d592264c090a0e6f64669", "version": "0.9.1", diff --git a/versions/l-/libjxl.json b/versions/l-/libjxl.json index 33244587504bc4..1612cee1cc1cb2 100644 --- a/versions/l-/libjxl.json +++ b/versions/l-/libjxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebfc043511f10c6dbe25a298b403b56ef9a57f87", + "version-semver": "0.6.1", + "port-version": 1 + }, { "git-tree": "4b89e4e9a92111a9733660afcecdfd59a6ee8d49", "version-semver": "0.6.1", diff --git a/versions/l-/libkeyfinder.json b/versions/l-/libkeyfinder.json index 04281ace1e201b..15caacdc3c4749 100644 --- a/versions/l-/libkeyfinder.json +++ b/versions/l-/libkeyfinder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "567c6574c6e38d9a10b7e08951c4c3a0fc72e3cb", + "version": "2.2.6", + "port-version": 0 + }, { "git-tree": "f4b04b3607199759e373764303378ab76ef9c158", "version-string": "2.2.5", diff --git a/versions/l-/liblinear.json b/versions/l-/liblinear.json index bc5f622669df61..3c17116bb33f2a 100644 --- a/versions/l-/liblinear.json +++ b/versions/l-/liblinear.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b88b9d95a1e851e77dd3018ce305abdc529a5da", + "version": "243", + "port-version": 1 + }, { "git-tree": "1a1acaef662beb37406c20bf6293109025f8df1b", "version-string": "243", diff --git a/versions/l-/liblzma.json b/versions/l-/liblzma.json index aa67e4602e48fe..ce6deba1127359 100644 --- a/versions/l-/liblzma.json +++ b/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18b7cbd0972b536a6bd4c0ef0f41dce9c3f047ac", + "version-semver": "5.2.5", + "port-version": 5 + }, { "git-tree": "273eaeff533f90bc42394cca9f1ea23ff6b49534", "version-semver": "5.2.5", diff --git a/versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json index 7b907d79c9b736..d4f1014c74f701 100644 --- a/versions/l-/libmediainfo.json +++ b/versions/l-/libmediainfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6b640103a75b965e6527d10819d276c2193775d", + "version-string": "21.03", + "port-version": 2 + }, { "git-tree": "2cdc779b496da59aabfb9e1cc459d68c54cdb4d8", "version-string": "21.03", diff --git a/versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json index 484dff20cde440..d90a9e06b29b10 100644 --- a/versions/l-/libmicrohttpd.json +++ b/versions/l-/libmicrohttpd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "059bfe5715b9179cbd4d365ca571e6fade762700", + "version": "0.9.75", + "port-version": 0 + }, { "git-tree": "f6c2bc7d6fd2ee5441a6235f3c99067aad069b14", "version": "0.9.63", diff --git a/versions/l-/libmodbus.json b/versions/l-/libmodbus.json index 86be284b35cf4e..f0a166f164b370 100644 --- a/versions/l-/libmodbus.json +++ b/versions/l-/libmodbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "654921557bd29a70ed05ce78374c52b43e6defad", + "version": "3.1.6", + "port-version": 2 + }, { "git-tree": "a4d3ea1104f095d0d92d4f81d595776ad6f6b21e", "version-string": "3.1.6", diff --git a/versions/l-/libmodman.json b/versions/l-/libmodman.json index 54709c67a13f31..b7eb568c744bcb 100644 --- a/versions/l-/libmodman.json +++ b/versions/l-/libmodman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64d71ad6052dd0027325c7e9390ad4264dbef108", + "version-string": "2.0.1", + "port-version": 4 + }, { "git-tree": "202e2ccfbf309183f222f9c849f92452bd8f3b48", "version-string": "2.0.1", diff --git a/versions/l-/libmpeg2.json b/versions/l-/libmpeg2.json index e13c81d623ac32..a291c352e928eb 100644 --- a/versions/l-/libmpeg2.json +++ b/versions/l-/libmpeg2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71e878d5483d51cab0d347f8e4e162b305216255", + "version": "0.5.1", + "port-version": 2 + }, { "git-tree": "f7325b83ac5b58747d2dc18859f771b641a0d76f", "version-string": "0.5.1", diff --git a/versions/l-/libmupdf.json b/versions/l-/libmupdf.json index a900d9f5f861a8..67e2b7dc0e84c1 100644 --- a/versions/l-/libmupdf.json +++ b/versions/l-/libmupdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ca3ac09949f15d339ff747bb36f8593ff087959", + "version": "1.19.0-rc2", + "port-version": 1 + }, { "git-tree": "e91affc70edc5bab8dc75c274f14ba03b345c0bb", "version-string": "1.19.0-rc2", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index 16299c14a549ce..113bab4268981a 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d19f8e799e7eb9dc6c24968d1fa8c31debc38b62", + "version": "8.0.20", + "port-version": 5 + }, { "git-tree": "5279f421e4d9409a5d78b0f767d41374f2f7e168", "version": "8.0.20", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index a6b3d01b0e7383..199e05f67008fe 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0317c7f34e075c4ebad894b0a6fffed8657f93e5", + "version": "0.1.18", + "port-version": 0 + }, { "git-tree": "5149e313236cfc0ae0e7352e6d151559564bd657", "version": "0.1.15", diff --git a/versions/l-/libosip2.json b/versions/l-/libosip2.json index b3dd2aa3420762..e94b9362b90ba2 100644 --- a/versions/l-/libosip2.json +++ b/versions/l-/libosip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "711e04603ccba9622918413848035af14335ef63", + "version": "5.2.0", + "port-version": 2 + }, { "git-tree": "918421395ccee5a5d894f2720b4a779369eb0f97", "version": "5.2.0", diff --git a/versions/l-/libosmium.json b/versions/l-/libosmium.json index acf60f09b41e6f..ff0000a08fa991 100644 --- a/versions/l-/libosmium.json +++ b/versions/l-/libosmium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e9ae3d97e11dfebbba6d839add7886b4bede3b1", + "version-semver": "2.17.1", + "port-version": 1 + }, { "git-tree": "862e140771bed4c7e9b7bc8ffc798edbbd3daa1c", "version-semver": "2.17.1", diff --git a/versions/l-/libp7client.json b/versions/l-/libp7client.json index c8f285bd06be8c..e1b4da476dec84 100644 --- a/versions/l-/libp7client.json +++ b/versions/l-/libp7client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcf6b61cbaf4a0d50c256e830142176b49eabad6", + "version-string": "5.6", + "port-version": 2 + }, { "git-tree": "dcb9500d0ef29115ec13c39c943ce85d2030ac56", "version-string": "5.6", diff --git a/versions/l-/libpcap.json b/versions/l-/libpcap.json index 4d97a3741392d0..5322e122c231a1 100644 --- a/versions/l-/libpcap.json +++ b/versions/l-/libpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a0a395c4b517e9a54e1b96327b1ac90e317c225", + "version-semver": "1.10.1", + "port-version": 1 + }, { "git-tree": "5fb18d1935c9d7db3a7ff158e2aba95d5a9c6cd2", "version-semver": "1.10.1", diff --git a/versions/l-/libpmemobj-cpp.json b/versions/l-/libpmemobj-cpp.json index 158beef8f08ed3..64b54f9d7d198d 100644 --- a/versions/l-/libpmemobj-cpp.json +++ b/versions/l-/libpmemobj-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d19201729977e87b6a75a47ac5f1dac6186caae", + "version-semver": "1.13.0", + "port-version": 1 + }, { "git-tree": "75d4c464f3bc9823857cab2f378bf7dc53cd7e2b", "version-semver": "1.13.0", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index af14f925114503..bdad019f865a81 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "099cade84111279ffa4a909061cb8f4f36137842", + "version": "12.9", + "port-version": 1 + }, { "git-tree": "bd369bc003e7ebebb688ee536065a356f1658260", "version": "12.2", diff --git a/versions/l-/libpqxx.json b/versions/l-/libpqxx.json index 8166fc426ec7f3..5c0592d27a1284 100644 --- a/versions/l-/libpqxx.json +++ b/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dd0107ca668c589cf18a57a884dd3ef276730cf", + "version-semver": "7.6.0", + "port-version": 3 + }, { "git-tree": "5c4df2807e229629d04aecc0a66f11219d4dcbcd", "version-semver": "7.6.0", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index 034b48d44842b5..1a5479e0192376 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a44c6a0f0d04d6ea82c7a29c879dfd13cadb38ca", + "version": "0.4.17", + "port-version": 2 + }, { "git-tree": "159dadd3ff9a4ba3ce1fec74a933980aa895ee02", "version": "0.4.17", diff --git a/versions/l-/libqcow.json b/versions/l-/libqcow.json index 2d4ce7f324f61e..7ea89f69314c65 100644 --- a/versions/l-/libqcow.json +++ b/versions/l-/libqcow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03d185bd85372ecd790739994ef2eb487a9595bc", + "version-string": "20210419", + "port-version": 2 + }, { "git-tree": "1d32eac160d01f07c4918816493353b53375f7de", "version-string": "20210419", diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json index 7b0b761a4a33c1..84f5a5de2b2687 100644 --- a/versions/l-/librabbitmq.json +++ b/versions/l-/librabbitmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfed3947ffb960b8b8bd399093aa21f5981464b7", + "version": "0.11.0", + "port-version": 0 + }, { "git-tree": "002128f2677cfaa53843e36849ebcfef1f2c540e", "version-string": "2020-06-03", diff --git a/versions/l-/libraqm.json b/versions/l-/libraqm.json index 12ac74fd869cbb..b024ba01997673 100644 --- a/versions/l-/libraqm.json +++ b/versions/l-/libraqm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5cdb799bec1a56eba248db499ac2e64d8a3b059", + "version-string": "0.9.0", + "port-version": 0 + }, { "git-tree": "7c83ce59ebe48d25178c998704ba4559807288ba", "version-string": "0.7.0", diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json index 9e4216a52f3fcd..698626379fc7bd 100644 --- a/versions/l-/libraw.json +++ b/versions/l-/libraw.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "aeb0a198c349fb336ad7cd710aeaf0b1017679a1", + "version-string": "201903", + "port-version": 7 + }, + { + "git-tree": "e05fbd81dbe6b44b09c9aae106f4dc7df708ce49", + "version-string": "201903", + "port-version": 6 + }, { "git-tree": "fa490349ec4e8e8d8854c18725068a8a8474b3ac", "version-string": "201903", diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index 4d4df5405918d2..5f65dbef337b90 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f7a6da2edf664e544914466d1cc8994d1ea475a", + "version": "1.8.2", + "port-version": 1 + }, { "git-tree": "dc5076b17ce1f54f6e61560036325ca9f24cda64", "version": "1.8.2", diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index 0ba04b1e1c91c2..7312a9eda54fc2 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "09613175bb9f051a273b68c0520ad4017d8fabd9", + "version": "3.4.2", + "port-version": 0 + }, + { + "git-tree": "1541c15439fdf9199c6796b51cd59fa644b7d9e4", + "version": "3.3.4", + "port-version": 1 + }, { "git-tree": "2dcc81c2e764c5f32d9c35280ab9ae06fda622c3", "version": "3.3.4", diff --git a/versions/l-/librsync.json b/versions/l-/librsync.json index 1233b9154e4736..6ea83e07fbf430 100644 --- a/versions/l-/librsync.json +++ b/versions/l-/librsync.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d252092a8f0d2ecbf57a4113324b363d4c43db1", + "version-semver": "2.3.2", + "port-version": 1 + }, { "git-tree": "e6fbc4e5fec56fbef5ac08d642e8b550a1c47490", "version-semver": "2.3.2", diff --git a/versions/l-/libsass.json b/versions/l-/libsass.json index 1e5b38e6cef095..55295b935cad76 100644 --- a/versions/l-/libsass.json +++ b/versions/l-/libsass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f688f8a8026f1078f224e7bcc4eef8fc21561a2", + "version": "3.6.5", + "port-version": 1 + }, { "git-tree": "f6568e763bc2718b27a5dc2d3d1db4d3cf651572", "version": "3.6.5", diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json index 9dd6c3d51314de..2f488b14479334 100644 --- a/versions/l-/libsbml.json +++ b/versions/l-/libsbml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9793402aaa4679187a9a703f189239544e3daf77", + "version": "5.19.0", + "port-version": 2 + }, { "git-tree": "12ec3d5ff69d3e8b960c03b9b0ae8127663227f5", "version": "5.19.0", diff --git a/versions/l-/libsecret.json b/versions/l-/libsecret.json index bdfe26d0a1a0c0..4b17d8ff5a9ff9 100644 --- a/versions/l-/libsecret.json +++ b/versions/l-/libsecret.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5e91b4b0043a5deb14f9ab62710b3410e969d54", + "version": "0.20.4", + "port-version": 1 + }, { "git-tree": "28e3a8bccc8c6ba0b40bf89f178e293dd282959b", "version": "0.20.4", diff --git a/versions/l-/libslirp.json b/versions/l-/libslirp.json new file mode 100644 index 00000000000000..7f45afb036c4c5 --- /dev/null +++ b/versions/l-/libslirp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5a7b734c0850f035d3eb2abc2d3dbf6389124be5", + "version-semver": "4.6.1", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json index 3e27f55b66a2ee..07034124af75d9 100644 --- a/versions/l-/libsmb2.json +++ b/versions/l-/libsmb2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2793ccd966a8c7b7cbe925000471c3ba3ef7d77b", + "version-date": "2021-04-29", + "port-version": 1 + }, { "git-tree": "033110ed64eb6d73a85ab8439c13b84b5ee02891", "version-date": "2021-04-29", diff --git a/versions/l-/libsnoretoast.json b/versions/l-/libsnoretoast.json index 513047f33c5864..026d6eaac4c0d1 100644 --- a/versions/l-/libsnoretoast.json +++ b/versions/l-/libsnoretoast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9931c3af48647454daf01f77ea23c63fc9aeb732", + "version": "0.8.0", + "port-version": 2 + }, { "git-tree": "66d0c5615dc55a5a5201e6de21d5a7acbaa4bd9b", "version": "0.8.0", diff --git a/versions/l-/libsodium.json b/versions/l-/libsodium.json index 248e4f7237aec1..7c623c5346469a 100644 --- a/versions/l-/libsodium.json +++ b/versions/l-/libsodium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06e21819c9b176b52aa0b9226c3e2bc07ec20a23", + "version": "1.0.18", + "port-version": 6 + }, { "git-tree": "8b1c2632e8f7c23408a655d6c97b6d51ad354a19", "version": "1.0.18", diff --git a/versions/l-/libsoundio.json b/versions/l-/libsoundio.json index 083e8b901d8e7e..b2a720c604f9f1 100644 --- a/versions/l-/libsoundio.json +++ b/versions/l-/libsoundio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ff8356daa64c082441be7beb2d51c5360a54a6cd", + "version": "2.0.0", + "port-version": 6 + }, + { + "git-tree": "ea8a154b722a142045906b20d2df00a38d330d6b", + "version": "2.0.0", + "port-version": 5 + }, { "git-tree": "96de946826ca6aafdc9409f9d75f02a6d082cffb", "version": "2.0.0", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index a41a3c5f9e8eb0..a122398270ea2a 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4d7f5aa6151c1285c1b6cd5b6c03ee34db4c0c98", + "version": "5.0.1", + "port-version": 4 + }, + { + "git-tree": "ad90cccc74f447ccc40309956f67092c845fe40b", + "version": "5.0.1", + "port-version": 3 + }, + { + "git-tree": "35cc452ea0fc43d38cfca4d340e47f13c9fd740f", + "version": "5.0.1", + "port-version": 2 + }, { "git-tree": "9a0fe08cf3273de9def88a4fd388a1ade854cfac", "version": "5.0.1", diff --git a/versions/l-/libspnav.json b/versions/l-/libspnav.json index 33081a8b7df85d..353ca850d32046 100644 --- a/versions/l-/libspnav.json +++ b/versions/l-/libspnav.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c31fef991e0961c3194b1f9847469e98a1bdb03", + "version": "0.2.3", + "port-version": 2 + }, { "git-tree": "c34294f2e748d1600ca87ed7086a0ddcedb1a7b9", "version-string": "0.2.3", diff --git a/versions/l-/libsrt.json b/versions/l-/libsrt.json index aa407873239134..80e2ed58c70cfd 100644 --- a/versions/l-/libsrt.json +++ b/versions/l-/libsrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bec354df76b0c680977252a11a9e88b1ae6818b9", + "version": "1.4.4", + "port-version": 2 + }, { "git-tree": "8181eb237eec2ba795164edfbd47f69d6b8466d8", "version": "1.4.4", diff --git a/versions/l-/libsrtp.json b/versions/l-/libsrtp.json index eafc5bb2b67f59..85c54b46b8e78b 100644 --- a/versions/l-/libsrtp.json +++ b/versions/l-/libsrtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7e8bce682acd4a29f666961a69127864cd93374", + "version": "2.4.2", + "port-version": 1 + }, { "git-tree": "20d89602c93b0aa1df176a8610b514b014375c8c", "version": "2.4.2", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index 087f62b1fee5d0..3d650f766634f5 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7023d2f926234da8e19b11cb3a6d1d37dfbb008c", + "version": "0.9.6", + "port-version": 2 + }, { "git-tree": "9e1cde44baefed40b0e994bfe088a7788f1efacf", "version": "0.9.6", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 0d3fbfbeb86152..baafe9a00fc65f 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "944feb4094c60226c2526be764fed688bb8b334f", + "version": "1.10.0", + "port-version": 2 + }, + { + "git-tree": "3c6dd977de517dc2091377a58c55b7d23f2bc3a0", + "version": "1.10.0", + "port-version": 1 + }, { "git-tree": "996df01b95684f41e8870b9154aeea3bffc63840", "version": "1.10.0", diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index eb40f06b1eb734..4cc62a81d81a2b 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec66d469b71cab685daede349e5193d15ab866c7", + "version": "1.20.1", + "port-version": 0 + }, { "git-tree": "6ab01712cf4356c3364d01b0e2c2c8cbbad760a3", "version-semver": "1.19.0", diff --git a/versions/l-/libtess2.json b/versions/l-/libtess2.json new file mode 100644 index 00000000000000..d66629b3a162a7 --- /dev/null +++ b/versions/l-/libtess2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "11b6d724d5897d2e856817ae213fec649c74530e", + "version-date": "2021-12-27", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libtins.json b/versions/l-/libtins.json index 12dfce59518c5d..d81d747b036c65 100644 --- a/versions/l-/libtins.json +++ b/versions/l-/libtins.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4a1470befea5c6b5c7418f9b85f37d6f8733d7d5", + "version": "4.3", + "port-version": 6 + }, + { + "git-tree": "9abc8b1a535ffaf99a680412cfd8f0c743c3fc6d", + "version": "4.3", + "port-version": 5 + }, + { + "git-tree": "de1a1dc51c90ca57412fe5f8d57eeef42a41ec74", + "version": "4.3", + "port-version": 4 + }, { "git-tree": "909dcc117f47579bc754369cd0a7a9d5a66b23bc", "version-string": "4.3", diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json index 919372b2ee67ac..bb12eb92ffc346 100644 --- a/versions/l-/libtorrent.json +++ b/versions/l-/libtorrent.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e27617cd7ff2be85ee0c2d4a60be16cee95f1302", + "version": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "eec22cb36f26cc1cd10714a8bdd974b451ba9832", + "version": "1.2.14", + "port-version": 2 + }, { "git-tree": "8ee811432c2056d11d9f2d346142c2c1be44a328", "version": "1.2.14", diff --git a/versions/l-/libudis86.json b/versions/l-/libudis86.json index 0e098416d243c0..1cd4ee6118dcb7 100644 --- a/versions/l-/libudis86.json +++ b/versions/l-/libudis86.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22693ee63d17429c0430a2888b515a047cbb4c7d", + "version-string": "2018-01-28-56ff6c87", + "port-version": 2 + }, { "git-tree": "e8ab6af2cfbbb52901433f92f0c028bc766ce3ae", "version-string": "2018-01-28-56ff6c87", diff --git a/versions/l-/libunifex.json b/versions/l-/libunifex.json index 2eb60baac970a1..1c23ed3fec9d0f 100644 --- a/versions/l-/libunifex.json +++ b/versions/l-/libunifex.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3d86e12f11e6d8e0528f4dfc62ccd33df1185673", + "version-date": "2021-12-07", + "port-version": 1 + }, + { + "git-tree": "713acea62d9dab0d2dd99d0790b9f716f9b9e971", + "version-date": "2021-12-07", + "port-version": 0 + }, { "git-tree": "7c98590771b98cb8c31e49867e78983853307a1f", "version-date": "2021-08-01", diff --git a/versions/l-/libunistring.json b/versions/l-/libunistring.json index 3651b41cfc3cb9..90395ba3cec3ce 100644 --- a/versions/l-/libunistring.json +++ b/versions/l-/libunistring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d6ff819975c70dc53d9aefa5d9046a0a21617b4", + "version": "0.9.10", + "port-version": 2 + }, { "git-tree": "7e74b9d781041b3a5c09b72f77b8e79ea6add168", "version": "0.9.10", diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 0ec46a4a754a02..b5e32b3429d5c1 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "65bbf5b3f642b9e76a659d78a9077d207c827b76", + "version": "2.0", + "port-version": 2 + }, + { + "git-tree": "e193d537e05887e8efeae8ab1328dc7e33499e01", + "version": "2.0", + "port-version": 1 + }, { "git-tree": "b4d90242721d15d6dc5287690c3b8d42c2e8d0f0", "version": "2.0", diff --git a/versions/l-/libusb-win32.json b/versions/l-/libusb-win32.json index df798ee16f055d..e7f17dc82a974a 100644 --- a/versions/l-/libusb-win32.json +++ b/versions/l-/libusb-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd3ac7f3d9331b546a957f651f9f911d69d7ef4f", + "version-string": "1.2.6.0", + "port-version": 8 + }, { "git-tree": "a75f1e3bedf1a31e8c812d07c24eb867fdd74a29", "version-string": "1.2.6.0", diff --git a/versions/l-/libusbmuxd.json b/versions/l-/libusbmuxd.json index c378816e63a7b2..06351ca95db578 100644 --- a/versions/l-/libusbmuxd.json +++ b/versions/l-/libusbmuxd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d6ac12d94326fae11d86e39030433003251aa62", + "version": "1.2.219", + "port-version": 2 + }, { "git-tree": "a50e755ad62ff56d5012dd84e0ccd196175a807c", "version-string": "1.2.219", diff --git a/versions/l-/libuuid.json b/versions/l-/libuuid.json index a927d01b3e0e65..aeb730dcdf850a 100644 --- a/versions/l-/libuuid.json +++ b/versions/l-/libuuid.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4d0fcae0591fc7776a9cf39996796326222e72ad", + "version": "1.0.3", + "port-version": 11 + }, + { + "git-tree": "47283ef4bb45ef38cfd61160bc1cec2d69e572b4", + "version": "1.0.3", + "port-version": 10 + }, + { + "git-tree": "a545c6c9bf405bd60cb97d6e2086f1273f5a3321", + "version": "1.0.3", + "port-version": 9 + }, { "git-tree": "4058a76786f399c80e1973a4101e8291032b3e9b", "version": "1.0.3", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 56c9a2b88873a1..fd88da0a514714 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa2d73ef2b9197ea47572bc783826b650ed04f0f", + "version-semver": "1.43.0", + "port-version": 0 + }, { "git-tree": "2cb9ed135277e1b121fbf0a391be6a8d5cb2ddcf", "version-semver": "1.42.0", diff --git a/versions/l-/libuvc.json b/versions/l-/libuvc.json index 5aa43cece35808..c29691ba51e6bd 100644 --- a/versions/l-/libuvc.json +++ b/versions/l-/libuvc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b254a9fb5aa3fc5d709a3f708d9c3dbb5d0a26bd", + "version-date": "2020-11-24", + "port-version": 3 + }, { "git-tree": "79ca2fc9bcce260bf39d630dcac5a2cc2cb7f486", "version-date": "2020-11-24", diff --git a/versions/l-/libvmdk.json b/versions/l-/libvmdk.json index d2569ca29137b2..d62a1103c9a2f3 100644 --- a/versions/l-/libvmdk.json +++ b/versions/l-/libvmdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1d35304c7ab4940f834735c091eca7a2ee43305", + "version-string": "20200926", + "port-version": 2 + }, { "git-tree": "8efc63f616daad6af987a274eb292d2605bd8f4b", "version-string": "20200926", diff --git a/versions/l-/libwandio.json b/versions/l-/libwandio.json index 754697db3b589a..53798c59befe06 100644 --- a/versions/l-/libwandio.json +++ b/versions/l-/libwandio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "eb4e485cc1313349e0fbb65d4997d5968245877a", + "version": "4.2.1", + "port-version": 6 + }, + { + "git-tree": "8340fce2f7c5dd26c578bb7c59f8d3f8d982c105", + "version-string": "4.2.1", + "port-version": 5 + }, { "git-tree": "ffa2cfbc601c2a9a2fdcbc20f44b312597952ec6", "version-string": "4.2.1", diff --git a/versions/l-/libwebm.json b/versions/l-/libwebm.json index 3834ffdda21955..51c7a5f3b8935d 100644 --- a/versions/l-/libwebm.json +++ b/versions/l-/libwebm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f210a205882bf4151ab8bec8c9b3a3fc328a280", + "version": "1.0.0.28", + "port-version": 1 + }, { "git-tree": "06a8f301505eb69082e8654f0c01d724b2e403e0", "version": "1.0.0.28", diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json index f30fa02917f7d5..ddafd222f61cb3 100644 --- a/versions/l-/libwebsockets.json +++ b/versions/l-/libwebsockets.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d8b0df2d428b6902450b58a8dc5e0743549d16b0", + "version-semver": "4.3.0", + "port-version": 2 + }, + { + "git-tree": "b4ef6833cbf3bb5c97e3150bbdb61bccb8db21cd", + "version-semver": "4.3.0", + "port-version": 1 + }, { "git-tree": "c3a1ad34c2592c162c5a3b0935fe8adb2d15a08a", "version-semver": "4.3.0", diff --git a/versions/l-/libxdiff.json b/versions/l-/libxdiff.json index e475c8b978391e..130c9f6feb9aba 100644 --- a/versions/l-/libxdiff.json +++ b/versions/l-/libxdiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88e90a302307649ee4266069f5f85a06941530ff", + "version": "0.23", + "port-version": 2 + }, { "git-tree": "dfe80df2ce315833069e20c710acf1349b901e60", "version-string": "0.23", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 5645cd5645cac3..e3f0b4de36b2e2 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "582189632eff9dc4ba2ef262a853c339d2838bd9", + "version-semver": "2.9.12", + "port-version": 5 + }, { "git-tree": "5cb8ed61786fdd081204880cd02d9376b17130eb", "version-semver": "2.9.12", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index 9db123f9e0e9f7..526fed6df5546d 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a603edc93c74d92bdbcef0bd8c38bbe331d1aa9d", + "version": "5.0.0", + "port-version": 2 + }, { "git-tree": "d3b0562bb045d23c33e6c01ed6d418c8f20f2358", "version": "5.0.0", diff --git a/versions/l-/libxmp-lite.json b/versions/l-/libxmp-lite.json index 2b2ca107544606..7fde53fb3524ef 100644 --- a/versions/l-/libxmp-lite.json +++ b/versions/l-/libxmp-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb6da404365a98bffa1f8622b652c15929c81811", + "version": "4.4.1", + "port-version": 8 + }, { "git-tree": "dda1a742b2612d9d926fef9c804d5e5efd041777", "version-string": "4.4.1", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 00300beaa376a9..4305d6ee5aa107 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "034ea26a2cde47c4d19df6eb35bc124a79ad37a3", + "version": "1.1.34", + "port-version": 4 + }, { "git-tree": "f139a7054e2347bc0f48ba6cabe14a74e7d1db36", "version": "1.1.34", diff --git a/versions/l-/libyaml.json b/versions/l-/libyaml.json index 4172a231a91549..3c90caf31cb15e 100644 --- a/versions/l-/libyaml.json +++ b/versions/l-/libyaml.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0a7af4d5e003c4971aa031bf5533ac14f35e91d7", + "version-string": "0.2.5", + "port-version": 3 + }, + { + "git-tree": "888d62d1f7440f3c9c5ff403e85175372903c0ef", + "version-string": "0.2.5", + "port-version": 2 + }, { "git-tree": "05217bc30337071036997a4d6152165823db9531", "version-string": "0.2.5", diff --git a/versions/l-/libyuv.json b/versions/l-/libyuv.json index e7439d7af98c32..2a523500c0c4f2 100644 --- a/versions/l-/libyuv.json +++ b/versions/l-/libyuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca463baa9f197bedced2b6ad24977d4ba928c0f2", + "version-date": "2021-04-15", + "port-version": 1 + }, { "git-tree": "d3e4d6adb28f13cb3aa4978cd0d6e319b87416cb", "version-date": "2021-04-15", diff --git a/versions/l-/libzen.json b/versions/l-/libzen.json index e319313e040bbe..80dbf209361612 100644 --- a/versions/l-/libzen.json +++ b/versions/l-/libzen.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "37c7d9f6e950b43bc62ed633bc8fc1964bb2ada3", + "version": "0.4.39", + "port-version": 1 + }, + { + "git-tree": "613111ba5e30b7f36fab5f147a4ae10180d8bebf", + "version": "0.4.39", + "port-version": 0 + }, { "git-tree": "f1c1cb55badf91c09b70e7480ff5c763518f1f51", "version-string": "0.4.38", diff --git a/versions/l-/licensepp.json b/versions/l-/licensepp.json index 20cd42e9e99034..6318660c9af1ad 100644 --- a/versions/l-/licensepp.json +++ b/versions/l-/licensepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bbecce6621b387f3522f31745fa839c6401f09d", + "version-date": "2020-05-19", + "port-version": 3 + }, { "git-tree": "f7115621dbc8deb47ebd3a8ff8dc7eeaf26c80fd", "version-string": "2020-05-19", diff --git a/versions/l-/lilv.json b/versions/l-/lilv.json index 3964c793f1a41b..0cc4bdc77b36f4 100644 --- a/versions/l-/lilv.json +++ b/versions/l-/lilv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4dc357aa0d6533993a18ec3a9358a39d9ed3a54", + "version": "0.24.10", + "port-version": 1 + }, { "git-tree": "7cf6faadffa3ad04da656c4fbbdcee367b302fdb", "version-string": "0.24.10", diff --git a/versions/l-/lionkor-commandline.json b/versions/l-/lionkor-commandline.json new file mode 100644 index 00000000000000..d5d8277faa1e43 --- /dev/null +++ b/versions/l-/lionkor-commandline.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "857618e8e62e8395973a0c48c61c837877b65fac", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/live555.json b/versions/l-/live555.json index 76a502690a2a43..68c898e36cc887 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2d9c96e8a0fa3a6af648952b384dc53504bf738", + "version-date": "2021-12-18", + "port-version": 0 + }, { "git-tree": "7d349d264f7be8a8802b521fddaa5ad047b48720", "version-string": "latest", diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index fa6953fb264016..f2a4b5461d84e2 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "aaacb49264f3175de57367f28c90bd3904d7209f", + "version-string": "2.0-20220112", + "port-version": 0 + }, + { + "git-tree": "105f6228f09ad995de4826cf860811d3e7eab7f2", + "version-string": "2.0-20211208", + "port-version": 0 + }, { "git-tree": "208ec7684366cb893eeeeb9f86b4b6c92fab7e28", "version-string": "2.0-20210922", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 6874e9e106f292..ee0a089ff7ab9a 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "15418b7e938058677963d920b616403240eca37f", + "version": "13.0.0", + "port-version": 3 + }, + { + "git-tree": "2c86dc65e952d8abe6140578df4db2c742180358", + "version": "13.0.0", + "port-version": 2 + }, + { + "git-tree": "b3ebd32f2ff4394d72edeb0f4b804d914a2e3f94", + "version": "13.0.0", + "port-version": 1 + }, + { + "git-tree": "fe86b4985609d9beb13e17327c52af54fb4869d4", + "version": "13.0.0", + "port-version": 0 + }, { "git-tree": "3726ade4edd3bd8e47f0cddbfac1e67803e7adea", "version-string": "12.0.1", diff --git a/versions/l-/lodepng-c.json b/versions/l-/lodepng-c.json index 2ee245fce71d6a..e1bd8ccecd89dd 100644 --- a/versions/l-/lodepng-c.json +++ b/versions/l-/lodepng-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c25297e81ddc744ed59e77f15209cfbd726bdcdb", + "version-string": "deprecated", + "port-version": 0 + }, { "git-tree": "df7ad4d806d2308089bd2131fec061ac36ab72f9", "version-date": "2021-03-01", diff --git a/versions/l-/lodepng.json b/versions/l-/lodepng.json index 842901158fd6b7..897a5f3be4adf1 100644 --- a/versions/l-/lodepng.json +++ b/versions/l-/lodepng.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "744376b1eace2fdab47d24858d7d1e79f32eefa3", + "version-date": "2021-12-04", + "port-version": 1 + }, + { + "git-tree": "454b1276a4855fba7699cbb07ca783d32d1baf7c", + "version-date": "2021-12-04", + "port-version": 0 + }, { "git-tree": "c80237ed99bb9821134df9802930c54fd8c8ee90", "version-string": "2020-03-15", diff --git a/versions/l-/log4cplus.json b/versions/l-/log4cplus.json index 474c940f56b699..ac896243b215aa 100644 --- a/versions/l-/log4cplus.json +++ b/versions/l-/log4cplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7eb39878c5311e28d66f4a25e0c1583c1c99ff82", + "version": "2.0.7", + "port-version": 1 + }, { "git-tree": "765ee7e801e35c4c77e890bb4af363042e9384ae", "version": "2.0.7", diff --git a/versions/l-/log4cpp.json b/versions/l-/log4cpp.json index 44f7d5172941fa..3f35bb86e7a0e2 100644 --- a/versions/l-/log4cpp.json +++ b/versions/l-/log4cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed51c9c96387b0e97754a2ede544d589ae3b5af2", + "version": "2.9.1", + "port-version": 7 + }, { "git-tree": "c68e17d674484b6ec48269fb47eb711f0e2fcbab", "version-string": "2.9.1", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index dcc83c47125ca3..c8f1a7adabdf0b 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b85ee3fd18c7e2f12f928ef132e5707059ad32c0", + "version": "0.12.1", + "port-version": 0 + }, { "git-tree": "3a0d34c9d2f6f0d0811bdb43d1a233e025963185", "version-string": "0.12.0", diff --git a/versions/l-/lua.json b/versions/l-/lua.json index b5478630869b88..9ee6c7e2580ede 100644 --- a/versions/l-/lua.json +++ b/versions/l-/lua.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "26701e6e610ff6eaee198ca1aaa0b9125e4b2d6f", + "version": "5.4.4", + "port-version": 1 + }, + { + "git-tree": "811a56cbdf5cfd0f8e57c2b3cff2a03e5c709723", + "version": "5.4.4", + "port-version": 0 + }, { "git-tree": "6a9a787a9369019f1dd867cc1c1d6c10296441d9", "version-semver": "5.4.3", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index 9f519d788c1533..2e60dce6192b5e 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3748aef9d3bd9d941f6af4d9c049cc55194cb7f5", + "version": "2.0.5", + "port-version": 5 + }, { "git-tree": "10777e8d3827f33dd042ae2cee5d309f48a108c0", "version-string": "2.0.5", diff --git a/versions/l-/luasocket.json b/versions/l-/luasocket.json index 40d0976fbc78d8..568f5f18145919 100644 --- a/versions/l-/luasocket.json +++ b/versions/l-/luasocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94ee0f78bf41cf8d10f7bc25b2305a9a0a33cb36", + "version-date": "2020-09-14", + "port-version": 2 + }, { "git-tree": "9eefd1250090f0a85e48d86a1d25f226e1a978d3", "version-string": "2020-09-14", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index bd69958e5d9dca..f4ee5a92365366 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb2fc062b29313fd1d23a656464fb3dd2b983370", + "version-string": "2020.06", + "port-version": 9 + }, { "git-tree": "f68058291469a1b9d3c62e766279c8f00cd479ec", "version-string": "2020.06", diff --git a/versions/m-/mailio.json b/versions/m-/mailio.json index b46de83b8cc71c..5e713851f4c13d 100644 --- a/versions/m-/mailio.json +++ b/versions/m-/mailio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "452f51edc1d79104f3cf968477176d155666cb46", + "version": "0.20.0", + "port-version": 2 + }, { "git-tree": "819040f9644957f597a2429bb3365cbf4f58e35d", "version": "0.20.0", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index faee7dbb0d57a2..19ea139ebe822a 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "ab089220fb5ecc215804a68c2122d3e0d3ed58bc", + "version-date": "2022-01-28", + "port-version": 1 + }, + { + "git-tree": "f352e6316057a4b1751482bd75dd9793aa92771a", + "version-date": "2022-01-28", + "port-version": 0 + }, + { + "git-tree": "e067081de907e0344717281f8d689421621d1798", + "version-date": "2021-12-14", + "port-version": 0 + }, { "git-tree": "3f8eb08ffc7a02dd08de30c0851587d9537fc72e", "version-date": "2021-11-15", diff --git a/versions/m-/marble.json b/versions/m-/marble.json index d7fb3c8c1a9839..69ee45563ac678 100644 --- a/versions/m-/marble.json +++ b/versions/m-/marble.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb15f05858eaff46b5d7b142d3c874f889d26557", + "version-string": "19.08.2", + "port-version": 3 + }, { "git-tree": "882d37f618c122d3484dcb02cb4f35ead8580768", "version-string": "19.08.2", diff --git a/versions/m-/marl.json b/versions/m-/marl.json index 0b62afa36d7566..fe8b7b988d5041 100644 --- a/versions/m-/marl.json +++ b/versions/m-/marl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b6430e8be3b742d1466c45570a5d4946c427dd25", + "version-date": "2022-03-02", + "port-version": 0 + }, + { + "git-tree": "fd57df5a81ab5870018fd3d288922a14a235fcc4", + "version-date": "2021-04-25", + "port-version": 1 + }, { "git-tree": "455a779684efcee90811a7a1d2a86ba1b29a8996", "version-date": "2021-04-25", diff --git a/versions/m-/mathgl.json b/versions/m-/mathgl.json index 12540d32001335..f1cb188ae8f7b5 100644 --- a/versions/m-/mathgl.json +++ b/versions/m-/mathgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d75f46bbb8d518f326f688d355d5e9d241f44dc6", + "version": "2.5", + "port-version": 0 + }, { "git-tree": "27b4e9bc3b747e8c53489a5ef16b85a3f6035504", "version": "2.4.3", diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json index d9fdc8f6b618c2..f1e254f7f5c03f 100644 --- a/versions/m-/mbedtls.json +++ b/versions/m-/mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "676b36c2f6fc72a2fbbbe521ae46fdefe5db67ca", + "version": "2.24.0", + "port-version": 4 + }, { "git-tree": "a68475211755b3999de8cb2ec1d2fdfe9bb8ab10", "version-string": "2.24.0", diff --git a/versions/m-/mdnsresponder.json b/versions/m-/mdnsresponder.json index 1503ea66832e5f..f410f52089cb92 100644 --- a/versions/m-/mdnsresponder.json +++ b/versions/m-/mdnsresponder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a57c5a00a432c5f54ca26ddf0a1ea7298364e55", + "version": "878.270.2", + "port-version": 1 + }, { "git-tree": "0feece31cd1ade61b7f16a0a23880d3b29ad3eb4", "version": "878.270.2", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index 7d643482e5d3ee..f526039cdd9f5c 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "60ae9e5d7081930a0e736be1742db18b01a0114b", + "version": "21.2.5", + "port-version": 2 + }, + { + "git-tree": "9318298d8532439ec65868f7b1997f2b8d49fec5", + "version": "21.2.5", + "port-version": 1 + }, + { + "git-tree": "55d54a8cf6adc14ea9d2ac84621f75295a367a07", + "version": "21.2.5", + "port-version": 0 + }, + { + "git-tree": "5308d779b4070c295771c630e4b2251582e16d0c", + "version": "21.2.0", + "port-version": 1 + }, { "git-tree": "931291396b7abd6c8fcdf7d6e995782dfa64bb80", "version": "21.2.0", diff --git a/versions/m-/mhook.json b/versions/m-/mhook.json index f2e9587c398166..40c74d9b36e159 100644 --- a/versions/m-/mhook.json +++ b/versions/m-/mhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f4f5f56588f1c2b391e6c8766a4fa4dd713514d", + "version": "2.5.1", + "port-version": 3 + }, { "git-tree": "63acd5f7a94d6b86d9fb2b3642e0fbd253f21e47", "version-string": "2.5.1", diff --git a/versions/m-/milerius-sfml-imgui.json b/versions/m-/milerius-sfml-imgui.json index 581b42fad13f99..90859a944b5e09 100644 --- a/versions/m-/milerius-sfml-imgui.json +++ b/versions/m-/milerius-sfml-imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4bfc198df4803019e174c0489fcc91e178f66930", + "version": "1.1", + "port-version": 4 + }, { "git-tree": "ecf4d9fd039390613094ab42564601f32f9982c3", "version-string": "1.1", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index caf7f5c8d006a4..8c6494be1d8d57 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "370692d9dc2cb2bc9f013041003e069e47febb67", + "version": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "e68a15fa535a3dcf4a1dba0f277eb239cc27b863", + "version": "2.0.3", + "port-version": 2 + }, + { + "git-tree": "0b8064b8481fdeb88e2b4933c485ea0f6b99d779", + "version": "2.0.3", + "port-version": 1 + }, + { + "git-tree": "6e1b6fbd3bff2cae13325183c95aa07ed470b6ad", + "version": "2.0.3", + "port-version": 0 + }, { "git-tree": "dab9a2e508bca4575fc8f26df59f3f01735a3dbb", "version": "2.0.2", diff --git a/versions/m-/minhook.json b/versions/m-/minhook.json index 8e90429e48504d..6cab064681c58d 100644 --- a/versions/m-/minhook.json +++ b/versions/m-/minhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fea414bee13115e201fe93699ba5b55c7ae031b8", + "version": "1.3.3", + "port-version": 3 + }, { "git-tree": "8dbdd0ae999b8929af5e9df0cbae321bb0d71cea", "version-string": "1.3.3", diff --git a/versions/m-/minio-cpp.json b/versions/m-/minio-cpp.json new file mode 100644 index 00000000000000..66dde1213cdbc1 --- /dev/null +++ b/versions/m-/minio-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0b0fe1b9353fd016b3f2e3212ae30a7a82b71ceb", + "version-date": "2022-01-03", + "port-version": 0 + } + ] +} diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json index acbf121370f2ab..5931b7c3204379 100644 --- a/versions/m-/minizip.json +++ b/versions/m-/minizip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3bec48dc73b936a25a26a9ec1941aac9e39fcf1", + "version-semver": "1.2.11", + "port-version": 10 + }, { "git-tree": "fc89de0b8a1105f6bee9625bba4031b138862a39", "version-semver": "1.2.11", diff --git a/versions/m-/mlpack.json b/versions/m-/mlpack.json index cb0e68931db259..f723df3054c1ca 100644 --- a/versions/m-/mlpack.json +++ b/versions/m-/mlpack.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "1ba342c0a0a5e88c4424207c3296b8db8c7062fc", + "version": "3.4.1", + "port-version": 5 + }, + { + "git-tree": "eb3aaa9dbc3991962b70c2c819d66e5c018ad41a", + "version": "3.4.1", + "port-version": 4 + }, + { + "git-tree": "aa79e1e52ba4e3112b84d77bc321580988b945f0", + "version": "3.4.1", + "port-version": 3 + }, { "git-tree": "587ee2575ef7543ff9a0ed30e645154db26f0001", "version": "3.4.1", diff --git a/versions/m-/mman.json b/versions/m-/mman.json index bf224236114eae..226b2e7d9a3951 100644 --- a/versions/m-/mman.json +++ b/versions/m-/mman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fff4dfa412b18aa027005a5ea952932cbf10cd74", + "version-string": "git-f5ff813", + "port-version": 5 + }, { "git-tree": "30ad8930ff3b29bd994587b1ff58e5205deb32bc", "version-string": "git-f5ff813", diff --git a/versions/m-/mmloader.json b/versions/m-/mmloader.json index ff952b9d88d27e..a381834b387837 100644 --- a/versions/m-/mmloader.json +++ b/versions/m-/mmloader.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "104d16ae01f6ae753fde8406f75a01b9353aa1f2", + "version-date": "2021-12-13", + "port-version": 1 + }, + { + "git-tree": "030c251ff729f1063950f5473cf393125f888ca2", + "version-date": "2021-12-13", + "port-version": 0 + }, { "git-tree": "e1825273819a6439f75ba1439385944a1331101c", "version-string": "2020-05-15", diff --git a/versions/m-/mnn.json b/versions/m-/mnn.json index fd88fd1d559b0b..af46b0080e8793 100644 --- a/versions/m-/mnn.json +++ b/versions/m-/mnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e77125ae365a54bdcbbdb5bb2d77d32834a4487b", + "version": "1.1.0", + "port-version": 2 + }, { "git-tree": "10351b13b0daa0e66de483597da63e0d60e9777a", "version": "1.1.0", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index 696d1d869291e6..4510acc815992e 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c9183634ff53b6e76b201ad39abf63b5d26bc8a", + "version": "3.6.5", + "port-version": 2 + }, { "git-tree": "2fd38965003b9bc7a653ab8aaabb8172a043d9d0", "version": "3.6.5", diff --git a/versions/m-/mongoose.json b/versions/m-/mongoose.json index fae1081ea31f2e..7d09a84ad15882 100644 --- a/versions/m-/mongoose.json +++ b/versions/m-/mongoose.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "504d873811dc91402f21952ea4c9fd08602cc822", + "version": "7.5", + "port-version": 1 + }, + { + "git-tree": "e48192c7d0e653962481e1c2be9e7663ead35e74", + "version": "7.5", + "port-version": 0 + }, { "git-tree": "a706659c49d7ac73bfa869a3497ffeec2c57af71", "version": "7.1", diff --git a/versions/m-/monkeys-audio.json b/versions/m-/monkeys-audio.json index b1effe8c7b997b..83f85a51b28a6a 100644 --- a/versions/m-/monkeys-audio.json +++ b/versions/m-/monkeys-audio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dbdeec6bf1752114f81a6ad09c85d046dc2ca3b", + "version": "5.70", + "port-version": 2 + }, { "git-tree": "e7058d11b081c99f9be409c3770e9d41b6487505", "version-string": "5.70", diff --git a/versions/m-/mpfr.json b/versions/m-/mpfr.json index 3db92fe86e01ee..65d2472d1ca639 100644 --- a/versions/m-/mpfr.json +++ b/versions/m-/mpfr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9f38beb4c3179d0b08008af901d05c2a70afaa1b", + "version-string": "4.1.0", + "port-version": 3 + }, + { + "git-tree": "655c136cd8328e30476ae39a3fd5ff99c915907c", + "version-string": "4.1.0", + "port-version": 2 + }, { "git-tree": "54544af431b7f178bc7bbe6604f103c40b7aa93b", "version-string": "4.1.0", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index e87a5956cd99d4..8e7e9b411e140c 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7d73f2de9ed526b2cc13e39a4bdc100fcd6ab4e", + "version": "1.29.2", + "port-version": 1 + }, { "git-tree": "a0b39904e9eec57506653dc7252ea7e808914b8c", "version": "1.29.2", diff --git a/versions/m-/mpir.json b/versions/m-/mpir.json index 0dd5bbbdcbafc7..ff850fbcd28ccd 100644 --- a/versions/m-/mpir.json +++ b/versions/m-/mpir.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5358d4a724061eab499969ae3b56f8abbdea3347", + "version-date": "2022-03-02", + "port-version": 0 + }, + { + "git-tree": "8aabcec72d2006d0a338159fac489aae1da57220", + "version": "3.0.0", + "port-version": 11 + }, { "git-tree": "6d62b01b328d3537a808a6b68cdecaa44ea0d0d7", "version-string": "3.0.0", diff --git a/versions/m-/ms-gltf.json b/versions/m-/ms-gltf.json index ccc4e4b3d17b5b..d31cbad7f459f1 100644 --- a/versions/m-/ms-gltf.json +++ b/versions/m-/ms-gltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b287c12480725603087cb1ebd5044a6a4bd6b2cb", + "version-string": "r1.9.5.4", + "port-version": 1 + }, { "git-tree": "aeeeac2de78af647be1312f6e9ab687c18369e99", "version-string": "r1.9.5.4", diff --git a/versions/m-/ms-gsl.json b/versions/m-/ms-gsl.json index a33d7ae4881c16..3693c27218c0f1 100644 --- a/versions/m-/ms-gsl.json +++ b/versions/m-/ms-gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d8d320f8c5db1a6b0c7517d110b854bc4b551e5", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "d51947d40835a72b1728c68ca8587e04e3f8e1e2", "version-string": "3.1.0", diff --git a/versions/m-/msmpi.json b/versions/m-/msmpi.json index 7890abdddcd664..16149fa9555cec 100644 --- a/versions/m-/msmpi.json +++ b/versions/m-/msmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92f5e217faeaf4ec7e205a56bfff3a13b75e0393", + "version": "10.1.12498", + "port-version": 3 + }, { "git-tree": "a93f4540161febeb02c42e92a6bfff770c4729dc", "version": "10.1.12498", diff --git a/versions/m-/munit.json b/versions/m-/munit.json index 36ea7690b0310b..a0f4d170796fe4 100644 --- a/versions/m-/munit.json +++ b/versions/m-/munit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d905b3126db7f555eba6a3a02598e0b3b6a97492", + "version-date": "2019-04-06", + "port-version": 5 + }, + { + "git-tree": "37416e6f9f63789221184c07fd4e040d4d8646a2", + "version-string": "2019-04-06", + "port-version": 4 + }, { "git-tree": "f6489068c02b6a87d45ab01592ef733e22904bd7", "version-string": "2019-04-06", diff --git a/versions/m-/muparser.json b/versions/m-/muparser.json index 481fd9ef30f80e..c2fd36fd16a59f 100644 --- a/versions/m-/muparser.json +++ b/versions/m-/muparser.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6987fcdb2ed52f7891489a2c97bdc92b64c46a6f", + "version": "2.3.3", + "port-version": 2 + }, + { + "git-tree": "6b93a7e6250aaa93e20c752426eb4fb1bcb08411", + "version": "2.3.3", + "port-version": 1 + }, + { + "git-tree": "e2e6e7754f6e242c497aca1dd784be15acc5c11f", + "version": "2.3.3-1", + "port-version": 0 + }, { "git-tree": "ffef8786866359a02e3e50d62bcda523967fddce", "version-string": "2.3.2", diff --git a/versions/m-/murmurhash.json b/versions/m-/murmurhash.json index a34122123adda8..090b6a7323a719 100644 --- a/versions/m-/murmurhash.json +++ b/versions/m-/murmurhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbaeb761deb522f06cde0e3efb0610ac3e6afa4d", + "version-date": "2016-01-09", + "port-version": 5 + }, { "git-tree": "5c0ccc0561113eac6ab8881d62a94f31a4ab8d70", "version-string": "2016-01-09", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json new file mode 100644 index 00000000000000..707fce61700c87 --- /dev/null +++ b/versions/m-/mvfst.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "042a5236f46c787daf8334a8ca9c0cd3f71ab1b4", + "version": "0.2", + "port-version": 1 + }, + { + "git-tree": "72ff9157858363c60db8f1e0bd8de03546f7d0e4", + "version": "0.2", + "port-version": 0 + }, + { + "git-tree": "c73381f28aba19d8c008096270feca19a798fa92", + "version": "0.1", + "port-version": 1 + }, + { + "git-tree": "9af76c6cd8bea86bff84e5ccddc9f9e39290391e", + "version": "0.1", + "port-version": 0 + } + ] +} diff --git a/versions/m-/mygui.json b/versions/m-/mygui.json index 581c0b1ff438db..d7b1309f58ae81 100644 --- a/versions/m-/mygui.json +++ b/versions/m-/mygui.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "425cd3df40c8941ec9b3755bc0b3effdd91dc162", + "version": "3.4.1", + "port-version": 2 + }, + { + "git-tree": "d06b2f348d834355086a927f9aabdd47d271819b", + "version": "3.4.1", + "port-version": 1 + }, + { + "git-tree": "6e9074e901ba523a48254a18b5d8e7f3807619be", + "version": "3.4.1", + "port-version": 0 + }, { "git-tree": "9d8226795430e83c733e936821400cf792265656", "version-string": "2020-06-17", diff --git a/versions/n-/nanobench.json b/versions/n-/nanobench.json index de8cc9db734318..7be13eb563b6f1 100644 --- a/versions/n-/nanobench.json +++ b/versions/n-/nanobench.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2078ee30dd4414efb21ecb3fe7c54efa854bc95", + "version": "4.3.6", + "port-version": 0 + }, { "git-tree": "d7dea56e415792e4f5c3a2b80ba3731a2955fbf2", "version-string": "4.3.0", diff --git a/versions/n-/nanogui.json b/versions/n-/nanogui.json index 96ea5ef6b79057..25cc3e33a729fd 100644 --- a/versions/n-/nanogui.json +++ b/versions/n-/nanogui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55a7f3e088fe04ac01f7693c0685770ba865e6ae", + "version-date": "2019-09-23", + "port-version": 3 + }, { "git-tree": "bb3bc286985c1be4bb92ab92e45617410726de3c", "version-string": "2019-09-23", diff --git a/versions/n-/nanovg.json b/versions/n-/nanovg.json index 3393bb25fd23aa..56718be730d131 100644 --- a/versions/n-/nanovg.json +++ b/versions/n-/nanovg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ea125c3f4f9b665a744cd0738c8a11837106f05", + "version-date": "2019-08-30", + "port-version": 5 + }, { "git-tree": "016ef1232ccb3f452530283711be418b33c28e17", "version-string": "2019-8-30", diff --git a/versions/n-/nativefiledialog.json b/versions/n-/nativefiledialog.json index 29df598c132248..831ee32e4dae8a 100644 --- a/versions/n-/nativefiledialog.json +++ b/versions/n-/nativefiledialog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a74fcf99cb59fc1094b1b40622cead632c0df81a", + "version-date": "2022-01-20", + "port-version": 0 + }, { "git-tree": "d765a8f84ba49c18701f68b7471f1b93b7313ddc", "version-date": "2019-08-28", diff --git a/versions/n-/nayuki-qr-code-generator.json b/versions/n-/nayuki-qr-code-generator.json new file mode 100644 index 00000000000000..126ef8e557b194 --- /dev/null +++ b/versions/n-/nayuki-qr-code-generator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9131848b9c36878cb0944b3e8058fa0d25b0d335", + "version": "1.7.0", + "port-version": 0 + } + ] +} diff --git a/versions/n-/nccl.json b/versions/n-/nccl.json index 67df8223421ad2..5739121ed520d0 100644 --- a/versions/n-/nccl.json +++ b/versions/n-/nccl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f07fdf26f53fd4974ad4cb6d6df430dc28e52aa", + "version": "2.4.6", + "port-version": 2 + }, { "git-tree": "c9b172ef032bf322539dab71b19f5dc27b679fd0", "version-string": "2.4.6", diff --git a/versions/n-/ncurses.json b/versions/n-/ncurses.json index 135f3c3b5ec239..26698d56191cd5 100644 --- a/versions/n-/ncurses.json +++ b/versions/n-/ncurses.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ea7aecbf38cef7f64f929c679d55812e679ca496", + "version": "6.3", + "port-version": 1 + }, + { + "git-tree": "68d49e9492a5a00c0b04cfbe2985ed99fc33973a", + "version-string": "6.3", + "port-version": 0 + }, { "git-tree": "f196044f9f7779e0bdb54015dbd3be84aaa00820", "version-string": "6.2", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index 2c4ad5ca6881a0..dbd0afaa80c26b 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "af77893b0d87106812194f8bc866ecfbc6ade24a", + "version-string": "0.0.0-cad832c8", + "port-version": 0 + }, + { + "git-tree": "e27f2efe92a17e1c67c5115c9ef15e7e63b1f3e8", + "version-string": "0.0.0-8089a948", + "port-version": 0 + }, { "git-tree": "801be68901e5e7e84e4069015346fc457e72953c", "version-string": "0.0.0-e691a6dc", diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json index 8aed42aefaf61f..af3e5e2b495b38 100644 --- a/versions/n-/netcdf-c.json +++ b/versions/n-/netcdf-c.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f4d487e2f7e093b2406887023bb3a0856735bad5", + "version": "4.8.1", + "port-version": 2 + }, + { + "git-tree": "9d8a0a97fd75563172e3f1947608db3802c3b84a", + "version": "4.8.1", + "port-version": 1 + }, { "git-tree": "7e6529a5673ac8494b62443a9fab590ce6810826", "version": "4.8.1", diff --git a/versions/n-/nethost.json b/versions/n-/nethost.json index c430d8a410950e..0181e8cdef56e8 100644 --- a/versions/n-/nethost.json +++ b/versions/n-/nethost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b1a7d98ce2c1520bbb370dfc2fcb8c3d704c300", + "version-date": "2019-12-21", + "port-version": 2 + }, { "git-tree": "15d7240f68194b95c97bdac0658a1ffce7015f34", "version-string": "2019-12-21", diff --git a/versions/n-/networkdirect-sdk.json b/versions/n-/networkdirect-sdk.json index 9032a3a6fc8905..36ef8dc5074d92 100644 --- a/versions/n-/networkdirect-sdk.json +++ b/versions/n-/networkdirect-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ae7e238a2a00496c78d2d2bb2101f9e054975e9", + "version": "2.0.1", + "port-version": 3 + }, { "git-tree": "38faf77539eb45a0336501ea8af5d63b9ca11c83", "version-string": "2.0.1", diff --git a/versions/n-/ngspice.json b/versions/n-/ngspice.json index e5ae9654dde19e..79a6d2a47756c7 100644 --- a/versions/n-/ngspice.json +++ b/versions/n-/ngspice.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ec514c4b9a568123369d7d081d004a2d92f6d592", + "version": "35", + "port-version": 2 + }, + { + "git-tree": "f9060da8afaaccceef8b5265f7758f20bc23e289", + "version": "35", + "port-version": 1 + }, { "git-tree": "cce657d55082d7a23496c44cb311e208ea31cab4", "version-string": "35", diff --git a/versions/n-/nlohmann-json.json b/versions/n-/nlohmann-json.json index 29cfd19384c4c7..00a57390f36342 100644 --- a/versions/n-/nlohmann-json.json +++ b/versions/n-/nlohmann-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1fe747457714c4c43b12502de05b2d006b440d4", + "version-semver": "3.10.5", + "port-version": 0 + }, { "git-tree": "f948131b4bc6e2e9ae67cb7d40f5e930991fba21", "version-semver": "3.10.4", diff --git a/versions/n-/nmslib.json b/versions/n-/nmslib.json index 83c6d4e864f932..733d5e4578e082 100644 --- a/versions/n-/nmslib.json +++ b/versions/n-/nmslib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98fea3cd9111ced5710357dee8212e576efd514b", + "version": "2.1.1", + "port-version": 1 + }, { "git-tree": "b0256cb272ca0fe86ee427cdd64ad08f41c656b8", "version": "2.1.1", diff --git a/versions/n-/nnpack.json b/versions/n-/nnpack.json index 00fe3761110442..28a12083ae0fa0 100644 --- a/versions/n-/nnpack.json +++ b/versions/n-/nnpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2479c1088fd75df5e9f06e85086c748aefae9e11", + "version-date": "2021-02-21", + "port-version": 2 + }, { "git-tree": "42cc5d6dad2376e9322d715341bb0c8e2d1297b8", "version-date": "2021-02-21", diff --git a/versions/n-/nowide.json b/versions/n-/nowide.json index 46c9cad9ee11c5..ef5bd9f1aee30a 100644 --- a/versions/n-/nowide.json +++ b/versions/n-/nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2243fbc97eb5f4ef81fe44e85e449227464cc185", + "version": "11.1.3", + "port-version": 0 + }, { "git-tree": "21c416b6bc370248b98485d54aa32960158012ea", "version": "11.1.2", diff --git a/versions/n-/nu-book-zxing-cpp.json b/versions/n-/nu-book-zxing-cpp.json new file mode 100644 index 00000000000000..09a5878c100948 --- /dev/null +++ b/versions/n-/nu-book-zxing-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b807d508317d0b4bfc5a368fae07f81770851c0b", + "version": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/n-/numactl.json b/versions/n-/numactl.json index f80d95f6e941ef..ce482e60d0a526 100644 --- a/versions/n-/numactl.json +++ b/versions/n-/numactl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38b7d6feca43ff05b6a059aae8ce218fa382853e", + "version": "2.0.14", + "port-version": 1 + }, { "git-tree": "58815aa974d9ab14d768576ade86c2e3b43d20a3", "version": "2.0.14", diff --git a/versions/n-/nvtt.json b/versions/n-/nvtt.json index 6941d034b59355..5bb7e4278dcf18 100644 --- a/versions/n-/nvtt.json +++ b/versions/n-/nvtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2db690561d6b3d44308bd53e0da9d3dc5794ea1", + "version": "2.1.2", + "port-version": 3 + }, { "git-tree": "80005bae9d45f506abd7b21dd09b246703381174", "version-string": "2.1.2", diff --git a/versions/o-/oatpp-consul.json b/versions/o-/oatpp-consul.json index bb5c050900cd9d..3dfcbc54700143 100644 --- a/versions/o-/oatpp-consul.json +++ b/versions/o-/oatpp-consul.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7dbba8dd8a15ee5a573d8893af3755c2c61e082", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "595495963d23d1c6b4c6c17d00ecd7c77482d3a2", "version": "1.2.5", diff --git a/versions/o-/oatpp-curl.json b/versions/o-/oatpp-curl.json index e74632da63c6a3..2302f299d84990 100644 --- a/versions/o-/oatpp-curl.json +++ b/versions/o-/oatpp-curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae678502914406793d56adb1bffbede8febdfb77", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "347efe19ad9ba33369ad147e83ac1c634cc63ca6", "version": "1.2.5", diff --git a/versions/o-/oatpp-libressl.json b/versions/o-/oatpp-libressl.json index 00953cf306ff76..0440e9e5f7c55d 100644 --- a/versions/o-/oatpp-libressl.json +++ b/versions/o-/oatpp-libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a94780d515079c88f644ac92b35f935fff138b5", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "e8b1d151bbd0338da87480893b466829b55ecc7a", "version": "1.2.5", diff --git a/versions/o-/oatpp-mbedtls.json b/versions/o-/oatpp-mbedtls.json index b438b0e99fd0ea..9a2bda18be6860 100644 --- a/versions/o-/oatpp-mbedtls.json +++ b/versions/o-/oatpp-mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3ed8d7f9afd6d6e5010b136ac0a8b516532b41f", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "9d453e8fdce152be19d4f0bda197adfdaeebb118", "version": "1.2.5", diff --git a/versions/o-/oatpp-mongo.json b/versions/o-/oatpp-mongo.json index 9888322aa55c0d..e89f32c69a3cb7 100644 --- a/versions/o-/oatpp-mongo.json +++ b/versions/o-/oatpp-mongo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb2cca9b0d5255e9c250210b6da94b8383673530", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "e6adcb5eb014357414879a0677983d6a7b4bc9db", "version": "1.2.5", diff --git a/versions/o-/oatpp-openssl.json b/versions/o-/oatpp-openssl.json index 80b4c28e447c60..b2c506111c0aef 100644 --- a/versions/o-/oatpp-openssl.json +++ b/versions/o-/oatpp-openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30adf601290c4dc9d8fd834701df6c3d84db7764", + "version-semver": "1.3.0", + "port-version": 0 + }, { "git-tree": "d127d675e359a2f4a430f49f9dab815dd7991bfb", "version-semver": "1.2.5", diff --git a/versions/o-/oatpp-postgresql.json b/versions/o-/oatpp-postgresql.json index b8b581480e76c6..76f2a311269482 100644 --- a/versions/o-/oatpp-postgresql.json +++ b/versions/o-/oatpp-postgresql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5475ec4475805e185290f9b6676cb0b3471d469", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "f2cbdc4de3f10789d3b258636819bdec76f55850", "version": "1.2.5", diff --git a/versions/o-/oatpp-sqlite.json b/versions/o-/oatpp-sqlite.json index 3351a6163e37f0..29af51afed1624 100644 --- a/versions/o-/oatpp-sqlite.json +++ b/versions/o-/oatpp-sqlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83864d8dac636388be925bc5228fb6067ff0c634", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "998bc24ce7db8343441a34779f38d500edd5a2c8", "version": "1.2.5", diff --git a/versions/o-/oatpp-ssdp.json b/versions/o-/oatpp-ssdp.json new file mode 100644 index 00000000000000..dbd84e5c216256 --- /dev/null +++ b/versions/o-/oatpp-ssdp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "37d034f06503445f5a4ac52a960f4360cb68ce58", + "version": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/versions/o-/oatpp-swagger.json b/versions/o-/oatpp-swagger.json index 21161946e2e69d..e2107262e7f95f 100644 --- a/versions/o-/oatpp-swagger.json +++ b/versions/o-/oatpp-swagger.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f0bc8c1d3f156e6d2a7cee4691154c0973b12bd", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "b1859f1a4fa6e90da2ed150098a07aa86189d681", "version": "1.2.5", diff --git a/versions/o-/oatpp-websocket.json b/versions/o-/oatpp-websocket.json index 69275f15b559db..53c7f919465b7a 100644 --- a/versions/o-/oatpp-websocket.json +++ b/versions/o-/oatpp-websocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bfe9a22be4776d9da6022b006d0adca20da7222", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "e492744484bc660010ae5e038aaa5703abce53f5", "version": "1.2.5", diff --git a/versions/o-/oatpp-zlib.json b/versions/o-/oatpp-zlib.json index eb9d7b12633e4c..db9f47ae2062b7 100644 --- a/versions/o-/oatpp-zlib.json +++ b/versions/o-/oatpp-zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74e51d02fac6e71c8bad4856fc97767f8d3041ea", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "9cbd1b70447175716f4415c18d4e66696c78ad80", "version": "1.2.5", diff --git a/versions/o-/oatpp.json b/versions/o-/oatpp.json index de4c162da955d9..5ec6257b202cdc 100644 --- a/versions/o-/oatpp.json +++ b/versions/o-/oatpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85f50043f867de15e428b3d0f8749a5aabc34e86", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "f6f5d0cb4da86c170670f9d3947b5704ed213a5c", "version": "1.2.5", diff --git a/versions/o-/ocilib.json b/versions/o-/ocilib.json index a5249e866d173b..29c753471d2f80 100644 --- a/versions/o-/ocilib.json +++ b/versions/o-/ocilib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "04a952ec38bbc46e3cfa6d5ee6ced8a5e9989e31", + "version": "4.7.3", + "port-version": 2 + }, + { + "git-tree": "76e672a75b678329bb9646c61e9f4bdba02aeedd", + "version": "4.7.3", + "port-version": 1 + }, { "git-tree": "cc328210424ed585e62cd1ec47b1a48b3a2174c2", "version": "4.7.3", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 5dd8f1b76d14f4..a717a3e98d97b8 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fd55a098294ab4f2f8b46bc67172e6a8be3c1df0", + "version": "1.12.9", + "port-version": 7 + }, + { + "git-tree": "64cee22caf52cb15e120895e0689281e8664f42a", + "version": "1.12.9", + "port-version": 6 + }, { "git-tree": "322b9a5290ce1656aa66b684b07d1e327b18eeeb", "version-string": "1.12.9", diff --git a/versions/o-/ois.json b/versions/o-/ois.json index d273f8c520a8f3..39d8df3b2b7240 100644 --- a/versions/o-/ois.json +++ b/versions/o-/ois.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79d79b0c5901492572044ad873cdf4df864accea", + "version": "1.5.1", + "port-version": 1 + }, { "git-tree": "05dc4bcc0372eaa7b8a86f89a268c5ef0c69c5bf", "version": "1.5.1", diff --git a/versions/o-/ompl.json b/versions/o-/ompl.json index ac0df1cbe5e421..bf7d5c30f4dff0 100644 --- a/versions/o-/ompl.json +++ b/versions/o-/ompl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "262729470ab00b469cfb9d63e196ebf4006d35cd", + "version": "1.5.1", + "port-version": 5 + }, + { + "git-tree": "cde8f8a96e5fc3c5764ca85632efa1b828868e26", + "version": "1.5.1", + "port-version": 4 + }, { "git-tree": "4385de7645c202d99bb25420d049f15cb54d9ed7", "version-string": "1.5.1", diff --git a/versions/o-/omplapp.json b/versions/o-/omplapp.json index 2df4f1b8ee9d8e..c4603fb1a4ebc1 100644 --- a/versions/o-/omplapp.json +++ b/versions/o-/omplapp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3f243c859f1597f18da61a472684c113e2ed150d", + "version": "1.5.1", + "port-version": 3 + }, + { + "git-tree": "f048abe6cf0219fa09fd9024188c54a3b5c289c3", + "version": "1.5.1", + "port-version": 2 + }, { "git-tree": "8860b6976a0c226039034eb0b59146708d27a635", "version": "1.5.1", diff --git a/versions/o-/onednn.json b/versions/o-/onednn.json index 9a62af9fd4aee4..f21847d63ccfc3 100644 --- a/versions/o-/onednn.json +++ b/versions/o-/onednn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ac578f6078a2120900435434f0df8c96d4a7a54", + "version-semver": "2.4.3", + "port-version": 1 + }, { "git-tree": "d2c75b6924fc7301f68d484674419fad3f076ca5", "version-semver": "2.4.3", diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json index de8a62fc6f5682..a61d8ee3f3c151 100644 --- a/versions/o-/onnx.json +++ b/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62ee0b78332273115540d669065a467314aace3a", + "version-semver": "1.10.2", + "port-version": 1 + }, { "git-tree": "a83605bd84787898f92ada1bf1874e162a441c10", "version-semver": "1.10.2", diff --git a/versions/o-/onnxruntime-gpu.json b/versions/o-/onnxruntime-gpu.json index 2b98c4448a0480..1fe9bafd6ef369 100644 --- a/versions/o-/onnxruntime-gpu.json +++ b/versions/o-/onnxruntime-gpu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9741bef63d2b0c74277568da67ab7aa1ab50c51b", + "version": "1.5.1", + "port-version": 1 + }, { "git-tree": "36273dd148753f754c51a4835aeb29bf5aa1556e", "version-string": "1.5.1", diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index 1edf75bb727c5e..40cad68db7cdf9 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7a42ce1cf8d2a5f4380a4dcc2807a0d86962d49d", + "version": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "62aab840d7f987d8ca2ad5b9d81111a0b6f93dfd", + "version": "1.2.2", + "port-version": 1 + }, { "git-tree": "e9f30c2699c8919f074676b99f79358ef1f0a059", "version": "1.2.2", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index fe1afc014d0049..1d70617a9c2886 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1dee3171a9184c0a13631fda79f6aa58d2b80b6", + "version-semver": "1.21.1", + "port-version": 4 + }, { "git-tree": "b6672158f9eda4512b07d89ba193c51ef2802641", "version-semver": "1.21.1", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 7a54f9b2cca3cc..0cf8441a75e8b1 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "631541b0dcf2ea300f96829885d9bc0282d38a65", + "version": "0.3.19", + "port-version": 0 + }, { "git-tree": "048ae3833af8e5633ce86c3174e20c2794fe573d", "version": "0.3.15", diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json index f4b6768bfa4a18..525db85fd9c9b6 100644 --- a/versions/o-/opencc.json +++ b/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10bc4f21926d1c116227ba57e954c4f8a6c9e999", + "version-date": "2020-04-26", + "port-version": 10 + }, { "git-tree": "b7f1756b470f31ae2da4a2d65eb5c409d4798b8e", "version-string": "2020-04-26", diff --git a/versions/o-/opencensus-cpp.json b/versions/o-/opencensus-cpp.json index 5954c8bfee1795..4b2735ff7d674a 100644 --- a/versions/o-/opencensus-cpp.json +++ b/versions/o-/opencensus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e0e908de8a31c22d295c1ad069e87ab2eb964b7", + "version-date": "2021-08-26", + "port-version": 0 + }, { "git-tree": "cd8e1133cda88028a939ad52bd047894959fc9fd", "version-string": "0.4.0", diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 36c009a1b21dc2..ac457821ba1b2d 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "80e8a46f8c1c2cd748834cd225edbe127a489d5a", + "version-semver": "2.1.1", + "port-version": 2 + }, + { + "git-tree": "c68079d3d055b028af29997748784c7fa8457f7c", + "version-semver": "2.1.1", + "port-version": 1 + }, + { + "git-tree": "5027649e2b69070030097c754018913b6ae0d8b0", + "version-semver": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "5b4c12d0a01185796534d2925a87fe3b874f1b91", + "version-semver": "2.1.0", + "port-version": 2 + }, + { + "git-tree": "512f32dd15d09dbb73d83b778898c99bf0697aa2", + "version-semver": "2.1.0", + "port-version": 1 + }, { "git-tree": "9781e9cd638610cdb11ed9968c7c1ccb1d198e79", "version-semver": "2.1.0", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 255c70456fd5e3..60ab4980b25a04 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "afe6b1b5c7be14be0656724754f95e537416c763", + "version": "4.5.5", + "port-version": 0 + }, + { + "git-tree": "c120b015f37bc79900712d64e8ca612d71be22cc", + "version": "4.5.4", + "port-version": 1 + }, { "git-tree": "7aaa340439ab4742d8e328a1069cd0923eba1072", "version": "4.5.4", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index 0863629483bfe0..c52b5ccf671079 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e02e468ae088086be3b3579366e0bc4c3c8be6cc", + "version": "2.4.13.7", + "port-version": 9 + }, { "git-tree": "e2c00be603dbf06283820dc2b2f6c04a77728a5f", "version": "2.4.13.7", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 6c9d8d075bbc98..9f39b0559ec81a 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "7060d481bf3045fdd24aa8ef0d83cf2db3b13a50", + "version": "3.4.16", + "port-version": 4 + }, + { + "git-tree": "76d605b750c5535590489574dc24fa30ffe249f8", + "version": "3.4.16", + "port-version": 3 + }, + { + "git-tree": "a11dd583ecb7212732fedb0ab3e3308ea84f10d9", + "version": "3.4.16", + "port-version": 2 + }, + { + "git-tree": "0bf28e1704eae1d6f24b98fe884b27c71db798a7", + "version": "3.4.16", + "port-version": 1 + }, { "git-tree": "e55e479a0240978c0d0dee3cb79619e93b3825a3", "version": "3.4.16", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 75c9d3e42808b3..aa1ddf5aed8d80 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "afed148d21295bf99e8ac657fdb808ed82467871", + "version": "4.5.5", + "port-version": 0 + }, + { + "git-tree": "ce474a40e6572ced8dd1229f22f6cbed9cc74212", + "version": "4.5.4", + "port-version": 4 + }, + { + "git-tree": "b170a087d34521462cd247a24f230627a272975e", + "version": "4.5.4", + "port-version": 3 + }, + { + "git-tree": "537abba5a070d173cf42510f86ff4ffe057dd77f", + "version": "4.5.4", + "port-version": 2 + }, + { + "git-tree": "6a5d8c17cfd9a4e3caa7acf4625876fec8880fe2", + "version": "4.5.4", + "port-version": 1 + }, { "git-tree": "35b4405de16e9116ce1e698827c2254a0b02b963", "version": "4.5.4", diff --git a/versions/o-/opendnp3.json b/versions/o-/opendnp3.json index c4d4381eed15ad..4eac48822822ef 100644 --- a/versions/o-/opendnp3.json +++ b/versions/o-/opendnp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9315f4a8ad7564c1fc8b81c4a9f4c7b0305c0b3", + "version": "3.1.1", + "port-version": 1 + }, { "git-tree": "bf6ee46efb76af8f7f317fabfb24358fd82312de", "version": "3.1.1", diff --git a/versions/o-/opengl.json b/versions/o-/opengl.json index 687d48943c8cf0..f2e28fba53280a 100644 --- a/versions/o-/opengl.json +++ b/versions/o-/opengl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6778094e7a9e5027545a46af473d27ce28890c53", + "version-date": "2022-03-14", + "port-version": 0 + }, { "git-tree": "9fa8ed2a1fb625613a32ee95d2413dbc921860f7", "version-string": "0.0", diff --git a/versions/o-/openh264.json b/versions/o-/openh264.json index 301ffd6c562b56..895d98ae05ff6b 100644 --- a/versions/o-/openh264.json +++ b/versions/o-/openh264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de70ba65ce87de6c9e2c53797d560e42bf6771ea", + "version-date": "2021-03-16", + "port-version": 3 + }, { "git-tree": "dd110373e4afc53e6ea5b43b9f940fda9204c72c", "version-date": "2021-03-16", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index bfe2c174b14e2f..ea3310044ddadc 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "a52afa5ed0495b47dd1c123d975746fdfa0b3459", + "version": "2.3.10.1", + "port-version": 2 + }, + { + "git-tree": "00b94623cc9528075483e57034da95bb356c6848", + "version": "2.3.10.1", + "port-version": 1 + }, + { + "git-tree": "f5a6955a1595a5d3ea429059d9be4ddedc8e7cab", + "version": "2.3.10.1", + "port-version": 0 + }, + { + "git-tree": "f9b44bac4dcc0735f5efc3e8f0d439790b7efbd0", + "version": "2.3.7.2", + "port-version": 5 + }, { "git-tree": "8b1ce552e00d88857ad35695435b353caf9ad4c2", "version": "2.3.7.2", diff --git a/versions/o-/openmpi.json b/versions/o-/openmpi.json index e98a3395b42593..dc5df6dfa88c0a 100644 --- a/versions/o-/openmpi.json +++ b/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96a3a8cd636443eaf50648e749ff144cb65ad851", + "version": "4.1.0", + "port-version": 4 + }, { "git-tree": "5d701c1350d6cb8e4380f829460e8287b0e2f6cc", "version": "4.1.0", diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index 1731c064e518f9..beea957cac0ac6 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "f32be4f15d0babca5ba5a6e02b78f4610ab6d2f4", + "version": "2.0", + "port-version": 3 + }, + { + "git-tree": "894793611702efbc0abc44768002cdd12f73557a", + "version": "2.0", + "port-version": 2 + }, + { + "git-tree": "eea9187e35c87676d442453e6942a47417d7c2dd", + "version": "2.0", + "port-version": 1 + }, + { + "git-tree": "08113de9c7bc1b9201be4c3a01c1c3e5a1cf5acd", + "version": "2.0", + "port-version": 0 + }, { "git-tree": "6f3087d8d002d7f226e77427ce363e2b20371485", "version": "1.6", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index a7dd4f8be61c30..38142e831a1c37 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "7e4d802e3bde4154c227c0dd1da75c719be9f07a", + "version-string": "1.1.1n", + "port-version": 0 + }, + { + "git-tree": "29c9d32a703896143a51c55f0b7ae4298684afd6", + "version-string": "1.1.1m", + "port-version": 2 + }, + { + "git-tree": "9b8e2ac096b1cd8782137a853c5fc76e07c2af9a", + "version-string": "1.1.1m", + "port-version": 1 + }, + { + "git-tree": "1dbcaacad14ed0761323aa12c13e917270153594", + "version-string": "1.1.1m", + "port-version": 0 + }, { "git-tree": "d25384246619019a1e44f018546cdfcaf1800174", "version-string": "1.1.1l", diff --git a/versions/o-/opensubdiv.json b/versions/o-/opensubdiv.json index be8519959c357f..963073c9dd5755 100644 --- a/versions/o-/opensubdiv.json +++ b/versions/o-/opensubdiv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91fabcb273d865674e59979585b5f9a6739ad6c5", + "version-semver": "3.4.3", + "port-version": 4 + }, { "git-tree": "786a994b5a4637b9cd43eaf2b790d913bce9cdce", "version-semver": "3.4.3", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 6b00edcbdda8a1..f10a1c230048a7 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c8c4bd4f115feaa3faed25dc74c695c1627d4f0d", + "version-semver": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "c6f08af646f830d343e50f00d01775f6ce8fc7d8", + "version-semver": "1.1.1", + "port-version": 0 + }, { "git-tree": "054971acff976718841101e8bad641169cf11a5d", "version-semver": "1.0.1", diff --git a/versions/o-/opentracing.json b/versions/o-/opentracing.json index 616b682881ca5f..94c1d40af1e1ea 100644 --- a/versions/o-/opentracing.json +++ b/versions/o-/opentracing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bd6797b313b265c51c85ea2838efcdaa70f87f7", + "version": "1.6.0", + "port-version": 2 + }, { "git-tree": "001eac5d529c5b20dd9dbfc85879568e07d9b55d", "version-string": "1.6.0", diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json index f26e57bb9fcd37..3549324dfc9177 100644 --- a/versions/o-/openvdb.json +++ b/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8546c4c4d392f4b0bb9a604e8bb6a831d39b99e8", + "version": "8.2.0", + "port-version": 0 + }, { "git-tree": "ecd4c1d0e5c1e497615d75cb0748c97fa1d70384", "version": "8.1.0", diff --git a/versions/o-/openvr.json b/versions/o-/openvr.json index d26235515817ec..f93111b2a37835 100644 --- a/versions/o-/openvr.json +++ b/versions/o-/openvr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29e327e41442a81d5bc3040244132649f032edb6", + "version": "1.16.8", + "port-version": 2 + }, { "git-tree": "cd3839d56ad4263ecc52a94440b22333ab1d7bfe", "version-string": "1.16.8", diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json index 217c909c3aedbf..7ccb3bc16ff0da 100644 --- a/versions/o-/openxr-loader.json +++ b/versions/o-/openxr-loader.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "9d673fe500c4b38f0806bd4b3c23a82bba897967", + "version": "1.0.22", + "port-version": 1 + }, + { + "git-tree": "445bbc9debe9866fad35544bd948d54fda4e72c4", + "version": "1.0.22", + "port-version": 0 + }, + { + "git-tree": "435893c175c6462b476e03f95d30717c9653eac3", + "version": "1.0.20", + "port-version": 1 + }, + { + "git-tree": "84f63fe87decf331d7cc6a4f07046d2528b3c313", + "version": "1.0.20", + "port-version": 0 + }, { "git-tree": "7d72d589a9281315c0e7ee4b9dd697b7147c0258", "version-string": "1.0.18", diff --git a/versions/o-/optimus-cpp.json b/versions/o-/optimus-cpp.json new file mode 100644 index 00000000000000..d3458510a705a5 --- /dev/null +++ b/versions/o-/optimus-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e180e598e04576e8a6f2e391c72031c360b5a3a2", + "version": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 60da91a0b332b0..7c76807e2496c6 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2e3d8cf49728cdb23060f31152768a2292c24ab8", + "version": "3.2", + "port-version": 3 + }, + { + "git-tree": "106a6da206a787832252687e41ad5ba3b102d062", + "version": "3.2", + "port-version": 2 + }, { "git-tree": "f3ac1cffb36f0b0b2b531af29145de695cee2291", "version": "3.2", diff --git a/versions/o-/otl.json b/versions/o-/otl.json index a1808f8167f8c8..48fe11f9828ec0 100644 --- a/versions/o-/otl.json +++ b/versions/o-/otl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02a8c353e8a348eb320fdfaf7dfd7d4a40d3d2e1", + "version": "4.0.463", + "port-version": 1 + }, { "git-tree": "bce79d0a6767b5593182564f94f3db98eea61be7", "version": "4.0.463", diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index 6c50899e89db1e..269477e3ea7694 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2abc0cf7913b6db02a17f3b01f6e5744bd43a9ae", + "version-string": "2.2.2-20211208", + "port-version": 0 + }, { "git-tree": "31aada521fafc8169a891338a3af04fa4f658327", "version-string": "2.2.2-20210922", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 3cb984a7c5cf49..59ae5304a99b65 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "024f716f80c8454769393287ef14a75de4785f32", + "version": "1.50.3", + "port-version": 0 + }, + { + "git-tree": "a9cc75941c3ff73920fb3900615d84bc6f1b423e", + "version": "1.48.10", + "port-version": 1 + }, { "git-tree": "a411f99ebac4507806d3824364cc766f578850e5", "version": "1.48.10", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 2634add9c57646..1f966eb4791d35 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "5aebede0dd324cd7e5db1460e1d9be26d18685ba", + "version": "2.50.0", + "port-version": 1 + }, + { + "git-tree": "72d0e19b3eb2fdb5d8c60c1ae78bafc51866325d", + "version": "2.50.0", + "port-version": 0 + }, + { + "git-tree": "c01e75e9dc192ca4e6e7161f3362d6866a952e7c", + "version": "2.48.1", + "port-version": 1 + }, { "git-tree": "1ff0b71c742896ffb9da84638f7e20b2960aff80", "version": "2.48.1", diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index eb98c22e2cadb4..eadbb281397c44 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f72efb2dae42b2f746be8e239b00b707b3a61449", + "version": "1.34", + "port-version": 0 + }, { "git-tree": "4c8c5305bf3135855a29acfde1effc1f9897ea4d", "version-string": "1.33", diff --git a/versions/p-/pbc.json b/versions/p-/pbc.json index 8231fad8f66870..1e3b1744586581 100644 --- a/versions/p-/pbc.json +++ b/versions/p-/pbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23742abe8879e71a911c56845977ad2387e9bfa6", + "version": "0.5.14", + "port-version": 6 + }, { "git-tree": "de531bdf83ba5c3a005655bde246d58074a28937", "version-string": "0.5.14", diff --git a/versions/p-/pcapplusplus.json b/versions/p-/pcapplusplus.json index 7c5b4840c76e73..c90a7c04976638 100644 --- a/versions/p-/pcapplusplus.json +++ b/versions/p-/pcapplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1f63c9365f0cb128761835ebceeafb6b162c815", + "version": "21.11", + "port-version": 1 + }, { "git-tree": "e0480fc24edf7b699eb027d24c3737026dd1128c", "version-string": "21.11", diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index 609b71c7d53b24..de398084c78f30 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "af82798f0369372866e38d58f1e38a1165801c1d", + "version": "1.12.0", + "port-version": 6 + }, + { + "git-tree": "5e5ebb57bf0a08e7eab28fe3571ebaa55c3d4ba8", + "version": "1.12.0", + "port-version": 5 + }, + { + "git-tree": "7e54ab86574dfc901275996e282f8db5c6c9c3fb", + "version": "1.12.0", + "port-version": 4 + }, + { + "git-tree": "0f0c24ef83692fbcc9434ec9622592ba9b16e0d5", + "version": "1.12.0", + "port-version": 3 + }, + { + "git-tree": "5d02740fc9422f1b520ae322cda71e8e6e5323cf", + "version": "1.12.0", + "port-version": 2 + }, { "git-tree": "a2eb47fa4d7f959d9c8712f0d0925c2af94bcc80", "version": "1.12.0", diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json index fe12a838d228e6..bba977373475ab 100644 --- a/versions/p-/pcre2.json +++ b/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a15903858198c8a3b890972b5e8c0d2aa3f89f8", + "version": "10.39", + "port-version": 2 + }, { "git-tree": "b25437749e0bcdd96807c66a8fc8764382c55203", "version": "10.39", diff --git a/versions/p-/pdal-c.json b/versions/p-/pdal-c.json index b989fb33fdff02..0eb2c8be9f68e4 100644 --- a/versions/p-/pdal-c.json +++ b/versions/p-/pdal-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c19bcf077b95f0d81ef14bfdf9774795521d6013", + "version-string": "2.1", + "port-version": 0 + }, { "git-tree": "9319bb871924d143523c4e79ecc45bc9260360b5", "version-string": "1.8", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index 65cfa4505309ab..d9f41bdfc13457 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "408d14a540c0a1e217efec2deea453594d9d1bde", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "11280c0564220eb3e82eae1c596843daf5b79294", "version": "1.7.1", diff --git a/versions/p-/pdcurses.json b/versions/p-/pdcurses.json index 28588339065bf0..68869abfcd4d59 100644 --- a/versions/p-/pdcurses.json +++ b/versions/p-/pdcurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e09ec910aff6b25bd1e1554b15dce08656b3f3d5", + "version-string": "3.9", + "port-version": 3 + }, { "git-tree": "190eafb5554bf1f484edff1aa94598bac3ff9830", "version-string": "3.9", diff --git a/versions/p-/pegtl.json b/versions/p-/pegtl.json index 8e6ca64f091608..dae6a54d3cd697 100644 --- a/versions/p-/pegtl.json +++ b/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43adc8ee136a8dd0ea88b54a6a7fdc7325cf7327", + "version-semver": "3.2.5", + "port-version": 0 + }, { "git-tree": "9e9bdd7c1860ebc540ca2df7ab8451e596dfff3a", "version-semver": "3.2.2", diff --git a/versions/p-/pfring.json b/versions/p-/pfring.json index a38584c0bad58e..c16247064e56fd 100644 --- a/versions/p-/pfring.json +++ b/versions/p-/pfring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed3dbffb4364b80331f2b986435bad956f39ad09", + "version-date": "2019-10-17", + "port-version": 4 + }, { "git-tree": "cc03f1b404adc6a550e8d7b9d5d36795fac6b4b7", "version-string": "2019-10-17", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 4d5ac929d2f13e..5cbbdf356642f6 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3efd7a1c7727eec4a15ba3ac6f8f013550750760", + "version-semver": "4.1.2", + "port-version": 1 + }, { "git-tree": "c2731461cec1f38b720c3db1038e3096957244a4", "version-semver": "4.1.2", diff --git a/versions/p-/piex.json b/versions/p-/piex.json index fcca063f2cdac4..dd5cd37456d387 100644 --- a/versions/p-/piex.json +++ b/versions/p-/piex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9f7ad5427c18be18708d00150fe9ca33dc30a8a", + "version-date": "2019-07-11", + "port-version": 2 + }, { "git-tree": "08ede8e9e8ed0d849edd62a316b407041cc8d4aa", "version-string": "2019-07-11", diff --git a/versions/p-/pistache.json b/versions/p-/pistache.json index e7538a69397a27..9c84e2e39a0808 100644 --- a/versions/p-/pistache.json +++ b/versions/p-/pistache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "270e04cb56d330fc6cd8482697341ed0d3bf1320", + "version-date": "2021-03-31", + "port-version": 3 + }, { "git-tree": "e8c089b0eec0784be71fb4347dbd583c4aaeb0d8", "version-date": "2021-03-31", diff --git a/versions/p-/pixel.json b/versions/p-/pixel.json index d10f82cfa36d0a..f0bfad783880e6 100644 --- a/versions/p-/pixel.json +++ b/versions/p-/pixel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dbf76415a78802e7dc2717280e2a44123a04df69", + "version-date": "2022-03-15", + "port-version": 0 + }, + { + "git-tree": "346ea5fe92b2cfe055a1cd242868605e56d94318", + "version": "0.3", + "port-version": 4 + }, { "git-tree": "57198090e451e125ad231a0a1068643cbd06cb61", "version-string": "0.3", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 9d4faf2fd5ada0..0faacd4b5a750a 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "85d5aa0bbd91cff8853d0767bc9dc73e97156291", + "version": "0.40.0", + "port-version": 2 + }, + { + "git-tree": "c2dd7fec404954b43ad0da4ee86c29a4cfdd8fc1", + "version": "0.40.0", + "port-version": 1 + }, { "git-tree": "9fa31a3aa7682c205028903d0b2d2df269a95db5", "version": "0.40.0", diff --git a/versions/p-/pkgconf.json b/versions/p-/pkgconf.json index 44a48125a8f1b4..87f63902cf5e65 100644 --- a/versions/p-/pkgconf.json +++ b/versions/p-/pkgconf.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5b599bd7dbbbc7837f7dbcf1b111478da076e2a4", + "version": "1.8.0", + "port-version": 2 + }, + { + "git-tree": "cbcb5f984f7713a636caa075f06b755d37493dbd", + "version": "1.8.0", + "port-version": 1 + }, { "git-tree": "a56de4007c52482253b4e052bc5551655711034c", "version": "1.8.0", diff --git a/versions/p-/plf-colony.json b/versions/p-/plf-colony.json index 88bbddd62111e9..16d3e369de96df 100644 --- a/versions/p-/plf-colony.json +++ b/versions/p-/plf-colony.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e90bb5fdf6e933b8d5c14e07d85c920e7a7afea", + "version": "6.33", + "port-version": 0 + }, { "git-tree": "39c9b9a09ea0d7f88ac7a9cd90addb057e259f20", "version": "6.28", diff --git a/versions/p-/plf-hive.json b/versions/p-/plf-hive.json new file mode 100644 index 00000000000000..7b8317a6582996 --- /dev/null +++ b/versions/p-/plf-hive.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8e5c8a3892eb3ca1cade64672eaa76d3a9c74990", + "version-date": "2021-12-11", + "port-version": 0 + } + ] +} diff --git a/versions/p-/plibsys.json b/versions/p-/plibsys.json index 4f2ce556b13c5f..4fa3dacd23ef1e 100644 --- a/versions/p-/plibsys.json +++ b/versions/p-/plibsys.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6691b7f463d3a1bf27ebafa6e317cdc41735665c", + "version": "0.0.4", + "port-version": 6 + }, { "git-tree": "1af02f154f0a23e71a9547cf67f4dc7b0cab732d", "version-string": "0.0.4", diff --git a/versions/p-/plplot.json b/versions/p-/plplot.json index d601a4faa4a92e..d845aa8708d507 100644 --- a/versions/p-/plplot.json +++ b/versions/p-/plplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bdc5ce1d9ab4085f8d1753de526830bee4bc92a", + "version-semver": "5.13.0", + "port-version": 15 + }, { "git-tree": "9e9bda9b45cefac69d08bbb2f3e947deab8cac14", "version-semver": "5.13.0", diff --git a/versions/p-/pmdk.json b/versions/p-/pmdk.json index e8e653c481c8de..762bd4b327f7e3 100644 --- a/versions/p-/pmdk.json +++ b/versions/p-/pmdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6a893e78e485b907148252308a5ea11befde1d9", + "version": "1.11.0", + "port-version": 1 + }, { "git-tree": "a2083c3fd577af1074c046235d2d0c73ad77d011", "version": "1.11.0", diff --git a/versions/p-/poco.json b/versions/p-/poco.json index 69062dd6e92abc..9a6677049e7013 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ae7e310067c34beca24a055b9b25e24fe1b42190", + "version": "1.11.1", + "port-version": 0 + }, + { + "git-tree": "6dec8737e7e8e89f212ae2ab75c55c6e977d8ab8", + "version-semver": "1.11.0", + "port-version": 2 + }, { "git-tree": "83279266114bf6eab34a86e6009313e10f3aa11e", "version-semver": "1.11.0", diff --git a/versions/p-/polyhook2.json b/versions/p-/polyhook2.json index a86411d5f9d74e..33d7a2951854ac 100644 --- a/versions/p-/polyhook2.json +++ b/versions/p-/polyhook2.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "bd2324e09d967fab5a098f0c2d42682abf5b4113", + "version-date": "2022-03-01", + "port-version": 0 + }, + { + "git-tree": "106988bbbfbb0402ee0263e7d71753b4df830a5d", + "version-date": "2022-02-21", + "port-version": 0 + }, + { + "git-tree": "8ad15683e3f77fd7301903e9dab7aa57302f4e80", + "version-date": "2022-02-06", + "port-version": 0 + }, + { + "git-tree": "519f086961afed4ccad13eb8d56ac009221f1714", + "version-date": "2022-02-02", + "port-version": 0 + }, + { + "git-tree": "bae35bd5e732a2468beb53b4407668d515204514", + "version-date": "2021-05-09", + "port-version": 2 + }, { "git-tree": "9b4af767d959bb37711e474327acba689127749c", "version-string": "2021-05-09", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index 0b609a36c975af..6dbef9b4de9fe4 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "139058e4ec62f875c5538cbd1577c95938183364", + "version": "22.2.0", + "port-version": 0 + }, { "git-tree": "3f15f5c09cc977692e0c081d39e7e85f2229efe1", "version": "20.12.1", diff --git a/versions/p-/popsift.json b/versions/p-/popsift.json index f2f024bbb79ae7..f1bc9ec3c2f6c2 100644 --- a/versions/p-/popsift.json +++ b/versions/p-/popsift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3c9c601da86fd7d73cf3cb8b00c08ddb390acdd", + "version": "0.9", + "port-version": 3 + }, { "git-tree": "c4901cdc3f98676dba684b75fd292b6570a46d35", "version-string": "0.9", diff --git a/versions/p-/portaudio.json b/versions/p-/portaudio.json index a44336cb8ba62e..34cfaa0f478d8d 100644 --- a/versions/p-/portaudio.json +++ b/versions/p-/portaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecfe7da0a3a51b33e76443799786bbcce7646f27", + "version": "19.7", + "port-version": 3 + }, { "git-tree": "b090c514cbfce25b342a884efc937ede432df55a", "version": "19.7", diff --git a/versions/p-/portmidi.json b/versions/p-/portmidi.json index 1cb7102a414a63..2cbea12a13317b 100644 --- a/versions/p-/portmidi.json +++ b/versions/p-/portmidi.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "9aba0f6770f874c56c8e8bebf2a6a9b3edbe899a", + "version": "2.0.2", + "port-version": 1 + }, + { + "git-tree": "a32d3d5e0e58e38089378c3f723f2b4862714a4c", + "version": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "4d58125fb4cf188de9f9485bc5064ae2eaf982c4", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "e4d17cd16212900720faf6d5895734341e5b269d", "version": "0.234", diff --git a/versions/p-/portsmf.json b/versions/p-/portsmf.json index c5124438cea45c..807b4337a9f647 100644 --- a/versions/p-/portsmf.json +++ b/versions/p-/portsmf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60b00990b46bbac28e91a94533d212be1af49ffb", + "version": "0.238", + "port-version": 1 + }, { "git-tree": "6edc5e2a3d90cd44a65b5d0f28207b5eb3c2dec5", "version": "0.238", diff --git a/versions/p-/presentmon.json b/versions/p-/presentmon.json index 5c83b268f77025..23521c07a072c6 100644 --- a/versions/p-/presentmon.json +++ b/versions/p-/presentmon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "daf02980cb0bef9bd56209e550d134f2bc06c699", + "version-semver": "1.7.0", + "port-version": 1 + }, { "git-tree": "0d57616105f23dbcceb4477bb30354e0d3e4a5b6", "version-semver": "1.7.0", diff --git a/versions/p-/proj.json b/versions/p-/proj.json index b4186059715e2f..59f4dd4bc8f6d0 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1566fbbbd7d8abba35cebac6c8821339d1da1d16", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "a90853a886ef1a9425ad477bc996b99c0824ff33", "version-string": "0", diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json index c9c039a63a6ff8..6644539313cb80 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "284d584afb127d11beb4126bf1ee7eccef413229", + "version-semver": "8.9.9", + "port-version": 1 + }, + { + "git-tree": "4ccf46b756dabd4cd841b866dcd5491d84a946e1", + "version-semver": "8.9.9", + "port-version": 0 + }, + { + "git-tree": "de72240f9bceda0263f58b734ab6de4f97632dbe", + "version-semver": "8.2.1", + "port-version": 1 + }, + { + "git-tree": "97a7f5c2cabaf598c15dc357d0e53d5c44e10225", + "version-semver": "8.2.1", + "port-version": 0 + }, + { + "git-tree": "d40a44623b794f07f5362653b6efd7efc16cc832", + "version-semver": "8.1.1", + "port-version": 0 + }, { "git-tree": "f1939ed4483f6f1d75f6ddacb6a741090144bcfb", "version-semver": "8.0.0", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index a91d6210ae5768..fab9f2a6725b0e 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "984039810172eb397ca0ec6d426d60764d6dfe46", + "version-semver": "3.19.4", + "port-version": 0 + }, + { + "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611", + "version-semver": "3.18.0", + "port-version": 1 + }, { "git-tree": "19c2bf45c235e6126161bae36aa7ff7e1fcda479", "version-semver": "3.18.0", diff --git a/versions/p-/protozero.json b/versions/p-/protozero.json index d05d0ecf2306ca..55c02b1a1fdc44 100644 --- a/versions/p-/protozero.json +++ b/versions/p-/protozero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e617bcd5ceeebd89da7229c7daeecacf7581d767", + "version-semver": "1.7.0", + "port-version": 1 + }, { "git-tree": "23f6ec11be6bbf623dc7590b128027ccb7f69727", "version-semver": "1.7.0", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 24859be6070a5e..cb1289d40e6159 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d17fc3eb415126e6e9d5d77eb2de69ffd3c30869", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "8dd3b93e98f28386e8c44f50df2efb4c2bb30ce1", + "version-string": "2021.06.14.00", + "port-version": 1 + }, { "git-tree": "a4a04ef230bcd866c6c1a078ac3e11d926333b21", "version-string": "2021.06.14.00", diff --git a/versions/p-/ptex.json b/versions/p-/ptex.json index 47f9c2dcaba574..4c8c95a6749f58 100644 --- a/versions/p-/ptex.json +++ b/versions/p-/ptex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f04f712745e5fb558f79324199b3fe8c1a00b84", + "version": "2.3.2", + "port-version": 4 + }, { "git-tree": "c524a2ab1940315d3481e9fbf745425caf5b7c15", "version": "2.3.2", diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json index ee5ae11d7d9bb9..179d5c534a8c99 100644 --- a/versions/p-/pybind11.json +++ b/versions/p-/pybind11.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "b1eb3bb762f1ba08ffd2ffb216df9504ed9fda3c", + "version": "2.9.1", + "port-version": 1 + }, + { + "git-tree": "24ea84c002f9cc529a54996dbbf2e9b2cce9cadf", + "version-semver": "2.9.1", + "port-version": 0 + }, + { + "git-tree": "66591866c63bfff5fea690e23a05aa14cad10967", + "version-semver": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "16618fe9543461ee68ba815f511afacbbcfd8330", + "version-semver": "2.8.1", + "port-version": 1 + }, { "git-tree": "893da2421e31681611515d8416a8f1a3b4496b5e", "version-semver": "2.8.1", diff --git a/versions/p-/python2.json b/versions/p-/python2.json index 95fa120883919c..60a67697bd4fee 100644 --- a/versions/p-/python2.json +++ b/versions/p-/python2.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "355e949adaecb1603d0cdc3d690101e49ad9fb13", + "version": "2.7.18", + "port-version": 4 + }, + { + "git-tree": "2a9fb7f96d762e213e9901452492aee00f6fe049", + "version": "2.7.18", + "port-version": 3 + }, + { + "git-tree": "fc1f7aaa8a2312a56ce7dc1324c2eaf608a7a331", + "version": "2.7.18", + "port-version": 2 + }, { "git-tree": "052ef22af59535134ca2944cfd8e7e7d3ea24d67", "version": "2.7.18", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index a382816966c2af..a89a02eb10de82 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,65 @@ { "versions": [ + { + "git-tree": "4e348bd50d8c4252bda83903ce22f1e60d34be88", + "version": "3.10.2", + "port-version": 1 + }, + { + "git-tree": "0cf2e0bbf8fd712f82ed1997be82b136f1c13108", + "version-semver": "3.10.2", + "port-version": 0 + }, + { + "git-tree": "ce4fddbb41412be06577c61632e8e9ef0a67901c", + "version-semver": "3.10.1", + "port-version": 8 + }, + { + "git-tree": "31155fa7fa6cfa0fd2554e89584c92a2135bce19", + "version-semver": "3.10.1", + "port-version": 7 + }, + { + "git-tree": "a7ef4a1d73a9e486cd23edd98f12a2f4d4216920", + "version-semver": "3.10.1", + "port-version": 6 + }, + { + "git-tree": "c9b705608afc0485c03effb5aaa439f027b20af4", + "version-semver": "3.10.1", + "port-version": 5 + }, + { + "git-tree": "75172bc36c45d15ee298de1803625af1770cb805", + "version-semver": "3.10.1", + "port-version": 4 + }, + { + "git-tree": "35f071d147af8c4d8dfac5eaa95ad41e395448a5", + "version-semver": "3.10.1", + "port-version": 3 + }, + { + "git-tree": "198663bdc6b156d4423eb6ebf085c803f83babf8", + "version-semver": "3.10.1", + "port-version": 2 + }, + { + "git-tree": "5fe3685d04e62103465074dbe416e3158a6017a8", + "version-semver": "3.10.1", + "port-version": 1 + }, + { + "git-tree": "a5808a65bfe083729207ce88e66204198e3d939c", + "version-semver": "3.10.1", + "port-version": 0 + }, + { + "git-tree": "4fc95c5f7429e4fa04ba978f79ae6530f5280749", + "version-semver": "3.10.0", + "port-version": 4 + }, { "git-tree": "f2b8029e8ffdc1cbbff8a40346ef5fa82c811616", "version-semver": "3.10.0", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index de9cc43aa0c0a5..bbba4bbf39c647 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "41239863ffd0059d8688502f6d6284785c6c8633", + "version": "2.3.4", + "port-version": 2 + }, + { + "git-tree": "d61c0d118f3d64f69c85f2442b28d4c2eed0a070", + "version": "2.3.4", + "port-version": 1 + }, + { + "git-tree": "8fd8829b933de5ae6fffecd509403987ca084634", + "version": "2.3.4", + "port-version": 0 + }, { "git-tree": "842dcdd87f56ec4318a5049e95b1eb9807dd2193", "version": "2.3.1", diff --git a/versions/q-/qhttpengine.json b/versions/q-/qhttpengine.json new file mode 100644 index 00000000000000..7ce14ff67e9662 --- /dev/null +++ b/versions/q-/qhttpengine.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7981cbfcf13bef7cfede8cf40a9d69967cc63dfb", + "version": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qhull.json b/versions/q-/qhull.json index 52eb5af94685cc..69b98685f1cdbc 100644 --- a/versions/q-/qhull.json +++ b/versions/q-/qhull.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afe7d7f235d72db1da52a99ebe085cafd21577b3", + "version": "8.0.2", + "port-version": 3 + }, { "git-tree": "574301a0f60d743f5ea7165dda5e45bd0f1082ba", "version-string": "8.0.2", diff --git a/versions/q-/qnnpack.json b/versions/q-/qnnpack.json index b9f21aaa7e7d02..ee1cf4c89ef5a1 100644 --- a/versions/q-/qnnpack.json +++ b/versions/q-/qnnpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dbc0dd7bdcf36b48124351fbc2ecc44d0b2e961", + "version-date": "2021-02-26", + "port-version": 1 + }, { "git-tree": "b433ea1861106777f4f358ba433eeea488e91c3a", "version-date": "2021-02-26", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index 82017e48c4be54..19532ceadc92bb 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "109a9bb4fac5d5c5a52cd620d7ddb22da6fe47f7", + "version": "0.32.0", + "port-version": 3 + }, { "git-tree": "c6ab0bd896fa44681e2c3d4b325915ddacb38a1a", "version": "0.32.0", diff --git a/versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json index 88a22840db1777..9d7d702fc758f2 100644 --- a/versions/q-/qt-advanced-docking-system.json +++ b/versions/q-/qt-advanced-docking-system.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "427efb4851b6f81f6301f6418d0e8d04bebbf557", + "version": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "0b7978e662c15be190cef924f1cdc93d3a8492f9", + "version": "3.7.2", + "port-version": 0 + }, { "git-tree": "1f19c23c1d05692cdf45c9876efc195412945dae", "version-string": "3.6.3", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 222b019eb75560..5c9b941164e414 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "174cc984a142087680da0f0f42e659b835bb17b8", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "0270bf15601be63bc4e72bee1edc44e1241cbbfc", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "21c442fd3e940a2ee9a83377da9a8e902539b51b", "version-semver": "6.2.1", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index 714056ab054bf1..f1bdb8731854c2 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5538f55e5cb938c965447c3a5ce67b243f5d97f1", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "4c43f4aec27c0ac682f88d1edfcce7c28e4a9458", + "version-string": "5.15.2", + "port-version": 3 + }, { "git-tree": "f46ab15ed74e4680e16b61851b9eb41523a626f6", "version-string": "5.15.2", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index 83332ee66ed0ee..35044981c9702d 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebae9d515816c48a9bbb2550acd02d02bfcfddc7", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "8bf9b51fd87d81531f301ee9060b76c829221afb", "version-string": "5.15.2", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index a8f18ffd40df70..1c72b66eac7dce 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0e32e6213649f8645b05c868b81dc3c982bfb30", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b8ff6ba90c3b7046e2728056998ff79665353503", "version-string": "5.15.2", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 5a7c19ab85f97c..81218465f2f26e 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "0b581b90072df50364b8c863110b2034a6b9f28e", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "8c2fa92b6281b496e3aead1b02238ab7668c204a", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "f21ebf7bf6644292d70d9c564c1408a224f26c77", + "version-semver": "5.15.2", + "port-version": 20 + }, + { + "git-tree": "5a9c2b85fd5f62bb1b52f18c4628b0e08d765dd4", + "version-semver": "5.15.2", + "port-version": 19 + }, + { + "git-tree": "5793fff5370499ba464430142f86b971a23dff25", + "version-semver": "5.15.2", + "port-version": 18 + }, + { + "git-tree": "f8fbecca6183036771dc794859432a2a84435abb", + "version-semver": "5.15.2", + "port-version": 17 + }, { "git-tree": "5f510633de982d6e75e3d1170af23feedf208166", "version-semver": "5.15.2", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index 7e8eac197dc5fe..4a69f2305d4f4e 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4fa404a600c749529faae7807d2f24f5a6f8673", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d51381395f58fbcf7b9488c2e49708522d968ffb", "version-string": "5.15.2", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 58a0903bbf4586..9e4118aede8013 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8929178e2d3f0d544b21ed4bd1ad635e81fdefc5", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "4f34765d100d517dc137a96aabc37ab5cb95ea13", "version-string": "5.15.2", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index 1bc9e97643bf10..db45fe7b362010 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8300805371f9fb2d98a2a2ace37e9e93149483e7", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "8a675679d46b85666ef053efb36a2bb70b40b8ee", "version-string": "5.15.2", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index 8877e0bae93d61..734ecb9697232d 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "51388bc681cd6616f0d2ecb29b1f3901b2e66613", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "670f3d6bfa437ca047f1d1644743e2f2012524c8", + "version": "5.15.2", + "port-version": 3 + }, { "git-tree": "0cef09afb36f9debf22319dc4adccf478c611885", "version-string": "5.15.2", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index 7ccfe2d85ff214..df590ce00b568a 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cecc56a1a87cf86f87dcde5bc650f8de1e53b60", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "4cb09a0ee4bcb79b460c69a4e924cbe19538a2d1", "version-string": "5.15.2", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index 5a9c6b8470fdf6..d937d0954bb827 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53e4e7090cc36a827b518f376c485aacade15d37", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d74a2774e03103111a4e73c990eb65e78416e784", "version-string": "5.15.2", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 4f9f479b24006c..fc40fa1637df02 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bb49ed2d96c2ad0d18a0508f2c170a0ef0a51cf", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "7548a80471fd031625a4395776ea298e2737c280", "version-string": "5.15.2", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 4b13e404f9cac7..d0446553918624 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bdb4dae2e952e636c45967063bcb7c5dbb9cea65", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "5bf32f350b7d08389629bc565c66aeb5f84e93b0", + "version": "5.15.2", + "port-version": 2 + }, { "git-tree": "6f6ca0b9e789dbfafa84ca02eec3da94f2728494", "version-string": "5.15.2", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index cffd62afadc744..a3db41f5aea654 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "374ad16cce9ae4eee7c91f701a72c21ede178794", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "7fb1b17892d53638ec4ada0a73b19ecef4062ec8", "version-string": "5.15.2", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index fcd9001920232e..b342d08f982f30 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35696a5675057de9b50f3bbb2215b3f0879d3261", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "fb1f68ce5b03012e9fa7ed0924bc2036c4d97edd", "version-string": "5.15.2", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index 36e684e44ada85..6d45e47f213b52 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8622cf28b900e34394e7c67ee272a0f0ae1a945", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "9a02099176012e710ae215855f4e72fe6f5b704a", "version": "5.15.2", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index 9f8782b6db6406..9248263492824e 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8336d9a40e956b24f846b25c7b017cfac417f1d8", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b909b49f99e6080fdd74b20419ac9f1059d993f6", "version-string": "5.15.2", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index dd41498330ac99..71860f30e08a19 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fed32ceb703389b16ddbf6843597358c92ff27e2", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "f6fcb48f7415ecf2a5f2f3966c48a08abd9b0355", "version-string": "5.15.2", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index b3a1c08491108c..e95c72dd4816f1 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1507aeba5c46c35cccbf662602be9bcfe6d4bc1", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "0e0745a65f393550ec04750071456604a5db72ba", "version-string": "5.15.2", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index ab5305153af009..cf1e69cbdd78b4 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0023d4eae57568295996c372c262c746fce54cd1", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "49313a150ff19dacc9614849648f29c90e424cd3", "version-string": "5.15.2", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index cea41fe2314540..c499391c83d1f0 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da9577fcd83a97070fbb31e9723645e1a353e780", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "c0f3cb1b07b4ac8c05297fd8c438ba7e1ba97ed8", "version-string": "5.15.2", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index f148c990dba0cd..f51c7a4acf2412 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc4b1cc8e132e4c53c32401e8eaea14140f39906", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "73a19321158fe546f1469f290a83050fa6af14f1", "version-string": "5.15.2", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index 842001bcc98163..491fdc3d47c6da 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "450d4c10bbd324c74ddca59e7d16c6cb215aa077", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d412fb9a21bbf733e6e2e00c2015787a7c262c6a", "version-string": "5.15.2", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index 70cfc0bb7cd7ec..8ed279f7efc002 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "894ab2a120cd88e276b795234c66715ac787e4ab", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "657fa8e20641b75338667e14b696127b252fcfd5", "version-string": "5.15.2", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index 87c3645756f1d4..8604dd80b1fb23 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7faff943ee0ed0c4be86730ded240b322d2b829", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "5ab7355283e60f00090972eafddf269519155344", "version-string": "5.15.2", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index eefb33d0c43479..70492fed04eede 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e16c9b0f5f3bb86c3fe988f049069901ae578d0e", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "23c4f38498a3eeaef1a0428cc0f9facb77c50bb5", "version-string": "5.15.2", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index 17d9dae6dab929..dbe0967192778b 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc7ba67e09a801eca90691b7c7db4baf43369a09", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b6e0403e0e46d6b3aa07ea90da894a33589c3dde", "version-string": "5.15.2", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 86bfb420785bf9..07c2e5ae9ac37b 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf21b1bb4dc124cba22d170e77ceb78315ab7de2", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "12c00b4bbf2206f8bb68ad44e8b44dbfd65fa6e4", "version-string": "5.15.2", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index 9954a1f1f996a1..f57f54bc12f860 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a43bcf48e884abdd82502f747342962e2a2c4b8", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "75e1a170720117fcc34369aae8ab7ee4816974a3", "version-string": "5.15.2", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index f4df8a3489020c..a5deb8aa64418b 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f3066692eacc724dde9d8f17d4cb67f019ecc75", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b28b98fb7bd66abe2c108d66c3a89c0e388d638f", "version-string": "5.15.2", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index 687f16bb80c0b0..b2f540c9e3c00d 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a0df59e14f9c24d2584e7f0424424f50eb4c9f7", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "195b59491201660e5c6299f6f3f78c446827e8d7", "version-string": "5.15.2", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index 1cabc7e949091e..81eb34974bcdb9 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c8514424cbc1c746ec7149ec383fbdd5174a0e4", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "45281062a0b509d6c5f2cfce1f26e77e90fa6192", "version-string": "5.15.2", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 5960d4316a8e43..77179d15c5c29e 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e8f0ffa97c7f3d1dfe627808bcafc4d4a77d3e2", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "10dc10d68dd34e3db201364ec60567459c6857dc", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index 361bfbd96ba0d4..28d7cc5a6d655a 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd0f8bbb8bb85bc208907a24c82fe9db0b902922", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "39e51839b2f67b03e0f72bf862dc44ad72bcc804", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index a3228a8ba3b47b..159af06521d1b0 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "533cd8995acbdf2a8cc24a96da7515777dfe7c38", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "4b097155aca1faecdaa639daec2395e9a8c0cdad", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "365537bee64190f604e1be03f0473ffe41067a82", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index 94398229114124..0c8b2fb9e1e264 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d081435832cdf86757d280e7fbf1bf2b5780199", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "44c3faa9de1a6f18a9f496e828c4ee64f0fcc315", "version-string": "5.15.2", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index 671a9ca61d7a8d..ec5af0ba63cc8b 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0380195d2431d25311a4fa542d3437d05f339da", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "0ca77dc0c75bd411f1d1e51257c761e775ca341d", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index f4e2014f7ea278..d1dac375d4f01b 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb6129ae1fa4b8945885ca352eca1bde34e1a345", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "8c8a8916c8fda707b4c8096388ea7156bada9a4c", "version-string": "5.15.2", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 1d4926a14ace17..144d13db8ad687 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5a7881475902048fa453bff04c347caa7e9a615b", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "89250816793ceacdf74730157af6f287070b8bf1", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "85a345a5fdc5a15584e6b2add00f1669e4099dbc", "version-string": "5.15.2", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index 1042604afb7acb..2a5fc9c4420005 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5321c86715348b879cee60dc4323c2e1d8fc9fe9", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "ce0ca52833bf80d8bc958cd4428acd10ab397911", "version-string": "5.15.2", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index 3777966f9887ee..27f8c21d64a568 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b87833daca4ff1492a4890d0f73bcbb416dfc615", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d4531f24cddd2692989fac9e84a9eb09301ee180", "version-string": "5.15.2", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index 39ad388946c300..2f4ee258a2d281 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "979ef9acc281793cef4f43f1e1eaed177ed9b408", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "428cdd43abdc1200e889c66b9c388b421d16bf58", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "9810d811337a74ca11e032b94b52f4e4bed5d1b1", "version-string": "5.15.2", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 4127070ebeef79..adc99282ff5f88 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d650b3405a677deca9110c6ea6861bfaa24645f2", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "766a30524747e5382462c57836e5a8a6a67a1b86", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "aab367de0f2bfab12d47c09e3a5baf3a04be6d1b", "version-semver": "6.2.1", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index c2a537cd25cd34..ecc4f8aa09b88e 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bc03ec029e90f445ee878ad27b476b60da06ee3e", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "adbc35d451c9ac13adbd23980b1609bce61e3dd9", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "9b4f9c648d93abf2dc5547a0c966f268809eeb58", "version-semver": "6.2.1", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json new file mode 100644 index 00000000000000..e07cc61014dc2a --- /dev/null +++ b/versions/q-/qtapplicationmanager.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9597e662be8fbe3317e0fd88058071db708da977", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "79db0a47002752179eb5aacedca44c0bc670030c", + "version-semver": "6.2.2", + "port-version": 1 + }, + { + "git-tree": "ca033ed7578b002c1ce195d879c622333231d159", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index bdef4075f17e76..0549e7a102f860 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "bfac5075bd2dcb338153b016e27ff8789b05688b", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "2362188815f81dd666df3eaee1d96a208c1a0838", + "version-semver": "6.2.2", + "port-version": 4 + }, + { + "git-tree": "e9fa18e04e930f9ada49aac4dca2e9fe4958b89a", + "version-semver": "6.2.2", + "port-version": 3 + }, + { + "git-tree": "bb6485a4e65e52d1a157f6e0c478a47bdc884726", + "version-semver": "6.2.2", + "port-version": 2 + }, + { + "git-tree": "8c343c019fd735cbe38bd56b00460539e94eaa9a", + "version-semver": "6.2.2", + "port-version": 1 + }, + { + "git-tree": "c314a6af00c3a57bbd887c834cc0b5f80bfd65fc", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "700e8c2e47b2d044d1623ea5062e15ac6cc9a970", "version-semver": "6.2.1", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index f04891f67050b2..d844c41aaf24d1 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f4676a2659098089318793815dcbff8cdb55ea9f", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "5fd0c04f1b0758cb38a161d2ec6a9b8757bb243c", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "68535daef3629a70ff0e5a347580f747aa075070", "version-semver": "6.2.1", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 19dc1a4e84139c..5d4d4767b0733e 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "948308d4ae9a45ee3c438fb512b2fe25c3661773", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "0fdd3a57eee65ddaa5bd2c83ece98efcc0a6e7e5", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "1397bf94a76801daaec069dbbc790dc45957ccaa", "version-semver": "6.2.1", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index 495095c425c007..9f1ac3bded4578 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fbe8db54ab4377615f8328227d21c8bf470551d6", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "9f62102338302645f71d4b060100dee977a5c744", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "0ed1e678661df3b938f67e6d9f8d68e62f8f75b6", "version-semver": "6.2.1", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 84326f72687404..22fa6a236e1c2b 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "014813f75ac07a1207692d81609b4cc6e28e5737", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "be38aa1f2d19491f9195779ab9bc5cf9469e2d46", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "64b4f2709811c4ab542a8534645e0ffdb1ffffe7", "version-semver": "6.2.1", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 7c01db2c48c004..f5a33ef2d74bdb 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "ede6e28a20ddf3b6d4cc7b1e7ac7dc41f80e64a8", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "986c605c0c11adc3c756743307730e41d1c16b5f", + "version-semver": "6.2.2", + "port-version": 1 + }, + { + "git-tree": "d4f31e8cfbb1e6c504ad8089e92e234b03a96679", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "3abe1c5e7e0fee7e89e99635bb1c7b4136854c2e", "version-semver": "6.2.1", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json new file mode 100644 index 00000000000000..e770498187d333 --- /dev/null +++ b/versions/q-/qtdeviceutilities.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "91bd6966a66abed85eab29725a1fa838b7416c9f", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "f6122e9d022e0d407e75f0af4b1faafa926f40cf", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index d59e821311be94..92d19e5f4af141 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "86089f5d381b17bdd89c9fd7953db2ff38dcec38", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "585382ff1e60120a0cf35e8b22e1b8152b83fa1d", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "d2640b87a1d668eeb0021bb55e7957f3d0d507e0", "version-semver": "6.2.1", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 53b64a4d1e8222..2fe4378a5d18fb 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fff7150f31fcb2531adcb2f8fa42b6106c2893d1", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "038c5575e3e47c1512381b63138896df5fd713b6", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "e500b15fc978066e6c781d3d7f54867b31c8a77c", "version-semver": "6.2.1", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json new file mode 100644 index 00000000000000..3dc3a83a7f5cc0 --- /dev/null +++ b/versions/q-/qtinterfaceframework.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "42968cd54d91bbbf94a3c5aaaf6f1de876b0efac", + "version": "6.2.3", + "port-version": 2 + }, + { + "git-tree": "26fa7610125a5a6b54ced0cda87ab6621a42a1d9", + "version": "6.2.3", + "port-version": 1 + }, + { + "git-tree": "bdbc69bff861cdbd2dad8178d022b10d4f6abfe2", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "cf3fdd99f01775fe030233d5526e5e3069e3e813", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtkeychain.json b/versions/q-/qtkeychain.json index 2ca47f28734984..3016ce87b99b35 100644 --- a/versions/q-/qtkeychain.json +++ b/versions/q-/qtkeychain.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef01f1d6401814e50c0438d3a8a7770568ac93ca", + "version": "0.13.2", + "port-version": 1 + }, { "git-tree": "2dda8930cc8e73b1741effda2750a980c0209e24", "version": "0.13.2", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index d47c7da968359c..20e7061486d4f8 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "589d851aebfb0c2dd786a5b0a8d7c33e56083223", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "d931a7ce122989a7d7740e0c196e736fa8caa3c3", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "7aeba7169d9ebb502e2fb276d36eaf0b562cefd7", "version-semver": "6.2.1", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 3cfd7661848c4a..687a4282b3419c 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ab8ffeb4492e7cabd51fa8c5ead514e4764f67e5", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "1f23eead56f7491312b8b16fe1729aa1e808598d", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "73dbf3d8520fa5aba164701b37217ec55dbfc16d", "version-semver": "6.2.1", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 2d5529578339b1..ebf75d0b7d2dce 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "adfab6c76e26f420db304e6d131cab246da43200", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "ab25c644271573b1106cea249b17740ff645a0dd", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "07e0bf2df2183ec6fb51a6f8d11a1ec3fb27a499", "version-semver": "6.2.1", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 1b1b88ae1bb1c6..aa38ef60343677 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3a6cdbf95fd19f196f2e0d7c9ed149e621690a7a", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "ddf67ffb4169c0c1d2a8e3b0cc317101fd2dfd95", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "e5a5554e1e9e997f82d4a90933b6a2edd2d0a2b0", "version-semver": "6.2.1", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 1597acf14c2556..24bdcff81c546d 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "205649afe146022c19e1246083c83c4ca1573959", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "e6a02544f81615f1628e9f75af57af10697d51b0", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "5aa75624c0e5b7b13380a7c7b6f0a8cc4deec8d8", "version-semver": "6.2.1", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index bfd34c00c5bdd3..7a59a4b9d51b2b 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3fef74b1cf459126f776aa964fa6900e7be903fb", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "45d2bb4f558ea5cd5d321d92bd9d361cb53acb49", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "e9e3856e0b345b9b27921eadc6d45115fe70fa26", "version-semver": "6.2.1", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json new file mode 100644 index 00000000000000..626e92145f1ac6 --- /dev/null +++ b/versions/q-/qtpositioning.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1c16604affb63067fcad166931565e516250434f", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "9e9bfb4dd17aa86cfcd5c80f0725c585ec140670", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 37d7349628d563..74f3ab310305a5 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "822ca9b71fbf3eb7ae119c25e87dc8e00f70b0a5", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "81a5365f84b789b91715504392ce6e8b09b8702b", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "4431f13552a344e856d7c1486d1cd0b51649b372", "version-semver": "6.2.1", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 6641925220d3b6..b4fd1a259afd7b 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d213e9348a705383181332c7448c14b94235f89e", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "43a873627defa053a83b64a73f4deb978a55cdcb", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "8721d7b3901d80a38f30a05a27a9f111356611b5", "version-semver": "6.2.1", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 693022765967aa..9299131b64d229 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a7a71c783e081189c9edb6a9e59707472863738f", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "caa274f1cb2a4e59d44aa9a22f039c040cf8823d", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "68c5454488b9c71989413817c7be02e3f758b11d", "version-semver": "6.2.1", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index d3d192acfb2a9b..eeb52829cd08e7 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e7c00e022f07f448e2c6d2509bc6986f5b75d3b8", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "011114ad3a3f710f7229eef99eb75cb0a061fbe1", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "f614e8155cd17d2720c1d8ad027b6655fbd5a744", "version-semver": "6.2.1", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 1976e9a50d83ad..679d6046e0f296 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5515c06070b3f4b8ae13497824653e91d09476d7", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "d712603b6a1fd9781f0ecd55bed2a905256a1c14", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "1aa5854f556f4f448a406daf6fe368a91a5a0b15", "version-semver": "6.2.1", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index d2358241227e37..80d6c10da4a697 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "413e942ee8da80bd4f4f64b4eb4de978740a9d65", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "8f038e84c8f9b127bc7998328e546ca7fb4e7553", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "ce2504f7bda386450268832846376a48529bce73", "version-semver": "6.2.1", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 2e2d6c06cb3069..3e499241fa73f0 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e500faa24ed6ecba0cfe64ce061763c47612c767", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "791608d6a9d95afa77b8db4a13a8f75928626926", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "ce4ab156356f3dcfe3fabbaf3f447ebbcd83972a", "version-semver": "6.2.1", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 686e1e19eaaac6..858c9a556905ff 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cd4279442737df6c5e8ba533f8ce52b0a03cdc08", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "70e894d24707b42dd208c14f491cf3164caf22f9", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "e5831c09c8eaf4936eaef1c9a52079fc4e9ffa0f", "version-semver": "6.2.1", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index e6678ab5b7b7d2..47fbdf6c17a5bd 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "37349a1661b8bfda73318abcb5db080fb6fc71d6", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "d6c1c34779691c0150e573246351f00b6fe1126f", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "aa7f5015760b1bc7f653f30b170c1201a437cd86", "version-semver": "6.2.1", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index abdb043533e369..3e34f143af1086 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "79247ffe31fa15579c9069634c3d8778672928ca", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "655cd4b3e9d57ebee9768c2ab0d1d4936b409c02", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "eb472063be2d7b507cb027c217564f9288b24482", "version-semver": "6.2.1", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index be4b26011c338a..d1ef10fc73f607 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3df8c89676608f1a4a58aeef4cb6e9edfe5666fb", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "51a188d5a80a0a9a3b5ec6319bfd0710e82d1769", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "9bf7f8aa0d90f72017d2e47f1a5628a93265b824", "version-semver": "6.2.1", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index c3dfc66c4edcb6..3e04c8feb2465d 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7ec572e9663958105a8c2b89c24a93d4280f002c", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "9bc69668572f2a83bf742b8b10ec3085f159d513", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "8b26db2df575c2b7a0341c7aaea9b88ee4e017b2", "version-semver": "6.2.1", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 04bc447168b401..3850ba0406fd2d 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6eaf26953606c37b93a2e03d2162f80e4d2d4d6a", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "7df54bd36afd381966e0b082e49154b1eb818bf0", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "5801a51524f383c98f98da3d085cad1ecc338ca6", "version-semver": "6.2.1", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 295bc65590faa1..0d167ca72958fe 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0f4fee2471dba6631d06fcac6a9f99c38fe14649", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "d3f7068b76b91006bd426b173fe5e723ca6364c4", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "963ccd119990c7c3ae09e323da25a38b4893df78", "version-semver": "6.2.1", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 6d86411f0c3572..72b1484513b766 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c09764532fe7b4367f6438db92b59f41cb3d4e52", + "version": "6.2.3", + "port-version": 1 + }, + { + "git-tree": "97ae42eec1de17a95e9d48132ee94dd80ab4a239", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "9a3f041f2f3f5fdb5e1304efbae7ae0e9abbef79", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "4c69c49d9fe8599dd22538d9cef12e09cb29778e", "version-semver": "6.2.1", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 912080de8a6622..010009b54e722c 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cc3e9ce12b12aecdb4372cee226fcb0ddc4b0f34", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "e051a024f04ac4bbb3700a022df3dfb85c35267d", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "1c23c3b938eaf83f287a460d95695732a4b784d3", "version-semver": "6.2.1", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index fbb56bc088125f..03401c6c35660e 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "36832dd9f2bf65b94b7b51bf37db50eaf266baf8", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "ef310559b2cef5f8dd1e2eee6c2f52c3942d0f26", + "version-semver": "6.2.2", + "port-version": 0 + }, { "git-tree": "04d26846445cac21376cf3b80264394fb6a83778", "version-semver": "6.2.1", diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 3277be8627ec43..c8bb6a47b5ca31 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d702f6d14c1a91b83a4950dd05e3b200700cfd8", + "version": "1.25", + "port-version": 0 + }, { "git-tree": "d8519a43e706ff22152e65942f48e5abd75bb76f", "version": "1.24", diff --git a/versions/q-/quazip.json b/versions/q-/quazip.json index c1aac224fd751d..3aaff18d30ca9a 100644 --- a/versions/q-/quazip.json +++ b/versions/q-/quazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e1b1da3a71a9e98c52bad16aef6c0666d993b56", + "version": "1.1", + "port-version": 1 + }, { "git-tree": "2fcb780cdf45dcb2a99c42837d9be27f5d07615e", "version": "1.1", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index da355a2fc5bc1e..fdd44a202c6ca5 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19f0208595bbec6d64a4e34e351b530d091212bd", + "version-semver": "1.6.3", + "port-version": 4 + }, { "git-tree": "037a819f5cf482d84083318e120e076c711a2760", "version-semver": "1.6.3", diff --git a/versions/q-/qwt.json b/versions/q-/qwt.json index 694ac8daa8f339..d9652ae7fb3cdb 100644 --- a/versions/q-/qwt.json +++ b/versions/q-/qwt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1e9f6474ec00dce373a287dcb04cca0a7398fa2", + "version-semver": "6.2.0", + "port-version": 2 + }, { "git-tree": "10d24bfb82979ffa078d34a17f976d2646e1cf5f", "version-semver": "6.2.0", diff --git a/versions/q-/qwtw.json b/versions/q-/qwtw.json index 81d0fd2cca70a1..c1b92e2b21647b 100644 --- a/versions/q-/qwtw.json +++ b/versions/q-/qwtw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5e27a5ec415b3edbce8dd6ea8d09bf2022b75f1", + "version": "3.1.0", + "port-version": 2 + }, { "git-tree": "debc8598b11213981d8489a27ca97894a72621c6", "version-string": "3.1.0", diff --git a/versions/r-/randomstr.json b/versions/r-/randomstr.json new file mode 100644 index 00000000000000..d0edba7c462664 --- /dev/null +++ b/versions/r-/randomstr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "231d69b973b9219271281ebe6d125c4c31380b87", + "version-date": "2022-02-03", + "port-version": 0 + } + ] +} diff --git a/versions/r-/range-v3.json b/versions/r-/range-v3.json index 4b82362f3aca76..07a0fffa3b60e1 100644 --- a/versions/r-/range-v3.json +++ b/versions/r-/range-v3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78edaab693f001b38b155c3ef35a85036fd938ae", + "version-date": "2021-11-02", + "port-version": 0 + }, { "git-tree": "fa8057ea7b4f44f684ce2e6178914dac0cafbe53", "version-string": "0.11.0", diff --git a/versions/r-/rapidcheck.json b/versions/r-/rapidcheck.json index d20603ebb17034..874b552d1f0817 100644 --- a/versions/r-/rapidcheck.json +++ b/versions/r-/rapidcheck.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "137241bc40d8475b70a28ce182e41cb6036f49d9", + "version-date": "2021-12-20", + "port-version": 0 + }, + { + "git-tree": "3cdc87364b35dbbcb96376a19da063b6d6d008ec", + "version-date": "2021-10-10", + "port-version": 0 + }, { "git-tree": "f583dcd38987b483ebe1f1b954cc7fb21cd08144", "version-string": "2020-08-25", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index 27e111f9adfd63..91b54dde0c2ac4 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "0b15021a8c0247cf83d5e4ca352b7e53b510b743", + "version-semver": "4.0.0", + "port-version": 3 + }, + { + "git-tree": "94a36f9f2d45dcba0e7ee689b5d58ad11bc4a4b9", + "version-semver": "4.0.0", + "port-version": 2 + }, + { + "git-tree": "4ab1c8406a740fce2da5e0844b10aea89850d044", + "version-semver": "4.0.0", + "port-version": 1 + }, { "git-tree": "394d0afab6e94ac36b289e350cdf2b8886560bb4", "version-semver": "4.0.0", diff --git a/versions/r-/readline-osx.json b/versions/r-/readline-osx.json new file mode 100644 index 00000000000000..ebc10167346e30 --- /dev/null +++ b/versions/r-/readline-osx.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "30d9d12e0486393aaf6929c5786829e5ca2cff5f", + "version-date": "2020-01-04", + "port-version": 0 + }, + { + "git-tree": "5b4b6fabb77d9f67ee0a4dcc7981040d9177caed", + "version": "8.1", + "port-version": 0 + } + ] +} diff --git a/versions/r-/readline-unix.json b/versions/r-/readline-unix.json new file mode 100644 index 00000000000000..a0284c726ab2a9 --- /dev/null +++ b/versions/r-/readline-unix.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "cc7ba8176a2492af17dc561bcb82c36f7c89e540", + "version": "8.1", + "port-version": 1 + }, + { + "git-tree": "e2ef4d4f472d6fe4f36009032dfdd3279a50c754", + "version": "8.1", + "port-version": 0 + } + ] +} diff --git a/versions/r-/readline-win32.json b/versions/r-/readline-win32.json index b2d5f3ac5c0e04..cfba5915001696 100644 --- a/versions/r-/readline-win32.json +++ b/versions/r-/readline-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1ed33b8ec37a1cf44926c9954b6943bce302b70", + "version": "5.0", + "port-version": 4 + }, { "git-tree": "5d2ea2655a570f6c0fd17689715d542336d531ea", "version-string": "5.0", diff --git a/versions/r-/readline.json b/versions/r-/readline.json index 672cc6f0c6b34a..1581311c25ebdc 100644 --- a/versions/r-/readline.json +++ b/versions/r-/readline.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "87822d2ce5b0936d374d94185da700e8a1cf4619", + "version-string": "0", + "port-version": 3 + }, + { + "git-tree": "b5c6800bc0cf924ec6bdbe627c9460839774f998", + "version-string": "0", + "port-version": 2 + }, { "git-tree": "1e0a62b3927f5b41e7861093dba7d2e2aa4de0b2", "version-string": "0", diff --git a/versions/r-/readosm.json b/versions/r-/readosm.json index 57b34a2f5099a0..79eeaa11694520 100644 --- a/versions/r-/readosm.json +++ b/versions/r-/readosm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a5f7efaec651bab56e95ba4db4e8d9316050b9c", + "version-string": "1.1.0a", + "port-version": 2 + }, { "git-tree": "32ab4a5c33cd4854b932547e791af28e39e4586e", "version-string": "1.1.0a", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index 24eec753ae450d..aa0a3998d8ab7a 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "310025edf50886cce00c7864f6f21d1eda53b51b", + "version": "2.50.0", + "port-version": 0 + }, { "git-tree": "23387c9d073a3e686615bd5c9da9dbf81ae6406d", "version": "2.49.0", diff --git a/versions/r-/refl-cpp.json b/versions/r-/refl-cpp.json index cdd68689d9e586..83d6be7ad9f308 100644 --- a/versions/r-/refl-cpp.json +++ b/versions/r-/refl-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5aea911f8cfd7c6eecadb50142f00205a2e7f57", + "version": "0.12.2", + "port-version": 0 + }, { "git-tree": "109d4729d1755ca3cc45a9b9e54b8e62e2ad20cd", "version": "0.12.1", diff --git a/versions/r-/replxx.json b/versions/r-/replxx.json index 1481e75958a087..9e09a73bc70d83 100644 --- a/versions/r-/replxx.json +++ b/versions/r-/replxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f699bd3a8850016bfd6ff8a8eb03d82fe83bdb9", + "version": "0.0.4", + "port-version": 1 + }, { "git-tree": "d4ea343882654077d63b8e2781b380a545331935", "version": "0.0.4", diff --git a/versions/r-/reproc.json b/versions/r-/reproc.json index ed13fab3fe3cdf..b90be37891c183 100644 --- a/versions/r-/reproc.json +++ b/versions/r-/reproc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eeac14685480439ee52ac05ec68faebb2cbaffad", + "version": "14.2.4", + "port-version": 1 + }, { "git-tree": "7fd87804e3a4b51c657b56c1be69d11e29168b89", "version": "14.2.4", diff --git a/versions/r-/restclient-cpp.json b/versions/r-/restclient-cpp.json index 398b5ed52dfffb..06de994004adbc 100644 --- a/versions/r-/restclient-cpp.json +++ b/versions/r-/restclient-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7eeae27247c8a1e6f5dab2356cb94370aaabb7fc", + "version-date": "2022-02-09", + "port-version": 0 + }, { "git-tree": "ab5e52242e8403aa8b9b26a60baead129e2a1798", "version-string": "0.5.2", diff --git a/versions/r-/rhash.json b/versions/r-/rhash.json index 32c38505f3e938..5645f745819011 100644 --- a/versions/r-/rhash.json +++ b/versions/r-/rhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db6e2fc777b1ffb5257989484d303fc52e9b39f5", + "version": "1.4.0", + "port-version": 2 + }, { "git-tree": "ade1e1726434d28ad58715f9b6a3c005a1f243bb", "version-string": "1.4.0", diff --git a/versions/r-/rhasheq.json b/versions/r-/rhasheq.json new file mode 100644 index 00000000000000..74506bc1e5947a --- /dev/null +++ b/versions/r-/rhasheq.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1f26547ad3e879dcf8083e3db488bdb1cda587f4", + "version": "0.0.1", + "port-version": 0 + } + ] +} diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index 73fad0f96b7704..2c292a49c3eb7f 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aaaaf8e01725428c22bcd3f6dcfef56568433dec", + "version": "4.3", + "port-version": 0 + }, { "git-tree": "67865d8852b0c90297adca30ee2640e469eb91d7", "version": "4.2", diff --git a/versions/r-/robin-hood-hashing.json b/versions/r-/robin-hood-hashing.json index 85b708e7733f30..071d8847183462 100644 --- a/versions/r-/robin-hood-hashing.json +++ b/versions/r-/robin-hood-hashing.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "79b90adbe2f012facdd920fdb6454bc21c84399e", + "version": "3.11.5", + "port-version": 0 + }, + { + "git-tree": "6f9ac2b49724c52f213148e36f09e886e346f1f8", + "version": "3.11.4", + "port-version": 0 + }, { "git-tree": "312efe5364281f04a0401cf9e7752041972f6e10", "version": "3.11.3", diff --git a/versions/r-/rocksdb.json b/versions/r-/rocksdb.json index ac2e3403d5a7aa..ecd1ee147ad5a6 100644 --- a/versions/r-/rocksdb.json +++ b/versions/r-/rocksdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "609a9d8753d7bb5e410ac6adbe53f097abdd0a76", + "version": "6.27.3", + "port-version": 0 + }, { "git-tree": "c65e598bc60aa73009c1c09f9644622dcfcbca50", "version": "6.26.1", diff --git a/versions/r-/rsasynccpp.json b/versions/r-/rsasynccpp.json index 398e8cc0f510ab..fbd102a5decccb 100644 --- a/versions/r-/rsasynccpp.json +++ b/versions/r-/rsasynccpp.json @@ -1,9 +1,14 @@ { "versions": [ + { + "git-tree": "7fc33d5002210774c5e4d7450a0cd88c3be82ca8", + "version": "0.0.7", + "port-version": 1 + }, { "git-tree": "80995d80f9e7e551f8305ce2cecb0a91bc9c457a", "version": "0.0.7", "port-version": 0 - } + } ] } diff --git a/versions/r-/rsm-binary-io.json b/versions/r-/rsm-binary-io.json index 168955fe12c314..34c422faf7d580 100644 --- a/versions/r-/rsm-binary-io.json +++ b/versions/r-/rsm-binary-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "954debdfb4b8f785728e7c263ea3ea3ee7093253", + "version-semver": "2.0.4", + "port-version": 1 + }, { "git-tree": "36b0aaf84f89c1ba6e63fe0da7ab72b6c1ccf535", "version-semver": "2.0.4", diff --git a/versions/r-/rsm-bsa.json b/versions/r-/rsm-bsa.json index 2623b9cb98dedb..200aa322982cca 100644 --- a/versions/r-/rsm-bsa.json +++ b/versions/r-/rsm-bsa.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c1791d77c435bd1a78a330e3c0bab2da49b8f183", + "version-semver": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "ab00b90abe4a8c06ede41183ef67b2208ae42297", + "version-semver": "4.0.0", + "port-version": 1 + }, { "git-tree": "a41057388bf027523e46eed7031efc1fb3920c17", "version-semver": "4.0.0", diff --git a/versions/r-/rsm-mmio.json b/versions/r-/rsm-mmio.json index ac662f9756a3d9..31ae61086639b9 100644 --- a/versions/r-/rsm-mmio.json +++ b/versions/r-/rsm-mmio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b64c5538a5de9cc3e4e516ba97f437480b94c6f0", + "version-semver": "1.1.0", + "port-version": 2 + }, { "git-tree": "634597e88010f239748fafb52c6e8f431242b53a", "version-semver": "1.1.0", diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json index bccb827b42405f..9b4d581a30cd54 100644 --- a/versions/r-/rsocket.json +++ b/versions/r-/rsocket.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c", + "version-string": "2021.08.30.00", + "port-version": 1 + }, + { + "git-tree": "9dbf0f51130cc7c6e2c23a2ca3a104e22384f4e7", + "version-string": "2021.08.30.00", + "port-version": 0 + }, + { + "git-tree": "79beeb5c846c3ecdb386e7b3445adf1ac42314df", + "version-string": "2020.05.04.00", + "port-version": 3 + }, { "git-tree": "c7ad735194f400692ba373c493c23778cbfe2c79", "version-string": "2020.05.04.00", diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index d9d7bb4fb870ed..1ef4831fd0524b 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cf41f524585ec0c2dd5b8c7d8b455a79265b62ea", + "version": "0.20.13", + "port-version": 3 + }, + { + "git-tree": "3dc228c0e837f979396a930bc24e8cf92f6190e3", + "version": "0.20.13", + "port-version": 2 + }, { "git-tree": "93a792dbedcec5e900509396ebbe4461cde51320", "version-string": "0.20.13", diff --git a/versions/r-/rtaudio.json b/versions/r-/rtaudio.json index b3534362189883..b8c79b7391b174 100644 --- a/versions/r-/rtaudio.json +++ b/versions/r-/rtaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21e8b0bced3d3323d342ac96a2b779415fdd11ac", + "version-date": "2021-11-16", + "port-version": 0 + }, { "git-tree": "603a92374a5c37c3efb3bc48aaee17b64046f7be", "version-date": "2021-08-15", diff --git a/versions/r-/rtlsdr.json b/versions/r-/rtlsdr.json index 491572e70d4633..38c8731448bde2 100644 --- a/versions/r-/rtlsdr.json +++ b/versions/r-/rtlsdr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62e4eb78a7e4f9cbbd24db08dd3f59ed284222e1", + "version-date": "2020-04-16", + "port-version": 3 + }, { "git-tree": "5ba19a6253c583cb9d97ea7ad3570c49284fadb1", "version-string": "2020-04-16", diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json index 07e63c77adaeff..ebda6dd64e6b2f 100644 --- a/versions/r-/rtmidi.json +++ b/versions/r-/rtmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d72ff2345f2c1b08f4808cedaa0caf87156d295", + "version-semver": "4.0.0", + "port-version": 4 + }, { "git-tree": "4c13583da321fa3efa7a075032d0ed880dd15e48", "version-semver": "4.0.0", diff --git a/versions/r-/rxspencer.json b/versions/r-/rxspencer.json index 9a23c4747d5635..1d4df6e4be1bfb 100644 --- a/versions/r-/rxspencer.json +++ b/versions/r-/rxspencer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0db813c47fd33b7e6f5ffb95790b66aafcaa53e", + "version": "3.9.0", + "port-version": 1 + }, { "git-tree": "c3b5bac6d89f6ae425bfe95a4309e72146f944dd", "version": "3.9.0", diff --git a/versions/r-/ryu.json b/versions/r-/ryu.json index 5bad84baa79e8e..5b448e6a124f2b 100644 --- a/versions/r-/ryu.json +++ b/versions/r-/ryu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b500b4b86daab326db966564fcd439215eae86ee", + "version": "2.0", + "port-version": 6 + }, { "git-tree": "e620954b8262664cd847436d34b412bc89292854", "version-string": "2.0", diff --git a/versions/s-/s2geometry.json b/versions/s-/s2geometry.json new file mode 100644 index 00000000000000..d7824d9754c29f --- /dev/null +++ b/versions/s-/s2geometry.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e72b94e77bff8c357c4cd2430094c4dadf21c174", + "version": "0.9.0", + "port-version": 1 + }, + { + "git-tree": "3cfb53e7df6cf6c9602e63606daa377568c52cd8", + "version": "0.9.0", + "port-version": 0 + } + ] +} diff --git a/versions/s-/s2n.json b/versions/s-/s2n.json index c974721885c153..73f3e5e037c760 100644 --- a/versions/s-/s2n.json +++ b/versions/s-/s2n.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6eed0d44ebcda6eea8c4a79b37ee119b9125060a", + "version": "1.3.5", + "port-version": 0 + }, + { + "git-tree": "7cb2325defd326de178cf524bd5db039ff1dc112", + "version": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "a8252a918117164e1f6472663244fda74690f849", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "b1f3fbca47339363713845a0e8e06c52c1198a2a", "version": "1.1.1", diff --git a/versions/s-/sail.json b/versions/s-/sail.json index f9326142ab419e..2d73e0aa87f3c9 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "a5a0265e855d48cc304d1e811a62e8b6f9603134", + "version-semver": "0.9.0-pre20", + "port-version": 0 + }, + { + "git-tree": "096fcf183ab11a1dd35b0fc3039e7cbee1826a82", + "version-semver": "0.9.0-pre19", + "port-version": 1 + }, + { + "git-tree": "197eaa8737cd3303cddf490693bef67a2e9eba41", + "version-semver": "0.9.0-pre19", + "port-version": 0 + }, { "git-tree": "33ba821b47bf709df78c48f302640cbdfac9860b", "version-semver": "0.9.0-pre18", diff --git a/versions/s-/sbp.json b/versions/s-/sbp.json index cd9ea4056dec52..1a8b87acacef39 100644 --- a/versions/s-/sbp.json +++ b/versions/s-/sbp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef46c718c23128379c5050d907d0a90d335206b3", + "version-semver": "3.4.10", + "port-version": 1 + }, { "git-tree": "d3d3511804be8ef1277c4bce734379748ee615f4", "version-semver": "3.4.10", diff --git a/versions/s-/scintilla.json b/versions/s-/scintilla.json index 95e2051826303a..649075160f61f7 100644 --- a/versions/s-/scintilla.json +++ b/versions/s-/scintilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65fa530f4695dbecf4c90bc60d89d59abc6eab2f", + "version": "4.4.6", + "port-version": 1 + }, { "git-tree": "725d3e47a1e30713a272b1ef12251b65696f8a3e", "version": "4.4.6", diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index 7f0cd51fd30dce..c8c3f635249f89 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,9 +1,14 @@ -{ - "versions": [ - { - "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", - "version-string": "4.4.8.16", - "port-version": 0 - } - ] -} +{ + "versions": [ + { + "git-tree": "01c76a267b6924a5f1f03349738e479e8bbe2c0b", + "version": "4.4.8.31", + "port-version": 0 + }, + { + "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", + "version-string": "4.4.8.16", + "port-version": 0 + } + ] +} diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index abda95cf95d5e3..8581c2417da88a 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81ca9aa67e4f00245a233d075c9ae95726a2d4e3", + "version": "1.0", + "port-version": 0 + }, { "git-tree": "d3ec8f415e27c9ca79bcaf3580692d28c6cf3a14", "version-string": "0.4", diff --git a/versions/s-/scylla-wrapper.json b/versions/s-/scylla-wrapper.json index 0093f06b340a17..2b12423a4bc403 100644 --- a/versions/s-/scylla-wrapper.json +++ b/versions/s-/scylla-wrapper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1633de82a41a7dac94c972377145d3bf67b80a4", + "version-string": "2018-08-26-16e6f435", + "port-version": 2 + }, { "git-tree": "358f082e98f164d3b0fdd5ef1a88dc2ec627610e", "version-string": "2018-08-26-16e6f435", diff --git a/versions/s-/sdformat10.json b/versions/s-/sdformat10.json index 20eadc1011dc6c..00cd92457625f1 100644 --- a/versions/s-/sdformat10.json +++ b/versions/s-/sdformat10.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abf1fc376b102a9ef833522a615261e5d3e155b8", + "version": "10.0.0", + "port-version": 2 + }, { "git-tree": "13fbbc3bb6bf9c38cb97d4e14af7c3a46ecba6e6", "version-string": "10.0.0", diff --git a/versions/s-/sdformat6.json b/versions/s-/sdformat6.json index 2429b11d27f2cd..b30a5ca6729ef5 100644 --- a/versions/s-/sdformat6.json +++ b/versions/s-/sdformat6.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bdc0f927266aa4195c3795075c9e07c426c4556c", + "version": "6.2.0", + "port-version": 6 + }, + { + "git-tree": "f3ec7ce50f9e64316ed940878271ade6cea1c0e3", + "version": "6.2.0", + "port-version": 5 + }, { "git-tree": "dc94f6d1e0351bb777ccd1823470fe22ad896c34", "version": "6.2.0", diff --git a/versions/s-/sdformat9.json b/versions/s-/sdformat9.json index adaa94b54ac14d..547317e56551b4 100644 --- a/versions/s-/sdformat9.json +++ b/versions/s-/sdformat9.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "d050d624faf72f8dcb62fdb7a5378ae5d8e8b5d8", + "version": "9.4.0", + "port-version": 5 + }, + { + "git-tree": "2b064abf9a6849ed5234b03bf5604ccd0169db4a", + "version": "9.4.0", + "port-version": 4 + }, + { + "git-tree": "5f47672c7e4349da14189c38db3a15dcdad5a196", + "version": "9.4.0", + "port-version": 3 + }, + { + "git-tree": "0ae3b0b53c638614e4a03164b1a5d1b70796e55e", + "version-string": "9.4.0", + "port-version": 2 + }, { "git-tree": "d8e35870677a08dcb88753aa2ef446b75a9646f2", "version-string": "9.4.0", diff --git a/versions/s-/sdl1.json b/versions/s-/sdl1.json index 16a3f5827fba3b..eaa05de79d8f97 100644 --- a/versions/s-/sdl1.json +++ b/versions/s-/sdl1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a3aba1bba75ee6d613144dbd6b2c64cbe6a090c", + "version": "1.2.15", + "port-version": 15 + }, { "git-tree": "dd8e1026af78ffd7bb4e9d6fa1455579367206e1", "version-string": "1.2.15", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index 9c30ac3ec88869..9e0ed9100fcdd1 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9042c449fc4c728c5b428332e09bc6d21a2acf34", + "version-string": "2.0.5", + "port-version": 4 + }, { "git-tree": "7cd6ce4e9108671f3f4bad86c37ee2586acbf440", "version-string": "2.0.5", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index 561ffed6d6fcce..dc799edf6ae75a 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "23eb6562f5153eb39a84eb2673d5dc9bd2ce78aa", + "version": "2.0.4", + "port-version": 16 + }, + { + "git-tree": "981b981d938287223eb7ebbe365cfbb371ba71ef", + "version": "2.0.4", + "port-version": 15 + }, { "git-tree": "960ae8e64dfba885f0fa2274277e2b929aaf0ded", "version": "2.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index a60265610d5307..93196b43ed7a3d 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5865b5fb9c52f255629f4c015f37df9ca788a33", + "version": "2.0.20", + "port-version": 0 + }, { "git-tree": "4d0926c154515596d8f178d7350c37433b05957b", "version": "2.0.16", diff --git a/versions/s-/seal.json b/versions/s-/seal.json index f8d84e29d260e7..5fd1786eaf2ff3 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c3499eaa1c19049bc521c3d2799d8d7d6d032a8a", + "version-semver": "3.7.2", + "port-version": 2 + }, + { + "git-tree": "11dc6c4e8b720416ff6ce195e48287982a6131ec", + "version-semver": "3.7.2", + "port-version": 1 + }, { "git-tree": "f60c9b8a5bafea149666d032b375f1b3980dd3ca", "version-semver": "3.7.2", diff --git a/versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json index 311ecd37394d4d..5d3c9d9ac35df4 100644 --- a/versions/s-/sentencepiece.json +++ b/versions/s-/sentencepiece.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b243e85760f8f59100632997fdc34cdae47bcfd4", + "version": "0.1.96", + "port-version": 1 + }, { "git-tree": "b83e7b28dc28e405cfee3c94385e2039c8564040", "version": "0.1.96", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index a68a56869f3de4..20d816302c7ac8 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "3dff7be1b47155d1580f43be48d8b95761251883", + "version-semver": "0.4.15", + "port-version": 0 + }, + { + "git-tree": "789ced09501be535989b9eadfc5b04317b4be8d6", + "version-semver": "0.4.14", + "port-version": 0 + }, + { + "git-tree": "02e695aa00b661662dfae906a4cd55c0d8371f73", + "version-semver": "0.4.13", + "port-version": 2 + }, + { + "git-tree": "9fb136cdde824d2f306a1afbd99830af76446158", + "version-semver": "0.4.13", + "port-version": 1 + }, + { + "git-tree": "d0ab3adf0fe8f521553af8345c6c11e6e883f065", + "version-semver": "0.4.13", + "port-version": 0 + }, { "git-tree": "02751ec1af944b27f69c9b50a8df4017cc24add3", "version-semver": "0.4.12", diff --git a/versions/s-/serdepp.json b/versions/s-/serdepp.json new file mode 100644 index 00000000000000..a6effc714a29e4 --- /dev/null +++ b/versions/s-/serdepp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "37783a8fa004467ce9ee44c8f1e79fd994abd8e7", + "version": "0.1.4", + "port-version": 0 + } + ] +} diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index d14e2ee1aba4b3..d9360682b05140 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bc9b03c639a91f2deff1fb78ab943cce64876ffe", + "version": "2.5.1", + "port-version": 12 + }, + { + "git-tree": "c9d7e4e8a4aeec1731d48bac0c2b59b53ee30ba8", + "version": "2.5.1", + "port-version": 11 + }, { "git-tree": "02d4e2c1c253e1ef48dd9c37d24bec0a47a716ff", "version": "2.5.1", diff --git a/versions/s-/shaderc.json b/versions/s-/shaderc.json index 8c608dcec57b5f..840e9fe99157fa 100644 --- a/versions/s-/shaderc.json +++ b/versions/s-/shaderc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "376570ffd232d9c4e0dad095ae3dea964dec52ed", + "version": "2021.1", + "port-version": 2 + }, { "git-tree": "e8590ab232dd5ccd2331bb321127f00788b573a3", "version": "2021.1", diff --git a/versions/s-/shaderwriter.json b/versions/s-/shaderwriter.json index 9261734581d1bb..4c30efff0b2774 100644 --- a/versions/s-/shaderwriter.json +++ b/versions/s-/shaderwriter.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e9ad5b26c40e2048a99c618972827c8f8e802eaa", + "version": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "74d64baacf8733ed2cb0a0ded83ac86b8213a609", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "3ed37649aa1fcdb0323fdf75fdfe3ffa038d0dfe", "version": "1.1.0", diff --git a/versions/s-/shiva.json b/versions/s-/shiva.json index 67c2c2a131ff78..81d1b1b42cb50a 100644 --- a/versions/s-/shiva.json +++ b/versions/s-/shiva.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "821cf61c76079cfd5c7a635dc36e01c0f33c38f5", + "version": "1.0", + "port-version": 5 + }, { "git-tree": "5ff8f81870f8963dc86da05ce330bbde585e940d", "version-string": "1.0", diff --git a/versions/s-/shogun.json b/versions/s-/shogun.json index 8fd9b801eb00ae..5cbf107c76eed6 100644 --- a/versions/s-/shogun.json +++ b/versions/s-/shogun.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13454c6a31030e65fdac9764f8b38c90bf40c9a9", + "version-string": "6.1.4", + "port-version": 7 + }, { "git-tree": "0ae86e647188a99b1602164f4614ba54d55cf22a", "version-string": "6.1.4", diff --git a/versions/s-/simage.json b/versions/s-/simage.json index 92165a5c2add04..6f298cfd70e1a8 100644 --- a/versions/s-/simage.json +++ b/versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c2ccc36f5c1ebb27f820fe4f6e89df014e4bafa", + "version-semver": "1.8.1", + "port-version": 4 + }, { "git-tree": "97e1edfae380f76bdb4d6e9a94a91bbccd82c3a2", "version-semver": "1.8.1", diff --git a/versions/s-/simbody.json b/versions/s-/simbody.json new file mode 100644 index 00000000000000..d3c76f8e03fb31 --- /dev/null +++ b/versions/s-/simbody.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "09ced08b16274ddf38f64031b659a76b8aea2e85", + "version-date": "2022-01-04", + "port-version": 1 + }, + { + "git-tree": "9474ba4a8027fb4f8e3e160decc4fa9f443a16e9", + "version-date": "2022-01-04", + "port-version": 0 + } + ] +} diff --git a/versions/s-/skcrypter.json b/versions/s-/skcrypter.json new file mode 100644 index 00000000000000..26fb5ac7221203 --- /dev/null +++ b/versions/s-/skcrypter.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "95af2c7ed5227763696b4101e416e227446b7299", + "version-date": "2021-12-03", + "port-version": 0 + } + ] +} diff --git a/versions/s-/skia.json b/versions/s-/skia.json index b35420ba8497d8..168d625e74968f 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "104ba7c5e5e46398000e92e0f9cc3c9f0999e142", + "version-date": "2020-05-18", + "port-version": 8 + }, + { + "git-tree": "f7b3961a52ea4c43d781a5c8ace67d0ef100cce7", + "version-date": "2020-05-18", + "port-version": 7 + }, { "git-tree": "100eb7e29ed2959e793dfce6500b408e84d56562", "version-date": "2020-05-18", diff --git a/versions/s-/skyr-url.json b/versions/s-/skyr-url.json index 3228ab10bca6ed..98ad9012437e04 100644 --- a/versions/s-/skyr-url.json +++ b/versions/s-/skyr-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "429bf1616eeeb9c2315b09d9a6c741245e3eae6a", + "version": "1.13.0", + "port-version": 2 + }, { "git-tree": "174f5bc4cc8080f2cb34c7a1aad9b14bedaa2c9a", "version-string": "1.13.0", diff --git a/versions/s-/sleef.json b/versions/s-/sleef.json index 304db6224f9952..706ae99f1a8d05 100644 --- a/versions/s-/sleef.json +++ b/versions/s-/sleef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea33cc5343944b32ab14b772d5242a07fb84865b", + "version": "3.5.1", + "port-version": 1 + }, { "git-tree": "0c195bd94ab64769463a4891db9d140fa37508a4", "version": "3.5.1", diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index d3d2a31a87d08a..1105f0b27e6411 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e868f4817878ec1c9686ab467b60f8086c50a00", + "version-date": "2022-02-05", + "port-version": 0 + }, { "git-tree": "0aba637e01389ec4ed5923eaf898ca78dac96cbb", "version-date": "2021-07-07", diff --git a/versions/s-/slikenet.json b/versions/s-/slikenet.json index ee83f0113e39ba..72f5c29378abf9 100644 --- a/versions/s-/slikenet.json +++ b/versions/s-/slikenet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "470cffd8e68b737e7131beccd5fc7a87be9c3151", + "version-date": "2021-06-07", + "port-version": 1 + }, { "git-tree": "ac7b0f3e2e112489c1d66b390c22e050bd410783", "version-date": "2021-06-07", diff --git a/versions/s-/so5extra.json b/versions/s-/so5extra.json index e78cac9f6f3569..5f012450617faf 100644 --- a/versions/s-/so5extra.json +++ b/versions/s-/so5extra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a25bef02c9cea8f01ec3066d423b4f4ca6615959", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "19014d4bd5c636ba619162dfad251af8142e4843", "version": "1.4.1.1", diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index 8de7b3de08718a..9edb247a2de80d 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d0c49d93ac92669376ad08293de921d9e36352e", + "version": "5.7.3", + "port-version": 0 + }, { "git-tree": "a9d077353078063b67cad355ccb7546a0b4bfcac", "version": "5.7.2.6", diff --git a/versions/s-/sockpp.json b/versions/s-/sockpp.json index 12e5a5bd06a181..dd37bb850e19b4 100644 --- a/versions/s-/sockpp.json +++ b/versions/s-/sockpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "18dad1cf56b14fdf423311b6f277014e0c3f6762", + "version-date": "2022-01-24", + "port-version": 0 + }, + { + "git-tree": "3afb916458a5548b20996882ed7f7054d041f0ff", + "version": "0.7", + "port-version": 2 + }, { "git-tree": "69d23d693d1ab8cfeeab35c6b2794d6f2a9ca748", "version-string": "0.7", diff --git a/versions/s-/soem.json b/versions/s-/soem.json index 5cf0babc9b1050..a758daeb6b7157 100644 --- a/versions/s-/soem.json +++ b/versions/s-/soem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc08020790a9060eb6adaa1e989af4463197854b", + "version": "1.4.0", + "port-version": 3 + }, { "git-tree": "df36d49ff0f6b1755c5a1a046c98c4d0df0e7d77", "version-string": "1.4.0", diff --git a/versions/s-/soil.json b/versions/s-/soil.json index c06dd8898fae09..76994b7e0efe75 100644 --- a/versions/s-/soil.json +++ b/versions/s-/soil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b4abbbc20cd42bad536a6aee64949a40ec3d850", + "version-date": "2021-04-22", + "port-version": 1 + }, { "git-tree": "9798401f421c850fbce93d990b143283ae5af293", "version-date": "2021-04-22", diff --git a/versions/s-/soil2.json b/versions/s-/soil2.json index e85069310b8c5d..849a933dbd31c3 100644 --- a/versions/s-/soil2.json +++ b/versions/s-/soil2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20e7e06d73b0119e99f870bcffc70be22a7c8287", + "version-date": "2021-05-01", + "port-version": 1 + }, { "git-tree": "e72741e77acc80b5d72a64ce396f6a713548e3a1", "version-date": "2021-05-01", diff --git a/versions/s-/sophus.json b/versions/s-/sophus.json index f31dd71d63d7af..64f100f3c69499 100644 --- a/versions/s-/sophus.json +++ b/versions/s-/sophus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90c7c425fb7d1af0e2201091c0ec00e97309e12e", + "version-date": "2021-09-14", + "port-version": 0 + }, { "git-tree": "4826fe050e6cfd22a46d50ab3d6258a39d2bb69f", "version": "1.0.0", diff --git a/versions/s-/soqt.json b/versions/s-/soqt.json index 8db3fc4ff8888a..d967a931a8f68d 100644 --- a/versions/s-/soqt.json +++ b/versions/s-/soqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25bc0ce4eb1212df1f9110770fbf02157a21bccd", + "version": "1.6.0", + "port-version": 4 + }, { "git-tree": "3bbb3ea4c3dff6485e3d04f6af1fbbe6e5a75be9", "version-string": "1.6.0", diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json index 81b7f378c52056..5c37a47d71b5ae 100644 --- a/versions/s-/soundtouch.json +++ b/versions/s-/soundtouch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4f307065b40b131fd80ce953afcc121aba46f9f", + "version": "2.3.1", + "port-version": 2 + }, { "git-tree": "a91341e5eb80526c64b263e5b10e0a6c800daa7e", "version": "2.3.1", diff --git a/versions/s-/spatialite-tools.json b/versions/s-/spatialite-tools.json index 5d2f0218897d9c..fa598148e940b9 100644 --- a/versions/s-/spatialite-tools.json +++ b/versions/s-/spatialite-tools.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1e91990a5c6a01d86cc1b4cb84bbea812e62b450", + "version": "5.0.1", + "port-version": 1 + }, + { + "git-tree": "bd6f0ddd2db2c709ce3bd94df91dced9e3d23c7e", + "version-string": "5.0.1", + "port-version": 0 + }, { "git-tree": "e31f1f43c34f7ab68bfbfcfe1a9edcd8040c3373", "version-string": "5.0.0", diff --git a/versions/s-/spdk-isal.json b/versions/s-/spdk-isal.json index 09c4734880c431..7439aac291e95c 100644 --- a/versions/s-/spdk-isal.json +++ b/versions/s-/spdk-isal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de270891534b1e4332e4cfbd67437653a9217823", + "version-string": "20181006", + "port-version": 2 + }, { "git-tree": "a3b83f2844457a26c4f286c651a85ec6b5cc43e2", "version-string": "20181006", diff --git a/versions/s-/speex.json b/versions/s-/speex.json index ea743307ec9b89..87a027137f63fb 100644 --- a/versions/s-/speex.json +++ b/versions/s-/speex.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7cbe163c0a5fabd08cb6665c092d6b13dfa51d69", + "version": "1.2.0", + "port-version": 11 + }, + { + "git-tree": "0f443cef71fd44439aa559063a219da440f6665d", + "version": "1.2.0", + "port-version": 10 + }, { "git-tree": "8713e87cf40c60307dfdef2102392b97cb3b4c3d", "version-string": "1.2.0", diff --git a/versions/s-/speexdsp.json b/versions/s-/speexdsp.json index 16ca82f1d03439..c97f95cd7a3693 100644 --- a/versions/s-/speexdsp.json +++ b/versions/s-/speexdsp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6606b66ecc502c89de6a1e570c1407bf1f8b2d03", + "version": "1.2.0", + "port-version": 7 + }, { "git-tree": "911ea65a3db9f26e595990e94ab4ec911cd8ef82", "version-string": "1.2.0", diff --git a/versions/s-/spirv-reflect.json b/versions/s-/spirv-reflect.json new file mode 100644 index 00000000000000..84a3fee89bdac1 --- /dev/null +++ b/versions/s-/spirv-reflect.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bcebcfdd9e9332b68c4185b3127fc898fc91402a", + "version-date": "2021-12-31", + "port-version": 0 + } + ] +} diff --git a/versions/s-/sqlcipher.json b/versions/s-/sqlcipher.json index df96b742b00e8e..391a0ed1d56b68 100644 --- a/versions/s-/sqlcipher.json +++ b/versions/s-/sqlcipher.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "3803a9648861130c25517c8b330c17d054fe6cd7", + "version": "4.5.1", + "port-version": 0 + }, + { + "git-tree": "e38664c89497e1686362947290d62bcf0eb6abaa", + "version": "4.5.0", + "port-version": 1 + }, + { + "git-tree": "dd42a5be2c9409d8e5c35b9821765f504ef960ff", + "version": "4.5.0", + "port-version": 0 + }, { "git-tree": "3811f54932ce20be68bed2fed0cafcfb1d03be56", "version": "4.4.3", diff --git a/versions/s-/sqlite-orm.json b/versions/s-/sqlite-orm.json index a69988e0b38eff..24620aedab3995 100644 --- a/versions/s-/sqlite-orm.json +++ b/versions/s-/sqlite-orm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a065a6f10e3d75198b433530fd91853eb691c325", + "version": "1.7.1", + "port-version": 0 + }, { "git-tree": "57c4daa9dadbff1a2f6c088f6716bd14b638984b", "version": "1.7", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 00752f4d0a8a2a..419fec4f39e3e7 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f49ad405225c6326558adb79f2082814002a8cda", + "version": "3.37.2", + "port-version": 1 + }, + { + "git-tree": "ac17b6f385706852a3895200764c358697c5c584", + "version": "3.37.1", + "port-version": 0 + }, + { + "git-tree": "abbe21d1a38c7eb9e8c87965235d92721001e997", + "version": "3.37.0", + "port-version": 1 + }, { "git-tree": "51ffa2ba781101e70546d4e6956d31f69a59cee6", "version": "3.37.0", diff --git a/versions/s-/starlink-ast.json b/versions/s-/starlink-ast.json index 0ba8d7525f3ba6..1ebc5ce9411bce 100644 --- a/versions/s-/starlink-ast.json +++ b/versions/s-/starlink-ast.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f749208cd4ad912baf5f9b84482f32a176ef910a", + "version": "9.2.7", + "port-version": 1 + }, + { + "git-tree": "9f0217b4694092c4b440de6e864986ee8c567f5e", + "version": "9.2.7", + "port-version": 0 + }, + { + "git-tree": "b5cfb9d9ff68b40b5a910240d3b0d09190b17b36", + "version-semver": "9.2.5", + "port-version": 0 + }, { "git-tree": "487c5e318ce957c09647d0d74a2b5b4a4e99ffef", "version-semver": "9.2.4", diff --git a/versions/s-/status-code.json b/versions/s-/status-code.json index 31210573bc5bdc..ab25f04dc48b08 100644 --- a/versions/s-/status-code.json +++ b/versions/s-/status-code.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c71af3efa61ec9c5bbb91287b610bcc561e95a47", + "version-string": "1.0.0-20211208", + "port-version": 1 + }, { "git-tree": "3acdd69c0d01a5041a2549a21a1d0d367efa7d53", "version-string": "1.0.0-ab3cd821", diff --git a/versions/s-/superlu.json b/versions/s-/superlu.json index 7d13bfe6b5a188..c048cc9ae21410 100644 --- a/versions/s-/superlu.json +++ b/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bee1e0197c0e768c6ee8b9acdf815b4d46b5978", + "version-date": "2020-01-07", + "port-version": 5 + }, { "git-tree": "88c6ebaf1337aa31cf3afec8250fd7ee1b990b6e", "version-string": "2020-01-07", diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json index 205aae2a5235fa..4c35acb6486875 100644 --- a/versions/t-/taglib.json +++ b/versions/t-/taglib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "246255cab48b434b3c78aaa315f5f62b4692f255", + "version-semver": "1.12.0", + "port-version": 2 + }, + { + "git-tree": "d14774690f0692baa62237a6ee67f8aa7e7974f9", + "version-semver": "1.12.0", + "port-version": 1 + }, { "git-tree": "c4559ad74a4b1757cc6f7b11abce3b6c4cab66c7", "version-semver": "1.12.0", diff --git a/versions/t-/taskflow.json b/versions/t-/taskflow.json index 4d3bfdb830fd2b..7bfe3dd2b9b98f 100644 --- a/versions/t-/taskflow.json +++ b/versions/t-/taskflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68130a893501e5e9bbe48c41ad00ef5de0a0a060", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "49d827de9e8309cb0f16fbb84ec611a1a44d18ec", "version": "3.2.0", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 9c56bf8a5a081b..bc96b938334ce5 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "016aeb70aa2dfba55a141a928863a0191314d4a9", + "version-string": "2020_U3", + "port-version": 8 + }, + { + "git-tree": "275198e39d268c87b807d7f552b51396d5cf6242", + "version-string": "2020_U3", + "port-version": 7 + }, { "git-tree": "e168e03c2e5776bdee59accf5f643ae26b0ddd84", "version-string": "2020_U3", diff --git a/versions/t-/tcb-span.json b/versions/t-/tcb-span.json new file mode 100644 index 00000000000000..64e48cc5286110 --- /dev/null +++ b/versions/t-/tcb-span.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "191bf0b7971f5aac50a5d81224d04e8f9aef7e38", + "version-date": "2021-12-15", + "port-version": 0 + } + ] +} diff --git a/versions/t-/teemo.json b/versions/t-/teemo.json index cd3f96c6d4220a..f06a0abfec997f 100644 --- a/versions/t-/teemo.json +++ b/versions/t-/teemo.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "6eff96ba13b50bd8a7b7b3d1197fdbda11c09712", + "version": "2.6", + "port-version": 1 + }, + { + "git-tree": "668ad24ea1e187f27877ffe3570555df857460d8", + "version": "2.6", + "port-version": 0 + }, + { + "git-tree": "d92f8edfaa4c8a208cfa6253c6d2ebd8beeaf303", + "version": "2.5", + "port-version": 1 + }, + { + "git-tree": "272a7ccdbd7429e98513b1d4c9c394406fa70d42", + "version": "2.5", + "port-version": 0 + }, + { + "git-tree": "f4a45a333657786fd8ee51f2d5df590909578bff", + "version": "2.4", + "port-version": 0 + }, { "git-tree": "d33e668cc0750872a5853c680fa707e12f032e9e", "version": "2.3", diff --git a/versions/t-/tensorflow-cc.json b/versions/t-/tensorflow-cc.json index 2fb6918aa5f074..475c71d108a7d7 100644 --- a/versions/t-/tensorflow-cc.json +++ b/versions/t-/tensorflow-cc.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c0b8bf99d3056c5b117dd2eabba3125f1d867442", + "version-semver": "2.7.0", + "port-version": 2 + }, + { + "git-tree": "48be8a2aea85f73821084ea35d307e4033726565", + "version-semver": "2.7.0", + "port-version": 1 + }, + { + "git-tree": "f0bd2999562da259b6e2c39131a6a02f632b21a8", + "version-semver": "2.7.0", + "port-version": 0 + }, { "git-tree": "b9e9f840127f8da0c67cadf0369023753c90686b", "version-semver": "2.6.0", diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json index 26d4c0d267ed2f..d276daf00fe9b5 100644 --- a/versions/t-/tensorflow-common.json +++ b/versions/t-/tensorflow-common.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "1f37cd68d08ecbb0ca6c2d630598d3f568f1fcc4", + "version-semver": "2.7.0", + "port-version": 2 + }, + { + "git-tree": "4c81239401e4304b124ed215960cdcdf19611e47", + "version-semver": "2.7.0", + "port-version": 1 + }, + { + "git-tree": "eb9e0e1345847b72eccecd5a6b85a441f034e1a7", + "version-semver": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "e766afec982de89398663f587da490fc8996474f", + "version-semver": "2.6.0", + "port-version": 1 + }, { "git-tree": "84662f791eb9d38350a4ffe99cd80d49f562b10f", "version-semver": "2.6.0", diff --git a/versions/t-/tensorflow.json b/versions/t-/tensorflow.json index 900e6a8ed8106e..e47e81c730751c 100644 --- a/versions/t-/tensorflow.json +++ b/versions/t-/tensorflow.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "07b6bd8bae65b448a163db4e720c46afd605a1cc", + "version-semver": "2.7.0", + "port-version": 2 + }, + { + "git-tree": "4f02ceeb872646409f83a5b164c9892322d75e6b", + "version-semver": "2.7.0", + "port-version": 1 + }, + { + "git-tree": "b12af58d1b9069b6ab8b2de9e1c6c7f2b07aadfe", + "version-semver": "2.7.0", + "port-version": 0 + }, { "git-tree": "8692b5026a3b7666e73dcaf7432e525dc103f8c5", "version-semver": "2.6.0", diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index 534b63696755f1..7ecdfe6e700d19 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc442cfbc144a4fc95ca41d9349ef04564d7ce5a", + "version-date": "2021-04-26", + "port-version": 1 + }, { "git-tree": "ab0e7e22e13c4ebe8c308008aaabb803dca57cdc", "version-date": "2021-04-26", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 08d629cf1c986e..e13ddd02565661 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ac84bef93d2709f28bf4ab8341a80dab949a8cf1", + "version": "4.1.1", + "port-version": 10 + }, + { + "git-tree": "10ffafb1de68c463fbac91a484d2c27cc618c0c9", + "version": "4.1.1", + "port-version": 9 + }, { "git-tree": "f0ab88788617df5c670d6c372f431a0356713d3d", "version": "4.1.1", diff --git a/versions/t-/tfhe.json b/versions/t-/tfhe.json index d44f73e0c2f499..dd960cfc1f88eb 100644 --- a/versions/t-/tfhe.json +++ b/versions/t-/tfhe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "657bf75ef9440b68186eeeccc1c7e3f2c55d3ec4", + "version-semver": "1.0.1", + "port-version": 3 + }, { "git-tree": "e87faaf58cb9feb686fe28d31f24cedf27e2aec1", "version-semver": "1.0.1", diff --git a/versions/t-/tgui.json b/versions/t-/tgui.json index f04e637e79f05e..c808cac1122731 100644 --- a/versions/t-/tgui.json +++ b/versions/t-/tgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fe7d561ea6d038584711e8581f6a5a72062c543", + "version-date": "2021-04-19", + "port-version": 3 + }, { "git-tree": "0fd517c4e738da62e959b791a6cdd952e7bd8345", "version-date": "2021-04-19", diff --git a/versions/t-/theia.json b/versions/t-/theia.json index 5afa2da9c87fc9..4ce29911e182ea 100644 --- a/versions/t-/theia.json +++ b/versions/t-/theia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f19561fe41ab71864fbf9640e491cc6a567c06b8", + "version-string": "0.8", + "port-version": 6 + }, { "git-tree": "eff19230130911fb05e12a22ba59fc35f0d4b341", "version-string": "0.8", diff --git a/versions/t-/tidy-html5.json b/versions/t-/tidy-html5.json index 372b548580bc74..8a48d8d4212b4c 100644 --- a/versions/t-/tidy-html5.json +++ b/versions/t-/tidy-html5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf333a8afdee1d7e0129928022e228cc092ed5de", + "version": "5.7.28", + "port-version": 5 + }, { "git-tree": "ba5557c5b17df0184bd2ee1eeee06ec1131576f8", "version-string": "5.7.28", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 29367b7306d910..8882dafc3c1329 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "7d1677b9568234f05c4be9f04f321b9506884376", + "version": "4.3.0", + "port-version": 6 + }, + { + "git-tree": "29af46222dc88425d734288253d807f1a9b96419", + "version": "4.3.0", + "port-version": 5 + }, + { + "git-tree": "b416d3e62450590e19a43f04b573c65555f3bc62", + "version": "4.3.0", + "port-version": 4 + }, + { + "git-tree": "d96194297723032655164b0fcb88027e38e06003", + "version": "4.3.0", + "port-version": 3 + }, { "git-tree": "f147253c84ad1d911393d8b5496f30574a07c780", "version": "4.3.0", diff --git a/versions/t-/tinkerforge.json b/versions/t-/tinkerforge.json index 0969ff465c79bb..433a2ef3a6abfa 100644 --- a/versions/t-/tinkerforge.json +++ b/versions/t-/tinkerforge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9c644023147820bc9c89e9fe9f896e1a5fa0913", + "version": "2.1.25", + "port-version": 2 + }, { "git-tree": "684528ec07914569ba89b0d42230290cc55fdd4a", "version-string": "2.1.25", diff --git a/versions/t-/tinyexif.json b/versions/t-/tinyexif.json index 70793522361ab6..32a1382c10df5c 100644 --- a/versions/t-/tinyexif.json +++ b/versions/t-/tinyexif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50ad94147ea76f0e34a0e2afdcd92d83ad0102b1", + "version-date": "2022-02-15", + "port-version": 0 + }, { "git-tree": "350cf76237d8fc38f67cba9766e25b2f68d50d64", "version-string": "1.0.2", diff --git a/versions/t-/tinyfiledialogs.json b/versions/t-/tinyfiledialogs.json index 7096611582475a..2b062876ff9bf3 100644 --- a/versions/t-/tinyfiledialogs.json +++ b/versions/t-/tinyfiledialogs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be887c4bad998770f49efced776f0ef5df71d342", + "version": "3.8.8", + "port-version": 4 + }, { "git-tree": "57a86420c47979e0b30dfb1e77482aad2836b07b", "version": "3.8.8", diff --git a/versions/t-/tl-ranges.json b/versions/t-/tl-ranges.json new file mode 100644 index 00000000000000..31aabb66ed3161 --- /dev/null +++ b/versions/t-/tl-ranges.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7b8e77a41595c1f5d6fc5efdba421c7240fc26d9", + "version-date": "2021-12-02", + "port-version": 0 + } + ] +} diff --git a/versions/t-/tmx.json b/versions/t-/tmx.json index d362504b41da52..862004cd4473ae 100644 --- a/versions/t-/tmx.json +++ b/versions/t-/tmx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b0ec7979f9a75aab71e9488940a4beff74bd745", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "207601a8ff1891880a88013e3b36ea0f81979010", "version": "1.2.0", diff --git a/versions/t-/tomlplusplus.json b/versions/t-/tomlplusplus.json index 7bbdb0081c9082..6cbfc7a3c17c17 100644 --- a/versions/t-/tomlplusplus.json +++ b/versions/t-/tomlplusplus.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "815508399a10ce972d933aa3f5b4f751c37c64d2", + "version": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "06ce1fc365e8e7aa80b1a234a97665ca5e593d0d", + "version": "2.5.0", + "port-version": 3 + }, { "git-tree": "8a772c48d2f8b5d525a1bcad95296bb483194e7a", "version": "2.5.0", diff --git a/versions/t-/tool-meson.json b/versions/t-/tool-meson.json index ec49d3f117a78f..046537d03ea4b8 100644 --- a/versions/t-/tool-meson.json +++ b/versions/t-/tool-meson.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cb1118e5da831de1c511424b6aaa7949777733a3", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "924a9b5b5dc11ea420a1be748873f8b252fd1417", + "version-date": "2021-11-19", + "port-version": 0 + }, { "git-tree": "7faddc68a615d0902938f8dd18182586f9e2363a", "version": "0.58.1", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json new file mode 100644 index 00000000000000..30e4cbde5cf508 --- /dev/null +++ b/versions/t-/tracy.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "4495b1e35b5ce98b10a2a6f28eebdda0088903e2", + "version": "0.7.8", + "port-version": 2 + }, + { + "git-tree": "3995e035cf62c81d54be47133d37eb3073a44343", + "version": "0.7.8", + "port-version": 1 + }, + { + "git-tree": "9649d5716ad8d1ff208bc0b1e97e9700e915ef55", + "version": "0.7.8", + "port-version": 0 + } + ] +} diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index 408107c8a67544..7f1733fc86f6e1 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9d602ca62a711669efb9d496f9644334fecd8c9d", + "version-semver": "1.5.5", + "port-version": 0 + }, + { + "git-tree": "aa2acfecd4618d2da7aaae3e93e5f2bb4ec7172e", + "version-semver": "1.5.4", + "port-version": 0 + }, { "git-tree": "a5395bb6aeca297cdc2a8b052599df7a7b568c07", "version-semver": "1.5.3", diff --git a/versions/t-/triangle.json b/versions/t-/triangle.json index 71a72f6da27f16..f3fae4ed4e1236 100644 --- a/versions/t-/triangle.json +++ b/versions/t-/triangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "645a20994580aa49313c0d9ef735ea60caf57976", + "version": "1.6", + "port-version": 2 + }, { "git-tree": "9b80b2815877547418bac0ed7ddba3fec7d0a2df", "version-string": "1.6", diff --git a/versions/t-/triton.json b/versions/t-/triton.json new file mode 100644 index 00000000000000..aae56d2cb2a91f --- /dev/null +++ b/versions/t-/triton.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1463df6dd74dfea7d12a8610b23009259b5c1e57", + "version": "0.9", + "port-version": 1 + }, + { + "git-tree": "168cc90ef1373fadb8b05ad53430eb37a022dd50", + "version": "0.9", + "port-version": 0 + } + ] +} diff --git a/versions/t-/ttauri.json b/versions/t-/ttauri.json index 74a61a87a9edb9..f1deb87b031664 100644 --- a/versions/t-/ttauri.json +++ b/versions/t-/ttauri.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5990b7368bf89a8b6cd1fa2a7b33406c9ef3a24e", + "version": "0.5.0", + "port-version": 1 + }, { "git-tree": "8214a006b0e577a7c4076ed5bfd7f155abc99ace", "version": "0.5.0", diff --git a/versions/t-/turbobase64.json b/versions/t-/turbobase64.json index c7e663d292e0fe..761a503da0e7d8 100644 --- a/versions/t-/turbobase64.json +++ b/versions/t-/turbobase64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1077b7996d7d22e798b337bc29177a566ec64e4b", + "version-date": "2020-01-12", + "port-version": 2 + }, { "git-tree": "42e8e3b3a43b2170811c936708766470ad137cab", "version-string": "2020-01-12", diff --git a/versions/t-/tvision.json b/versions/t-/tvision.json index 888ab5edd1c10d..8dea359d6afe80 100644 --- a/versions/t-/tvision.json +++ b/versions/t-/tvision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43ab1f9cb4407aab0a936520a82ddee84a48bd92", + "version-date": "2021-08-10", + "port-version": 1 + }, { "git-tree": "9d7a52a21054aae326fe5793acc7d54b04ec40f6", "version-date": "2021-08-10", diff --git a/versions/u-/uchardet.json b/versions/u-/uchardet.json index c8c1d09fa58a50..cc62db1c5832f3 100644 --- a/versions/u-/uchardet.json +++ b/versions/u-/uchardet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8333800cb0daceea8448ca6d20a91a1944b31559", + "version-date": "2021-09-03", + "port-version": 2 + }, { "git-tree": "bef8f2cbbb385ec635dbca67e3783496a15cb4a0", "version-date": "2021-09-03", diff --git a/versions/u-/umock-c.json b/versions/u-/umock-c.json index ec6028e36886fe..366826108aab81 100644 --- a/versions/u-/umock-c.json +++ b/versions/u-/umock-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67f2fda1636719281706ebef0314a388ba5c8d15", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "b34153650a29eb81f88e48f53bd06ca05d4383c4", "version-string": "2020-06-17", diff --git a/versions/u-/unicorn-lib.json b/versions/u-/unicorn-lib.json index eec55aaa604950..db2bc9f7856661 100644 --- a/versions/u-/unicorn-lib.json +++ b/versions/u-/unicorn-lib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "278115c391839dcfc66ac80339c8dcd9a660c9e0", + "version-date": "2022-01-24", + "port-version": 0 + }, { "git-tree": "e88ab2927a310295171887057ac0f6cc6502a8d5", "version-date": "2020-03-02", diff --git a/versions/u-/unicorn.json b/versions/u-/unicorn.json index f71f2b6839d4ce..611d03bceef023 100644 --- a/versions/u-/unicorn.json +++ b/versions/u-/unicorn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78e0a5d0840a6e2ae29d4922f34c858b821ab377", + "version-date": "2020-09-14", + "port-version": 2 + }, { "git-tree": "5126bae583b1f4d7d512b4bc06d799da0cd664be", "version-string": "2020-09-14", diff --git a/versions/u-/unixodbc.json b/versions/u-/unixodbc.json index 59f0979ab87bda..6b6e135c31f850 100644 --- a/versions/u-/unixodbc.json +++ b/versions/u-/unixodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68ea55f1c4679d7585ab6482d1641bfb6b106b23", + "version": "2.3.9", + "port-version": 1 + }, { "git-tree": "7576aa3f19845c2388e7786118082d4cfa9efb49", "version": "2.3.9", diff --git a/versions/u-/unrar.json b/versions/u-/unrar.json index 4d2dcb5c2147b2..0aa96d38a76da7 100644 --- a/versions/u-/unrar.json +++ b/versions/u-/unrar.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d2ade299ed837817b3d02522f990af3a64cb938b", + "version": "5.8.1", + "port-version": 3 + }, + { + "git-tree": "4d39c9643a67338a3252672f3c5910891c6a87cd", + "version": "5.8.1", + "port-version": 2 + }, { "git-tree": "31f7c1900da6148793b6b10c1b7be7b5e80d4172", "version-string": "5.8.1", diff --git a/versions/u-/urdfdom.json b/versions/u-/urdfdom.json index bcefd4e533ad4f..8c71cc56c88d86 100644 --- a/versions/u-/urdfdom.json +++ b/versions/u-/urdfdom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a74450532028f2079b8ea0b20bb82ded93e951d6", + "version": "1.0.4", + "port-version": 5 + }, { "git-tree": "1022fc5895356fb9cd1c37767cf2397e4edfd415", "version-string": "1.0.4", diff --git a/versions/u-/urho3d.json b/versions/u-/urho3d.json index 8a1c844d674590..894984ca802baf 100644 --- a/versions/u-/urho3d.json +++ b/versions/u-/urho3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d6c7a328006bca59755eec70c09a83fe9b1a087", + "version-date": "2021-03-01", + "port-version": 2 + }, { "git-tree": "a31df110bd09d7f49eec0cc5e7f19799ab83564a", "version-date": "2021-03-01", diff --git a/versions/u-/uriparser.json b/versions/u-/uriparser.json index b4704cd8998a67..a943063fde6936 100644 --- a/versions/u-/uriparser.json +++ b/versions/u-/uriparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f9aef4f8260430170711fecac6c383bb259f034", + "version": "0.9.6", + "port-version": 0 + }, { "git-tree": "6e6605cac24d7d9cc91af51a7ea3b1da2adde159", "version-semver": "0.9.5", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index 1c7e2f2ff09a7f..f32c455a84edf2 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "177f2af7397316cc1fa92a72ea8992f6acca8dfb", + "version-string": "20.08", + "port-version": 2 + }, { "git-tree": "44bef511fe3c249b1579ab696b8bd7e82147b788", "version-string": "20.08", diff --git a/versions/u-/utf8h.json b/versions/u-/utf8h.json index e6d95f597bf460..9963adfbee61a8 100644 --- a/versions/u-/utf8h.json +++ b/versions/u-/utf8h.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f26a3cff10653923f791bc424e4ed1839c33a9ad", + "version-date": "2021-11-18", + "port-version": 0 + }, { "git-tree": "e54d88f6fff213e5e7ab15eefffc3e2674f1da63", "version-date": "2021-10-21", diff --git a/versions/u-/uthenticode.json b/versions/u-/uthenticode.json index 8bb7320735cd52..b4f7957ef03362 100644 --- a/versions/u-/uthenticode.json +++ b/versions/u-/uthenticode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc0bd0b234a79de442f7001bd1a216716333e067", + "version": "1.0.6", + "port-version": 1 + }, { "git-tree": "bd27c0f342a4c62251b30f323be232c86bc999af", "version-string": "1.0.6", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index 21f25ac1484365..b523cbb8d89b2b 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fe5522a95b1f9ef72d43c019948fd94055b42410", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "4f353fc6ad423c0a9d95c7b2d2f6c7a150e43b25", + "version-date": "2021-11-08", + "port-version": 1 + }, { "git-tree": "c9e1961e16fefb328333a2f99555a33cdc496356", "version-date": "2021-11-08", diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index 55ffaefc7cd58e..ce1397846d4627 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5b1e062e56cf8ea0bdfe07414a11791e62c964fe", + "version-semver": "20.11.0", + "port-version": 0 + }, + { + "git-tree": "bbc3058932f01e905d7cf4129e55da10496f8374", + "version-semver": "20.9.0", + "port-version": 0 + }, { "git-tree": "8a874bc8213f0b0a2e96710cce72f6e7d344ffac", "version-semver": "20.8.0", diff --git a/versions/v-/v-hacd.json b/versions/v-/v-hacd.json index 0be1cb57ba7062..cfe1c12b87dd40 100644 --- a/versions/v-/v-hacd.json +++ b/versions/v-/v-hacd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c65970db1719a0f4ac77a70859ce0a46a430c54a", + "version": "3.2.0", + "port-version": 3 + }, { "git-tree": "fb52b4b2323057dd987225a70627ed40016756ee", "version-string": "3.2.0", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index 9a859f286bc93a..9583dc8d42738f 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3abf0953ae7dcf4bb4b4ede21adb27ad850b1e1c", + "version": "9.1.269.39", + "port-version": 3 + }, + { + "git-tree": "b245f57cb85bfd7a699e2ceb9628682b39bcc150", + "version": "9.1.269.39", + "port-version": 2 + }, { "git-tree": "d179f8f99ecce385eab497b2850e605976f4d9d5", "version": "9.1.269.39", diff --git a/versions/v-/vamp-sdk.json b/versions/v-/vamp-sdk.json index d43b514319b7a6..153a9e1f0a314a 100644 --- a/versions/v-/vamp-sdk.json +++ b/versions/v-/vamp-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d2b2ab057b4e31d833668e82f95283c7afbc551", + "version": "2.10", + "port-version": 2 + }, { "git-tree": "1c71927e1997998f40a9d051d65ba4e5760f4257", "version": "2.10", diff --git a/versions/v-/vc.json b/versions/v-/vc.json index 03ffe16c1fa4d7..2d7db742642630 100644 --- a/versions/v-/vc.json +++ b/versions/v-/vc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57204c2b095452a828860a6476b8b997463ee36d", + "version": "1.4.2", + "port-version": 2 + }, { "git-tree": "670b9bb5b2fe8a35ac2115b355d87995b1ee85b6", "version-string": "1.4.2", diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json index ebb17990d27437..208504f941a30c 100644 --- a/versions/v-/vcpkg-cmake-config.json +++ b/versions/v-/vcpkg-cmake-config.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "24dc7dfc704406e9f745f033643dc25f56e4ca18", + "version-date": "2022-02-06", + "port-version": 0 + }, + { + "git-tree": "fea8f92ffa5e14c7111fe526f8cc93ecd8f9dbf0", + "version-date": "2022-01-30", + "port-version": 0 + }, + { + "git-tree": "e33152002c946b93a0262931ba8bf54a2e6ab9ad", + "version-date": "2021-12-28", + "port-version": 0 + }, + { + "git-tree": "51df1bbddb22782b9e7f23f9b3588674184e991a", + "version-date": "2021-12-01", + "port-version": 0 + }, { "git-tree": "38a87ee8edd9ea8e8fff604fbcb785661a8d0e28", "version-date": "2021-11-01", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 6c05751fd73036..b61a6fe25f1beb 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b7c050fe60f91dcedef6d87a3f87584151bf8aee", + "version-date": "2022-01-19", + "port-version": 0 + }, + { + "git-tree": "a35eb7c761372dc64526d59fa918a13c0dfbba1b", + "version-date": "2021-12-20", + "port-version": 0 + }, + { + "git-tree": "462dd9ada82163b8c104cef8c2ad5b5c0bfa5eb8", + "version-date": "2021-12-05", + "port-version": 0 + }, { "git-tree": "fc4d9fcc5b8d2b97c083c6b70dd06df5174bd97b", "version-date": "2021-09-13", diff --git a/versions/v-/vcpkg-gfortran.json b/versions/v-/vcpkg-gfortran.json index 59725ac545af18..73e8296641380e 100644 --- a/versions/v-/vcpkg-gfortran.json +++ b/versions/v-/vcpkg-gfortran.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fa617d0b37f47f7f19210be936e25914d6f64c6", + "version": "3", + "port-version": 2 + }, { "git-tree": "46d6be1a505fd008358fc3b426a74a0063661f68", "version-string": "3", diff --git a/versions/v-/vcpkg-gn.json b/versions/v-/vcpkg-gn.json index 542393a83b802c..b1802e0e8d086b 100644 --- a/versions/v-/vcpkg-gn.json +++ b/versions/v-/vcpkg-gn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba02b5d9d66b0e227762e6aeac0851fd8fb4314e", + "version-date": "2021-11-16", + "port-version": 1 + }, { "git-tree": "f0ec062fd9ed47e9a00f343e15f185e4201e661b", "version-date": "2021-11-16", diff --git a/versions/v-/vcpkg-pkgconfig-get-modules.json b/versions/v-/vcpkg-pkgconfig-get-modules.json index 7a206d061cf282..1b3b6360a4fc5d 100644 --- a/versions/v-/vcpkg-pkgconfig-get-modules.json +++ b/versions/v-/vcpkg-pkgconfig-get-modules.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d4f1fd82fd733b622ed83f5f502b8483e5b2ca3b", + "version-date": "2022-02-10", + "port-version": 0 + }, + { + "git-tree": "1fae7b16a1eb390ca9239c3e82aa0fdb41f9565b", + "version-date": "2022-01-10", + "port-version": 0 + }, { "git-tree": "558512de1cc52fd9e246d6e7b99575418dd8500f", "version-date": "2021-04-02", diff --git a/versions/v-/vcpkg-tool-lessmsi.json b/versions/v-/vcpkg-tool-lessmsi.json new file mode 100644 index 00000000000000..f515fe25435502 --- /dev/null +++ b/versions/v-/vcpkg-tool-lessmsi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "82ed573f8102d4ac7c15f40c64bba00968085d51", + "version": "1.10.0", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json new file mode 100644 index 00000000000000..c5143684dbbe85 --- /dev/null +++ b/versions/v-/vcpkg-tool-meson.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6fe7cf1649af5d90c1e88765411a463cac55e99c", + "version": "0.60.2", + "port-version": 2 + }, + { + "git-tree": "932036adfc24dd5fa63787b825974b6938402700", + "version": "0.60.2", + "port-version": 1 + }, + { + "git-tree": "e6ef15a9dc810b4bde53d9b1e3da3a20107e3983", + "version": "0.60.2", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vcpkg-tool-python2.json b/versions/v-/vcpkg-tool-python2.json new file mode 100644 index 00000000000000..466cf26f9b8192 --- /dev/null +++ b/versions/v-/vcpkg-tool-python2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "207c41205cd98688dda41cee13ecec02aae1f5fd", + "version": "2.7.18", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vectorclass.json b/versions/v-/vectorclass.json index 02a9695eb21da0..dc472b4a17439d 100644 --- a/versions/v-/vectorclass.json +++ b/versions/v-/vectorclass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1c1b1ca0e0ddb9d5c27129234b2c22c9b73bd16", + "version-string": "2.00.01", + "port-version": 2 + }, { "git-tree": "0e6cebabfff6ad5300bf2fd306e48a7a7392abcb", "version-string": "2.00.01", diff --git a/versions/v-/vk-bootstrap.json b/versions/v-/vk-bootstrap.json new file mode 100644 index 00000000000000..25a7da98c5a310 --- /dev/null +++ b/versions/v-/vk-bootstrap.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c882b9c4c2adf3ea8e63dae9d4ab03b4d34a4dc1", + "version": "0.5", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vlpp.json b/versions/v-/vlpp.json index 61c6b6577ee624..37a6699ba2e81c 100644 --- a/versions/v-/vlpp.json +++ b/versions/v-/vlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfa763a8d53142b93748fde4a578ddbd95431ac2", + "version-string": "0.11.0.0", + "port-version": 2 + }, { "git-tree": "0497f92c39e00928468399f96b7da4ef729b4c4f", "version-string": "0.11.0.0", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 36d887d4c23cee..d7362563531e1c 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "6a7eea485be980aa5c9fae1e0a75084f98e5dc27", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 10 + }, + { + "git-tree": "3fa106f1a3c80a3ad15d8db406067c5253decc8e", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 9 + }, + { + "git-tree": "585d1bca8e71d950c6d12ceb6ad720825ecbd704", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 8 + }, + { + "git-tree": "4ba3d3d0db6e98e9a47d8c5c86790da3ef9af25b", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 7 + }, + { + "git-tree": "4a9a03829df133347e358e94e79953ac9d91ae82", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 6 + }, { "git-tree": "bd6ac57e684fd8a2234509813248f64a6cb522d5", "version-semver": "9.0.3-pv5.9.1", diff --git a/versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json index 6e512adb3a5513..e1f1052545357a 100644 --- a/versions/v-/vulkan-headers.json +++ b/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5192b1575959f03e204edc4712351461b6a2c23", + "version": "1.2.203", + "port-version": 0 + }, { "git-tree": "67ab6950d3e363975e70de04b73c39a35db721b3", "version-semver": "1.2.184", diff --git a/versions/v-/vulkan-hpp.json b/versions/v-/vulkan-hpp.json index db78e0da164c4b..d3871998589f45 100644 --- a/versions/v-/vulkan-hpp.json +++ b/versions/v-/vulkan-hpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f1e3c5ad864b671b57492c92079e7270bde0558", + "version": "1.2.203", + "port-version": 0 + }, { "git-tree": "a3f04aeb70ff80b168cf4e86134c7c61f7d23d62", "version-string": "1.2.184", diff --git a/versions/w-/wampcc.json b/versions/w-/wampcc.json index 6c5eb55af194d3..1c4f726c924568 100644 --- a/versions/w-/wampcc.json +++ b/versions/w-/wampcc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f712e2c2cd060bb7ee6888b8c00cd3f0cd4a937", + "version-date": "2019-09-04", + "port-version": 3 + }, { "git-tree": "00037d098a709bf36797f4cc768b5e62ad4db387", "version-string": "2019-09-04", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 80d9cd9a5f87c4..e52206307b869a 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "387fe8f00443c17cf01fe0ebc235dd8cc5dd3f03", + "version-string": "2022.01.31.00", + "port-version": 0 + }, { "git-tree": "070f35ba95d1f0b817f225896daa7bd48ce3e47d", "version-string": "2021.06.14.00", diff --git a/versions/w-/wavpack.json b/versions/w-/wavpack.json index 89722b850f63bc..a723cf1107e7a3 100644 --- a/versions/w-/wavpack.json +++ b/versions/w-/wavpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77b8c9ab85776abb2d049d562db7350525ddf7e2", + "version": "5.4.0", + "port-version": 1 + }, { "git-tree": "ba245d1ac0cf8e5024feca18df32365ceed6a402", "version": "5.4.0", diff --git a/versions/w-/wil.json b/versions/w-/wil.json index 7ed0118fca0359..713da01061c08f 100644 --- a/versions/w-/wil.json +++ b/versions/w-/wil.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c918f3ae742f41c096f5758afd5af98fe7a194b5", + "version-date": "2021-12-25", + "port-version": 0 + }, + { + "git-tree": "287e04f5640f1793bdb27bc477dea1ca0e727961", + "version-date": "2021-08-03", + "port-version": 2 + }, { "git-tree": "fe6538eb3c7260ca155c82808519426a280e42e5", "version-string": "2021-08-03", diff --git a/versions/w-/wincrypt.json b/versions/w-/wincrypt.json index f6a6f6867d2527..8448b32dce25d7 100644 --- a/versions/w-/wincrypt.json +++ b/versions/w-/wincrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67bd745832f348a85a09259db83dd4d6db5c8843", + "version": "0.0", + "port-version": 4 + }, { "git-tree": "0ab415a2d32d39cf7dd59d5fd3ca4bf544c42f51", "version-string": "0.0", diff --git a/versions/w-/winpcap.json b/versions/w-/winpcap.json index 9d8a244b8fdc06..b29cb56e0dd93e 100644 --- a/versions/w-/winpcap.json +++ b/versions/w-/winpcap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "85d70a721afa26cf8ff26aec62fd04a16f8e6f7b", + "version": "4.1.3", + "port-version": 8 + }, + { + "git-tree": "8b3f6f5a5e85be5df29d86d4e8e1621a9f3369f4", + "version": "4.1.3", + "port-version": 7 + }, { "git-tree": "12c456f2d3fc78f821ff85ac7bb55d89ce140ed6", "version": "4.1.3", diff --git a/versions/w-/winreg.json b/versions/w-/winreg.json index de6e0e42d9a790..8f257f3dd1ee3b 100644 --- a/versions/w-/winreg.json +++ b/versions/w-/winreg.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a788126cfabb1299a7f43933fec7ced6074a7939", + "version": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "303a59adfcedbd8c8acdc053ec6b1139d056ecae", + "version": "4.1.2", + "port-version": 1 + }, { "git-tree": "000a828ce0f4abd8b4732c7ca7e819e25e82144b", "version": "4.1.2", diff --git a/versions/w-/winsock2.json b/versions/w-/winsock2.json index ca48a65da4d0d5..8c41d101f24ac9 100644 --- a/versions/w-/winsock2.json +++ b/versions/w-/winsock2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6fb217f4eea375e9691dbde28c72c01dddd0c9f", + "version": "0.0", + "port-version": 4 + }, { "git-tree": "64b2e9218e0f0a50655510451914a5e532613795", "version-string": "0.0", diff --git a/versions/w-/winsparkle.json b/versions/w-/winsparkle.json new file mode 100644 index 00000000000000..49297b7f6e97df --- /dev/null +++ b/versions/w-/winsparkle.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0d756f506e6a79a2a79706f9080c05b45e7df882", + "version": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/versions/w-/wintoast.json b/versions/w-/wintoast.json index 712905b577b5be..b61765e3e8ff0d 100644 --- a/versions/w-/wintoast.json +++ b/versions/w-/wintoast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e0b224e777c1a12676204204a97636e3639c4c1", + "version": "1.2.0", + "port-version": 2 + }, { "git-tree": "186a3b60dc0a76ecb0b1a5a2147306dbfe734797", "version-string": "1.2.0", diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json index 9f7b2a523e28ea..2b2c63cfe10921 100644 --- a/versions/w-/wpilib.json +++ b/versions/w-/wpilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf10ef63982d54978a85c868d37462ce21643188", + "version-string": "2020.3.2", + "port-version": 2 + }, { "git-tree": "f656633935224ac3005954533294babd766921b1", "version-string": "2020.3.2", diff --git a/versions/w-/wt.json b/versions/w-/wt.json index 8fc39c07a13b0a..a965342635ea7f 100644 --- a/versions/w-/wt.json +++ b/versions/w-/wt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0d5d5d96583b44370437e567f086173a2c0ad51e", + "version": "4.6.1", + "port-version": 0 + }, + { + "git-tree": "62d1e8353f693697e3c7346c09afd96e1e6a1031", + "version": "4.5.0", + "port-version": 3 + }, { "git-tree": "1535b49590f6871ba9195f3a712e99ba1da27107", "version-string": "4.5.0", diff --git a/versions/w-/wtl.json b/versions/w-/wtl.json index 394a38ef4992eb..474f02cc8f2be7 100644 --- a/versions/w-/wtl.json +++ b/versions/w-/wtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3345336300f47e924a80d3be0f3fb76c558a54fe", + "version-string": "10.0.10320", + "port-version": 2 + }, { "git-tree": "6d429012165553d38ea4ae45057ce85bb34deb96", "version-string": "10.0.10320", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index d674192ce108db..c8da366d3717e7 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "9184caa631070403a5fd8c177b56907a313ad197", + "version-semver": "3.1.5", + "port-version": 7 + }, + { + "git-tree": "79ef97e2255a360a5515d0fbdbb839c15bb12548", + "version-semver": "3.1.5", + "port-version": 6 + }, + { + "git-tree": "f12ef0e93d9ca2f6d1c8cb4ad3703d98359abacd", + "version-semver": "3.1.5", + "port-version": 5 + }, + { + "git-tree": "c485515f9004da8092ce9ed1ea3e319fa66a7f77", + "version-semver": "3.1.5", + "port-version": 4 + }, { "git-tree": "dcd0a52fd041f8c7b658a01ec1141f36d77220c6", "version-semver": "3.1.5", diff --git a/versions/x-/x-plane.json b/versions/x-/x-plane.json index 46907fbe4942c4..34333db077cb66 100644 --- a/versions/x-/x-plane.json +++ b/versions/x-/x-plane.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b49030933a1014e1e897438a29a52fbb163b5f3", + "version": "3.0.3", + "port-version": 1 + }, { "git-tree": "abc8034ffafdac8f5840bc31600af7854c24f6b9", "version-string": "3.0.3", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 381e5fa4adee89..bd8a969ea8dad4 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7eea109502309e62a578bcc69811ad0659e00f9d", + "version-string": "164-5db6aa6cab1b146", + "port-version": 4 + }, + { + "git-tree": "6021c139214cb74f8fcc2e89344f05210ea4826d", + "version-string": "164-5db6aa6cab1b146", + "port-version": 3 + }, + { + "git-tree": "c449395a31c61601c5313e4f3e6040bee9c67fde", + "version-string": "164-5db6aa6cab1b146", + "port-version": 2 + }, { "git-tree": "8d6c7ba5815a0683a2915df5f95de5d06e938781", "version-string": "164-5db6aa6cab1b146", diff --git a/versions/x-/xaudio2redist.json b/versions/x-/xaudio2redist.json index f87be3dcc11cd2..d5b291aaa2a44a 100644 --- a/versions/x-/xaudio2redist.json +++ b/versions/x-/xaudio2redist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fe6eda4ff7a68db79013f5c5632e6e1a87b98e9", + "version": "1.2.8", + "port-version": 1 + }, { "git-tree": "71315ed933daddc996ecb863c39fc178b3f80771", "version-string": "1.2.8", diff --git a/versions/x-/xbyak.json b/versions/x-/xbyak.json index 480d7d214674f7..26f3261d0cae3f 100644 --- a/versions/x-/xbyak.json +++ b/versions/x-/xbyak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef05725cf97fc484f475a6db447bc6d503c8d42b", + "version-string": "6.00", + "port-version": 1 + }, { "git-tree": "ca393737aa37584343dc10008000c850f26b0881", "version-string": "6.00", diff --git a/versions/x-/xerces-c.json b/versions/x-/xerces-c.json index 2f515db5c405f2..bb735c60540b09 100644 --- a/versions/x-/xerces-c.json +++ b/versions/x-/xerces-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e0b3743b100fd4c22291b3c55ff73aac8ae188c", + "version": "3.2.3", + "port-version": 4 + }, { "git-tree": "b920ebcb559e728e512c42e7e27ce5db58aba440", "version-string": "3.2.3", diff --git a/versions/x-/xqilla.json b/versions/x-/xqilla.json new file mode 100644 index 00000000000000..46f07c53b0e253 --- /dev/null +++ b/versions/x-/xqilla.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5e0e7d4ac944e58a70a8a71a8a715598b22c7e73", + "version": "2.3.4", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xtensor-io.json b/versions/x-/xtensor-io.json index 8bf28e92533383..9c5f26f192533b 100644 --- a/versions/x-/xtensor-io.json +++ b/versions/x-/xtensor-io.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5673651fb8b30a016de2c3a3d7fbe96838690cb1", + "version": "0.13.0", + "port-version": 1 + }, + { + "git-tree": "71f1c4cb5fb871e6dd863766646a38b232a20b2f", + "version": "0.13.0", + "port-version": 0 + }, { "git-tree": "ba855025d72826b6462959f0e8f895e62102e626", "version": "0.12.8", diff --git a/versions/x-/xtensor.json b/versions/x-/xtensor.json index b175c89b578b14..3d91ce24be2a38 100644 --- a/versions/x-/xtensor.json +++ b/versions/x-/xtensor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7e23c44907ce8f4ca8cec01cb5534f092e74dda", + "version": "0.24.0", + "port-version": 0 + }, { "git-tree": "ca365f721479380995943c5ab4e8cdd6866ec785", "version": "0.23.10", diff --git a/versions/x-/xxhash.json b/versions/x-/xxhash.json index 2f8f582edafe10..bd93be72cf761c 100644 --- a/versions/x-/xxhash.json +++ b/versions/x-/xxhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "895a0039b3cd40c7f66725608d07dc851e0d54b6", + "version": "0.8.1", + "port-version": 1 + }, { "git-tree": "69e750b7b17d837d2d7e41385c7f339e7e23f65c", "version": "0.8.1", diff --git a/versions/y-/yajl.json b/versions/y-/yajl.json index d51bb4bee74b78..a6494c169c6fe8 100644 --- a/versions/y-/yajl.json +++ b/versions/y-/yajl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "348d0cb4e70b0db911dbd9e014d69164eb53cec4", + "version-string": "2.1.0", + "port-version": 3 + }, { "git-tree": "a1f09d6c9effe9aa148fb4c659498c3dc82c61d8", "version-string": "2.1.0", diff --git a/versions/y-/yasm-tool-helper.json b/versions/y-/yasm-tool-helper.json index 606a5eee5603e9..c8ab8dabf50d70 100644 --- a/versions/y-/yasm-tool-helper.json +++ b/versions/y-/yasm-tool-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a2dfb294bebae79c48cc710756756164175be1d", + "version-date": "2020-03-11", + "port-version": 1 + }, { "git-tree": "7d0e3b2224338888cd1e2f7a00c182961a7ea760", "version-string": "2020-03-11", diff --git a/versions/y-/yasm-tool.json b/versions/y-/yasm-tool.json index 3ae9fc64031da7..41a4f9b7059125 100644 --- a/versions/y-/yasm-tool.json +++ b/versions/y-/yasm-tool.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5dc61ac1b2f25ef005c279fd65cd98cbdedc161a", + "version-date": "2021-12-14", + "port-version": 0 + }, + { + "git-tree": "456004e2ac7a578572cb14ebf581c246b869516a", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "cb913a26c18cde98be038655f65d2363ecee2cc1", "version": "1.3.0", diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json index 629197c55a304c..8ce7047cc23ea7 100644 --- a/versions/y-/yasm.json +++ b/versions/y-/yasm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4368509dc3dfe6cab848b8713b22c9c0ef408527", + "version": "1.3.0", + "port-version": 3 + }, + { + "git-tree": "eaab6c3ae3bfc1ffcfaee3b1695d7ee21dacc7b1", + "version-string": "1.3.0", + "port-version": 2 + }, { "git-tree": "10778f3b98b275cbbc840e6a3c6d96465b2a20a9", "version-string": "1.3.0", diff --git a/versions/y-/yato.json b/versions/y-/yato.json index 6a7e311f8ef73e..856103ad3cb7c3 100644 --- a/versions/y-/yato.json +++ b/versions/y-/yato.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "302773e4845f27896621a44a76a964baec26f3e8", + "version-date": "2022-03-06", + "port-version": 0 + }, { "git-tree": "8605c052211c8394b3f3a524ffe071307582a941", "version-string": "1.0", diff --git a/versions/z-/z3.json b/versions/z-/z3.json index ee81c0872d8c9c..f04b7bd925fa4c 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "78366a5b407998768b97ddee528306cf9cbe9847", + "version": "4.8.14", + "port-version": 0 + }, + { + "git-tree": "eb7c4238f0496b64a6527fd4b07dd753f31a1975", + "version": "4.8.12", + "port-version": 2 + }, { "git-tree": "679ab881c1277be69ffc601a568e3b47d4d55432", "version": "4.8.12", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index 28e134099eb40c..03d110f382c790 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "246f585e58f536087c5f70f918459d5500a4dc43", + "version": "4.3.4", + "port-version": 5 + }, + { + "git-tree": "efc9d6229adaef7b036d222004dd786353f8cd4e", + "version": "4.3.4", + "port-version": 4 + }, + { + "git-tree": "46cd1dcc3bc077341533cc01c32f467d1a7e181f", + "version": "4.3.4", + "port-version": 3 + }, { "git-tree": "423c351e8759303bc9ba74a065ce9b983a5f85f5", "version": "4.3.4", diff --git a/versions/z-/zkpp.json b/versions/z-/zkpp.json index 7c366122c06265..5cac9127c2dd41 100644 --- a/versions/z-/zkpp.json +++ b/versions/z-/zkpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcef2196b5ca1a1cc813c22eb903e5a9677f9eab", + "version": "0.2.3", + "port-version": 2 + }, { "git-tree": "5d45cca2392d1a09d62bc9e2d53e1296f0bd49fc", "version-string": "0.2.3", diff --git a/versions/z-/zpp-bits.json b/versions/z-/zpp-bits.json new file mode 100644 index 00000000000000..8b50b3560f8005 --- /dev/null +++ b/versions/z-/zpp-bits.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cfb5cd37a6ed4a1ccab70eeb3112db9ad3d2f026", + "version": "4.3.3", + "port-version": 0 + } + ] +} diff --git a/versions/z-/zstd.json b/versions/z-/zstd.json index 3ba7ad7e74deab..7fe2aa211d6e1c 100644 --- a/versions/z-/zstd.json +++ b/versions/z-/zstd.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2f8a5da3f925dc994500dabb2d3b5c7e11df0afd", + "version": "1.5.2", + "port-version": 1 + }, + { + "git-tree": "4e0feee1fa5d2c318aa16702dc6c89d9301a8ddb", + "version": "1.5.2", + "port-version": 0 + }, { "git-tree": "1260425f27dec6dd2e795369d4c28de5a676daef", "version-semver": "1.5.0",